From nobody Thu Aug 11 10:15:11 2022 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 4M3N3M3GXMz4Yyf2; Thu, 11 Aug 2022 10:15:11 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M3N3M2kxpz3n8n; Thu, 11 Aug 2022 10:15:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660212911; 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=/GmHlkhXtM236WYfIsXtU5WBIaTFjOkP+E/8EAmNL/U=; b=QxPeDcpaD5/41pk4OL83BmAabBQ97YBlYdiC1V0YK+j2Dwaxf69aA6oLXKdX28pTg9e5c6 3q6Sv23nXQYiRHff0KdDE9igasIxfkkG65sk7foE2IZwzb/BhTXRramlA4E+oj4kVshwGM ROOSLJnNYW3ETkjjxuHPunQtvmG+xxTL0VMeoa/HM1zl2tuwtR7C7mBJJ4WBPoQARSS4DX fWg7F+fIHtbLK7CkeLcOgecNU3/ZDeProAlELwkk17SgWC9FmdGSiqOdob7CjQB+d8bCjm fIpXSHVrTHDHuLUyCwuRAEnqhph4fJeRbK+CQt3LWzEeOHV2m6V/fAZ4UTtmqg== 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 4M3N3M1jY3znXJ; Thu, 11 Aug 2022 10:15:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27BAFBUD052253; Thu, 11 Aug 2022 10:15:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27BAFB39052252; Thu, 11 Aug 2022 10:15:11 GMT (envelope-from git) Date: Thu, 11 Aug 2022 10:15:11 GMT Message-Id: <202208111015.27BAFB39052252@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: f515b0e657e7 - main - textproc/gnugrep: add missing dependency, build with --program-prefix=g 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f515b0e657e7bd11d88725e9bc3cb1ccb3706baa Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660212911; 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=/GmHlkhXtM236WYfIsXtU5WBIaTFjOkP+E/8EAmNL/U=; b=qYNJfZz+NOR5DXaL3gxH3tdu6KCVsgi/TFm46cim43enZi9FaFiy7Bv+/x+/LMlu+JTNqz d5MtGtSf2+uGXy7kw/Ei6inr1MF7mw6tyOdrneQCo9QEp5EuWT1zPx/JHxo/BRduaoIcUu JBgeXqVvaLxYGZX18dpJC4gI4wzemUKOn74+k9QidbWxm/pcV+rX1uF8METf/5WDjFSNSo +tXpwX0zcrs5MTvVxcTU7udphGVlziY2bMEfErOjFVjYrYh9mldXu7ObQodJUO/Ig+QcCn 7NrKsHhxq7MbsZcfpGMMgRnjQa1luvgyoXfb93er8mnBY8IOgfaEbpWz9ObPSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660212911; a=rsa-sha256; cv=none; b=TBoUTwiKdz/LqZTaElDa3wvT3rxYq4a4vShZsVYf36cMt3f7562XLhhL1RLh8zZCJXRrPt 2gt/PCbjIEjMPbg7issk7QDG+otv3T7n6Ipu/fg1LLaxFYfMbskOn/HA/dVxtN61AREELQ ckLHe6JNqPLe/dWNfECRuX8VpDuS6FXnbANfIJERvx9EEQ3efKfoehtndTpkLvwcTCdavN mx1hpBuoKnoxuVkCX3RaNvfONkpRdMFrk0kusiPitKcU0McNfVYYjVzTAih2ssmLhHceba D7Tk74Nt/hEwT5XvpgXW410IASHrl6zwLgmwa5aQXO2yS+hSQ7Zki1UcrCQPVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=f515b0e657e7bd11d88725e9bc3cb1ccb3706baa commit f515b0e657e7bd11d88725e9bc3cb1ccb3706baa Author: Alexey Dokuchaev AuthorDate: 2022-08-11 10:13:08 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-08-11 10:13:08 +0000 textproc/gnugrep: add missing dependency, build with --program-prefix=g - Add run-time dependency on `textproc/groff': the manual page won't be rendered if groff(1) is not installed; - By popular demand, configure the port with `--program-prefix=g' as we do for other GNU utilities. This places the binaries within the same namespace more consistently; several other non-GNU/Linux systems, e.g. NetBSD, OpenBSD, Solaris, macOS (Homebrew) are doing the same. Avoid POLA violation by creating traditionally named compatibility symlinks. PR: 263275, 265729 --- textproc/gnugrep/Makefile | 9 +++++++++ textproc/gnugrep/pkg-plist | 9 ++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/textproc/gnugrep/Makefile b/textproc/gnugrep/Makefile index 914bc036b3d0..9534e9ff6289 100644 --- a/textproc/gnugrep/Makefile +++ b/textproc/gnugrep/Makefile @@ -1,5 +1,6 @@ PORTNAME= grep PORTVERSION= 3.7 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= GNU PKGNAMEPREFIX= gnu @@ -11,8 +12,11 @@ LICENSE= GPLv3+ CONFLICTS= bsd-grep +RUN_DEPENDS= groff:textproc/groff + USES= charsetfix cpe tar:xz GNU_CONFIGURE= yes +CONFIGURE_ARGS= --program-prefix=g TEST_TARGET= check INFO= grep @@ -46,4 +50,9 @@ post-patch-NLS-off: @${REINPLACE_CMD} '/install-exec-local:/s/install-exec-localcharset//' \ ${WRKSRC}/lib/Makefile.in +post-install: +.for p in grep egrep fgrep + ${LN} -sf g${p} ${STAGEDIR}${PREFIX}/bin/${p} +.endfor + .include diff --git a/textproc/gnugrep/pkg-plist b/textproc/gnugrep/pkg-plist index 6d59dd1baef0..499828b03cb5 100644 --- a/textproc/gnugrep/pkg-plist +++ b/textproc/gnugrep/pkg-plist @@ -1,9 +1,12 @@ bin/egrep bin/fgrep +bin/gegrep +bin/gfgrep +bin/ggrep bin/grep -man/man1/egrep.1.gz -man/man1/fgrep.1.gz -man/man1/grep.1.gz +man/man1/gegrep.1.gz +man/man1/gfgrep.1.gz +man/man1/ggrep.1.gz %%NLS%%share/locale/af/LC_MESSAGES/grep.mo %%NLS%%share/locale/be/LC_MESSAGES/grep.mo %%NLS%%share/locale/bg/LC_MESSAGES/grep.mo