git: 3e41c1690e0c - main - misc/getopt: Update to 2.41.1

From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Tue, 02 Sep 2025 18:15:23 UTC
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3e41c1690e0c54b91b8196c9db1176236627eae2

commit 3e41c1690e0c54b91b8196c9db1176236627eae2
Author:     Matthias Andree <mandree@FreeBSD.org>
AuthorDate: 2025-09-02 18:03:13 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2025-09-02 18:10:27 +0000

    misc/getopt: Update to 2.41.1
    
    - Use util-linux versioning
    - Rename DOCS option to EXAMPLES
    
    Changes:        https://github.com/util-linux/util-linux/commits/master/misc-utils/getopt.c
    PR:             288057
---
 misc/getopt/Makefile                | 12 +++++-------
 misc/getopt/distinfo                |  6 +++---
 misc/getopt/files/patch-Makefile.in | 35 ++++++++++++++++++++++-------------
 misc/getopt/files/patch-configure   |  4 ++--
 misc/getopt/pkg-plist               |  4 ++--
 5 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/misc/getopt/Makefile b/misc/getopt/Makefile
index 364220576706..c443c45207ca 100644
--- a/misc/getopt/Makefile
+++ b/misc/getopt/Makefile
@@ -1,9 +1,8 @@
 PORTNAME=	getopt
-PORTVERSION=	1.1.6
-PORTREVISION=	2
+PORTVERSION=	2.41.1
 CATEGORIES=	misc
-MASTER_SITES=	KERNEL_ORG/linux/utils/util-linux/v${UTIL_LINUX_PORTVERSION:R}/
-DISTNAME=	util-linux-${UTIL_LINUX_PORTVERSION}
+MASTER_SITES=	KERNEL_ORG/linux/utils/util-linux/v${PORTVERSION:R}/
+DISTNAME=	util-linux-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Replacement for getopt(1) that supports GNU-style long options
@@ -25,8 +24,7 @@ GNU_CONFIGURE=	yes
 
 SHEBANG_FILES=	misc-utils/getopt-example.bash
 
-UTIL_LINUX_PORTVERSION=	2.39.4
-
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	EXAMPLES
+OPTIONS_SUB=	yes
 
 .include <bsd.port.mk>
diff --git a/misc/getopt/distinfo b/misc/getopt/distinfo
index bcb689df13a7..3ca4b157aab1 100644
--- a/misc/getopt/distinfo
+++ b/misc/getopt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1714112744
-SHA256 (util-linux-2.39.4.tar.xz) = 6c4f8723dafd41c39d93ecbf16509fc88c33cd5bd3277880ae5a1d97a014fd0e
-SIZE (util-linux-2.39.4.tar.xz) = 8541176
+TIMESTAMP = 1755062624
+SHA256 (util-linux-2.41.1.tar.xz) = be9ad9a276f4305ab7dd2f5225c8be1ff54352f565ff4dede9628c1aaa7dec57
+SIZE (util-linux-2.41.1.tar.xz) = 9606156
diff --git a/misc/getopt/files/patch-Makefile.in b/misc/getopt/files/patch-Makefile.in
index 2e5784155571..a22fa85f1738 100644
--- a/misc/getopt/files/patch-Makefile.in
+++ b/misc/getopt/files/patch-Makefile.in
@@ -1,20 +1,29 @@
---- Makefile.in.orig	2024-04-04 09:13:52 UTC
+--- Makefile.in.orig	2025-06-24 07:57:05 UTC
 +++ Makefile.in
-@@ -5335,7 +5335,7 @@ ADOCFILES_COMMON = man-common/bugreports.adoc man-comm
+@@ -5974,7 +5974,7 @@ ADOCFILES_COMMON = man-common/bugreports.adoc man-comm
  	man-common/footer-lib.adoc man-common/help-version.adoc \
  	man-common/in-bytes.adoc man-common/manpage-stub.adoc \
  	man-common/translation.adoc
