diff options
| -rw-r--r-- | lang/gawk/Makefile | 4 | ||||
| -rw-r--r-- | lang/gawk/PLIST | 4 | ||||
| -rw-r--r-- | lang/gawk/distinfo | 12 | ||||
| -rw-r--r-- | lang/gawk/patches/patch-Makefile.in | 13 | ||||
| -rw-r--r-- | lang/gawk/patches/patch-extension_Makefile.in | 22 |
5 files changed, 22 insertions, 33 deletions
diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile index 3bb60f9a7b3..c8a2b4d29d8 100644 --- a/lang/gawk/Makefile +++ b/lang/gawk/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.61 2014/10/09 14:06:38 wiz Exp $ +# $NetBSD: Makefile,v 1.62 2015/05/01 02:02:40 wen Exp $ -DISTNAME= gawk-4.1.1 +DISTNAME= gawk-4.1.2 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GNU:=gawk/} EXTRACT_SUFX= .tar.xz diff --git a/lang/gawk/PLIST b/lang/gawk/PLIST index 490405ab2d5..cd4a39009ea 100644 --- a/lang/gawk/PLIST +++ b/lang/gawk/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.22 2014/06/06 23:24:10 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.23 2015/05/01 02:02:40 wen Exp $ bin/gawk bin/${PKGNAME} bin/igawk @@ -48,11 +48,13 @@ share/awk/libintl.awk share/awk/noassign.awk share/awk/ord.awk share/awk/passwd.awk +share/awk/processarray.awk share/awk/quicksort.awk share/awk/readable.awk share/awk/readfile.awk share/awk/rewind.awk share/awk/round.awk +share/awk/shellquote.awk share/awk/strtonum.awk share/awk/walkarray.awk share/awk/zerofile.awk diff --git a/lang/gawk/distinfo b/lang/gawk/distinfo index 949c7c347c5..9bb5b0e5ee4 100644 --- a/lang/gawk/distinfo +++ b/lang/gawk/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.32 2015/04/19 14:26:06 tnn Exp $ +$NetBSD: distinfo,v 1.33 2015/05/01 02:02:40 wen Exp $ -SHA1 (gawk-4.1.1.tar.xz) = 547feb48d20e923aff58daccee97c94e047fdc18 -RMD160 (gawk-4.1.1.tar.xz) = a5a6ab9491bf702310cef7c035531cc7fad0a62d -Size (gawk-4.1.1.tar.xz) = 2196904 bytes -SHA1 (patch-Makefile.in) = 12eb8f205fa224634b9f5122cfca55803382516f +SHA1 (gawk-4.1.2.tar.xz) = 559cc317d88247ba3cfb2c1beaa787b36102a0d9 +RMD160 (gawk-4.1.2.tar.xz) = 40f3d26d0e49916f81a43eab765b80b532541440 +Size (gawk-4.1.2.tar.xz) = 2279136 bytes +SHA1 (patch-Makefile.in) = 7af8e5321b3e2ea56515d4f2ee159a2fec220bd0 SHA1 (patch-awk.h) = 2292be5ec392e7fea5688fbb18012a735e43803f SHA1 (patch-debug.c) = 40c423e2ddbb7de1eb35bb4b7b4452f8f2ebec01 -SHA1 (patch-extension_Makefile.in) = bc735eebe2e094c97e46b08a782b143d2042a865 +SHA1 (patch-extension_Makefile.in) = 7a03efc54d0fe54ef94fbe6f35d5145b61cb0f07 SHA1 (patch-extension_filefuncs.c) = 212774354ab55f69ff67728470ab23b43e038093 SHA1 (patch-extension_gawkfts.c) = a6c59c42c3f5564ee078b373c9a8d09aa6732a0b SHA1 (patch-test_Makefile.in) = 7610407e0735f4b78b568e24717f3f103f8566d3 diff --git a/lang/gawk/patches/patch-Makefile.in b/lang/gawk/patches/patch-Makefile.in index e44b0d9f55f..de5011d8544 100644 --- a/lang/gawk/patches/patch-Makefile.in +++ b/lang/gawk/patches/patch-Makefile.in @@ -1,10 +1,9 @@ -$NetBSD: patch-Makefile.in,v 1.2 2013/05/15 11:55:20 adam Exp $ +$NetBSD: patch-Makefile.in,v 1.3 2015/05/01 02:02:40 wen Exp $ Correct locale location, use names gawk and pgawk unconditionally - ---- Makefile.in.orig 2013-05-09 12:59:40.000000000 +0000 +--- Makefile.in.orig 2015-05-01 09:28:59.000000000 +0000 +++ Makefile.in -@@ -285,7 +285,7 @@ CFLAGS = @CFLAGS@ +@@ -324,7 +324,7 @@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -13,12 +12,12 @@ Correct locale location, use names gawk and pgawk unconditionally DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ -@@ -1131,9 +1131,7 @@ uninstall-am: uninstall-binPROGRAMS unin +@@ -1175,9 +1175,7 @@ uninstall-am: uninstall-binPROGRAMS unin install-exec-hook: (cd $(DESTDIR)$(bindir); \ $(LN) gawk$(EXEEXT) gawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \ -- if [ ! -f awk ]; \ -- then $(LN_S) gawk$(EXEEXT) awk; \ +- if [ ! -f awk$(EXEEXT) ]; \ +- then $(LN_S) gawk$(EXEEXT) awk$(EXEEXT); \ - fi; exit 0) + exit 0) diff --git a/lang/gawk/patches/patch-extension_Makefile.in b/lang/gawk/patches/patch-extension_Makefile.in index ef3ea607e05..dc60301c0c7 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.2 2014/06/06 23:24:10 ryoon Exp $ +$NetBSD: patch-extension_Makefile.in,v 1.3 2015/05/01 02:02:40 wen 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 2014-04-08 16:13:03.000000000 +0000 +--- extension/Makefile.in.orig 2015-05-01 09:36:09.000000000 +0000 +++ extension/Makefile.in -@@ -300,7 +300,7 @@ am__can_run_installinfo = \ +@@ -291,7 +291,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 \ -@@ -1154,7 +1154,6 @@ info-am: +@@ -1152,7 +1152,6 @@ info-am: install-data-am: install-man install-pkgextensionLTLIBRARIES @$(NORMAL_INSTALL) @@ -22,7 +22,7 @@ Install *.la file for extensions, reduce PLIST divergence. install-dvi: install-dvi-recursive install-dvi-am: -@@ -1217,7 +1216,7 @@ uninstall-man: uninstall-man3 +@@ -1215,7 +1214,7 @@ uninstall-man: uninstall-man3 distclean-hdr distclean-libtool distclean-tags distcleancheck \ distdir distuninstallcheck dvi dvi-am html html-am info \ info-am install install-am install-data install-data-am \ @@ -31,15 +31,3 @@ Install *.la file for extensions, reduce PLIST divergence. 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 \ -@@ -1229,11 +1228,6 @@ uninstall-man: uninstall-man3 - uninstall-man3 uninstall-pkgextensionLTLIBRARIES - - --install-data-hook: -- for i in $(pkgextension_LTLIBRARIES) ; do \ -- $(RM) $(pkgextensiondir)/$$i ; \ -- done -- - # Keep the uninstall check working: - uninstall-so: - $(RM) $(pkgextensiondir)/*.so |