Merge two patches that were modifying the same file (configure).

Ensure that RPATH_FLAG is seen by configure (fixes build).
Include bsd.prefs.mk for the WGET_USE_SSL variable and add it to BUILD_DEFS.
Some Makefile cleanup.

4 files changed, 21 insertions, 23 deletions

diff --git a/net/wget/Makefile b/net/wget/Makefile
index b0177b3da56..948a2195e7b 100644
--- a/net/wget/Makefile
+++ b/net/wget/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2003/03/18 22:59:52 jschauma Exp $
+# $NetBSD: Makefile,v 1.60 2003/03/22 12:06:16 jmmv Exp $
 
 DISTNAME=	wget-1.8.2
 CATEGORIES=	net
@@ -8,26 +8,29 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/wget/wget.html
 COMMENT=	Retrieve files from the 'net via HTTP and FTP
 
-USE_PERL5=	build
-
 BUILD_USES_MSGFMT=	YES
+
+USE_PERL5=		build
 USE_BUILDLINK2=		YES
 USE_PKGINSTALL=		YES
 
 GNU_CONFIGURE=		YES
 USE_PKGLOCALEDIR=	YES
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ENV+=		RPATH_FLAG="${RPATH_FLAG}"
+
 EGDIR=			${PREFIX}/share/examples/wget
 CONF_FILES=		${EGDIR}/wgetrc ${PKG_SYSCONFDIR}/wgetrc
 
 INFO_FILES=		wget.info
 
-WGET_USE_SSL?=		YES
+.include "../../mk/bsd.prefs.mk"
 
-.if ${WGET_USE_SSL} == YES
+BUILD_DEFS+=		WGET_USE_SSL
+.if !empty(WGET_USE_SSL:M[Yy][Ee][Ss])
 .include "../../security/openssl/buildlink2.mk"
 CONFIGURE_ARGS+=--with-ssl=${SSLBASE}
 .else
diff --git a/net/wget/distinfo b/net/wget/distinfo
index 90a3a99e665..16d1ee7988c 100644
--- a/net/wget/distinfo
+++ b/net/wget/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2003/03/18 22:59:52 jschauma Exp $
+$NetBSD: distinfo,v 1.18 2003/03/22 12:06:16 jmmv Exp $
 
 SHA1 (wget-1.8.2.tar.gz) = cb14189c47f281b33fd1ef37c4c8df39250fa7d5
 Size (wget-1.8.2.tar.gz) = 1154648 bytes
@@ -7,5 +7,4 @@ SHA1 (patch-ad) = ecd764d96e1d0646ab0b6dbce5b2aad606979d43
 SHA1 (patch-ae) = 200b93efcbea69292dd62559a90116c379aa6e0d
 SHA1 (patch-af) = 3921360a2986004063ded15f9eaa5a6290a54bfc
 SHA1 (patch-ag) = ea1e64523b8a6dcf5976840863ca995a7d4c755b
-SHA1 (patch-ah) = 208428640f131fe85a5c38ecabd0e89bee983f74
-SHA1 (patch-ai) = fd6f0866091fb773dc23a0815d22c3870a4ad1f3
+SHA1 (patch-ah) = efc829eceecb179be1579c91c274b61006cb1202
diff --git a/net/wget/patches/patch-ah b/net/wget/patches/patch-ah
index e46df9973a2..aa84d894b7f 100644
--- a/net/wget/patches/patch-ah
+++ b/net/wget/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.1 2002/12/16 16:14:06 drochner Exp $
+$NetBSD: patch-ah,v 1.2 2003/03/22 12:06:16 jmmv Exp $
 
 --- configure.orig	Mon Dec 16 17:06:11 2002
 +++ configure	Mon Dec 16 17:07:42 2002
@@ -11,3 +11,12 @@ $NetBSD: patch-ah,v 1.1 2002/12/16 16:14:06 drochner Exp $
  
              echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
  echo "configure:7185: checking for dlopen in -ldl" >&5
+@@ -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
diff --git a/net/wget/patches/patch-ai b/net/wget/patches/patch-ai
deleted file mode 100644
index d5f626523bf..00000000000
--- a/net/wget/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$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