Update to popt-1.14:

1.13 -> 1.14:
    - jbj: remove findme.c, add poptint.c, to po/POTFILES.in.
    - jbj: use stpcpy 2 more places (Wayne Davison<wayned@samba.org>).
    - jbj: add @LTLIBICONV@ when needed (Stanislav Brabec<sbrabec@suse.cz>).
    - jbj: fix: remove the "echo --" Fedorable hack-a-round.
    - rsc: updated de.po (not from the Translation Project).
    - jbj: study the mess with splint. Sigh, splint is so easily confused ...
    - jbj: rewrite findProgramPath & move to popt.c. Nuke the findme.{c,h} toys.
    - jbj: use stpcpy several more places (Wayne Davison<wayned@samba.org>).
    - jbj: enable equal after short option (Wayne Davison<wayned@samba.org>).
    - jbj: permit "#define POPT_fprintf fprintf" to lose the malloc'ing fprintf.
    - jbj: use vasprintf(3) when available (Wayne Davison<wayned@samba.org>).
    - jbj: study the mess with splint, remove annotations where possible.
    - jbj: add -D_GNU_SOURCE for gcc to use __builtin_stpcpy when available.
    - jbj: add static inline stpcpy for the deprived.
    - jbj: use stpcpy to eliminate sprintf calls everywhere but popthelp.c
    - jbj: remove (now unneeded afaik) va_copy() from POPT_fprintf().
    - jbj: inline strdup_fprintf() => POPT_fprintf keeping (unneeded?) va_copy.
    - rse: fix memcpy(3) based va_copy(3) fallbacks
    - jbj: fix: short option with "foo=bar" argument was mishandled.
	(Wayne Davison<wayned@samba.org>).
    - jbj: rename _ABS to avoid collisions, define DBL_EPSILON if not present
	(Wayne Davison<wayned@samba.org>).
    - jbj: test for <glob.h>, disable reading directory poptrc files if not.
    - jbj: add __attribute__(__unused__) (Wayne Davison<wayned@samba.org>).
    - jbj: permit equal after short option (Wayne Davison<wayned@samba.org>).
    - jbj: make sure that short options are printed only once with --usage.
    - jbj: don't display hidden short options with --usage.
    - jbj: updated sv.po (Translation Project).
    - jbj: updated {fi,nl}.po (Translation Project).
    - jbj: updated th.po (Translation Project).
    - rsc: avoid multilib file conflicts in generated doxygen.
    - jbj: updated vi.po and zh_CN.po (Translation Project).
    - jbj: fix: keep the poptHelpOptions array exactly the same size.
    - jbj: updated pl.po (Translation Project).
    - jbj: add new fi, th, zh_TW translations (Translation Project).
    - jbj: add "make updatepo" to simplify PO file maintenance.
    - jbj: display POPT_ARG_ARGV options in --help just like other options.
    - jbj: add test for POPT_ARG_ARGV handling.
    - jbj: fix: permit "--foo bar" and "--foo=bar" equivalent forms for aliases.
    - jbj: fix: tests 20 -> 23 require an explicit '--' arg separator now.
    - jbj: popt.3: add POPT_ARG_ARGV description.
    - jbj: use NUL terminator to align help with (possible) multibyte chars.
    - jbj: add utf8_skip_data table[] to keep track of utf8 character widths.
    - jbj: refactor the POPT_WCHAR_HACK into stringDisplayWidth().
    - jbj: add POPT_dgettext() prototype.
    - jbj: add POPT_dgettext() for popt internal UTF-8 codeset (Takao Fujiwara).
    - jbj: add POPT_next_char(), backout POPT_fprintf() usage (for the moment).
    - jbj: finish POPT_ARG_ARGV implementation.
    - jbj: free aliases/execs with common code.
    - jbj: rewrite the callback logic using a switch for simplicity.
    - jbj: hide bit field structure behind F_ISSET/LF_ISSET/CBF_ISSET macros.
    - jbj: expose poptSaveLongLong and poptSaveString in the loader map.
    - jbj: add POPT_ARG_ARGV, starting with the poptSaveString() method.
    - jbj: add help for POPT_ARG_LONGLONG.
    - jbj: hmmm, POSIXly correct --echo-args needs fixing, disable for now.
    - jbj: poptint.h: typedef's for string and string arrays.
    - jbj: add POPT_ARG_LONGLONG, and poptSaveLongLong().
    - jbj: poptint.h: add poptSubstituteHelpI18N() to bury the ABI hack.
    - jbj: start using poptArg and poptArgType() where useful.
    - jbj: poptint.h: add a poptArgType define for bitfield type abstraction.
    - jbj: poptint.h: add a poptArg union for opt->arg access without casts.
    - jbj: include "-- Terminate options" end-of-options msg in poptHelpOptions.
    - jbj: opt->argDescrip[0] determines "--foo=bar" or "--foo bar".
    - jbj: --long always padded for alignment with/without "-X, ".
    - jbj: Display shortName iff printable non-space.
    - jbj: POPT_AUTOALIAS: if no popt aliases/execs, don't display the sub-head.
    - jbj: add --libdir=/%{_lib} to popt.spec.
    - jbj: add .cvsignore to m4 subdirectory.
    - jbj: remove duplicate nb locale from ALL_LINGUAS.
    - jbj: autogen.sh: on linux, add --libdir=/lib (no /lib64 autodetect yet).

