Index: head/devel/popt/Makefile =================================================================== --- head/devel/popt/Makefile (revision 540842) +++ head/devel/popt/Makefile (revision 540843) @@ -1,29 +1,29 @@ # Created by: Yuan-Chen Cheng # $FreeBSD$ PORTNAME= popt -PORTVERSION= 1.16 -PORTREVISION= 2 +PORTVERSION= 1.18 CATEGORIES= devel -MASTER_SITES= http://ftp.rpm.org/mirror/popt/ \ - GENTOO +MASTER_SITES= http://ftp.rpm.org/popt/releases/popt-1.x/ MAINTAINER= jpaetzel@FreeBSD.org COMMENT= Getopt(3) like library with a number of enhancements, from Redhat LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/COPYING +USES= iconv libtool pathfix + +TEST_TARGET= check + OPTIONS_DEFINE= NLS GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip -USES= iconv libtool pathfix USE_LDCONFIG= yes NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext OPTIONS_SUB= yes .include Index: head/devel/popt/distinfo =================================================================== --- head/devel/popt/distinfo (revision 540842) +++ head/devel/popt/distinfo (revision 540843) @@ -1,3 +1,3 @@ -TIMESTAMP = 1579345838 -SHA256 (popt-1.16.tar.gz) = e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8 -SIZE (popt-1.16.tar.gz) = 702769 +TIMESTAMP = 1593027760 +SHA256 (popt-1.18.tar.gz) = 5159bc03a20b28ce363aa96765f37df99ea4d8850b1ece17d1e6ad5c24fdc5d1 +SIZE (popt-1.18.tar.gz) = 580569 Index: head/devel/popt/files/patch-popt.c =================================================================== --- head/devel/popt/files/patch-popt.c (revision 540842) +++ head/devel/popt/files/patch-popt.c (nonexistent) @@ -1,12 +0,0 @@ ---- popt.c.orig 2010-01-19 00:39:10 UTC -+++ popt.c -@@ -22,6 +22,9 @@ extern long long int strtoll(const char *nptr, /*@null - #include - #endif - #include -+#ifdef __FreeBSD__ -+#include -+#endif - - #include "poptint.h" - Property changes on: head/devel/popt/files/patch-popt.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/popt/files/patch-Makefile.in =================================================================== --- head/devel/popt/files/patch-Makefile.in (revision 540842) +++ head/devel/popt/files/patch-Makefile.in (nonexistent) @@ -1,32 +0,0 @@ ---- Makefile.in.orig 2017-07-12 14:39:00 UTC -+++ Makefile.in -@@ -92,7 +92,7 @@ am__base_list = \ - am__installdirs = "$(DESTDIR)$(usrlibdir)" "$(DESTDIR)$(man3dir)" \ - "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(includedir)" - LTLIBRARIES = $(usrlib_LTLIBRARIES) --libpopt_la_LIBADD = -+libpopt_la_LIBADD = $(LTLIBINTL) - am_libpopt_la_OBJECTS = popt.lo poptparse.lo poptconfig.lo popthelp.lo \ - poptint.lo - libpopt_la_OBJECTS = $(am_libpopt_la_OBJECTS) -@@ -349,16 +349,16 @@ AM_CPPFLAGS = -I. -I$(top_srcdir) - noinst_HEADERS = poptint.h system.h - test1_SOURCES = test1.c - test1_LDFLAGS = --test1_LDADD = $(usrlib_LTLIBRARIES) -+test1_LDADD = $(usrlib_LTLIBRARIES) $(LTLIBICONV) - test2_SOURCES = test2.c - test2_LDFLAGS = --test2_LDADD = $(usrlib_LTLIBRARIES) -+test2_LDADD = $(usrlib_LTLIBRARIES) $(LTLIBICONV) - #test3_SOURCES = test3.c - #test3_LDFLAGS = --#test3_LDADD = $(usrlib_LTLIBRARIES) -+#test3_LDADD = $(usrlib_LTLIBRARIES) $(LTLIBICONV) - tdict_SOURCES = tdict.c - tdict_LDFLAGS = --tdict_LDADD = $(usrlib_LTLIBRARIES) -+tdict_LDADD = $(usrlib_LTLIBRARIES) $(LTLIBICONV) - noinst_SCRIPTS = testit.sh - TESTS_ENVIRONMENT = \ - test1="$(top_builddir)/test1" Property changes on: head/devel/popt/files/patch-Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/popt/files/patch-tests_testit.sh =================================================================== --- head/devel/popt/files/patch-tests_testit.sh (nonexistent) +++ head/devel/popt/files/patch-tests_testit.sh (revision 540843) @@ -0,0 +1,66 @@ +--- tests/testit.sh.orig 2020-06-24 22:53:32 UTC ++++ tests/testit.sh +@@ -114,63 +114,6 @@ run test1 "test1 - 56" "arg1: 0 arg2: (none) aFlag: 0x + + run test1 "test1 - 57" "arg1: 0 arg2: (none) aBits: foo,baz" --bits foo,bar,baz,!bar + +-run test1 "test1 - 58" "\ +-Usage: lt-test1 [-I?] [-c|--cb2=STRING] [--arg1] [-2|--arg2=ARG] +- [-3|--arg3=ANARG] [-onedash] [--optional=STRING] [--val] +- [-i|--int=INT] [-s|--short=SHORT] [-l|--long=LONG] +- [-L|--longlong=LONGLONG] [-f|--float=FLOAT] [-d|--double=DOUBLE] +- [--randint=INT] [--randshort=SHORT] [--randlong=LONG] +- [--randlonglong=LONGLONG] [--argv=STRING] [--bitset] [--bitclr] +- [--bitxor] [--nstr=STRING] [--lstr=STRING] [-I|--inc] +- [-c|--cb=STRING] [--longopt] [-?|--help] [--usage] [--simple=ARG]" --usage +-run test1 "test1 - 59" "\ +-Usage: lt-test1 [OPTION...] +- --arg1 First argument with a really long +- description. After all, we have to test +- argument help wrapping somehow, right? +- -2, --arg2=ARG Another argument (default: \"(none)\") +- -3, --arg3=ANARG A third argument +- -onedash POPT_ARGFLAG_ONEDASH: Option takes a single - +- --optional[=STRING] POPT_ARGFLAG_OPTIONAL: Takes an optional +- string argument +- --val POPT_ARG_VAL: 125992 141421 +- -i, --int=INT POPT_ARG_INT: 271828 (default: 271828) +- -s, --short=SHORT POPT_ARG_SHORT: 4523 (default: 4523) +- -l, --long=LONG POPT_ARG_LONG: 738905609 (default: 738905609) +- -L, --longlong=LONGLONG POPT_ARG_LONGLONG: 738905609 (default: +- 738905609) +- -f, --float=FLOAT POPT_ARG_FLOAT: 3.14159 (default: 3.14159) +- -d, --double=DOUBLE POPT_ARG_DOUBLE: 9.8696 (default: 9.8696) +- --randint=INT POPT_ARGFLAG_RANDOM: experimental +- --randshort=SHORT POPT_ARGFLAG_RANDOM: experimental +- --randlong=LONG POPT_ARGFLAG_RANDOM: experimental +- --randlonglong=LONGLONG POPT_ARGFLAG_RANDOM: experimental +- --argv STRING POPT_ARG_ARGV: append string to argv array +- (can be used multiple times) +- --[no]bitset POPT_BIT_SET: |= 0x7777 +- --[no]bitclr POPT_BIT_CLR: &= ~0xf842 +- --bitxor POPT_ARGFLAG_XOR: ^= (0x8ace^0xfeed) +- --nstr=STRING POPT_ARG_STRING: (null) (default: null) +- --lstr=STRING POPT_ARG_STRING: \"123456789...\" (default: +- \"This tests default strings and exceeds the +- ... limit. +- 123456789+123456789+123456789+123456789+123456789+ 123456789+123456789+123456789+123456789+123456789+ 1234567...\") +- +-arg for cb2 +- -c, --cb2=STRING Test argument callbacks +- -I, --inc An included argument +- +-Callback arguments +- -c, --cb=STRING Test argument callbacks +- --longopt Unused option for help testing +- +-Options implemented via popt alias/exec: +- --simple=ARG simple description +- +-Help options: +- -?, --help Show this help message +- --usage Display brief usage message" --help +- + #run_diff test3 "test3 - 51" test3-data/01.input test3-data/01.answer + #run_diff test3 "test3 - 52" test3-data/02.input test3-data/02.answer + #run_diff test3 "test3 - 53" test3-data/03.input test3-data/03.answer Property changes on: head/devel/popt/files/patch-tests_testit.sh ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/popt/pkg-plist =================================================================== --- head/devel/popt/pkg-plist (revision 540842) +++ head/devel/popt/pkg-plist (revision 540843) @@ -1,39 +1,39 @@ include/popt.h lib/libpopt.a lib/libpopt.so lib/libpopt.so.0 -lib/libpopt.so.0.0.0 +lib/libpopt.so.0.0.1 libdata/pkgconfig/popt.pc man/man3/popt.3.gz %%NLS%%share/locale/cs/LC_MESSAGES/popt.mo %%NLS%%share/locale/da/LC_MESSAGES/popt.mo %%NLS%%share/locale/de/LC_MESSAGES/popt.mo %%NLS%%share/locale/eo/LC_MESSAGES/popt.mo %%NLS%%share/locale/es/LC_MESSAGES/popt.mo %%NLS%%share/locale/fi/LC_MESSAGES/popt.mo %%NLS%%share/locale/fr/LC_MESSAGES/popt.mo %%NLS%%share/locale/ga/LC_MESSAGES/popt.mo %%NLS%%share/locale/gl/LC_MESSAGES/popt.mo %%NLS%%share/locale/hu/LC_MESSAGES/popt.mo %%NLS%%share/locale/id/LC_MESSAGES/popt.mo %%NLS%%share/locale/is/LC_MESSAGES/popt.mo %%NLS%%share/locale/it/LC_MESSAGES/popt.mo %%NLS%%share/locale/ja/LC_MESSAGES/popt.mo %%NLS%%share/locale/ko/LC_MESSAGES/popt.mo %%NLS%%share/locale/lv/LC_MESSAGES/popt.mo %%NLS%%share/locale/nb/LC_MESSAGES/popt.mo %%NLS%%share/locale/nl/LC_MESSAGES/popt.mo %%NLS%%share/locale/pl/LC_MESSAGES/popt.mo %%NLS%%share/locale/pt/LC_MESSAGES/popt.mo %%NLS%%share/locale/ro/LC_MESSAGES/popt.mo %%NLS%%share/locale/ru/LC_MESSAGES/popt.mo %%NLS%%share/locale/sk/LC_MESSAGES/popt.mo %%NLS%%share/locale/sl/LC_MESSAGES/popt.mo %%NLS%%share/locale/sv/LC_MESSAGES/popt.mo %%NLS%%share/locale/th/LC_MESSAGES/popt.mo %%NLS%%share/locale/tr/LC_MESSAGES/popt.mo %%NLS%%share/locale/uk/LC_MESSAGES/popt.mo %%NLS%%share/locale/vi/LC_MESSAGES/popt.mo %%NLS%%share/locale/wa/LC_MESSAGES/popt.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/popt.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/popt.mo