Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/www/libwww/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/www/libwww/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.30.2.3
retrieving revision 1.31
diff -u -p -r1.30.2.3 -r1.31
--- pkgsrc/www/libwww/Makefile	2002/08/22 11:12:58	1.30.2.3
+++ pkgsrc/www/libwww/Makefile	2002/06/17 10:33:53	1.31
@@ -1,30 +1,32 @@
-# $NetBSD: Makefile,v 1.30.2.3 2002/08/22 11:12:58 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2002/06/17 10:33:53 wiz Exp $
 
 DISTNAME=		w3c-libwww-5.3.2
 PKGNAME=		libwww-5.3.2
-PKGREVISION=		3
+PKGREVISION=		1
 CATEGORIES=		www devel
 MASTER_SITES=		http://www.w3.org/Library/Distribution/ \
 			ftp://ftp.uni-hannover.de/pub/mirror/info-systems/WWW/libwww/
 
-MAINTAINER=		packages@netbsd.org
+MAINTAINER=		tv@netbsd.org
 HOMEPAGE=		http://www.w3.org/Library/
 COMMENT=		The W3C Reference Library
 
 BUILD_DEPENDS+=		automake>=1.4:../../devel/automake
+BUILD_DEPENDS+=		perl>=${PERL5_REQD}:../../lang/perl5
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK_ONLY=	YES
 USE_GMAKE=		YES
 USE_LIBTOOL=		YES
-USE_PERL5=		build
 
-GNU_CONFIGURE=		YES
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--with-zlib --with-regex --without-x
-CONFIGURE_ARGS+=	--with-ssl="${SSLBASE}"
+CONFIGURE_ARGS+=	--with-ssl="${BUILDLINK_DIR}"
 
 DOCDIR=			${PREFIX}/share/doc/libwww
 LTCONFIG_OVERRIDE=	${WRKSRC}/config/ltconfig
 
+CFLAGS+=		${LDFLAGS}
+
 pre-configure:
 	cd ${WRKSRC}; \
 	    ${LOCALBASE}/bin/aclocal && \
@@ -37,16 +39,15 @@ pre-configure:
 .if defined(USE_SOCKS) && (${USE_SOCKS} == 4 || ${USE_SOCKS} == 5)
 .if ${USE_SOCKS} == 4
 .include "../../net/socks4/buildlink.mk"
-CONFIGURE_ARGS+= 	--with-socks4=${BUILDLINK_PREFIX.socks4}/lib/libsocks4.a
+CONFIGURE_ARGS+= 	--with-socks4=${BUILDLINK_DIR}/lib/libsocks4.a
 CONFIGURE_ARGS+=	--with-socks5=no
 .else
 .include "../../net/socks5/buildlink.mk"
 CONFIGURE_ARGS+=	--with-socks4=no
-CONFIGURE_ARGS+= 	--with-socks5=${BUILDLINK_prefix.socks5}/lib/libsocks5.a
+CONFIGURE_ARGS+= 	--with-socks5=${BUILDLINK_DIR}/lib/libsocks5.a
 .endif
 .endif
 
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../security/openssl/buildlink2.mk"
-
+.include "../../devel/zlib/buildlink.mk"
+.include "../../security/openssl/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"