pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net/wget Remove some old rpath hacks that aren't neede...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/68bb7c68ecf2
branches:  trunk
changeset: 475489:68bb7c68ecf2
user:      danw <danw%pkgsrc.org@localhost>
date:      Sun May 16 20:27:04 2004 +0000

description:
Remove some old rpath hacks that aren't needed with modern buildlink3.
Fixes the build on darwin (PR 25326)

diffstat:

 net/wget/Makefile         |   7 +------
 net/wget/distinfo         |   4 ++--
 net/wget/patches/patch-ah |  11 +----------
 3 files changed, 4 insertions(+), 18 deletions(-)

diffs (56 lines):

diff -r bd911de24a91 -r 68bb7c68ecf2 net/wget/Makefile
--- a/net/wget/Makefile Sun May 16 20:01:59 2004 +0000
+++ b/net/wget/Makefile Sun May 16 20:27:04 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2004/04/18 07:16:32 snj Exp $
+# $NetBSD: Makefile,v 1.74 2004/05/16 20:27:04 danw Exp $
 
 DISTNAME=      wget-1.9.1
 PKGREVISION=   1
@@ -19,12 +19,7 @@
 USE_PKGLOCALEDIR=      YES
 USE_LIBTOOL=           YES
 
-OPENSSL_LDFLAGS=       ${LDFLAGS} -L${BUILDLINK_PREFIX.openssl}/lib \
-                       -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib
-FIX_RPATH+=            OPENSSL_LDFLAGS
-
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ENV+=                OPENSSL_LDFLAGS="${OPENSSL_LDFLAGS}"
 CONFIGURE_ENV+=                ac_cv_func_sigsetjmp=yes
 
 EGDIR=                 ${PREFIX}/share/examples/wget
diff -r bd911de24a91 -r 68bb7c68ecf2 net/wget/distinfo
--- a/net/wget/distinfo Sun May 16 20:01:59 2004 +0000
+++ b/net/wget/distinfo Sun May 16 20:27:04 2004 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.20 2003/12/08 21:44:35 wiz Exp $
+$NetBSD: distinfo,v 1.21 2004/05/16 20:27:04 danw Exp $
 
 SHA1 (wget-1.9.1.tar.gz) = 0597a4f47b056e3e60cf7d08c9409d67358e7099
 Size (wget-1.9.1.tar.gz) = 1322378 bytes
 SHA1 (patch-ag) = d13900b60f52cac6c71f701026e6de8b32f00354
-SHA1 (patch-ah) = 86a03b2d1c0c4849f7b6e69f973bcef427f78e0f
+SHA1 (patch-ah) = e31060497c77f87f0ed4cab44e63597654ca0525
diff -r bd911de24a91 -r 68bb7c68ecf2 net/wget/patches/patch-ah
--- a/net/wget/patches/patch-ah Sun May 16 20:01:59 2004 +0000
+++ b/net/wget/patches/patch-ah Sun May 16 20:27:04 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.4 2003/12/08 21:44:35 wiz Exp $
+$NetBSD: patch-ah,v 1.5 2004/05/16 20:27:04 danw Exp $
 
 --- configure.orig     Wed Nov 12 00:42:20 2003
 +++ configure
@@ -11,12 +11,3 @@
  
  
  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-@@ -12524,7 +12524,7 @@ fi
-             SSL_INCLUDES=
-     else
-             SSL_INCLUDES=-I$ssl_root/include
--                  LDFLAGS="-L$ssl_root/lib -R$ssl_root/lib $wget_save_LDFLAGS"
-+                  LDFLAGS="${OPENSSL_LDFLAGS} $wget_save_LDFLAGS"
-     fi
- 
-     echo "$as_me:$LINENO: result: Looking for SSL libraries in $ssl_root" >&5



Home | Main Index | Thread Index | Old Index