From 66be95305fda6a4baa4485bc201d1c0091f22cdf Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Thu, 26 Jul 2001 14:29:12 +0000
Subject: Don't workaround broken LDFLAGS setting in configure -- just fix it
 directly by patching the script.  This causes LDFLAGS to be reset properly
 before checking for gettext(), which now succeeds and causes the locale files
 to be built.  Remove USE_LIBINTL as unnecessary.  Tested on NetBSD-1.5W/i386
 and NetBSD-1.5.1/mac68k.

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

(limited to 'net')

diff --git a/net/wget/Makefile b/net/wget/Makefile
index f3da6c606b2..5549ad58c7d 100644
--- a/net/wget/Makefile
+++ b/net/wget/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2001/07/26 12:15:03 tron Exp $
+# $NetBSD: Makefile,v 1.40 2001/07/26 14:29:12 jlam Exp $
 
 DISTNAME=	wget-1.7
 CATEGORIES=	net
@@ -19,9 +19,7 @@ USE_BUILDLINK_ONLY=	YES
 
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
-USE_LIBINTL=	YES
 MAKE_ENV+=	PKGLOCALEDIR="${PKGLOCALEDIR}"
-MAKE_FLAGS+=	LDFLAGS="${LDFLAGS}"
 
 INFO_FILES=	wget.info
 
diff --git a/net/wget/distinfo b/net/wget/distinfo
index 98bedf6034d..36098f696c6 100644
--- a/net/wget/distinfo
+++ b/net/wget/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2001/07/22 15:46:20 tron Exp $
+$NetBSD: distinfo,v 1.9 2001/07/26 14:29:12 jlam Exp $
 
 SHA1 (wget-1.7.tar.gz) = b44118972c11a410b81ad3d306861b370071e611
 Size (wget-1.7.tar.gz) = 945138 bytes
@@ -8,3 +8,4 @@ SHA1 (patch-aa) = 98c944716c403d0501505fc52c69c898d7870ea5
 SHA1 (patch-ab) = 797716b5a213c1e6b12f9407769e606b50818a67
 SHA1 (patch-ac) = 20cc35210374c68ddcaf39830620d853b4311988
 SHA1 (patch-ad) = 8994c291eb3e06c87a6c83dfc2b02fbf9f318c34
+SHA1 (patch-ae) = 1400b747cb0b2cd4311e566941cbc8ff3e59c76d
diff --git a/net/wget/patches/patch-ae b/net/wget/patches/patch-ae
new file mode 100644
index 00000000000..24e878a01e9
--- /dev/null
+++ b/net/wget/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.3 2001/07/26 14:29:12 jlam Exp $
+
+--- configure.orig	Thu Jul 26 06:52:57 2001
++++ configure
+@@ -3715,7 +3715,7 @@
+   cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest*
+-      LDFLAGS=$ODL_LDFLAGS
++      LDFLAGS=$OLD_LDFLAGS
+       test -n "$dash_r" && break
+     done ;;
+ esac
-- 
cgit v1.2.3