Remove patch-ad and Makefile changes intended to fix PR 43879 that

caused PR 44003.

Fix PR 43879 by removing patch-ac which was added in 2004 to fix a problem
on Darwin -- Darwins from at least 10.4 up don't need it any longer.

4 files changed, 2 insertions, 36 deletions

diff --git a/devel/gettext-lib/Makefile b/devel/gettext-lib/Makefile
index 96df1cf0d12..5bb6273a5da 100644
--- a/devel/gettext-lib/Makefile
+++ b/devel/gettext-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2010/10/27 15:43:54 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2010/10/28 09:34:19 wiz Exp $
 
 DISTNAME=	gettext-0.14.6
 PKGNAME=	gettext-lib-0.14.6
@@ -36,10 +36,5 @@ LOCALEDIR=		${PREFIX}/${PKGLOCALEDIR}/locale
 REQD_DIRS+=		${LOCALEDIR}
 REQD_FILES+=		${EGDIR}/locale.alias ${LOCALEDIR}/locale.alias
 
-USE_TOOLS+=            autoconf
-
-pre-configure:
-	cd ${WRKSRC}/gettext-runtime && autoconf
-
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gettext-lib/distinfo b/devel/gettext-lib/distinfo
index 118fc0865d9..7f3be543af6 100644
--- a/devel/gettext-lib/distinfo
+++ b/devel/gettext-lib/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.16 2010/10/22 16:12:47 darcy Exp $
+$NetBSD: distinfo,v 1.17 2010/10/28 09:34:19 wiz Exp $
 
 SHA1 (gettext-0.14.6.tar.gz) = 0d8ce8d9a09a719065a1530399c4f45c15a002c5
 RMD160 (gettext-0.14.6.tar.gz) = 02138d12fd4d9ce0b3bda2d132f1569b30d16726
 Size (gettext-0.14.6.tar.gz) = 7102365 bytes
 SHA1 (patch-aa) = b0d25a2e9547649a3d6d583bdfc98255dcafbf90
 SHA1 (patch-ab) = fc4da46f6f7003c22880455dfe66ff161aa92135
-SHA1 (patch-ac) = 7097eecac165b0462e7bf270c58ed7cdb3bff94e
-SHA1 (patch-ad) = f10738419323c90a250ac34d72de7a8104f70739
diff --git a/devel/gettext-lib/patches/patch-ac b/devel/gettext-lib/patches/patch-ac
deleted file mode 100644
index 0a9d6717d7a..00000000000
--- a/devel/gettext-lib/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2010/02/05 08:44:04 obache Exp $
-
---- gettext-runtime/intl/dcigettext.c.orig	2005-05-20 20:06:17.000000000 +0000
-+++ gettext-runtime/intl/dcigettext.c
-@@ -243,7 +243,9 @@ struct known_translation_t
- /* Root of the search tree with known translations.  We can use this
-    only if the system provides the `tsearch' function family.  */
- #if defined HAVE_TSEARCH || defined _LIBC
--# include <search.h>
-+# if defined HAVE_SEARCH_H
-+#  include <search.h>
-+# endif
- 
- static void *root;
- 
diff --git a/devel/gettext-lib/patches/patch-ad b/devel/gettext-lib/patches/patch-ad
deleted file mode 100644
index d81e161f682..00000000000
--- a/devel/gettext-lib/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2010/10/22 16:12:48 darcy Exp $
-
---- gettext-runtime/configure.ac.orig	2005-05-20 21:03:39.000000000 +0000
-+++ gettext-runtime/configure.ac
-@@ -76,6 +76,7 @@ dnl Checks for libraries.
- 
- dnl Checks for header files.
- AC_CHECK_HEADERS(string.h)
-+AC_CHECK_HEADERS(search.h)
- AM_STDBOOL_H
- 
- dnl Checks for typedefs, structures, and compiler characteristics.