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
retrieving revision 1.30.2.2
diff -u -p -r1.30 -r1.30.2.2
--- pkgsrc/www/libwww/Makefile	2001/11/29 19:46:13	1.30
+++ pkgsrc/www/libwww/Makefile	2002/06/30 06:24:33	1.30.2.2
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2001/11/29 19:46:13 jlam Exp $
+# $NetBSD: Makefile,v 1.30.2.2 2002/06/30 06:24:33 jlam Exp $
 
 DISTNAME=		w3c-libwww-5.3.2
 PKGNAME=		libwww-5.3.2
@@ -14,14 +14,13 @@ COMMENT=		The W3C Reference Library
 BUILD_DEPENDS+=		automake>=1.4:../../devel/automake
 BUILD_DEPENDS+=		perl>=${PERL5_REQD}:../../lang/perl5
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 USE_GMAKE=		YES
 USE_LIBTOOL=		YES
-#USE_SSL=		YES
 
-GNU_CONFIGURE=		yes
+GNU_CONFIGURE=		YES
 CONFIGURE_ARGS=		--with-zlib --with-regex --without-x
-CONFIGURE_ARGS+=	--with-ssl="${BUILDLINK_DIR}"
+CONFIGURE_ARGS+=	--with-ssl="${SSLBASE}"
 
 DOCDIR=			${PREFIX}/share/doc/libwww
 LTCONFIG_OVERRIDE=	${WRKSRC}/config/ltconfig
@@ -40,15 +39,16 @@ 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_DIR}/lib/libsocks4.a
+CONFIGURE_ARGS+= 	--with-socks4=${BUILDLINK_PREFIX.socks4}/lib/libsocks4.a
 CONFIGURE_ARGS+=	--with-socks5=no
 .else
 .include "../../net/socks5/buildlink.mk"
 CONFIGURE_ARGS+=	--with-socks4=no
-CONFIGURE_ARGS+= 	--with-socks5=${BUILDLINK_DIR}/lib/libsocks5.a
+CONFIGURE_ARGS+= 	--with-socks5=${BUILDLINK_prefix.socks5}/lib/libsocks5.a
 .endif
 .endif
 
-.include "../../devel/zlib/buildlink.mk"
-.include "../../security/openssl/buildlink.mk"
+.include "../../devel/zlib/buildlink2.mk"
+.include "../../security/openssl/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"