diff options
| author | jmmv <jmmv@pkgsrc.org> | 2003-06-04 09:02:24 +0000 |
|---|---|---|
| committer | jmmv <jmmv@pkgsrc.org> | 2003-06-04 09:02:24 +0000 |
| commit | f20ec469cc15b080f69967f25572d1c16fb4ab26 (patch) | |
| tree | 5b658df9b4a571721defd49aaa0100fd2caa1949 /net/wget | |
| parent | 8503335bace627c39ee2ad20afb21956b48daeaa (diff) | |
| download | pkgsrc-f20ec469cc15b080f69967f25572d1c16fb4ab26.tar.gz | |
Fix build on platforms where rpath is not used (like Darwin).
Closes PR pkg/21651 by Michael Wolfson.
Diffstat (limited to 'net/wget')
| -rw-r--r-- | net/wget/Makefile | 8 | ||||
| -rw-r--r-- | net/wget/distinfo | 4 | ||||
| -rw-r--r-- | net/wget/patches/patch-ah | 4 |
3 files changed, 10 insertions, 6 deletions
diff --git a/net/wget/Makefile b/net/wget/Makefile index 305acdbd17d..074016dbf60 100644 --- a/net/wget/Makefile +++ b/net/wget/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.61 2003/06/02 01:17:38 jschauma Exp $ +# $NetBSD: Makefile,v 1.62 2003/06/04 09:02:24 jmmv Exp $ DISTNAME= wget-1.8.2 CATEGORIES= net @@ -19,8 +19,12 @@ USE_PKGLOCALEDIR= YES USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +OPENSSL_LDFLAGS= ${LDFLAGS} -L${BUILDLINK_PREFIX.openssl}/lib \ + ${RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib +FIX_RPATH+= OPENSSL_LDFLAGS + CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ENV+= RPATH_FLAG="${RPATH_FLAG}" +CONFIGURE_ENV+= OPENSSL_LDFLAGS="${OPENSSL_LDFLAGS}" EGDIR= ${PREFIX}/share/examples/wget CONF_FILES= ${EGDIR}/wgetrc ${PKG_SYSCONFDIR}/wgetrc diff --git a/net/wget/distinfo b/net/wget/distinfo index 16d1ee7988c..6c29c5e2090 100644 --- a/net/wget/distinfo +++ b/net/wget/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.18 2003/03/22 12:06:16 jmmv Exp $ +$NetBSD: distinfo,v 1.19 2003/06/04 09:02:24 jmmv Exp $ SHA1 (wget-1.8.2.tar.gz) = cb14189c47f281b33fd1ef37c4c8df39250fa7d5 Size (wget-1.8.2.tar.gz) = 1154648 bytes @@ -7,4 +7,4 @@ SHA1 (patch-ad) = ecd764d96e1d0646ab0b6dbce5b2aad606979d43 SHA1 (patch-ae) = 200b93efcbea69292dd62559a90116c379aa6e0d SHA1 (patch-af) = 3921360a2986004063ded15f9eaa5a6290a54bfc SHA1 (patch-ag) = ea1e64523b8a6dcf5976840863ca995a7d4c755b -SHA1 (patch-ah) = efc829eceecb179be1579c91c274b61006cb1202 +SHA1 (patch-ah) = 4d2cd80e4d9170b5072b6af502c624aab7fb507c diff --git a/net/wget/patches/patch-ah b/net/wget/patches/patch-ah index aa84d894b7f..0f92a23852c 100644 --- a/net/wget/patches/patch-ah +++ b/net/wget/patches/patch-ah @@ -1,4 +1,4 @@ -$NetBSD: patch-ah,v 1.2 2003/03/22 12:06:16 jmmv Exp $ +$NetBSD: patch-ah,v 1.3 2003/06/04 09:02:25 jmmv Exp $ --- configure.orig Mon Dec 16 17:06:11 2002 +++ configure Mon Dec 16 17:07:42 2002 @@ -16,7 +16,7 @@ $NetBSD: patch-ah,v 1.2 2003/03/22 12:06:16 jmmv Exp $ else SSL_INCLUDES=-I$ssl_root/include - LDFLAGS="-L$ssl_root/lib -R$ssl_root/lib $wget_save_LDFLAGS" -+ LDFLAGS="-L$ssl_root/lib ${RPATH_FLAG}$ssl_root/lib $wget_save_LDFLAGS" ++ LDFLAGS="${OPENSSL_LDFLAGS} $wget_save_LDFLAGS" fi echo "$ac_t"""Looking for SSL libraries in $ssl_root"" 1>&6 |