1.12 -> 1.13:
    - release popt-1.13.
    - jbj: add a %track section (as in rpm-5.0) to popt.spec.
    - jbj: chg poptGetOptArg() to "char *", document application needs to free.
    - jbj: re-add it.po (from Sandro Bonazzola <sandro.bonazzola@gmail.com>).
    - jbj: rescuscitate the splint annotations.
    - jbj: change sizeof to use the type implicitly, rather than explicitly.
    - jbj: remove incorrect casts, changing to size_t where needed.
    - jbj: remove unused STD_VFPRINTF macro.
    - jbj: reindent (and otherwise diddle) recent patch for popt coding style.
    - jbj: remove splint bounds/branch annotations, little gain, much pain.
    - jbj: revert alloca usage again again.
    - jbj: handle Solaris signed character isspace(3) issues consistently.
    - bero: read /etc/popt.d/* files.
    - jbj: don't read /etc/popt twice (#290531).
    - jbj: isspace(3) has i18n encoding signednesss issues on Solaris (#172393).
    - jbj: refactor column cursor to a structure, carry maxcols as well.
    - jbj: use TIOCGWINSZ to determine --help column wrapping.
    - jbj: help formatting for POPT_ARG_MAINCALL.
    - jbj: remove N_(...) markings from popt.h, markers in popthelp.c instead.
    - jbj: add zh_CN.po (Translation Project).
    - jbj: use PACKAGE_BUGREPORT.
    - jbj: hotwire POPT_AUTOHELP/POPT_AUTOALIAS lookup in popt i18n domain.

1.11 -> 1.12
    - jbj: plug a memory leak.
    - jbj: fix index thinko.
    - jbj: add vi.po (Translation Project).
    - jbj: add nl.po (Translation Project).

3 files changed, 13 insertions, 27 deletions

diff --git a/devel/popt/Makefile b/devel/popt/Makefile
index de9253165f0..435b7ac2a9b 100644
--- a/devel/popt/Makefile
+++ b/devel/popt/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.38 2007/05/28 07:57:46 obache Exp $
+# $NetBSD: Makefile,v 1.39 2008/04/13 23:17:52 wiz Exp $
 #
 
-DISTNAME=	popt-1.10.7
+DISTNAME=	popt-1.14
 CATEGORIES=	devel
-MASTER_SITES=	http://wraptastic.org/pub/rpm-4.4.x/		\
-		ftp://wraptastic.org/pub/rpm-4.4.x/
+MASTER_SITES=	http://rpm5.org/files/popt/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Command line option parsing library
@@ -21,17 +20,5 @@ USE_LIBTOOL=		yes
 
 TEST_TARGET=		check
 
-# XXX: avoid to check GNU xgettext.
-post-extract:
-	touch ${WRKDIR}/rpm.c
-
-# XXX: avoid to install library into ${PREFIX}/lib64 on 64-bit
-SUBST_CLASSES+=		mark64
-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/PLIST b/devel/popt/PLIST
index cc0ae094e9f..f1122ba3bc6 100644
--- a/devel/popt/PLIST
+++ b/devel/popt/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2007/05/12 00:52:29 obache Exp $
+@comment $NetBSD: PLIST,v 1.7 2008/04/13 23:17:52 wiz Exp $
 include/popt.h
 lib/libpopt.la
 man/man3/popt.3
@@ -6,29 +6,28 @@ share/locale/cs/LC_MESSAGES/popt.mo
 share/locale/da/LC_MESSAGES/popt.mo
 share/locale/de/LC_MESSAGES/popt.mo
 share/locale/es/LC_MESSAGES/popt.mo
-share/locale/eu_ES/LC_MESSAGES/popt.mo
 share/locale/fi/LC_MESSAGES/popt.mo
 share/locale/fr/LC_MESSAGES/popt.mo
+share/locale/ga/LC_MESSAGES/popt.mo
 share/locale/gl/LC_MESSAGES/popt.mo
 share/locale/hu/LC_MESSAGES/popt.mo
-share/locale/id/LC_MESSAGES/popt.mo
 share/locale/is/LC_MESSAGES/popt.mo
 share/locale/it/LC_MESSAGES/popt.mo
 share/locale/ja/LC_MESSAGES/popt.mo
 share/locale/ko/LC_MESSAGES/popt.mo
-share/locale/no/LC_MESSAGES/popt.mo
+share/locale/nb/LC_MESSAGES/popt.mo
+share/locale/nl/LC_MESSAGES/popt.mo
 share/locale/pl/LC_MESSAGES/popt.mo
 share/locale/pt/LC_MESSAGES/popt.mo
-share/locale/pt_BR/LC_MESSAGES/popt.mo
 share/locale/ro/LC_MESSAGES/popt.mo
 share/locale/ru/LC_MESSAGES/popt.mo
 share/locale/sk/LC_MESSAGES/popt.mo
 share/locale/sl/LC_MESSAGES/popt.mo
-share/locale/sr/LC_MESSAGES/popt.mo
 share/locale/sv/LC_MESSAGES/popt.mo
+share/locale/th/LC_MESSAGES/popt.mo
 share/locale/tr/LC_MESSAGES/popt.mo
 share/locale/uk/LC_MESSAGES/popt.mo
+share/locale/vi/LC_MESSAGES/popt.mo
 share/locale/wa/LC_MESSAGES/popt.mo
-share/locale/zh/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 0ffb33dcad4..d0b607cd340 100644
--- a/devel/popt/distinfo
+++ b/devel/popt/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.18 2007/05/28 07:57:46 obache Exp $
+$NetBSD: distinfo,v 1.19 2008/04/13 23:17:52 wiz 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 (popt-1.14.tar.gz) = af0a7e2b187d600d624515a53d88374c15104e15
+RMD160 (popt-1.14.tar.gz) = 5dce0552b249ee9640ccb9089ada1044be94206b
+Size (popt-1.14.tar.gz) = 695557 bytes