Attachment #215918 for bug #247529




# $FreeBSD$

PORTNAME=	popt
PORTVERSION=	1.18
PORTREVISION=	2
CATEGORIES=	devel
MASTER_SITES=	http://ftp.rpm.org/popt/releases/popt-1.x/
		GENTOO

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

Lines 1-3 Link Here

(-)b/devel/popt/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1579345838	1	TIMESTAMP = 1593027760
2	SHA256 (popt-1.16.tar.gz) = e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8	2	SHA256 (popt-1.18.tar.gz) = 5159bc03a20b28ce363aa96765f37df99ea4d8850b1ece17d1e6ad5c24fdc5d1
3	SIZE (popt-1.16.tar.gz) = 702769	3	SIZE (popt-1.18.tar.gz) = 580569




--- 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"




--- 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 <float.h>
 #endif
 #include <math.h>
+#ifdef __FreeBSD__
+#include <machine/float.h>
+#endif
 
 #include "poptint.h"
 




--- 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

Lines 2-8 include/popt.h Link Here

(-)b/devel/popt/pkg-plist (-2 / +1 lines)
2	lib/libpopt.a	2	lib/libpopt.a
3	lib/libpopt.so	3	lib/libpopt.so
4	lib/libpopt.so.0	4	lib/libpopt.so.0
5	lib/libpopt.so.0.0.0	5	lib/libpopt.so.0.0.1
6	libdata/pkgconfig/popt.pc	6	libdata/pkgconfig/popt.pc
7	man/man3/popt.3.gz	7	man/man3/popt.3.gz
8	%%NLS%%share/locale/cs/LC_MESSAGES/popt.mo	8	%%NLS%%share/locale/cs/LC_MESSAGES/popt.mo
9	-

Return to bug 247529

Lines 2-25 Link Here

