diff options
Diffstat (limited to 'www/libwww')
| -rw-r--r-- | www/libwww/Makefile | 26 | ||||
| -rw-r--r-- | www/libwww/distinfo | 4 | ||||
| -rw-r--r-- | www/libwww/patches/patch-ah | 4 |
3 files changed, 18 insertions, 16 deletions
diff --git a/www/libwww/Makefile b/www/libwww/Makefile index ffa957aa3ca..8a959977d6e 100644 --- a/www/libwww/Makefile +++ b/www/libwww/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2001/04/30 03:46:34 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2001/06/28 20:55:53 jlam Exp $ # FreeBSD Id: Makefile,v 1.10 1998/06/14 23:34:59 jseger Exp # @@ -16,17 +16,20 @@ BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf BUILD_DEPENDS+= automake-1.4:../../devel/automake BUILD_DEPENDS+= perl>=${PERL5_REQD}:../../lang/perl5 +USE_BUILDLINK_ONLY= yes USE_GMAKE= yes USE_LIBTOOL= yes -USE_SSL= yes +#USE_SSL= 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 && \ @@ -38,17 +41,16 @@ pre-configure: # Include SOCKS firewall support .if defined(USE_SOCKS) && (${USE_SOCKS} == 4 || ${USE_SOCKS} == 5) .if ${USE_SOCKS} == 4 -CONFIGURE_ARGS+= --with-socks4=${LOCALBASE}/lib/libsocks4.a --with-socks5=no -DEPENDS+= socks4-2.2:../../net/socks4 +.include "../../net/socks4/buildlink.mk" +CONFIGURE_ARGS+= --with-socks4=${BUILDLINK_DIR}/lib/libsocks4.a +CONFIGURE_ARGS+= --with-socks5=no .else -CONFIGURE_ARGS+= --with-socks5=${LOCALBASE}/lib/libsocks5.a --with-socks4=no -DEPENDS+= socks5-1.0.2:../../net/socks5 +.include "../../net/socks5/buildlink.mk" +CONFIGURE_ARGS+= --with-socks4=no +CONFIGURE_ARGS+= --with-socks5=${BUILDLINK_DIR}/lib/libsocks5.a .endif .endif +.include "../../devel/zlib/buildlink.mk" +.include "../../security/openssl/buildlink.mk" .include "../../mk/bsd.pkg.mk" - -# This has to come after bsd.pkg.mk's construction of "${CONFIGURE_ENV}" -# in order to have the desired effect. It's purpose is to allow "${SSLBASE}" -# to take control of which "openssl" is used, if several are installed. -CONFIGURE_ENV+= LDFLAGS="" diff --git a/www/libwww/distinfo b/www/libwww/distinfo index c17bcbde82f..9361a560ff4 100644 --- a/www/libwww/distinfo +++ b/www/libwww/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2001/04/20 12:43:38 fredb Exp $ +$NetBSD: distinfo,v 1.5 2001/06/28 20:55:53 jlam Exp $ SHA1 (w3c-libwww-5.3.2.tar.gz) = c50f3624889b3a0ebc720264a1b9b64990457516 Size (w3c-libwww-5.3.2.tar.gz) = 1956340 bytes @@ -9,5 +9,5 @@ SHA1 (patch-ad) = 3dbc185d083b655f4157055b13563b5b123931f5 SHA1 (patch-ae) = 4130a9a20d806553a79e04c79d652b76ec1dce34 SHA1 (patch-af) = 9b982568c52f4685862be2192612ce3d795ac813 SHA1 (patch-ag) = b3b0ca974d4dfccf4aaebc2ee65f0938525eb51b -SHA1 (patch-ah) = 3c41a679b4f679f65df3f5723f8f8ada8609c78a +SHA1 (patch-ah) = ab96743a1c2a0e88874245da5e9790d3f1e3a6ff SHA1 (patch-ai) = 95912fb5b836e4dce01b630f9e6e9c9f41d7bb72 diff --git a/www/libwww/patches/patch-ah b/www/libwww/patches/patch-ah index 2e4779dab60..421256e32fc 100644 --- a/www/libwww/patches/patch-ah +++ b/www/libwww/patches/patch-ah @@ -1,4 +1,4 @@ -$NetBSD: patch-ah,v 1.1 2001/04/20 12:33:53 fredb Exp $ +$NetBSD: patch-ah,v 1.2 2001/06/28 20:55:54 jlam Exp $ --- configure.in.orig Thu Dec 14 05:49:06 2000 +++ configure.in @@ -78,7 +78,7 @@ $NetBSD: patch-ah,v 1.1 2001/04/20 12:33:53 fredb Exp $ + SSLLIBS="$ssllib" + else + SSLINC="-I${withval}/include -I${withval}/include/openssl" -+ SSLLIBS="-L${withval}/lib -Wl,-R${withval}/lib -lssl -lcrypto" ++ SSLLIBS="-L${withval}/lib -lssl -lcrypto" fi - LIBS="$LIBS $withval" + SAVED_LIBS="${LIBS}" |