Update popt to 1.10.7.

Changes are unavailable.

8 files changed, 48 insertions, 80 deletions

diff --git a/devel/popt/Makefile b/devel/popt/Makefile
index 99a9613baa5..133ea73be12 100644
--- a/devel/popt/Makefile
+++ b/devel/popt/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.35 2007/05/11 13:50:40 obache Exp $
+# $NetBSD: Makefile,v 1.36 2007/05/12 00:52:28 obache Exp $
 #
 
-DISTNAME=	popt-1.7
-PKGREVISION=	7
+DISTNAME=	popt-1.10.7
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/		\
-		ftp://ftp.iks-jena.de/pub/software/unix/misc/		\
-		ftp://sunsite.cnlab-switch.ch/mirror/rpm/dist/rpm-4.1.x/
+MASTER_SITES=	http://wraptastic.org/pub/rpm-4.4.x/		\
+		ftp://wraptastic.org/pub/rpm-4.4.x/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Command line option parsing library
@@ -16,12 +14,13 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 CONFLICTS=		ORBit<=0.5.3
 
-WRKSRC=			${WRKDIR}/${DISTNAME}
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 
+TEST_TARGET=		check
+
 # XXX: avoid to check GNU xgettext.
 post-extract:
 	touch ${WRKDIR}/rpm.c
diff --git a/devel/popt/PLIST b/devel/popt/PLIST
index da976800493..cc0ae094e9f 100644
--- a/devel/popt/PLIST
+++ b/devel/popt/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2006/04/17 07:07:17 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2007/05/12 00:52:29 obache Exp $
 include/popt.h
 lib/libpopt.la
 man/man3/popt.3
@@ -30,4 +30,5 @@ share/locale/tr/LC_MESSAGES/popt.mo
 share/locale/uk/LC_MESSAGES/popt.mo
 share/locale/wa/LC_MESSAGES/popt.mo
 share/locale/zh/LC_MESSAGES/popt.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/popt.mo
+share/locale/zh_CN/LC_MESSAGES/popt.mo
+share/locale/zh_TW/LC_MESSAGES/popt.mo
diff --git a/devel/popt/distinfo b/devel/popt/distinfo
index df17c54e26c..bcf6a7153d7 100644
--- a/devel/popt/distinfo
+++ b/devel/popt/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.16 2005/03/03 07:51:40 grant Exp $
+$NetBSD: distinfo,v 1.17 2007/05/12 00:52:29 obache Exp $
 
-SHA1 (popt-1.7.tar.gz) = 66f3c77b87a160951b180447f4a6dce68ad2f71b
-RMD160 (popt-1.7.tar.gz) = 2942c28d82607501d5ae595063da27599b5b93da
-Size (popt-1.7.tar.gz) = 574549 bytes
-SHA1 (patch-ab) = a4bb5b3bd08b2bb6591345e68be7fea380de9d65
-SHA1 (patch-ac) = d95914024999789d60bd530865bb8613ed13f17c
-SHA1 (patch-ad) = 33ac94c57ad05d2fe99c9620181b59ce1402c21e
-SHA1 (patch-ae) = 4ed189cb6b91a334e56be266ecfc90e3099b6564
-SHA1 (patch-af) = 0b01a94513ba9efcbaa6b6200cdf100ca1007ebb
+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
index 56dbfb91195..23b108d4cca 100644
--- a/devel/popt/patches/patch-ab
+++ b/devel/popt/patches/patch-ab
@@ -1,34 +1,30 @@
-$NetBSD: patch-ab,v 1.6 2005/03/03 07:51:40 grant Exp $
+$NetBSD: patch-ab,v 1.7 2007/05/12 00:52:29 obache Exp $
 
---- Makefile.in.orig	2002-08-31 23:22:18.000000000 +1000
+--- Makefile.in.orig	2006-10-15 14:29:45.000000000 +0000
 +++ Makefile.in
-@@ -132,14 +132,14 @@ noinst_HEADERS = findme.h poptint.h syst
- 
- noinst_PROGRAMS = test1 test2 test3
+@@ -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 = -all-static
--test1_LDADD = $(lib_LTLIBRARIES)
-+test1_LDFLAGS =
-+test1_LDADD = $(lib_LTLIBRARIES) $(LIBINTL)
+ test1_LDFLAGS = 
+-test1_LDADD = $(usrlib_LTLIBRARIES)
++test1_LDADD = $(usrlib_LTLIBRARIES) $(LIBINTL)
  test2_SOURCES = test2.c
