Updated popt to 1.6.3. List of changes is unknown.

4 files changed, 18 insertions, 51 deletions

diff --git a/devel/popt/Makefile b/devel/popt/Makefile
index c48d38727bf..53006b8acf5 100644
--- a/devel/popt/Makefile
+++ b/devel/popt/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2001/10/03 16:52:48 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2002/01/10 07:49:34 martti Exp $
 #
 
-DISTNAME=	popt-1.6.2
+DISTNAME=	popt-1.6.3
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/		\
 		http://gd.tuwien.ac.at/z7/utils/rpm.org/dist/rpm-4.0.x/	\
diff --git a/devel/popt/PLIST b/devel/popt/PLIST
index 703d2cc9b52..f1b83c97155 100644
--- a/devel/popt/PLIST
+++ b/devel/popt/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:25:56 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/01/10 07:49:34 martti Exp $
 include/popt.h
 lib/libpopt.a
 lib/libpopt.la
@@ -8,6 +8,7 @@ lib/libpopt.so.0.0
 man/man3/popt.3
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/popt.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/popt.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/popt.mo
 ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/popt.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/popt.mo
 ${PKGLOCALEDIR}/locale/is/LC_MESSAGES/popt.mo
diff --git a/devel/popt/distinfo b/devel/popt/distinfo
index f7adc0cb9a7..04ad3c8bd77 100644
--- a/devel/popt/distinfo
+++ b/devel/popt/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2001/09/30 21:03:23 rh Exp $
+$NetBSD: distinfo,v 1.6 2002/01/10 07:49:34 martti Exp $
 
-SHA1 (popt-1.6.2.tar.gz) = 1a636662fbe1648f8c899378765e093ab53bff0e
-Size (popt-1.6.2.tar.gz) = 446164 bytes
-SHA1 (patch-aa) = 8ffd927f904920e34812d7ae07bd7c4475cc23ad
+SHA1 (popt-1.6.3.tar.gz) = ef10c632a53ba71291cc9342d4b385da0662cc5f
+Size (popt-1.6.3.tar.gz) = 529198 bytes
+SHA1 (patch-aa) = 5ca9c3dbcedb46d95cc34d5347832854266b28da
diff --git a/devel/popt/patches/patch-aa b/devel/popt/patches/patch-aa
index 40c929221cb..c550f421e27 100644
--- a/devel/popt/patches/patch-aa
+++ b/devel/popt/patches/patch-aa
@@ -1,47 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2001/09/30 21:03:23 rh Exp $
+$NetBSD: patch-aa,v 1.4 2002/01/10 07:49:35 martti Exp $
 
---- configure.orig	Fri Feb 23 22:43:41 2001
-+++ configure
-@@ -3674,13 +3674,13 @@
- if { (eval echo configure:3675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   CATOBJEXT=.gmo
--		   DATADIRNAME=share
-+		   DATADIRNAME=${PKGLOCALEDIR}
- else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CATOBJEXT=.mo
--		   DATADIRNAME=lib
-+		   DATADIRNAME=${PKGLOCALEDIR}
- fi
- rm -f conftest*
- 		INSTOBJEXT=.mo
-@@ -3942,7 +3942,7 @@
- 		 USE_INCLUDED_LIBINTL=yes
- 		 CATOBJEXT=.cat
- 		 INSTOBJEXT=.cat
--		 DATADIRNAME=lib
-+		 DATADIRNAME=${PKGLOCALEDIR}
- 		 INTLDEPS='$(top_builddir)/intl/libintl.a'
- 		 INTLLIBS=$INTLDEPS
- 		 LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-@@ -4071,7 +4071,7 @@
- 	USE_INCLUDED_LIBINTL=yes
-         CATOBJEXT=.gmo
-         INSTOBJEXT=.mo
+--- configure.orig	Thu Nov 29 20:04:04 2001
++++ configure	Wed Jan  9 09:51:00 2002
+@@ -7334,7 +7334,7 @@
+         nls_cv_header_intl=
+     nls_cv_header_libgt=
+ 
 -        DATADIRNAME=share
 +        DATADIRNAME=${PKGLOCALEDIR}
- 	INTLDEPS='$(top_builddir)/intl/libintl.a'
- 	INTLLIBS=$INTLDEPS
- 	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-@@ -4091,7 +4091,7 @@
-       # We need to process the po/ directory.
-       POSUB=po
-     else
--      DATADIRNAME=share
-+      DATADIRNAME=${PKGLOCALEDIR}
-       nls_cv_header_intl=intl/libintl.h
-       nls_cv_header_libgt=intl/libgettext.h
-     fi
+     
+ 
+         INSTOBJEXT=.mo