--MANPAGES = lib/terminal-colors.d.5 $(am__append_20) $(am__append_44) \
-+MANPAGES = $(am__append_20) $(am__append_44) \
- 	$(am__append_91) $(am__append_94) $(am__append_97) \
- 	$(am__append_100) $(am__append_103) $(am__append_106) \
+-MANPAGES = lib/terminal-colors.d.5 $(am__append_20) $(am__append_31) \
++MANPAGES = $(am__append_20) $(am__append_31) \
+ 	$(am__append_55) $(am__append_89) $(am__append_106) \
  	$(am__append_109) $(am__append_112) $(am__append_115) \
-@@ -5436,7 +5436,7 @@ CLEANFILES = $(am__append_336) $(PATHFILES) $(EXTRA_LT
- 	disk-utils/meson.build login-utils/meson.build \
- 	$(PATHFILES:=.in) $(am__append_667) $(am__append_670)
- CLEANFILES = $(am__append_336) $(PATHFILES) $(EXTRA_LTLIBRARIES)
--SUBDIRS = po $(am__append_3) $(am__append_41) $(am__append_63) \
-+SUBDIRS = $(am__append_3) $(am__append_41) $(am__append_63) \
- 	$(am__append_73) $(am__append_87)
+ 	$(am__append_118) $(am__append_121) $(am__append_124) \
+@@ -6093,7 +6093,7 @@ DISTCLEANFILES = po-man/util-linux-man.pot $(POMAN_PO_
+ 	$(am__append_533) $(am__append_720) $(PATHFILES) \
+ 	$(EXTRA_LTLIBRARIES)
+ DISTCLEANFILES = po-man/util-linux-man.pot $(POMAN_PO_FILES)
+-SUBDIRS = po $(am__append_52) $(am__append_75) $(am__append_86) \
++SUBDIRS = $(am__append_52) $(am__append_75) $(am__append_86) \
+ 	$(am__append_102)
  RCS_FIND_IGNORE = \( -name SCCS -o -name BitKeeper -o -name .svn -o \
  		-name CVS -o -name .pc -o -name .hg -o -name .git \) -prune -o
+@@ -7260,7 +7260,7 @@ test_islocal_CPPFLAGS = -DTEST_PROGRAM $(AM_CPPFLAGS)
+ @BUILD_RENAME_TRUE@rename_LDADD = $(LDADD) libcommon.la
+ @BUILD_GETOPT_TRUE@getopt_SOURCES = misc-utils/getopt.c
+ @BUILD_GETOPT_TRUE@getopt_LDADD = $(LDADD) libcommon.la
+-@BUILD_GETOPT_TRUE@getoptexampledir = $(docdir)
++@BUILD_GETOPT_TRUE@getoptexampledir = ${datarootdir}/examples/${PACKAGE_TARNAME}
+ @BUILD_GETOPT_TRUE@dist_getoptexample_DATA = \
+ @BUILD_GETOPT_TRUE@	misc-utils/getopt-example.bash \
+ @BUILD_GETOPT_TRUE@	misc-utils/getopt-example.tcsh
diff --git a/misc/getopt/files/patch-configure b/misc/getopt/files/patch-configure
index 9a98bdbaa070..75213723e5b2 100644
--- a/misc/getopt/files/patch-configure
+++ b/misc/getopt/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2024-04-04 09:13:50 UTC
+--- configure.orig	2025-06-24 07:57:03 UTC
 +++ configure
-@@ -35861,7 +35861,7 @@ fi
+@@ -38303,7 +38303,7 @@ fi
    enable_getopt=$ul_default_estate
    build_getopt=yes
    if test "x$ul_default_estate" = xno; then
diff --git a/misc/getopt/pkg-plist b/misc/getopt/pkg-plist
index 9750a1ad4723..2bfa62e0580e 100644
--- a/misc/getopt/pkg-plist
+++ b/misc/getopt/pkg-plist
@@ -1,5 +1,5 @@
 bin/getopt
 share/bash-completion/completions/getopt
-%%PORTDOCS%%share/doc/util-linux/getopt-example.bash
-%%PORTDOCS%%share/doc/util-linux/getopt-example.tcsh
+%%PORTEXAMPLES%%share/examples/util-linux/getopt-example.bash
+%%PORTEXAMPLES%%share/examples/util-linux/getopt-example.tcsh
 share/man/man1/getopt.1.gz