(-)b/devel/popt/Makefile (-7 / +7 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= popt	4	PORTNAME= popt
5	PORTVERSION= 1.16	5	PORTVERSION= 1.18
6	PORTREVISION= 2
7	CATEGORIES= devel	6	CATEGORIES= devel
8	MASTER_SITES= http://ftp.rpm.org/mirror/popt/ \	7	MASTER_SITES= http://ftp.rpm.org/popt/releases/popt-1.x/
9	GENTOO
10		8
11	MAINTAINER= jpaetzel@FreeBSD.org	9	MAINTAINER= jpaetzel@FreeBSD.org
12	COMMENT= Getopt(3) like library with a number of enhancements, from Redhat	10	COMMENT= Getopt(3) like library with a number of enhancements, from Redhat
13		11
14	LICENSE= MIT	12	LICENSE= MIT
		13	LICENSE_FILE= ${WRKSRC}/COPYING
		14
		15	USES= iconv libtool pathfix
		16
		17	TEST_TARGET= check
15		18
16	OPTIONS_DEFINE= NLS	19	OPTIONS_DEFINE= NLS
17		20
18	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
19	CPPFLAGS+= -I${LOCALBASE}/include
20	LIBS+= -L${LOCALBASE}/lib
21	INSTALL_TARGET= install-strip	22	INSTALL_TARGET= install-strip
22	USES= iconv libtool pathfix
23	USE_LDCONFIG= yes	23	USE_LDCONFIG= yes
24		24
25	NLS_CONFIGURE_ENABLE= nls	25	NLS_CONFIGURE_ENABLE= nls

Removed Link Here

(-)a/devel/popt/files/patch-Makefile.in (-32 lines)
1	--- Makefile.in.orig 2017-07-12 14:39:00 UTC
2	+++ Makefile.in
3	@@ -92,7 +92,7 @@ am__base_list = \
4	am__installdirs = "$(DESTDIR)$(usrlibdir)" "$(DESTDIR)$(man3dir)" \
5	"$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(includedir)"
6	LTLIBRARIES = $(usrlib_LTLIBRARIES)
7	-libpopt_la_LIBADD =
8	+libpopt_la_LIBADD = $(LTLIBINTL)
9	am_libpopt_la_OBJECTS = popt.lo poptparse.lo poptconfig.lo popthelp.lo \
10	poptint.lo
11	libpopt_la_OBJECTS = $(am_libpopt_la_OBJECTS)
12	@@ -349,16 +349,16 @@ AM_CPPFLAGS = -I. -I$(top_srcdir)
13	noinst_HEADERS = poptint.h system.h
14	test1_SOURCES = test1.c
15	test1_LDFLAGS =
16	-test1_LDADD = $(usrlib_LTLIBRARIES)
17	+test1_LDADD = $(usrlib_LTLIBRARIES) $(LTLIBICONV)
18	test2_SOURCES = test2.c
19	test2_LDFLAGS =
20	-test2_LDADD = $(usrlib_LTLIBRARIES)
21	+test2_LDADD = $(usrlib_LTLIBRARIES) $(LTLIBICONV)
22	#test3_SOURCES = test3.c
23	#test3_LDFLAGS =
24	-#test3_LDADD = $(usrlib_LTLIBRARIES)
25	+#test3_LDADD = $(usrlib_LTLIBRARIES) $(LTLIBICONV)
26	tdict_SOURCES = tdict.c
27	tdict_LDFLAGS =
28	-tdict_LDADD = $(usrlib_LTLIBRARIES)
29	+tdict_LDADD = $(usrlib_LTLIBRARIES) $(LTLIBICONV)
30	noinst_SCRIPTS = testit.sh
31	TESTS_ENVIRONMENT = \
32	test1="$(top_builddir)/test1"

Removed Link Here

(-)a/devel/popt/files/patch-popt.c (-12 lines)
1	--- popt.c.orig 2010-01-19 00:39:10 UTC
2	+++ popt.c
3	@@ -22,6 +22,9 @@ extern long long int strtoll(const char nptr, /@null
4	#include <float.h>
5	#endif
6	#include <math.h>
7	+#ifdef __FreeBSD__
8	+#include <machine/float.h>
9	+#endif
10
11	#include "poptint.h"
12

Added Link Here

(-)b/devel/popt/files/patch-tests_testit.sh (+66 lines)
1	--- tests/testit.sh.orig 2020-06-24 22:53:32 UTC
2	+++ tests/testit.sh
3	@@ -114,63 +114,6 @@ run test1 "test1 - 56" "arg1: 0 arg2: (none) aFlag: 0x
4
5	run test1 "test1 - 57" "arg1: 0 arg2: (none) aBits: foo,baz" --bits foo,bar,baz,!bar
6
7	-run test1 "test1 - 58" "\
8	-Usage: lt-test1 [-I?] [-c\|--cb2=STRING] [--arg1] [-2\|--arg2=ARG]
9	- [-3\|--arg3=ANARG] [-onedash] [--optional=STRING] [--val]
10	- [-i\|--int=INT] [-s\|--short=SHORT] [-l\|--long=LONG]
11	- [-L\|--longlong=LONGLONG] [-f\|--float=FLOAT] [-d\|--double=DOUBLE]
12	- [--randint=INT] [--randshort=SHORT] [--randlong=LONG]
13	- [--randlonglong=LONGLONG] [--argv=STRING] [--bitset] [--bitclr]
14	- [--bitxor] [--nstr=STRING] [--lstr=STRING] [-I\|--inc]
15	- [-c\|--cb=STRING] [--longopt] [-?\|--help] [--usage] [--simple=ARG]" --usage
16	-run test1 "test1 - 59" "\
17	-Usage: lt-test1 [OPTION...]
18	- --arg1 First argument with a really long
19	- description. After all, we have to test
20	- argument help wrapping somehow, right?
21	- -2, --arg2=ARG Another argument (default: \"(none)\")
22	- -3, --arg3=ANARG A third argument
23	- -onedash POPT_ARGFLAG_ONEDASH: Option takes a single -
24	- --optional[=STRING] POPT_ARGFLAG_OPTIONAL: Takes an optional
25	- string argument
26	- --val POPT_ARG_VAL: 125992 141421
27	- -i, --int=INT POPT_ARG_INT: 271828 (default: 271828)
28	- -s, --short=SHORT POPT_ARG_SHORT: 4523 (default: 4523)
29	- -l, --long=LONG POPT_ARG_LONG: 738905609 (default: 738905609)
30	- -L, --longlong=LONGLONG POPT_ARG_LONGLONG: 738905609 (default:
31	- 738905609)
32	- -f, --float=FLOAT POPT_ARG_FLOAT: 3.14159 (default: 3.14159)
33	- -d, --double=DOUBLE POPT_ARG_DOUBLE: 9.8696 (default: 9.8696)
34	- --randint=INT POPT_ARGFLAG_RANDOM: experimental
35	- --randshort=SHORT POPT_ARGFLAG_RANDOM: experimental
36	- --randlong=LONG POPT_ARGFLAG_RANDOM: experimental
37	- --randlonglong=LONGLONG POPT_ARGFLAG_RANDOM: experimental
38	- --argv STRING POPT_ARG_ARGV: append string to argv array
39	- (can be used multiple times)
40	- --[no]bitset POPT_BIT_SET: \|= 0x7777
41	- --[no]bitclr POPT_BIT_CLR: &= ~0xf842
42	- --bitxor POPT_ARGFLAG_XOR: ^= (0x8ace^0xfeed)
43	- --nstr=STRING POPT_ARG_STRING: (null) (default: null)
44	- --lstr=STRING POPT_ARG_STRING: \"123456789...\" (default:
45	- \"This tests default strings and exceeds the
46	- ... limit.
47	- 123456789+123456789+123456789+123456789+123456789+ 123456789+123456789+123456789+123456789+123456789+ 1234567...\")
48	-
49	-arg for cb2
50	- -c, --cb2=STRING Test argument callbacks
51	- -I, --inc An included argument
52	-
53	-Callback arguments
54	- -c, --cb=STRING Test argument callbacks
55	- --longopt Unused option for help testing
56	-
57	-Options implemented via popt alias/exec:
58	- --simple=ARG simple description
59	-
60	-Help options:
61	- -?, --help Show this help message
62	- --usage Display brief usage message" --help
63	-
64	#run_diff test3 "test3 - 51" test3-data/01.input test3-data/01.answer
65	#run_diff test3 "test3 - 52" test3-data/02.input test3-data/02.answer
66	#run_diff test3 "test3 - 53" test3-data/03.input test3-data/03.answer