Here is an update to popt 1.16. I was going to post a diff to fix the current rpm port for its patching of popt support for internal vs external linking since its the only port that broke after updating popt, but the rpm4 update posted recently is the better way to go for sure and takes care of that issue at the same time.
Index: Makefile =================================================================== RCS file: /home/cvs/ports/devel/popt/Makefile,v retrieving revision 1.18 diff -u -p -r1.18 Makefile --- Makefile 15 Nov 2010 19:46:07 -0000 1.18 +++ Makefile 3 Sep 2011 08:16:40 -0000 @@ -1,29 +1,27 @@ # $OpenBSD: Makefile,v 1.18 2010/11/15 19:46:07 espie Exp $ -COMMENT= getopt(3)-like library with a number of enhancements +COMMENT= getopt(3)-like library with a number of enhancements -DISTNAME= popt-1.7 -REVISION = 1 -SHARED_LIBS= popt 0.3 -CATEGORIES= devel -MASTER_SITES= ftp://ftp.mirrorservice.org/sites/ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/ \ - ftp://ftp.sunfreeware.com/pub/freeware/SOURCES/ \ - ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/ +DISTNAME= popt-1.16 +CATEGORIES= devel +MASTER_SITES= http://rpm5.org/files/popt/ -# BSD-like +SHARED_LIBS= popt 1.0 + +# MIT PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -USE_GMAKE= Yes -USE_LIBTOOL= Yes -USE_GROFF = Yes -SEPARATE_BUILD= concurrent -CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} -CONFIGURE_ARGS+= --with-included-gettext -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +MODULES= devel/gettext + +USE_GMAKE= Yes +USE_LIBTOOL= Yes +SEPARATE_BUILD= concurrent +CONFIGURE_STYLE= gnu +CONFIGURE_ARGS= ${CONFIGURE_SHARED} +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /home/cvs/ports/devel/popt/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- distinfo 5 Apr 2007 15:38:05 -0000 1.4 +++ distinfo 2 Sep 2011 23:56:36 -0000 @@ -1,5 +1,5 @@ -MD5 (popt-1.7.tar.gz) = WYjnrrCuTayNg1YSZZhMyQ== -RMD160 (popt-1.7.tar.gz) = KULCjYJgdQHVrllQY9onWZtbk9o= -SHA1 (popt-1.7.tar.gz) = ZvPHe4ehYJUbGARH9Kbc5orS9xs= -SHA256 (popt-1.7.tar.gz) = TnXLKHk/DUQTT3H65TBX1fJQgF5iaPvZyXgGVLc7DcE= -SIZE (popt-1.7.tar.gz) = 574549 +MD5 (popt-1.16.tar.gz) = N0O+76PdYkenP496MsFMMw== +RMD160 (popt-1.16.tar.gz) = nFK/+XJZ3kAQSZ9px20qY5aSA0I= +SHA1 (popt-1.16.tar.gz) = z+lKFaJATbhYWKgf+N4nyP8+I14= +SHA256 (popt-1.16.tar.gz) = 5yjtKW/p8Gmg4AUAPD1rLd49nK1FNCKhDWVYYW0wTMg= +SIZE (popt-1.16.tar.gz) = 702769 Index: patches/patch-configure =================================================================== RCS file: /home/cvs/ports/devel/popt/patches/patch-configure,v retrieving revision 1.2 diff -u -p -r1.2 patch-configure --- patches/patch-configure 15 Jul 2003 16:50:22 -0000 1.2 +++ patches/patch-configure 3 Sep 2011 08:17:30 -0000 @@ -1,21 +1,12 @@ $OpenBSD: patch-configure,v 1.2 2003/07/15 16:50:22 jolan Exp $ ---- configure.orig Sat Jun 21 22:38:13 2003 -+++ configure Sat Jun 21 22:38:17 2003 -@@ -6382,7 +6382,7 @@ else - hardcode_direct=yes - hardcode_shlibpath_var=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' - else -@@ -6392,7 +6392,7 @@ else - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) -- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac +--- configure.orig Sat Sep 3 04:16:58 2011 ++++ configure Sat Sep 3 04:17:21 2011 +@@ -16076,7 +16076,7 @@ _ACEOF + # (https://bugzilla.novell.com/show_bug.cgi?id=529921) + # - Don't require a not upstream patch to pkgconfig + # (https://bugs.freedesktop.org/show_bug.cgi?id=16095) +-popt_pkgconfig_libs='-L${libdir} -lpopt' ++popt_pkgconfig_libs='-L${libdir} -lpopt -lintl -liconv' + case "${host}" in + *-*-linux*) + case "${libdir}" in Index: pkg/PLIST =================================================================== RCS file: /home/cvs/ports/devel/popt/pkg/PLIST,v retrieving revision 1.4 diff -u -p -r1.4 PLIST --- pkg/PLIST 10 Aug 2004 09:43:46 -0000 1.4 +++ pkg/PLIST 3 Sep 2011 08:21:25 -0000 @@ -1,96 +1,48 @@ @comment $OpenBSD: PLIST,v 1.4 2004/08/10 09:43:46 espie Exp $ +%%SHARED%% include/popt.h @comment lib/charset.alias lib/libpopt.a lib/libpopt.la +lib/pkgconfig/ +lib/pkgconfig/popt.pc @man man/man3/popt.3 -share/locale/ -share/locale/cs/ -share/locale/cs/LC_MESSAGES/ share/locale/cs/LC_MESSAGES/popt.mo -share/locale/da/ -share/locale/da/LC_MESSAGES/ share/locale/da/LC_MESSAGES/popt.mo -share/locale/de/ -share/locale/de/LC_MESSAGES/ share/locale/de/LC_MESSAGES/popt.mo -share/locale/es/ -share/locale/es/LC_MESSAGES/ +share/locale/eo/LC_MESSAGES/popt.mo share/locale/es/LC_MESSAGES/popt.mo -share/locale/eu_ES/ -share/locale/eu_ES/LC_MESSAGES/ -share/locale/eu_ES/LC_MESSAGES/popt.mo -share/locale/fi/ -share/locale/fi/LC_MESSAGES/ share/locale/fi/LC_MESSAGES/popt.mo -share/locale/fr/ -share/locale/fr/LC_MESSAGES/ share/locale/fr/LC_MESSAGES/popt.mo -share/locale/gl/ -share/locale/gl/LC_MESSAGES/ +share/locale/ga/LC_MESSAGES/popt.mo share/locale/gl/LC_MESSAGES/popt.mo -share/locale/hu/ -share/locale/hu/LC_MESSAGES/ share/locale/hu/LC_MESSAGES/popt.mo -share/locale/id/ -share/locale/id/LC_MESSAGES/ share/locale/id/LC_MESSAGES/popt.mo share/locale/is/ share/locale/is/LC_MESSAGES/ share/locale/is/LC_MESSAGES/popt.mo -share/locale/it/ -share/locale/it/LC_MESSAGES/ share/locale/it/LC_MESSAGES/popt.mo -share/locale/ja/ -share/locale/ja/LC_MESSAGES/ share/locale/ja/LC_MESSAGES/popt.mo -share/locale/ko/ -share/locale/ko/LC_MESSAGES/ share/locale/ko/LC_MESSAGES/popt.mo @comment share/locale/locale.alias -share/locale/no/ -share/locale/no/LC_MESSAGES/ -share/locale/no/LC_MESSAGES/popt.mo -share/locale/pl/ -share/locale/pl/LC_MESSAGES/ +share/locale/lv/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/ -share/locale/pt/LC_MESSAGES/ share/locale/pt/LC_MESSAGES/popt.mo -share/locale/pt_BR/ -share/locale/pt_BR/LC_MESSAGES/ -share/locale/pt_BR/LC_MESSAGES/popt.mo -share/locale/ro/ -share/locale/ro/LC_MESSAGES/ share/locale/ro/LC_MESSAGES/popt.mo -share/locale/ru/ -share/locale/ru/LC_MESSAGES/ share/locale/ru/LC_MESSAGES/popt.mo -share/locale/sk/ -share/locale/sk/LC_MESSAGES/ share/locale/sk/LC_MESSAGES/popt.mo -share/locale/sl/ -share/locale/sl/LC_MESSAGES/ share/locale/sl/LC_MESSAGES/popt.mo -share/locale/sr/ -share/locale/sr/LC_MESSAGES/ -share/locale/sr/LC_MESSAGES/popt.mo -share/locale/sv/ -share/locale/sv/LC_MESSAGES/ share/locale/sv/LC_MESSAGES/popt.mo -share/locale/tr/ -share/locale/tr/LC_MESSAGES/ +share/locale/th/ +share/locale/th/LC_MESSAGES/ +share/locale/th/LC_MESSAGES/popt.mo share/locale/tr/LC_MESSAGES/popt.mo -share/locale/uk/ -share/locale/uk/LC_MESSAGES/ share/locale/uk/LC_MESSAGES/popt.mo +share/locale/vi/LC_MESSAGES/popt.mo share/locale/wa/ share/locale/wa/LC_MESSAGES/ share/locale/wa/LC_MESSAGES/popt.mo -share/locale/zh/ -share/locale/zh/LC_MESSAGES/ -share/locale/zh/LC_MESSAGES/popt.mo -share/locale/zh_CN.GB2312/ -share/locale/zh_CN.GB2312/LC_MESSAGES/ -share/locale/zh_CN.GB2312/LC_MESSAGES/popt.mo -%%SHARED%% +share/locale/zh_CN/LC_MESSAGES/popt.mo +share/locale/zh_TW/LC_MESSAGES/popt.mo
