upgrade to 0.3.5

6 files changed, 24 insertions, 32 deletions

diff --git a/misc/chmlib/Makefile b/misc/chmlib/Makefile
index eb5b11c12fb..a0ec810264b 100644
--- a/misc/chmlib/Makefile
+++ b/misc/chmlib/Makefile
@@ -7,21 +7,18 @@
 #
 
 PORTNAME=	chmlib
-PORTVERSION=	0.3.1
-PORTREVISION=	2
+PORTVERSION=	0.3.5
+PORTREVISION=	0
 CATEGORIES=	misc
 MASTER_SITES=	http://66.93.236.84/~jedwin/projects/chmlib/
-DISTNAME=	${PORTNAME}-0.31
+DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A library for dealing with Microsoft ITSS/CHM format files
 
-WANT_LIBTOOL_VER=13
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
-do-configure:
-	@${DO_NADA}
-
 .include <bsd.port.mk>
diff --git a/misc/chmlib/distinfo b/misc/chmlib/distinfo
index e7f4b0bd7e3..e430bb884f4 100644
--- a/misc/chmlib/distinfo
+++ b/misc/chmlib/distinfo
@@ -1,2 +1,2 @@
-MD5 (chmlib-0.31.tgz) = 5ff2d8476d4124d04aae11601b844c63
-SIZE (chmlib-0.31.tgz) = 45453
+MD5 (chmlib-0.35.tgz) = 8fa0e692b2606a03fb51589f66a82eec
+SIZE (chmlib-0.35.tgz) = 368428
diff --git a/misc/chmlib/files/patch-Makefile b/misc/chmlib/files/patch-Makefile
deleted file mode 100644
index f34d5f7ae7c..00000000000
--- a/misc/chmlib/files/patch-Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
---- Makefile.orig	Thu Oct 10 12:25:54 2002
-+++ Makefile	Thu Jun 19 21:34:15 2003
-@@ -7,11 +7,11 @@
- # Note: LDFLAGS must contain -lpthread if you are using -DCHM_MT.
- #
- #CFLAGS=-DCHM_MT -DCHM_USE_PREAD -DCHM_USE_IO64
--CFLAGS=-DCHM_MT -DCHM_USE_PREAD -DCHM_USE_IO64 -g -DDMALLOC_DISABLE
--LDFLAGS=-lpthread
--INSTALLPREFIX=/usr/local/
--CC=gcc-3.2
--LD=gcc-3.2
-+CFLAGS+=-DCHM_MT -DDMALLOC_DISABLE
-+LDFLAGS=${PTHREAD_LIBS}
-+INSTALLPREFIX=${PREFIX}
-+#CC=gcc-3.2
-+LD=${CC}
- LIBTOOL=libtool
- CP=/bin/cp
- EXAMPLES=test_chmLib enum_chmLib enumdir_chmLib chm_http extract_chmLib
diff --git a/misc/chmlib/files/patch-chm_lib.c b/misc/chmlib/files/patch-chm_lib.c
index 43b1d330c70..bc32cdd9d06 100644
--- a/misc/chmlib/files/patch-chm_lib.c
+++ b/misc/chmlib/files/patch-chm_lib.c
@@ -1,6 +1,6 @@
---- chm_lib.c.orig	Tue Apr  8 10:33:30 2003
-+++ chm_lib.c	Tue Apr  8 10:40:56 2003
-@@ -139,6 +139,17 @@
+--- src/chm_lib.c.orig	Tue Apr  8 10:33:30 2003
++++ src/chm_lib.c	Tue Apr  8 10:40:56 2003
+@@ -156,6 +156,17 @@
  typedef __int64                 Int64;
  typedef unsigned __int64        UInt64;
  
diff --git a/misc/chmlib/files/patch-ltmain.sh b/misc/chmlib/files/patch-ltmain.sh
new file mode 100644
index 00000000000..f266f396d9d
--- /dev/null
+++ b/misc/chmlib/files/patch-ltmain.sh
@@ -0,0 +1,15 @@
+--- 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 aadb448d709..4ceb7628699 100644
--- a/misc/chmlib/pkg-plist
+++ b/misc/chmlib/pkg-plist
@@ -1,5 +1,4 @@
 include/chm_lib.h
 lib/libchm.a
-lib/libchm.la
 lib/libchm.so
 lib/libchm.so.0