--test2_LDFLAGS = -all-static
--test2_LDADD = $(lib_LTLIBRARIES)
-+test2_LDFLAGS =
-+test2_LDADD = $(lib_LTLIBRARIES) $(LIBINTL)
+ test2_LDFLAGS = 
+-test2_LDADD = $(usrlib_LTLIBRARIES)
++test2_LDADD = $(usrlib_LTLIBRARIES) $(LIBINTL)
  test3_SOURCES = test3.c
--test3_LDFLAGS = -all-static
--test3_LDADD = $(lib_LTLIBRARIES)
-+test3_LDFLAGS =
-+test3_LDADD = $(lib_LTLIBRARIES) $(LIBINTL)
- 
+ test3_LDFLAGS = 
+-test3_LDADD = $(usrlib_LTLIBRARIES)
++test3_LDADD = $(usrlib_LTLIBRARIES) $(LIBINTL)
  noinst_SCRIPTS = testit.sh
- 
-@@ -187,7 +187,7 @@ DEFS = @DEFS@
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I.
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ @INTLLIBS@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/findme.Plo ./$(DEPDIR)/popt.Plo \
+ TESTS_ENVIRONMENT = \
+ test1="./test1"
diff --git a/devel/popt/patches/patch-ac b/devel/popt/patches/patch-ac
index c459b0c0a18..d43f9fd7ff0 100644
--- a/devel/popt/patches/patch-ac
+++ b/devel/popt/patches/patch-ac
@@ -1,14 +1,14 @@
-$NetBSD: patch-ac,v 1.1 2003/05/06 13:08:37 grant Exp $
+$NetBSD: patch-ac,v 1.2 2007/05/12 00:52:29 obache Exp $
 
---- aclocal.m4.orig	Sat Aug 31 23:22:08 2002
+--- aclocal.m4.orig	2006-09-17 14:03:42.000000000 +0000
 +++ aclocal.m4
-@@ -1016,8 +1016,8 @@ AC_DEFUN([AC_PROG_LIBTOOL],
+@@ -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
++# Always use pkgsrc libtool.
 +LIBTOOL=libtool
  AC_SUBST(LIBTOOL)dnl
  
diff --git a/devel/popt/patches/patch-ad b/devel/popt/patches/patch-ad
index 013bc50c137..a4ec844161b 100644
--- a/devel/popt/patches/patch-ad
+++ b/devel/popt/patches/patch-ad
@@ -1,14 +1,14 @@
-$NetBSD: patch-ad,v 1.1 2003/05/06 13:08:37 grant Exp $
+$NetBSD: patch-ad,v 1.2 2007/05/12 00:52:29 obache Exp $
 
---- configure.orig	Sat Aug 31 23:22:20 2002
+--- configure.orig	2006-10-15 14:28:26.000000000 +0000
 +++ configure
-@@ -8328,8 +8328,8 @@ fi
+@@ -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
++# Always use pkgsrc libtool.
 +LIBTOOL=libtool
  
  # Prevent multiple expansion
diff --git a/devel/popt/patches/patch-ae b/devel/popt/patches/patch-ae
deleted file mode 100644
index 3673b32cae9..00000000000
--- a/devel/popt/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2003/11/24 19:13:19 gson Exp $
-
---- popt.h.orig	2002-07-28 07:52:33.000000000 -0700
-+++ popt.h
-@@ -440,7 +440,7 @@ int poptConfigFileToString(FILE *fp, /*@
-  * @return		error string
-  */
- /*@-redecl@*/
--/*@observer@*/ const char *const poptStrerror(const int error)
-+/*@observer@*/ const char *poptStrerror(const int error)
- 	/*@*/;
- /*@=redecl@*/
- 
diff --git a/devel/popt/patches/patch-af b/devel/popt/patches/patch-af
deleted file mode 100644
index e7109ee5832..00000000000
--- a/devel/popt/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2003/11/24 19:13:19 gson Exp $
-
---- popt.c.orig	2002-08-22 07:17:44.000000000 -0700
-+++ popt.c
-@@ -1153,7 +1153,7 @@ const char * poptBadOption(poptContext c
-     /*@=nullderef@*/
- }
- 
--const char *const poptStrerror(const int error)
-+const char *poptStrerror(const int error)
- {
-     switch (error) {
-       case POPT_ERROR_NOARG: