Add and activate the W3C libwww pkg. This pkg makes use of the new

libtool pkg to create shared and static libraries automatically on all
platforms.

5 files changed, 34 insertions, 41 deletions

diff --git a/www/Makefile b/www/Makefile
index 911d10ce809..b95ed9216c0 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 1998/07/12 04:05:50 tv Exp $
+# $NetBSD: Makefile,v 1.13 1998/07/14 16:56:50 tv Exp $
 # FreeBSD Id: Makefile,v 1.65 1997/11/17 06:31:39 fenner Exp
 #
 
@@ -21,7 +21,7 @@
 #    SUBDIR += harvest
 #    SUBDIR += http-analyze
 #    SUBDIR += libpics
-#    SUBDIR += libwww
+    SUBDIR += libwww
 #    SUBDIR += linemode
 #    SUBDIR += linux-netscape4
     SUBDIR += lynx
diff --git a/www/libwww/Makefile b/www/libwww/Makefile
index 29032ae01ea..dd11161c336 100644
--- a/www/libwww/Makefile
+++ b/www/libwww/Makefile
@@ -1,31 +1,30 @@
-# New ports collection makefile for:	libwww
-# Version required:	5.1m1
-# Date created:		18 Feb 1996
-# Whom:			torstenb
-#
-# $Id: Makefile,v 1.1.1.1 1998/07/14 16:51:20 tv Exp $
+# $NetBSD: Makefile,v 1.2 1998/07/14 16:56:51 tv Exp $
+# FreeBSD Id: Makefile,v 1.10 1998/06/14 23:34:59 jseger Exp
 #
 
-PKGNAME=	libwww-5.1m1
 DISTNAME=	w3c-${PKGNAME}
+PKGNAME=	libwww-5.1m1
 CATEGORIES=	www devel
 MASTER_SITES=	ftp://ftp.w3.org/pub/libwww/
 
-MAINTAINER=	jseger@FreeBSD.org
+MAINTAINER=	tv@netbsd.org
+
+BUILD_DEPENDS=	${PREFIX}/bin/libtool:../../devel/libtool
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	--enable-shared --enable-static
+CONFIGURE_ARGS=	--with-zlib --with-regex
+CONFIGURE_ENV=	LIBTOOL=${PREFIX}/bin/libtool \
+		CPPFLAGS="-I${X11BASE}/include" \
+		LDFLAGS="-L${X11BASE}/lib"
+WRKSRC=		${WRKDIR}/w3c-libwww-5.1m
+
 DOCDIR=		${PREFIX}/share/doc/libwww
 
-WRKSRC=		${WRKDIR}/w3c-libwww-5.1m
 post-install:
-	@${LDCONFIG} -m ${PREFIX}/lib
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCDIR}/User
 	${CP} -R ${WRKSRC}/Library/User/* ${DOCDIR}/User
 	@${MKDIR} ${DOCDIR}/src
 	${CP} ${WRKSRC}/Library/src/*.html ${DOCDIR}/src
-.endif
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/libwww/patches/patch-ab b/www/libwww/patches/patch-ab
index 96f6af62fea..8d4d27db9cf 100644
--- a/www/libwww/patches/patch-ab
+++ b/www/libwww/patches/patch-ab
@@ -1,11 +1,18 @@
---- Library/src/HTMemLog.c.orig	Wed Feb 19 06:04:55 1997
-+++ Library/src/HTMemLog.c	Mon Jun  9 16:29:21 1997
-@@ -17,7 +17,7 @@
- #ifdef WWW_MSWINDOWS
- #define OPEN_FLAGS	O_WRONLY|O_CREAT|O_TRUNC
- #else /* WWW_MSWINDOWS */
--#define OPEN_FLAGS	O_WRONLY|O_CREAT|O_TRUNC|O_SYNC
-+#define OPEN_FLAGS	O_WRONLY|O_CREAT|O_TRUNC
- #endif /* !WWW_MSWINDOWS */
+--- configure.orig	Tue Jul 14 07:36:55 1998
++++ configure	Tue Jul 14 07:38:11 1998
+@@ -1432,6 +1432,7 @@
+   echo "$ac_t""no" 1>&6
+ fi
  
- PRIVATE size_t		LogBuffSize = 1024; /* default size is 1k */
++if false; then
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ 
+@@ -1477,6 +1478,7 @@
+ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
+ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
++fi
+ 
+ echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
+ echo "configure:1483: checking whether ${MAKE-make} sets \${MAKE}" >&5
diff --git a/www/libwww/patches/patch-ac b/www/libwww/patches/patch-ac
deleted file mode 100644
index a3a6fff007d..00000000000
--- a/www/libwww/patches/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- Library/src/Makefile.in.orig	Sun Jun 14 17:54:17 1998
-+++ Library/src/Makefile.in	Sun Jun 14 17:54:29 1998
-@@ -98,7 +98,7 @@
- subdirs = @subdirs@
- 
- lib_LTLIBRARIES = libwww.la
--libwww_la_LDFLAGS = -version-info 1:0:1
-+libwww_la_LDFLAGS = -version-info 5:3:1
- 
- SUBDIRS = windows vms
- 
diff --git a/www/libwww/pkg/PLIST b/www/libwww/pkg/PLIST
index b68a9c87904..4107247f2d9 100644
--- a/www/libwww/pkg/PLIST
+++ b/www/libwww/pkg/PLIST
@@ -1,3 +1,4 @@
+@comment $NetBSD: PLIST,v 1.2 1998/07/14 16:56:52 tv Exp $
 bin/w3c
 bin/webbot
 bin/www
@@ -148,10 +149,7 @@ include/w3c-libwww/wwwsys.h
 lib/libpics.a
 lib/libwww.a
 lib/libwww.la
-lib/libwww.so
-lib/libwww.so.5.3
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
+lib/libwww.so.1.0
 share/doc/libwww/User/Applications.html
 share/doc/libwww/User/Architecture/A.gif
 share/doc/libwww/User/Architecture/Alert.html