Remove unneeded patches.

5 files changed, 4 insertions, 65 deletions

diff --git a/devel/popt/Makefile b/devel/popt/Makefile
index 995d30a0aba..de9253165f0 100644
--- a/devel/popt/Makefile
+++ b/devel/popt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2007/05/13 15:04:00 obache Exp $
+# $NetBSD: Makefile,v 1.38 2007/05/28 07:57:46 obache Exp $
 #
 
 DISTNAME=	popt-1.10.7
@@ -31,5 +31,7 @@ SUBST_STAGE.mark64=	pre-configure
 SUBST_FILES.mark64=	Makefile.am Makefile.in
 SUBST_SED.mark64=	-e 's|@MARK64@||g'
 
+BROKEN_GETTEXT_DETECTION=	yes
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/popt/distinfo b/devel/popt/distinfo
index bcf6a7153d7..0ffb33dcad4 100644
--- a/devel/popt/distinfo
+++ b/devel/popt/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.17 2007/05/12 00:52:29 obache Exp $
+$NetBSD: distinfo,v 1.18 2007/05/28 07:57:46 obache Exp $
 
 SHA1 (popt-1.10.7.tar.gz) = c1a22bd3b50b24f64654c69a6f91142ca54ca853
 RMD160 (popt-1.10.7.tar.gz) = d5342c1a5e1059f45d75a93ca7a3c997b2fef05d
 Size (popt-1.10.7.tar.gz) = 728283 bytes
-SHA1 (patch-ab) = ceefe880c3a1e55c70c9308f148163627be41dbe
-SHA1 (patch-ac) = cf0fe2bed11d930e51f4f92c1a0fdc54ea089d29
-SHA1 (patch-ad) = 6f5cccbdbf762b81c93643f83a2ce555e9e6f8dd
diff --git a/devel/popt/patches/patch-ab b/devel/popt/patches/patch-ab
deleted file mode 100644
index 23b108d4cca..00000000000
--- a/devel/popt/patches/patch-ab
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2007/05/12 00:52:29 obache Exp $
-
---- Makefile.in.orig	2006-10-15 14:29:45.000000000 +0000
-+++ Makefile.in
-@@ -183,7 +183,7 @@ LDFLAGS = @LDFLAGS@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
- LIBOBJS = @LIBOBJS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ @INTLLIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBICONV = @LTLIBICONV@
-@@ -277,13 +277,13 @@ INCLUDES = -I. -I$(top_srcdir)
- noinst_HEADERS = findme.h poptint.h system.h
- test1_SOURCES = test1.c
- test1_LDFLAGS = 
--test1_LDADD = $(usrlib_LTLIBRARIES)
-+test1_LDADD = $(usrlib_LTLIBRARIES) $(LIBINTL)
- test2_SOURCES = test2.c
- test2_LDFLAGS = 
--test2_LDADD = $(usrlib_LTLIBRARIES)
-+test2_LDADD = $(usrlib_LTLIBRARIES) $(LIBINTL)
- test3_SOURCES = test3.c
- test3_LDFLAGS = 
--test3_LDADD = $(usrlib_LTLIBRARIES)
-+test3_LDADD = $(usrlib_LTLIBRARIES) $(LIBINTL)
- noinst_SCRIPTS = testit.sh
- TESTS_ENVIRONMENT = \
- test1="./test1"
diff --git a/devel/popt/patches/patch-ac b/devel/popt/patches/patch-ac
deleted file mode 100644
index d43f9fd7ff0..00000000000
--- a/devel/popt/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2007/05/12 00:52:29 obache Exp $
-
---- aclocal.m4.orig	2006-09-17 14:03:42.000000000 +0000
-+++ aclocal.m4
-@@ -1869,8 +1869,8 @@ AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
- 
--# Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+# Always use pkgsrc libtool.
-+LIBTOOL=libtool
- AC_SUBST(LIBTOOL)dnl
- 
- # Prevent multiple expansion
diff --git a/devel/popt/patches/patch-ad b/devel/popt/patches/patch-ad
deleted file mode 100644
index a4ec844161b..00000000000
--- a/devel/popt/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2007/05/12 00:52:29 obache Exp $
-
---- configure.orig	2006-10-15 14:28:26.000000000 +0000
-+++ configure
-@@ -20135,8 +20135,8 @@ fi
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
- 
--# Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+# Always use pkgsrc libtool.
-+LIBTOOL=libtool
- 
- # Prevent multiple expansion
-