diff options
| author | fredb <fredb> | 2002-08-07 15:56:22 +0000 |
|---|---|---|
| committer | fredb <fredb> | 2002-08-07 15:56:22 +0000 |
| commit | 89f535211094e338b789c814b5392537af9de60c (patch) | |
| tree | 854358af65c92d21272d79f7e76cf89660a06037 /www/libwww | |
| parent | c91291a6a54f487d45683fa83f6a09e5c896830a (diff) | |
| download | pkgsrc-89f535211094e338b789c814b5392537af9de60c.tar.gz | |
Add an explicit runpath for the libwwwssl.so.1.0 shared library, and
partially revert Makefile, v1.32, so platforms without openssl-0.9.6e
in base will be able to find libssl.so.300 and libcrypto.so.300 for
binaries linked against libwwwwwl.so. Bump pkgrevision to reflect the
change in dependencies on platforms without openssl-0.9.6e in base.
Diffstat (limited to 'www/libwww')
| -rw-r--r-- | www/libwww/Makefile | 10 | ||||
| -rw-r--r-- | www/libwww/distinfo | 4 | ||||
| -rw-r--r-- | www/libwww/patches/patch-ah | 6 |
3 files changed, 8 insertions, 12 deletions
diff --git a/www/libwww/Makefile b/www/libwww/Makefile index 4d4df4abd62..46bc7ef163b 100644 --- a/www/libwww/Makefile +++ b/www/libwww/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.34 2002/08/01 02:37:41 jschauma Exp $ +# $NetBSD: Makefile,v 1.35 2002/08/07 15:56:22 fredb Exp $ DISTNAME= w3c-libwww-5.3.2 PKGNAME= libwww-5.3.2 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= www devel MASTER_SITES= http://www.w3.org/Library/Distribution/ \ ftp://ftp.uni-hannover.de/pub/mirror/info-systems/WWW/libwww/ @@ -13,8 +13,6 @@ COMMENT= The W3C Reference Library BUILD_DEPENDS+= automake>=1.4:../../devel/automake -BUILDLINK_DEPENDS.openssl= openssl-* - USE_BUILDLINK_ONLY= YES USE_GMAKE= YES USE_LIBTOOL= YES @@ -22,13 +20,11 @@ USE_PERL5= build GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-zlib --with-regex --without-x -CONFIGURE_ARGS+= --with-ssl="${BUILDLINK_DIR}" +CONFIGURE_ARGS+= --with-ssl="${BUILDLINK_PREFIX.openssl}" DOCDIR= ${PREFIX}/share/doc/libwww LTCONFIG_OVERRIDE= ${WRKSRC}/config/ltconfig -CFLAGS+= ${LDFLAGS} - pre-configure: cd ${WRKSRC}; \ ${LOCALBASE}/bin/aclocal && \ diff --git a/www/libwww/distinfo b/www/libwww/distinfo index b78d8a57e2c..75a9e5def45 100644 --- a/www/libwww/distinfo +++ b/www/libwww/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2001/08/28 16:35:03 skrll Exp $ +$NetBSD: distinfo,v 1.7 2002/08/07 15:56:23 fredb Exp $ SHA1 (w3c-libwww-5.3.2.tar.gz) = c50f3624889b3a0ebc720264a1b9b64990457516 Size (w3c-libwww-5.3.2.tar.gz) = 1956340 bytes @@ -9,6 +9,6 @@ SHA1 (patch-ad) = 3dbc185d083b655f4157055b13563b5b123931f5 SHA1 (patch-ae) = 4130a9a20d806553a79e04c79d652b76ec1dce34 SHA1 (patch-af) = 9b982568c52f4685862be2192612ce3d795ac813 SHA1 (patch-ag) = b3b0ca974d4dfccf4aaebc2ee65f0938525eb51b -SHA1 (patch-ah) = 46b823651b0003c394dc232e7f1fb6928310ba6a +SHA1 (patch-ah) = ac0ac37bcb3e4af5c677cbca785afd038ff04713 SHA1 (patch-ai) = 95912fb5b836e4dce01b630f9e6e9c9f41d7bb72 SHA1 (patch-aj) = 6148ae393aefcce54477b289835038b01a26a0ed diff --git a/www/libwww/patches/patch-ah b/www/libwww/patches/patch-ah index 0aa47f685f7..b49fcc8a4cc 100644 --- a/www/libwww/patches/patch-ah +++ b/www/libwww/patches/patch-ah @@ -1,4 +1,4 @@ -$NetBSD: patch-ah,v 1.4 2002/05/20 19:07:42 cjep Exp $ +$NetBSD: patch-ah,v 1.5 2002/08/07 15:56:24 fredb Exp $ --- configure.in.orig Thu Dec 14 11:49:06 2000 +++ configure.in Tue Aug 28 17:09:57 2001 @@ -213,7 +213,12 @@ @@ -90,8 +90,8 @@ $NetBSD: patch-ah,v 1.4 2002/05/20 19:07:42 cjep Exp $ + SSLINC="$sslinc" + SSLLIBS="$ssllib" + else -+ SSLINC="-I${withval}/include -I${withval}/include/openssl" -+ SSLLIBS="-L${withval}/lib -lssl -lcrypto" ++ SSLINC="-I${withval}/include/openssl -I${withval}/include" ++ SSLLIBS="-L${withval}/lib -lssl -lcrypto -Wl,-rpath,${withval}/lib" fi - LIBS="$LIBS $withval" + SAVED_LIBS="${LIBS}" |