diff options
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/gawk/Makefile | 5 | ||||
| -rw-r--r-- | lang/gawk/PLIST | 5 | ||||
| -rw-r--r-- | lang/gawk/distinfo | 16 | ||||
| -rw-r--r-- | lang/gawk/patches/patch-extension_Makefile.in | 36 | ||||
| -rw-r--r-- | lang/gawk/patches/patch-extension_configure | 12 | ||||
| -rw-r--r-- | lang/gawk/patches/patch-extension_filefuncs.c | 10 | ||||
| -rw-r--r-- | lang/gawk/patches/patch-getopt.c | 15 | ||||
| -rw-r--r-- | lang/gawk/patches/patch-test_Makefile.in | 18 |
8 files changed, 60 insertions, 57 deletions
diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile index d1a41061a78..dc41428df2a 100644 --- a/lang/gawk/Makefile +++ b/lang/gawk/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.59 2014/02/05 20:25:09 wiz Exp $ +# $NetBSD: Makefile,v 1.60 2014/06/06 23:24:10 ryoon Exp $ -DISTNAME= gawk-4.1.0 -PKGREVISION= 2 +DISTNAME= gawk-4.1.1 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GNU:=gawk/} EXTRACT_SUFX= .tar.xz diff --git a/lang/gawk/PLIST b/lang/gawk/PLIST index 64f3ba6324d..490405ab2d5 100644 --- a/lang/gawk/PLIST +++ b/lang/gawk/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.21 2014/02/05 20:25:09 wiz Exp $ +@comment $NetBSD: PLIST,v 1.22 2014/06/06 23:24:10 ryoon Exp $ bin/gawk bin/${PKGNAME} bin/igawk @@ -26,6 +26,7 @@ man/man1/igawk.1 ${PLIST.extension}man/man3am/filefuncs.3am ${PLIST.extension}man/man3am/fnmatch.3am ${PLIST.extension}man/man3am/fork.3am +${PLIST.extension}man/man3am/inplace.3am ${PLIST.extension}man/man3am/ordchr.3am ${PLIST.extension}man/man3am/readdir.3am ${PLIST.extension}man/man3am/readfile.3am @@ -49,11 +50,13 @@ share/awk/ord.awk share/awk/passwd.awk share/awk/quicksort.awk share/awk/readable.awk +share/awk/readfile.awk share/awk/rewind.awk share/awk/round.awk share/awk/strtonum.awk share/awk/walkarray.awk share/awk/zerofile.awk +share/locale/ca/LC_MESSAGES/gawk.mo share/locale/da/LC_MESSAGES/gawk.mo share/locale/de/LC_MESSAGES/gawk.mo share/locale/es/LC_MESSAGES/gawk.mo diff --git a/lang/gawk/distinfo b/lang/gawk/distinfo index b299286953a..7d10c58095d 100644 --- a/lang/gawk/distinfo +++ b/lang/gawk/distinfo @@ -1,12 +1,10 @@ -$NetBSD: distinfo,v 1.29 2014/02/05 21:12:46 wiz Exp $ +$NetBSD: distinfo,v 1.30 2014/06/06 23:24:10 ryoon Exp $ -SHA1 (gawk-4.1.0.tar.xz) = caabca3c1a59d05807c826c45a4639b82cad612a -RMD160 (gawk-4.1.0.tar.xz) = 71267e56aabed02ecc77f26661171a7b626dc71d -Size (gawk-4.1.0.tar.xz) = 2049080 bytes +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 (patch-awk.h) = 2292be5ec392e7fea5688fbb18012a735e43803f -SHA1 (patch-extension_Makefile.in) = e6ffaf27a1758df026d7315b6714265ec5a7268d -SHA1 (patch-extension_configure) = f53c897d1931a139a0bdaad69234a7530db6c838 -SHA1 (patch-extension_filefuncs.c) = 959868fabf63beb52014e039de84493dca125a0a -SHA1 (patch-getopt.c) = ec519d4276fab67b350cb934b2a9959e1dbf8a2f -SHA1 (patch-test_Makefile.in) = 19ce59a4e72fde4901c83af9b9472b9260fda228 +SHA1 (patch-extension_Makefile.in) = bc735eebe2e094c97e46b08a782b143d2042a865 +SHA1 (patch-extension_filefuncs.c) = 212774354ab55f69ff67728470ab23b43e038093 +SHA1 (patch-test_Makefile.in) = 7610407e0735f4b78b568e24717f3f103f8566d3 diff --git a/lang/gawk/patches/patch-extension_Makefile.in b/lang/gawk/patches/patch-extension_Makefile.in index caec2b5d5cd..ef3ea607e05 100644 --- a/lang/gawk/patches/patch-extension_Makefile.in +++ b/lang/gawk/patches/patch-extension_Makefile.in @@ -1,10 +1,11 @@ -$NetBSD: patch-extension_Makefile.in,v 1.1 2014/02/05 20:25:09 wiz Exp $ +$NetBSD: patch-extension_Makefile.in,v 1.2 2014/06/06 23:24:10 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 2013-05-09 13:00:15.000000000 +0000 +--- extension/Makefile.in.orig 2014-04-08 16:13:03.000000000 +0000 +++ extension/Makefile.in -@@ -272,7 +272,7 @@ am__can_run_installinfo = \ +@@ -300,7 +300,7 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac @@ -13,3 +14,32 @@ Install into a separate directory, otherwise these shadow e.g. time(3). NROFF = nroff MANS = $(dist_man_MANS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ +@@ -1154,7 +1154,6 @@ info-am: + + install-data-am: install-man install-pkgextensionLTLIBRARIES + @$(NORMAL_INSTALL) +- $(MAKE) $(AM_MAKEFLAGS) install-data-hook + install-dvi: install-dvi-recursive + + install-dvi-am: +@@ -1217,7 +1216,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 \ +- 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 \ +@@ -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 diff --git a/lang/gawk/patches/patch-extension_configure b/lang/gawk/patches/patch-extension_configure deleted file mode 100644 index 9a30c811580..00000000000 --- a/lang/gawk/patches/patch-extension_configure +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-extension_configure,v 1.1 2013/10/19 19:47:39 bsiegert Exp $ - ---- extension/configure.orig Fri Aug 30 14:41:50 2013 -+++ extension/configure -@@ -16532,7 +16532,6 @@ case `uname` in - MirBSD | MirOS | "OS/390") - cat << \EOF > Makefile - all dist check clean distclean install uninstall distcheck: -- @exit 0 - EOF - ;; - *) diff --git a/lang/gawk/patches/patch-extension_filefuncs.c b/lang/gawk/patches/patch-extension_filefuncs.c index b1077d09631..432418c4acc 100644 --- a/lang/gawk/patches/patch-extension_filefuncs.c +++ b/lang/gawk/patches/patch-extension_filefuncs.c @@ -1,13 +1,13 @@ -$NetBSD: patch-extension_filefuncs.c,v 1.1 2013/12/26 19:19:32 tron Exp $ +$NetBSD: patch-extension_filefuncs.c,v 1.2 2014/06/06 23:24:10 ryoon Exp $ Fix build problem under Solaris. The more elegant fix is available here: http://lists.gnu.org/archive/html/bug-gawk/2013-06/msg00010.html ---- extension/filefuncs.c.orig 2013-05-02 20:51:30.000000000 +0100 -+++ extension/filefuncs.c 2013-12-26 19:12:54.000000000 +0000 -@@ -75,6 +75,10 @@ - #define minor(s) (0) +--- extension/filefuncs.c.orig 2014-03-31 19:17:46.000000000 +0000 ++++ extension/filefuncs.c +@@ -137,6 +137,10 @@ get_inode(const char *fname) + } #endif +#ifdef __sun diff --git a/lang/gawk/patches/patch-getopt.c b/lang/gawk/patches/patch-getopt.c deleted file mode 100644 index 62c52cb9b2a..00000000000 --- a/lang/gawk/patches/patch-getopt.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-getopt.c,v 1.1 2013/12/15 09:42:14 richard Exp $ - -SunOS needs stdlib.h for malloc/free used in p_getopt_internal_r - ---- getopt.c.orig 2013-05-02 19:51:30.000000000 +0000 -+++ getopt.c -@@ -57,7 +57,7 @@ - - /* This needs to come after some library #include - to get __GNU_LIBRARY__ defined. */ --#if defined (__GNU_LIBRARY__) || defined (__CYGWIN__) || defined(__DJGPP__) -+#if defined (__GNU_LIBRARY__) || defined (__CYGWIN__) || defined(__DJGPP__) || defined(__sun) - /* Don't include stdlib.h for - * non-GNU C libraries - * non-Cygwin diff --git a/lang/gawk/patches/patch-test_Makefile.in b/lang/gawk/patches/patch-test_Makefile.in index c6da481dd4b..db11cb3a204 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.1 2013/12/15 09:42:14 richard Exp $ +$NetBSD: patch-test_Makefile.in,v 1.2 2014/06/06 23:24:10 ryoon Exp $ Non portable '-f' flag for ls should be -U for unsorted pkgsrc replacement links mean -L should be used too. @@ -6,14 +6,14 @@ 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 2013-12-15 08:43:50.258867212 +0000 +--- test/Makefile.in.orig 2014-04-08 16:13:13.000000000 +0000 +++ test/Makefile.in -@@ -2156,7 +2156,7 @@ readdir: +@@ -2249,7 +2249,7 @@ readdir: fi @echo $@ - @$(AWK) -f $(srcdir)/readdir.awk $(top_srcdir) > _$@ -- @ls -afli $(top_srcdir) | sed 1d | $(AWK) -f $(srcdir)/readdir0.awk -v extout=_$@ > $@.ok -+ @ls -aliUL $(top_srcdir) | sed 1d | $(AWK) -f $(srcdir)/readdir0.awk -v extout=_$@ > $@.ok - @-$(CMP) $@.ok _$@ && rm -f $@.ok _$@ - - fts: + @$(AWK) -f "$(srcdir)"/readdir.awk "$(top_srcdir)" > _$@ +- @ls -afi "$(top_srcdir)" > _dirlist ++ @ls -aiUL "$(top_srcdir)" > _dirlist + @ls -lna "$(top_srcdir)" | sed 1d > _longlist + @$(AWK) -f "$(srcdir)"/readdir0.awk -v extout=_$@ \ + -v dirlist=_dirlist -v longlist=_longlist > $@.ok |