diff options
| author | fredb <fredb> | 2002-07-15 14:39:21 +0000 |
|---|---|---|
| committer | fredb <fredb> | 2002-07-15 14:39:21 +0000 |
| commit | 58a183ab1bbf3b17fd42834fad838842188865e5 (patch) | |
| tree | cf8cc64f4f94600466802ed105d41bd2e99807f8 /www/libwww | |
| parent | 5f4d58e7cafeadcff5e636159db63500e3ef2c56 (diff) | |
| download | pkgsrc-58a183ab1bbf3b17fd42834fad838842188865e5.tar.gz | |
Remove the capability to link with static "socks":
1) Linking a shared library against a static "socks{4,5}" library
does not have the desired effect of eliminating the dependency on
"socks" (not as it does for binaries).
2) No package linked against "libwww" seems to actually utilize
"socks".
Also bump the PKGREVISION and buildlink DEPENDS to the current level,
and liberalize the (formal) dependency on "openssl", for the benefit
of pre-NetBSD-1.5 systems. From now on, we can have no more issues
with "openssl" or "socks{4,5}" versions, as only the libwwwssl.*
shared libraries carry a run-time dependency on "openssl", but no
package links against them, and no "libwww" shared libraries can carry
a run-time dependency on any "socks" libraries. [Previous versions, of
course, may have had issues -- see PR 17010, which this is a partial
fix for.]
Diffstat (limited to 'www/libwww')
| -rw-r--r-- | www/libwww/Makefile | 21 | ||||
| -rw-r--r-- | www/libwww/buildlink.mk | 4 |
2 files changed, 6 insertions, 19 deletions
diff --git a/www/libwww/Makefile b/www/libwww/Makefile index bbf2e928a55..78d1314b6d3 100644 --- a/www/libwww/Makefile +++ b/www/libwww/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.31 2002/06/17 10:33:53 wiz Exp $ +# $NetBSD: Makefile,v 1.32 2002/07/15 14:39:21 fredb Exp $ DISTNAME= w3c-libwww-5.3.2 PKGNAME= libwww-5.3.2 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= www devel MASTER_SITES= http://www.w3.org/Library/Distribution/ \ ftp://ftp.uni-hannover.de/pub/mirror/info-systems/WWW/libwww/ @@ -14,6 +14,8 @@ COMMENT= The W3C Reference Library BUILD_DEPENDS+= automake>=1.4:../../devel/automake BUILD_DEPENDS+= perl>=${PERL5_REQD}:../../lang/perl5 +BUILDLINK_DEPENDS.openssl= openssl-* + USE_BUILDLINK_ONLY= YES USE_GMAKE= YES USE_LIBTOOL= YES @@ -33,21 +35,6 @@ pre-configure: ${LOCALBASE}/bin/automake && \ ${LOCALBASE}/bin/autoconf -.include "../../mk/bsd.prefs.mk" - -# Include SOCKS firewall support -.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-socks5=no -.else -.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" diff --git a/www/libwww/buildlink.mk b/www/libwww/buildlink.mk index 99fbf799b81..e2e252eedba 100644 --- a/www/libwww/buildlink.mk +++ b/www/libwww/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.8 2002/01/02 21:01:23 fredb Exp $ +# $NetBSD: buildlink.mk,v 1.9 2002/07/15 14:39:21 fredb Exp $ # # This Makefile fragment is included by packages that use libwww. # @@ -17,7 +17,7 @@ LIBWWW_BUILDLINK_MK= # defined .include "../../mk/bsd.buildlink.mk" -BUILDLINK_DEPENDS.libwww?= libwww>=5.3.2 +BUILDLINK_DEPENDS.libwww?= libwww>=5.3.2nb2 DEPENDS+= ${BUILDLINK_DEPENDS.libwww}:../../www/libwww EVAL_PREFIX+= BUILDLINK_PREFIX.libwww=libwww |