summaryrefslogtreecommitdiff
path: root/misc/chmlib
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@FreeBSD.org>2005-10-27 17:47:33 +0000
committerVsevolod Stakhov <vsevolod@FreeBSD.org>2005-10-27 17:47:33 +0000
commit5b0dca02e945dfce666fc5ac273712fe81cc14eb (patch)
tree7c68b100ca3f77535836e76930fe50607949f38f /misc/chmlib
parentAdd missing size in distinfo. Perhaps portlint should check for that... (diff)
- Update to 0.37 version that fixes important security bug.
Noted by: Jed Wing (author)
Notes
Notes: svn path=/head/; revision=146502
Diffstat (limited to 'misc/chmlib')
-rw-r--r--misc/chmlib/Makefile4
-rw-r--r--misc/chmlib/distinfo4
-rw-r--r--misc/chmlib/files/patch-Makefile.in35
3 files changed, 31 insertions, 12 deletions
diff --git a/misc/chmlib/Makefile b/misc/chmlib/Makefile
index ecc4fe0c6683..99fcc15bda50 100644
--- a/misc/chmlib/Makefile
+++ b/misc/chmlib/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= chmlib
-PORTVERSION= 0.3.6
+PORTVERSION= 0.3.7
PORTREVISION= 0
CATEGORIES= misc
MASTER_SITES= http://66.93.236.84/~jedwin/projects/chmlib/
@@ -19,7 +19,7 @@ COMMENT= A library for dealing with Microsoft ITSS/CHM format files
USE_REINPLACE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --disable-io64 --disable-pread
+CONFIGURE_ARGS= --disable-io64 --disable-pread --exec-prefix=${PREFIX}
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/misc/chmlib/distinfo b/misc/chmlib/distinfo
index 41e191a75205..3e99a43d81e0 100644
--- a/misc/chmlib/distinfo
+++ b/misc/chmlib/distinfo
@@ -1,2 +1,2 @@
-MD5 (chmlib-0.36.tgz) = 989343e66c80265ae80907b05e80c841
-SIZE (chmlib-0.36.tgz) = 369830
+MD5 (chmlib-0.37.tgz) = 86c2aba79f231b91ff1d9eade9872359
+SIZE (chmlib-0.37.tgz) = 363771
diff --git a/misc/chmlib/files/patch-Makefile.in b/misc/chmlib/files/patch-Makefile.in
index 7519c9c4fa4e..7e7d8d2a0b6b 100644
--- a/misc/chmlib/files/patch-Makefile.in
+++ b/misc/chmlib/files/patch-Makefile.in
@@ -1,15 +1,34 @@
---- Makefile.in.orig Fri Feb 25 18:43:09 2005
-+++ Makefile.in Fri Feb 25 18:43:21 2005
-@@ -26,7 +26,7 @@
- %.lo: %.c
+--- Makefile.in.orig Wed Oct 26 16:13:45 2005
++++ Makefile.in Thu Oct 27 21:33:48 2005
+@@ -11,6 +11,7 @@
+ CFLAGS=@CFLAGS@ @CHM_MT@ @CHM_USE_PREAD@ @CHM_USE_IO64@ @DMALLOC_DISABLE@
+ LDFLAGS=@LDFLAGS@
+ prefix=@prefix@
++exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+ CC=@CC@
+@@ -29,17 +29,15 @@
+ src/%.lo: $(srcdir)/src/%.c
${LIBTOOL} --mode=compile ${CC} -c -o $@ $^ ${CFLAGS}
-
+
-src/libchm.la: src/chm_lib.lo src/lzx.lo
+src/libchm.la: src/chm_lib.lo src/lzx.lo src/az_chmlib_add.lo
- ${LIBTOOL} --mode=link ${CC} -o $@ $^ ${LDFLAGS} -rpath ${INSTALLPREFIX}/lib
-
+ ${LIBTOOL} --mode=link ${CC} -o $@ $^ ${LDFLAGS} -rpath $(libdir)
+
install: src/libchm.la
-
+ chmod a+r src/libchm.la
+ mkdir -p $(prefix)
+- install -m0755 src/libchm.la $(DESTDIR)$(libdir)/
+ install -m0644 $(srcdir)/src/chm_lib.h $(DESTDIR)$(includedir)/
+- install -m0755 src/.libs/libchm.so.0.0.0 $(DESTDIR)$(libdir)/
+- ln -s $(DESTDIR)$(libdir)/libchm.so.0.0.0 $(DESTDIR)$(libdir)/libchm.so
+- ln -s $(DESTDIR)$(libdir)/libchm.so.0.0.0 $(DESTDIR)$(libdir)/libchm.so.0
++ install -m0755 src/.libs/libchm.so.0 $(DESTDIR)$(libdir)/
++ ln -s $(DESTDIR)$(libdir)/libchm.so.0 $(DESTDIR)$(libdir)/libchm.so
+
+ clean:
+ rm -fr src/libchm.la src/*.o src/*.lo .libs src/.libs src/${EXAMPLES}
patch-az_chmlib_add.c
--- /dev/null Fri Feb 25 18:33:00 2005