diff options
| -rw-r--r-- | lang/gawk/Makefile | 4 | ||||
| -rw-r--r-- | lang/gawk/PLIST | 4 | ||||
| -rw-r--r-- | lang/gawk/distinfo | 15 | ||||
| -rw-r--r-- | lang/gawk/patches/patch-awk.h | 18 | ||||
| -rw-r--r-- | lang/gawk/patches/patch-extension_Makefile.in | 26 | ||||
| -rw-r--r-- | lang/gawk/patches/patch-test_Makefile.in | 10 |
6 files changed, 30 insertions, 47 deletions
diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile index c8dec2c9785..10a417b4275 100644 --- a/lang/gawk/Makefile +++ b/lang/gawk/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.68 2019/03/05 16:58:31 hauke Exp $ +# $NetBSD: Makefile,v 1.69 2019/04/16 11:43:29 ryoon Exp $ -DISTNAME= gawk-4.2.1 +DISTNAME= gawk-5.0.0 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GNU:=gawk/} EXTRACT_SUFX= .tar.xz diff --git a/lang/gawk/PLIST b/lang/gawk/PLIST index 746aec79de1..f1b81d97a0d 100644 --- a/lang/gawk/PLIST +++ b/lang/gawk/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.25 2018/07/14 13:47:32 adam Exp $ +@comment $NetBSD: PLIST,v 1.26 2019/04/16 11:43:29 ryoon Exp $ bin/${PKGNAME} bin/gawk gnu/bin/awk @@ -47,6 +47,7 @@ share/awk/intdiv0.awk share/awk/join.awk share/awk/libintl.awk share/awk/noassign.awk +share/awk/ns_passwd.awk share/awk/ord.awk share/awk/passwd.awk share/awk/processarray.awk @@ -68,6 +69,7 @@ share/locale/fr/LC_MESSAGES/gawk.mo share/locale/id/LC_MESSAGES/gawk.mo share/locale/it/LC_MESSAGES/gawk.mo share/locale/ja/LC_MESSAGES/gawk.mo +share/locale/ko/LC_MESSAGES/gawk.mo share/locale/ms/LC_MESSAGES/gawk.mo share/locale/nl/LC_MESSAGES/gawk.mo share/locale/pl/LC_MESSAGES/gawk.mo diff --git a/lang/gawk/distinfo b/lang/gawk/distinfo index fcbb994e99b..29e5a1c2e88 100644 --- a/lang/gawk/distinfo +++ b/lang/gawk/distinfo @@ -1,12 +1,11 @@ -$NetBSD: distinfo,v 1.39 2018/07/14 13:47:32 adam Exp $ +$NetBSD: distinfo,v 1.40 2019/04/16 11:43:29 ryoon Exp $ -SHA1 (gawk-4.2.1.tar.xz) = 71fc3595865ea6ea859587cbbb35cbf9aeb39d2d -RMD160 (gawk-4.2.1.tar.xz) = 4a7a4ddccb871626d8c3ec3019de65c47b71fb29 -SHA512 (gawk-4.2.1.tar.xz) = 0e3006a795dc3ac91359a7d2590c0cccbfd39b18a1d491617d68505c55a2800355b1439050681b4fcacf65fb0d533151a046babe0fd774503037bab363ef2ae4 -Size (gawk-4.2.1.tar.xz) = 2985412 bytes +SHA1 (gawk-5.0.0.tar.xz) = 4a02d5eaa2cb29b80a26b60e40fe9742f64f2222 +RMD160 (gawk-5.0.0.tar.xz) = b6d10cc874b7b347bf2e9b99cceeeb0ad0111121 +SHA512 (gawk-5.0.0.tar.xz) = 9eb663bbcad53165b7ddb7d72cfb8377252b68004733a9eb8c191b2ddddaff857e48ba811280311384243eb67574fbe7ac9edf4e507f9a82d67b4b2adff8ef6e +Size (gawk-5.0.0.tar.xz) = 3000432 bytes SHA1 (patch-Makefile.in) = 2f9e8c3ca477ece817d251e22345bf2476fccd00 -SHA1 (patch-awk.h) = 2292be5ec392e7fea5688fbb18012a735e43803f -SHA1 (patch-extension_Makefile.in) = 3d0d904327e891169568e4e5ec927daada6e3c17 +SHA1 (patch-extension_Makefile.in) = 07184d54caadbdc4193d1ba2ee52eb557900bdf3 SHA1 (patch-extension_gawkfts.c) = a88ac0ed14be5133cf081bf25ab8663f0f3372a7 SHA1 (patch-extension_inplace.c) = 84b1d8f18ed78a872cd7befa65def30b4bcb3252 -SHA1 (patch-test_Makefile.in) = 1be6ffd773bc0616adc66f357fe07c42d2727e87 +SHA1 (patch-test_Makefile.in) = e4f9a009fc6f282b15af1d1aaf9584e7531a41d6 diff --git a/lang/gawk/patches/patch-awk.h b/lang/gawk/patches/patch-awk.h deleted file mode 100644 index 3db0683e8b0..00000000000 --- a/lang/gawk/patches/patch-awk.h +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-awk.h,v 1.1 2013/12/26 19:19:32 tron Exp $ - -Fix build problem with SunStudio compiler under Solaris. Patch taken -from here: - -http://lists.gnu.org/archive/html/bug-gawk/2011-07/msg00008.html - ---- awk.h.orig 2013-04-07 18:54:28.000000000 +0100 -+++ awk.h 2013-12-26 19:03:34.000000000 +0000 -@@ -69,7 +69,7 @@ - #endif /* LOCALEDIR */ - #endif - --#if !defined(__STDC__) || __STDC__ < 1 -+#if !defined(__STDC__) || __STDC__ < 1 && !defined(__EXTENSIONS__) - #error "gawk no longer supports non-C89 environments (no __STDC__ or __STDC__ < 1)" - #endif - diff --git a/lang/gawk/patches/patch-extension_Makefile.in b/lang/gawk/patches/patch-extension_Makefile.in index 5828347be78..72dfc99a434 100644 --- a/lang/gawk/patches/patch-extension_Makefile.in +++ b/lang/gawk/patches/patch-extension_Makefile.in @@ -1,11 +1,11 @@ -$NetBSD: patch-extension_Makefile.in,v 1.4 2018/07/14 13:47:32 adam Exp $ +$NetBSD: patch-extension_Makefile.in,v 1.5 2019/04/16 11:43:29 ryoon Exp $ Install into a separate directory, otherwise these shadow e.g. time(3). Install *.la file for extensions, reduce PLIST divergence. ---- extension/Makefile.in.orig 2018-02-25 17:06:54.000000000 +0000 +--- extension/Makefile.in.orig 2019-04-12 09:03:11.000000000 +0000 +++ extension/Makefile.in -@@ -314,7 +314,7 @@ am__can_run_installinfo = \ +@@ -323,7 +323,7 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac @@ -14,7 +14,7 @@ Install *.la file for extensions, reduce PLIST divergence. NROFF = nroff MANS = $(dist_man_MANS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ -@@ -1236,7 +1236,6 @@ info-am: +@@ -1269,7 +1269,6 @@ info-am: install-data-am: install-man install-pkgextensionLTLIBRARIES @$(NORMAL_INSTALL) @@ -22,12 +22,12 @@ Install *.la file for extensions, reduce PLIST divergence. install-dvi: install-dvi-recursive install-dvi-am: -@@ -1300,7 +1299,7 @@ uninstall-man: uninstall-man3 - distclean-libtool distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ -- install-data-hook install-dvi install-dvi-am install-exec \ -+ install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-man3 install-pdf \ - install-pdf-am install-pkgextensionLTLIBRARIES install-ps \ +@@ -1348,7 +1347,7 @@ uninstall-man: uninstall-man3 + distclean-libtool distclean-local distclean-tags \ + distcleancheck distdir distuninstallcheck dvi dvi-am html \ + html-am info info-am install install-am install-data \ +- install-data-am install-data-hook install-dvi install-dvi-am \ ++ install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-man3 \ + install-pdf install-pdf-am install-pkgextensionLTLIBRARIES \ diff --git a/lang/gawk/patches/patch-test_Makefile.in b/lang/gawk/patches/patch-test_Makefile.in index ebef4fb9b48..9f823aef388 100644 --- a/lang/gawk/patches/patch-test_Makefile.in +++ b/lang/gawk/patches/patch-test_Makefile.in @@ -1,4 +1,4 @@ -$NetBSD: patch-test_Makefile.in,v 1.3 2018/07/14 13:47:32 adam Exp $ +$NetBSD: patch-test_Makefile.in,v 1.4 2019/04/16 11:43:29 ryoon Exp $ Non portable '-f' flag for ls should be -U for unsorted pkgsrc replacement links mean -L should be used too. @@ -6,12 +6,12 @@ pkgsrc replacement links mean -L should be used too. NB on SunOS, locale/en should be installed in order to have all tests successfully execute (namely mbfw1 and mbprintf1) ---- test/Makefile.in.orig 2018-02-25 17:06:29.000000000 +0000 +--- test/Makefile.in.orig 2019-04-12 09:03:05.000000000 +0000 +++ test/Makefile.in -@@ -2697,7 +2697,7 @@ readdir: +@@ -2563,7 +2563,7 @@ readdir: + echo If it does, try rerunning on an ext'[234]' filesystem. ; \ fi - @echo $@ - @$(AWK) -f "$(srcdir)"/readdir.awk "$(top_srcdir)" > _$@ + @$(AWK) -f "$(srcdir)"/readdir.awk "$(top_srcdir)" > _$@ || echo EXIT CODE: $$? >> _$@ - @ls -afi "$(top_srcdir)" > _dirlist + @ls -aiUL "$(top_srcdir)" > _dirlist @ls -lna "$(top_srcdir)" | sed 1d > _longlist |