USE_LIBTOOL instead of PKGLIBTOOL.

4 files changed, 39 insertions, 44 deletions

diff --git a/www/libwww/Makefile b/www/libwww/Makefile
index 5950707720d..479902be592 100644
--- a/www/libwww/Makefile
+++ b/www/libwww/Makefile
@@ -1,21 +1,23 @@
-# $NetBSD: Makefile,v 1.8 2000/06/01 11:23:43 rh Exp $
+# $NetBSD: Makefile,v 1.9 2000/06/21 02:58:23 jlam Exp $
 # FreeBSD Id: Makefile,v 1.10 1998/06/14 23:34:59 jseger Exp
 #
 
-DISTNAME=	w3c-${PKGNAME}
-PKGNAME=	libwww-5.2.8
-CATEGORIES=	www devel
-MASTER_SITES=	http://www.w3.org/Library/Distribution/
+DISTNAME=		w3c-${PKGNAME}
+PKGNAME=		libwww-5.2.8
+CATEGORIES=		www devel
+MASTER_SITES=		http://www.w3.org/Library/Distribution/
 
-MAINTAINER=	tv@netbsd.org
-HOMEPAGE=	http://www.w3.org/Library/
+MAINTAINER=		tv@netbsd.org
+HOMEPAGE=		http://www.w3.org/Library/
 
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_PKGLIBTOOL=	yes
-CONFIGURE_ARGS=	--with-zlib --with-regex --without-x
+USE_GMAKE=		# defined
+USE_LIBTOOL=		# defined
+LTCONFIG_OVERRIDE=	${WRKSRC}/config/ltconfig
 
-DOCDIR=		${PREFIX}/share/doc/libwww
+GNU_CONFIGURE=		# defined
+CONFIGURE_ARGS=		--with-zlib --with-regex --without-x
+
+DOCDIR=			${PREFIX}/share/doc/libwww
 
 post-install:
 	@${MKDIR} ${DOCDIR}/User
diff --git a/www/libwww/files/patch-sum b/www/libwww/files/patch-sum
index 298217cecf3..06ef83b529b 100644
--- a/www/libwww/files/patch-sum
+++ b/www/libwww/files/patch-sum
@@ -1,7 +1,6 @@
-$NetBSD: patch-sum,v 1.3 1999/10/14 14:11:01 deberg Exp $
+$NetBSD: patch-sum,v 1.4 2000/06/21 02:58:25 jlam Exp $
 
 MD5 (patch-aa) = a519b8eb3c732d53a366d148c3be6ea4
-MD5 (patch-ab) = d816fc47e28af17910ee2bd1555ab642
 MD5 (patch-ac) = 248bcfe7e511a021fc96a3d0d311aefa
 MD5 (patch-ad) = ee66245051e6df813c8594280eece4c3
 MD5 (patch-ae) = a9b8a535f0b6bfc40cf2fb6ec908d1d6
diff --git a/www/libwww/patches/patch-ab b/www/libwww/patches/patch-ab
deleted file mode 100644
index fd539113877..00000000000
--- a/www/libwww/patches/patch-ab
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ab,v 1.4 1999/10/08 04:43:07 deberg Exp $
-
---- configure.orig	Thu May 27 16:41:53 1999
-+++ configure	Thu May 27 16:48:05 1999
-@@ -2014,5 +2014,5 @@
- fi
- 
--
-+if false; then
- # Check for any special flags to pass to ltconfig.
- #
-@@ -2242,4 +2242,5 @@
-   libtool_flags="$libtool_flags --disable-lock"
- fi
-+fi
- 
- 
-@@ -2293,4 +2294,5 @@
- 
- 
-+if false; then
- # Actually configure libtool.  ac_aux_dir is where install-sh is found.
- CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-@@ -2316,4 +2318,5 @@
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+fi
- 
- # Redirect the config.log output again, so that the ltconfig log is not
diff --git a/www/libwww/pkg/PLIST b/www/libwww/pkg/PLIST
index 137c3b7cf0e..3c6093c1465 100644
--- a/www/libwww/pkg/PLIST
+++ b/www/libwww/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 1999/10/08 04:43:07 deberg Exp $
+@comment $NetBSD: PLIST,v 1.5 2000/06/21 02:58:26 jlam Exp $
 bin/w3c
 bin/webbot
 bin/libwww-config
@@ -154,50 +154,73 @@ include/w3c-libwww/WWWZip.h
 include/w3c-libwww/wwwconf.h
 include/w3c-libwww/wwwsys.h
 lib/libmd5.a
+lib/libmd5.la
 lib/libmd5.so.1.0
 lib/libpics.a
+lib/libpics.la
 lib/libpics.so.0.0
 lib/libwwwapp.a
+lib/libwwwapp.la
 lib/libwwwapp.so.1.0
 lib/libwwwcache.a
+lib/libwwwcache.la
 lib/libwwwcache.so.1.0
 lib/libwwwcore.a
+lib/libwwwcore.la
 lib/libwwwcore.so.1.0
 lib/libwwwdir.a
+lib/libwwwdir.la
 lib/libwwwdir.so.1.0
 lib/libwwwfile.a
+lib/libwwwfile.la
 lib/libwwwfile.so.1.0
 lib/libwwwftp.a
+lib/libwwwftp.la
 lib/libwwwftp.so.1.0
 lib/libwwwgopher.a
+lib/libwwwgopher.la
 lib/libwwwgopher.so.1.0
 lib/libwwwhttp.a
+lib/libwwwhttp.la
 lib/libwwwhttp.so.1.0
 lib/libwwwhtml.a
+lib/libwwwhtml.la
 lib/libwwwhtml.so.1.0
 lib/libwwwinit.a
+lib/libwwwinit.la
 lib/libwwwinit.so.1.0
 lib/libwwwmime.a
+lib/libwwwmime.la
 lib/libwwwmime.so.1.0
 lib/libwwwmux.a
+lib/libwwwmux.la
 lib/libwwwmux.so.1.0
 lib/libwwwnews.a
+lib/libwwwnews.la
 lib/libwwwnews.so.1.0
 lib/libwwwstream.a
+lib/libwwwstream.la
 lib/libwwwstream.so.1.0
 lib/libwwwtelnet.a
+lib/libwwwtelnet.la
 lib/libwwwtelnet.so.1.0
 lib/libwwwtrans.a
+lib/libwwwtrans.la
 lib/libwwwtrans.so.1.0
 lib/libwwwutils.a
+lib/libwwwutils.la
 lib/libwwwutils.so.1.0
 lib/libwwwxml.a
+lib/libwwwxml.la
 lib/libwwwxml.so.1.0
 lib/libwwwzip.a
+lib/libwwwzip.la
 lib/libwwwzip.so.1.0
 lib/libxmlparse.a
+lib/libxmlparse.la
 lib/libxmlparse.so.1.0
 lib/libxmltok.a
+lib/libxmltok.la
 lib/libxmltok.so.1.0
 share/doc/libwww/User/Applications.html
 share/doc/libwww/User/Architecture/A.gif