5 files changed, 10 insertions, 46 deletions

diff --git a/misc/chmlib/Makefile b/misc/chmlib/Makefile
index 99fcc15bda50..e809b3141ef8 100644
--- a/misc/chmlib/Makefile
+++ b/misc/chmlib/Makefile
@@ -7,21 +7,19 @@
 #
 
 PORTNAME=	chmlib
-PORTVERSION=	0.3.7
-PORTREVISION=	0
+PORTVERSION=	0.37.4
 CATEGORIES=	misc
 MASTER_SITES=	http://66.93.236.84/~jedwin/projects/chmlib/
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	vsevolod@FreeBSD.org
 COMMENT=	A library for dealing with Microsoft ITSS/CHM format files
 
-USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-io64 --disable-pread --exec-prefix=${PREFIX}
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}-0.37
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,-lpthread,${PTHREAD_LIBS}," ${WRKSRC}/configure
diff --git a/misc/chmlib/distinfo b/misc/chmlib/distinfo
index 29d64c19803b..ddc623a5b1a0 100644
--- a/misc/chmlib/distinfo
+++ b/misc/chmlib/distinfo
@@ -1,3 +1,3 @@
-MD5 (chmlib-0.37.tgz) = 86c2aba79f231b91ff1d9eade9872359
-SHA256 (chmlib-0.37.tgz) = e01b7d0194a9b37cd817aaf2315c24773af2a9650fe0d504f42f36fab8353410
-SIZE (chmlib-0.37.tgz) = 363771
+MD5 (chmlib-0.37.4.tgz) = 458c14c7a38c441263e6984924a05b24
+SHA256 (chmlib-0.37.4.tgz) = 9c6dde31330b77e760600c187c8279f38bc8b7fada8e03bb9cf5cfd9f91d2aab
+SIZE (chmlib-0.37.4.tgz) = 363315
diff --git a/misc/chmlib/files/patch-Makefile.in b/misc/chmlib/files/patch-Makefile.in
index 7e7d8d2a0b6b..7b722c5bd062 100644
--- a/misc/chmlib/files/patch-Makefile.in
+++ b/misc/chmlib/files/patch-Makefile.in
@@ -1,35 +1,14 @@
 --- 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 @@
+@@ -30,7 +31,7 @@
  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 $(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
 +++ src/az_chmlib_add.c	Fri Feb 25 18:29:45 2005
diff --git a/misc/chmlib/files/patch-ltmain.sh b/misc/chmlib/files/patch-ltmain.sh
deleted file mode 100644
index f266f396d9d2..000000000000
--- a/misc/chmlib/files/patch-ltmain.sh
+++ /dev/null
@@ -1,15 +0,0 @@
---- ltmain.sh.orig	Fri Oct 22 09:03:41 2004
-+++ ltmain.sh	Fri Oct 22 09:03:58 2004
-@@ -5550,10 +5550,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false ; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/misc/chmlib/pkg-plist b/misc/chmlib/pkg-plist
index 5a77b42469a0..aadb448d709d 100644
--- a/misc/chmlib/pkg-plist
+++ b/misc/chmlib/pkg-plist
@@ -1,3 +1,5 @@
 include/chm_lib.h
+lib/libchm.a
+lib/libchm.la
 lib/libchm.so
 lib/libchm.so.0