From 6e186fe3821e8eee5fc9987d048872e1a37b8c70 Mon Sep 17 00:00:00 2001
From: jschauma <jschauma@pkgsrc.org>
Date: Tue, 18 Mar 2003 22:59:52 +0000
Subject: Use RPATH_FLAG for configure. Also only compile with ssl if the
 variable is set (which it is by default).

---
 net/wget/Makefile         |  6 +++---
 net/wget/distinfo         |  3 ++-
 net/wget/patches/patch-ai | 13 +++++++++++++
 3 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 net/wget/patches/patch-ai

(limited to 'net/wget')

diff --git a/net/wget/Makefile b/net/wget/Makefile
index 525ab5bda13..b0177b3da56 100644
--- a/net/wget/Makefile
+++ b/net/wget/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2003/03/13 17:08:22 jschauma Exp $
+# $NetBSD: Makefile,v 1.59 2003/03/18 22:59:52 jschauma Exp $
 
 DISTNAME=	wget-1.8.2
 CATEGORIES=	net
@@ -30,10 +30,10 @@ WGET_USE_SSL?=		YES
 .if ${WGET_USE_SSL} == YES
 .include "../../security/openssl/buildlink2.mk"
 CONFIGURE_ARGS+=--with-ssl=${SSLBASE}
+.else
+CONFIGURE_ARGS+=--without-ssl
 .endif
 
-CONFIGURE_ARGS+=--with-ssl=${SSLBASE}
-
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/wget/distinfo b/net/wget/distinfo
index 201df9df0b3..90a3a99e665 100644
--- a/net/wget/distinfo
+++ b/net/wget/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2002/12/16 16:14:06 drochner Exp $
+$NetBSD: distinfo,v 1.17 2003/03/18 22:59:52 jschauma Exp $
 
 SHA1 (wget-1.8.2.tar.gz) = cb14189c47f281b33fd1ef37c4c8df39250fa7d5
 Size (wget-1.8.2.tar.gz) = 1154648 bytes
@@ -8,3 +8,4 @@ SHA1 (patch-ae) = 200b93efcbea69292dd62559a90116c379aa6e0d
 SHA1 (patch-af) = 3921360a2986004063ded15f9eaa5a6290a54bfc
 SHA1 (patch-ag) = ea1e64523b8a6dcf5976840863ca995a7d4c755b
 SHA1 (patch-ah) = 208428640f131fe85a5c38ecabd0e89bee983f74
+SHA1 (patch-ai) = fd6f0866091fb773dc23a0815d22c3870a4ad1f3
diff --git a/net/wget/patches/patch-ai b/net/wget/patches/patch-ai
new file mode 100644
index 00000000000..d5f626523bf
--- /dev/null
+++ b/net/wget/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2003/03/18 22:59:52 jschauma Exp $
+
+--- configure.orig	Sat Mar 15 09:59:28 2003
++++ configure	Sat Mar 15 10:03:25 2003
+@@ -7283,7 +7283,7 @@
+             SSL_INCLUDES=
+     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"
+     fi
+ 
+     echo "$ac_t"""Looking for SSL libraries in $ssl_root"" 1>&6
-- 
cgit v1.2.3