Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 24 May 2023 08:52:37 GMT
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: b4895e1e5e97 - main - lang/gawk: update the port to the latest version 5.2.2
Message-ID:  <202305240852.34O8qbd6044525@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by danfe:

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

commit b4895e1e5e9774adf67dbda4f9bf360b2e9899e6
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2023-05-24 08:51:22 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2023-05-24 08:51:22 +0000

    lang/gawk: update the port to the latest version 5.2.2
    
    GNU make is not required for the build, but the test suite assumes
    this particular implementation in several places.  While they could
    be patched, some of these changes won't be easily upstreamable I'm
    afraid, so let's just USES+=gmake for the time being.
    
    Drop the `post-patch' target added in commit 0c0c5d528f4cd (n243249)
    to prevent bogus makeinfo(1) banner propagation as this problem no
    longer exhibits itself.
    
    Reported by:    portscout
---
 lang/gawk/Makefile                |  7 ++-----
 lang/gawk/distinfo                |  6 +++---
 lang/gawk/files/patch-Makefile.in | 10 +++++-----
 lang/gawk/pkg-plist               |  7 +++++++
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile
index 3c51e4560175..5f3df306681f 100644
--- a/lang/gawk/Makefile
+++ b/lang/gawk/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gawk
-PORTVERSION=	5.2.1
+PORTVERSION=	5.2.2
 CATEGORIES=	lang
 MASTER_SITES=	GNU
 
@@ -25,7 +25,7 @@ MPFR_CONFIGURE_OFF=	--without-gmp --without-mpfr
 INFO=		gawk gawkinet gawkworkflow pm-gawk
 
 GNU_CONFIGURE=	yes
-USES=		iconv libtool makeinfo readline tar:lz
+USES=		gmake iconv libtool makeinfo readline tar:lz
 CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG} \
 		--with-libintl-prefix=${LOCALBASE} \
 		AWK=${AWK}
@@ -34,7 +34,4 @@ TEST_TARGET=	check
 
 PLIST_SUB+=	VERSION=${PORTVERSION}
 
-post-patch:
-	@${RM} ${WRKSRC}/doc/*.info
-
 .include <bsd.port.mk>
diff --git a/lang/gawk/distinfo b/lang/gawk/distinfo
index 4ec558dc2da5..be0d1c67e965 100644
--- a/lang/gawk/distinfo
+++ b/lang/gawk/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1669135006
-SHA256 (gawk-5.2.1.tar.lz) = 26c58bfe5b1c0d2ab2b5d440772bd28baa9d282e0ba42ca3e1270f784c72d3ad
-SIZE (gawk-5.2.1.tar.lz) = 3253425
+TIMESTAMP = 1683611786
+SHA256 (gawk-5.2.2.tar.lz) = d672438c4faaee78562adfeea31ad183881fe2b694c6a79025591810ec39972d
+SIZE (gawk-5.2.2.tar.lz) = 3272115
diff --git a/lang/gawk/files/patch-Makefile.in b/lang/gawk/files/patch-Makefile.in
index ed32fb3b3939..393dd720f340 100644
--- a/lang/gawk/files/patch-Makefile.in
+++ b/lang/gawk/files/patch-Makefile.in
@@ -1,9 +1,9 @@
---- Makefile.in.orig	2015-05-19 13:38:35 UTC
+--- Makefile.in.orig	2023-05-07 18:29:33 UTC
 +++ Makefile.in
-@@ -1178,7 +1178,7 @@ install-exec-hook:
- 	(cd $(DESTDIR)$(bindir); \
- 	name=`echo gawk | sed '$(transform)'` ; \
- 	$(LN) $${name}$(EXEEXT) gawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \
+@@ -1306,7 +1306,7 @@ install-exec-hook:
+ 	if [ ! -f gawk-$(VERSION)$(EXEEXT) ]; \
+ 	then	$(LN) $${name}$(EXEEXT) gawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \
+ 	fi; \
 -	if [ ! -f awk$(EXEEXT) ]; \
 +	if ! /usr/bin/which -s awk; \
  	then	$(LN_S) $${name}$(EXEEXT) awk$(EXEEXT); \
diff --git a/lang/gawk/pkg-plist b/lang/gawk/pkg-plist
index c00de6bd0ce7..3f42c27282e0 100644
--- a/lang/gawk/pkg-plist
+++ b/lang/gawk/pkg-plist
@@ -60,6 +60,13 @@ share/awk/shellquote.awk
 share/awk/strtonum.awk
 share/awk/walkarray.awk
 share/awk/zerofile.awk
+share/info/gawk_api-figure1.png
+share/info/gawk_api-figure2.png
+share/info/gawk_api-figure3.png
+share/info/gawk_array-elements.png
+share/info/gawk_general-program.png
+share/info/gawk_process-flow.png
+share/info/gawk_statist.jpg
 %%NLS%%share/locale/bg/LC_MESSAGES/gawk.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/gawk.mo
 %%NLS%%share/locale/da/LC_MESSAGES/gawk.mo



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202305240852.34O8qbd6044525>