git: 9b6004f57a36 - main - devel/popt: Revert update to latest commit
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 20 Sep 2026 22:32:06 UTC
The branch main has been updated by diizzy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=9b6004f57a364b0148912029c418f660324dccf9
commit 9b6004f57a364b0148912029c418f660324dccf9
Author: Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2026-09-20 22:27:15 +0000
Commit: Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2026-09-20 22:31:22 +0000
devel/popt: Revert update to latest commit
This wasn't supposed to go in yet due to still waiting on timeout
PR: 298326
Pointy hat to: myself
---
devel/popt/Makefile | 26 ++++++++------
devel/popt/distinfo | 6 ++--
devel/popt/files/patch-tests_testit.sh | 66 ++++++++++++++++++++++++++++++++++
devel/popt/pkg-plist | 43 +++++++++++++++++++---
4 files changed, 122 insertions(+), 19 deletions(-)
diff --git a/devel/popt/Makefile b/devel/popt/Makefile
index 3b90754d80bc..43742a22abe2 100644
--- a/devel/popt/Makefile
+++ b/devel/popt/Makefile
@@ -1,8 +1,10 @@
PORTNAME= popt
-DISTVERSION= 1.19.20260818
+PORTVERSION= 1.19
+PORTREVISION= 2
+PORTEPOCH= 1
CATEGORIES= devel
-#MASTER_SITES= https://ftp.osuosl.org/pub/rpm/popt/releases/popt-1.x/ \
-# http://ftp.rpm.org/popt/releases/popt-1.x/
+MASTER_SITES= https://ftp.osuosl.org/pub/rpm/popt/releases/popt-1.x/ \
+ http://ftp.rpm.org/popt/releases/popt-1.x/
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= Getopt(3) like library with a number of enhancements, from Redhat
@@ -11,17 +13,19 @@ WWW= https://github.com/rpm-software-management/popt
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= cmake:testing cpe iconv pathfix
-CPE_VENDOR= popt_project
+USES= cpe iconv libtool
+
+GNU_CONFIGURE= yes
+INSTALL_TARGET= install-strip
+TEST_TARGET= check
USE_LDCONFIG= yes
-USE_GITHUB= yes
-GH_ACCOUNT= rpm-software-management
-GH_TAGNAME= 14c42b4
+CPE_VENDOR= popt_project
-CMAKE_ON= MAKE_DISABLE_FIND_PACKAGE_Doxygen
+OPTIONS_DEFINE= NLS
-post-install:
- ${INSTALL_MAN} ${WRKSRC}/popt.3 ${STAGEDIR}${PREFIX}/share/man/man3
+NLS_CONFIGURE_ENABLE= nls
+NLS_USES= gettext-runtime localbase
+OPTIONS_SUB= yes
.include <bsd.port.mk>
diff --git a/devel/popt/distinfo b/devel/popt/distinfo
index 66e7e2cabeb5..9b877153827f 100644
--- a/devel/popt/distinfo
+++ b/devel/popt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1788737505
-SHA256 (rpm-software-management-popt-1.19.20260818-14c42b4_GH0.tar.gz) = 26b41ba003ed8a755b87bc912109d62eb9b593b38a07d56b458010cc53fca7ca
-SIZE (rpm-software-management-popt-1.19.20260818-14c42b4_GH0.tar.gz) = 134010
+TIMESTAMP = 1663672744
+SHA256 (popt-1.19.tar.gz) = c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9
+SIZE (popt-1.19.tar.gz) = 596676
diff --git a/devel/popt/files/patch-tests_testit.sh b/devel/popt/files/patch-tests_testit.sh
new file mode 100644
index 000000000000..241892876c1e
--- /dev/null
+++ b/devel/popt/files/patch-tests_testit.sh
@@ -0,0 +1,66 @@
+--- tests/testit.sh.orig 2022-08-24 06:30:21 UTC
++++ tests/testit.sh
+@@ -110,63 +110,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: 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]
+- [-x|--bitxor] [--nstr=STRING] [--lstr=STRING] [-I|--inc]
+- [-c|--cb=STRING] [--longopt] [-?|--help] [--usage] [--simple=ARG]" --usage
+-run test1 "test1 - 59" "\
+-Usage: 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
+- -x, --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 test1 "test1 - 60" "" --val=foo
+ run test1 "test1 - 61" "" -x=f1
+
diff --git a/devel/popt/pkg-plist b/devel/popt/pkg-plist
index 6dbe9aed50a6..52a033d09a9c 100644
--- a/devel/popt/pkg-plist
+++ b/devel/popt/pkg-plist
@@ -1,10 +1,43 @@
include/popt.h
-lib/cmake/popt/poptConfig.cmake
-lib/cmake/popt/poptConfigVersion.cmake
-lib/cmake/popt/poptTargets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/popt/poptTargets.cmake
+lib/libpopt.a
lib/libpopt.so
lib/libpopt.so.0
-lib/libpopt.so.1.19
+lib/libpopt.so.0.0.2
libdata/pkgconfig/popt.pc
+%%NLS%%share/locale/ca/LC_MESSAGES/popt.mo
+%%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/ka/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/pt_BR/LC_MESSAGES/popt.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/popt.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/popt.mo
+%%NLS%%share/locale/si/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
share/man/man3/popt.3.gz