From nobody Sun Nov 03 11:50:26 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XhCb66wr1z5bxQy; Sun, 03 Nov 2024 11:50:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XhCb66Q7Rz4hSG; Sun, 3 Nov 2024 11:50:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730634626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gau4GTWEhJU00OfoOANH0Q2Z/vRT3vPiaLyx+EHMml4=; b=gsMnLkkzTjHCA9sqqGsAJIEoTWXPw/jrHm57jjTOFOBsc/kq0uFIpkkwlEKZJ3rWPF3FdK MpCuPUdu2H7UAtyfiBdc//OHPIBkrrvmimovuJAvpea4yXkgn/43ny2KL45EE7wsbg6Kz1 hw9QYZTtxcU7m3RCEBL2kNmZzfn2574HMuov4foURwWv2nhXdo+Zn/yH5IsrG454f4v2G+ 6ie/NqijblktCSg5vqx3OO6YlEQ7CMLnTGqrppCJpyW8Zxn3+grtQID9Ynm00q8Ijesw0Q DfZHpjAUxpg+h8HP20DwzFijNtWci79a9jB96MxqjWMMA+WlzNjvXtzkmh82PQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730634626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gau4GTWEhJU00OfoOANH0Q2Z/vRT3vPiaLyx+EHMml4=; b=puvYe6/Im9k3wPdW9lj1WsmZm9ywOZOJ0hnHOxofLQvyyKIwup13g2/eUiTN/GNKcqKhPE y4UAt3i3k+Z/zpxv4q7EwxRmFIPwcvdUHlErRQCJtqQRdEj+KTY4ry+aCoUe09TXJUtGOY +ona3itUpKNocck1y4YNUBjz0aBLeVuVVrDXILjJ2Lp40ClBeXv/1aprQ9mi07o/VBgvNL Nkc7cg5EsM3oDN5qVVFSiFoiI8zwvkp6PPfbhS7CnqgUIpdOqyNfk2p1mKdfEE2E40AG1s WzQYazhI7d6gVG75GlKdyUxOZVUJel6Mo2psVf//vFTxo31xT6kJD4pJ38yxPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730634626; a=rsa-sha256; cv=none; b=N5++DajHLIcYB2IfpyfvtLAJbRWYdvX1j6AvQr8MrNPgaiFdqr3UKIhynqdcXW2HkZdRU5 vA630y13NY/oGBQL1NDs2JQ9B+UBFGrTgrI/PRoco3gBSMppkMvGgksQTF9moOdNRJrvIq PbxemvOdb6T1NHAeM3uYQYQXU+kZp/OmkUjDW0dXr28spmYpSYy1NpP4oCbGt74pya3meI v3hQf1CMBTlPeqZ7B5VioM6n9ss/daxZg+rhEcbKdvjo2UprmMnqtiHBzBnPh9/U3msMns oa7AU8zH+6aey2VpIX+pmMK74mL+XUkh1MpC5DLUTFC6BKZmbnWGyyzLu5psWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XhCb65zn7znRP; Sun, 3 Nov 2024 11:50:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A3BoQoF041675; Sun, 3 Nov 2024 11:50:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A3BoQui041672; Sun, 3 Nov 2024 11:50:26 GMT (envelope-from git) Date: Sun, 3 Nov 2024 11:50:26 GMT Message-Id: <202411031150.4A3BoQui041672@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 4ddfd281f8eb - main - misc/getopt: Re-add getopt 1.1.6 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4ddfd281f8eb07657fd1e268fed59478a4a2ce38 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=4ddfd281f8eb07657fd1e268fed59478a4a2ce38 commit 4ddfd281f8eb07657fd1e268fed59478a4a2ce38 Author: Po-Chuan Hsieh AuthorDate: 2024-11-03 11:34:23 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-11-03 11:34:23 +0000 misc/getopt: Re-add getopt 1.1.6 PR: 281625 --- MOVED | 1 - misc/Makefile | 1 + misc/getopt/Makefile | 38 +++++++++++++++++++++++++++++++ misc/getopt/distinfo | 3 +++ misc/getopt/files/patch-Makefile | 49 ++++++++++++++++++++++++++++++++++++++++ misc/getopt/pkg-descr | 11 +++++++++ misc/getopt/pkg-plist | 28 +++++++++++++++++++++++ 7 files changed, 130 insertions(+), 1 deletion(-) diff --git a/MOVED b/MOVED index 7d96a4d146ee..6d75cf949f97 100644 --- a/MOVED +++ b/MOVED @@ -3577,4 +3577,3 @@ misc/uk-phone||2024-10-31|Has expired: Obsolete, 20+ year old data textproc/ssddiff||2024-10-31|Has expired: Abandonware, unfetchable and upstream is gone sysutils/pydf||2024-11-02|Has expired: Inactive upstream. Does not properly work on FreeBSD ports-mgmt/freebsd-bugzilla-cli||2024-11-02|Has expired: Broken. Upstream unavailable -misc/getopt||2024-11-02|Has expired: Use getopt from devel/util-linux instead diff --git a/misc/Makefile b/misc/Makefile index f6b464417a65..34195fc80e54 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -152,6 +152,7 @@ SUBDIR += g810-led SUBDIR += gedkeeper SUBDIR += geekcode + SUBDIR += getopt SUBDIR += gimp-help-en SUBDIR += gkrellm-gamma SUBDIR += gkrellm-xkb diff --git a/misc/getopt/Makefile b/misc/getopt/Makefile new file mode 100644 index 000000000000..7dcb45220b28 --- /dev/null +++ b/misc/getopt/Makefile @@ -0,0 +1,38 @@ +PORTNAME= getopt +PORTVERSION= 1.1.6 +PORTREVISION= 1 +CATEGORIES= misc +MASTER_SITES= http://frodo.looijaard.name/system/files/software/getopt/ \ + LOCAL/sunpoet + +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Replacement for getopt(1) that supports GNU-style long options +WWW= https://software.frodo.looijaard.name/getopt/ + +LICENSE= GPLv2 GPLv3 +LICENSE_COMB= dual + +DEPRECATED= Use getopt from devel/util-linux instead +EXPIRATION_DATE=2024-10-31 + +OPTIONS_DEFINE= DOCS NLS +OPTIONS_SUB= yes + +MAKE_ARGS= CC=${CC} LIBCGETOPT=0 +USES= gmake + +PORTDOCS= Changelog README + +NLS_MAKE_ARGS= WITHOUT_GETTEXT=0 +NLS_MAKE_ARGS_OFF= WITHOUT_GETTEXT=1 +NLS_LDFLAGS= -lintl +NLS_USES= gettext localbase:ldflags + +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/getopt + +post-install-DOCS-on: + ${MKDIR} ${STAGEDIR}${DOCSDIR}/ + cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ + +.include diff --git a/misc/getopt/distinfo b/misc/getopt/distinfo new file mode 100644 index 000000000000..649952d571db --- /dev/null +++ b/misc/getopt/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1730633654 +SHA256 (getopt-1.1.6.tar.gz) = d0bf1dc642a993e7388a1cddfb9409bed375c21d5278056ccca3a0acd09dc5fe +SIZE (getopt-1.1.6.tar.gz) = 58926 diff --git a/misc/getopt/files/patch-Makefile b/misc/getopt/files/patch-Makefile new file mode 100644 index 000000000000..3383ee09c28f --- /dev/null +++ b/misc/getopt/files/patch-Makefile @@ -0,0 +1,49 @@ +--- Makefile.orig 2014-11-24 12:33:39 UTC ++++ Makefile +@@ -1,9 +1,9 @@ DESTDIR= + .SUFFIXES: + + DESTDIR= +-prefix=/usr/local ++prefix=$(PREFIX) + bindir=$(prefix)/bin +-mandir=$(prefix)/man ++mandir=$(prefix)/share/man + man1dir=$(mandir)/man1 + sharedir=$(prefix)/share + getoptdir=$(sharedir)/getopt +@@ -32,18 +32,15 @@ MOFILES:=$(patsubst %,po/%.mo,$(LANGUAGES)) + LANGUAGES = ca cs da de es et eu fi fr gl hr hu id it ja nl pl pt_BR ru sl sv tr uk vi zh_CN zh_TW + MOFILES:=$(patsubst %,po/%.mo,$(LANGUAGES)) + +-CPPFLAGS=-DLIBCGETOPT=$(LIBCGETOPT) -DWITHOUT_GETTEXT=$(WITHOUT_GETTEXT) -DLOCALEDIR=\"$(localedir)\" -DNOT_UTIL_LINUX -Dprogram_invocation_short_name=\"$(PACKAGE)\" -Dprogram_version=\"$(VERSION)\" ++CPPFLAGS+=-DLIBCGETOPT=$(LIBCGETOPT) -DWITHOUT_GETTEXT=$(WITHOUT_GETTEXT) -DLOCALEDIR=\"$(localedir)\" -DNOT_UTIL_LINUX -Dprogram_invocation_short_name=\"$(PACKAGE)\" -Dprogram_version=\"$(VERSION)\" + ifeq ($(LIBCGETOPT),0) +-CPPFLAGS+=-I./gnu ++CPPFLAGS+=-I./gnu + endif + WARNINGS=-Wall \ + -W -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual \ + -Wcast-align -Wmissing-declarations \ + -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \ + -Wnested-externs -Winline +-OPTIMIZE=-O3 -fno-strength-reduce +-CFLAGS=$(WARNINGS) $(OPTIMIZE) +-LDFLAGS= + + sources=getopt.c + ifeq ($(LIBCGETOPT),0) +@@ -54,11 +51,11 @@ binaries=getopt + + binaries=getopt + +-.PHONY: all clean realclean ++.PHONY: all clean realclean + all: $(binaries) all_po + + clean: clean_po +- -$(RM) $(objects) $(binaries) ++ -$(RM) $(objects) $(binaries) + + getopt: $(objects) + $(CC) $(LDFLAGS) -o $@ $(objects) diff --git a/misc/getopt/pkg-descr b/misc/getopt/pkg-descr new file mode 100644 index 000000000000..799c23ba34c8 --- /dev/null +++ b/misc/getopt/pkg-descr @@ -0,0 +1,11 @@ +Rewrite of getopt(1) with the following features: + +* It can do anything that the GNU getopt(3) routines can do. +* It can cope with spaces and shell metacharacters within arguments. +* It can parse long parameters. +* It can shuffle parameters, so you can mix options and other parameters + on the command-line. +* It can be easily identified as an enhanced getopt(1) from within shell + scripts. +* It can report parse errors as coming from the shell script. +* It compiles cleanly with both libc-5 and glibc-2. diff --git a/misc/getopt/pkg-plist b/misc/getopt/pkg-plist new file mode 100644 index 000000000000..c1a68f51212d --- /dev/null +++ b/misc/getopt/pkg-plist @@ -0,0 +1,28 @@ +bin/getopt +%%NLS%%share/locale/ca/LC_MESSAGES/getopt.mo +%%NLS%%share/locale/cs/LC_MESSAGES/getopt.mo +%%NLS%%share/locale/da/LC_MESSAGES/getopt.mo +%%NLS%%share/locale/de/LC_MESSAGES/getopt.mo +%%NLS%%share/locale/es/LC_MESSAGES/getopt.mo +%%NLS%%share/locale/et/LC_MESSAGES/getopt.mo +%%NLS%%share/locale/eu/LC_MESSAGES/getopt.mo +%%NLS%%share/locale/fi/LC_MESSAGES/getopt.mo +%%NLS%%share/locale/fr/LC_MESSAGES/getopt.mo +%%NLS%%share/locale/gl/LC_MESSAGES/getopt.mo +%%NLS%%share/locale/hr/LC_MESSAGES/getopt.mo +%%NLS%%share/locale/hu/LC_MESSAGES/getopt.mo +%%NLS%%share/locale/id/LC_MESSAGES/getopt.mo +%%NLS%%share/locale/it/LC_MESSAGES/getopt.mo +%%NLS%%share/locale/ja/LC_MESSAGES/getopt.mo +%%NLS%%share/locale/nl/LC_MESSAGES/getopt.mo +%%NLS%%share/locale/pl/LC_MESSAGES/getopt.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/getopt.mo +%%NLS%%share/locale/ru/LC_MESSAGES/getopt.mo +%%NLS%%share/locale/sl/LC_MESSAGES/getopt.mo +%%NLS%%share/locale/sv/LC_MESSAGES/getopt.mo +%%NLS%%share/locale/tr/LC_MESSAGES/getopt.mo +%%NLS%%share/locale/uk/LC_MESSAGES/getopt.mo +%%NLS%%share/locale/vi/LC_MESSAGES/getopt.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/getopt.mo +%%NLS%%share/locale/zh_TW/LC_MESSAGES/getopt.mo +share/man/man1/getopt.1.gz