SF.net SVN: gar:[22164] csw/mgar/pkg/gawk/trunk

[dmichelsen at users.sourceforge.net]

Revision: 22164
          http://gar.svn.sourceforge.net/gar/?rev=22164&view=rev
Author:   dmichelsen
Date:     2013-10-08 10:04:04 +0000 (Tue, 08 Oct 2013)
Log Message:
-----------
gawk/trunk: Update to 4.1.0

Modified Paths:
--------------
    csw/mgar/pkg/gawk/trunk/Makefile
    csw/mgar/pkg/gawk/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/gawk/trunk/files/0001-Add-inclusion-of-mkdev.h-for-major-minor.patch
    csw/mgar/pkg/gawk/trunk/files/0001-Allow-null-pointer-on-readline-detect.patch

Modified: csw/mgar/pkg/gawk/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gawk/trunk/Makefile	2013-10-08 08:30:56 UTC (rev 22163)
+++ csw/mgar/pkg/gawk/trunk/Makefile	2013-10-08 10:04:04 UTC (rev 22164)
@@ -1,5 +1,5 @@
 NAME = gawk
-VERSION = 4.0.2
+VERSION = 4.1.0
 GARTYPE = v2
 
 DESCRIPTION = GNU awk
@@ -17,16 +17,21 @@
 MASTER_SITES = $(GNU_MIRROR)
 DISTFILES = $(DISTNAME).tar.xz
 
+PATCHFILES += 0001-Add-inclusion-of-mkdev.h-for-major-minor.patch
+
+# Use patch until this is fixed:
+#   http://lists.gnu.org/archive/html/bug-gawk/2013-10/msg00000.html
+PATCHFILES += 0001-Allow-null-pointer-on-readline-detect.patch
+
 PACKAGES += CSWgawk
 SPKG_DESC_CSWgawk = GNU awk
 # PKGFILES is catchall
 RUNTIME_DEP_PKGS_CSWgawk += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWgawk += CSWlibsigsegv2
 RUNTIME_DEP_PKGS_CSWgawk += CSWlibreadline6
+RUNTIME_DEP_PKGS_CSWgawk += CSWlibmpfr4
+RUNTIME_DEP_PKGS_CSWgawk += CSWlibgmp10
 
-# This is just an example
-CHECKPKG_OVERRIDES_CSWgawk += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/gawk.1
-
 BUILD64 = 1
 ISAEXEC = 1
 
@@ -36,15 +41,6 @@
 # the replacement of uint64_t by upad64_t.
 EXTRA_CFLAGS = -Xc -D_XPG4_2 -Duint64_t=upad64_t
 
-# These are install instructions for other platforms (os/2... 'nuff said.)
-CHECKPKG_OVERRIDES_CSWgawk += file-with-bad-content|/usr/share|root/opt/csw/share/info/gawk.info
-
-# These are instruction for awk, possible adjust them later
-CHECKPKG_OVERRIDES_CSWgawk += file-with-bad-content|/usr/local|root/opt/csw/share/info/gawk.info
-
-# This is an example path (YMMV in the docs)
-CHECKPKG_OVERRIDES_CSWgawk += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/pgawk.1
-
 include gar/category.mk
 
 post-install:

Modified: csw/mgar/pkg/gawk/trunk/checksums
===================================================================
--- csw/mgar/pkg/gawk/trunk/checksums	2013-10-08 08:30:56 UTC (rev 22163)
+++ csw/mgar/pkg/gawk/trunk/checksums	2013-10-08 10:04:04 UTC (rev 22164)
@@ -1 +1 @@
-8a9b2f1170ac9dcd3eb13716b5ec4021  gawk-4.0.2.tar.xz
+b18992ff8faf3217dab55d2d0aa7d707  gawk-4.1.0.tar.xz

Added: csw/mgar/pkg/gawk/trunk/files/0001-Add-inclusion-of-mkdev.h-for-major-minor.patch
===================================================================
--- csw/mgar/pkg/gawk/trunk/files/0001-Add-inclusion-of-mkdev.h-for-major-minor.patch	                        (rev 0)
+++ csw/mgar/pkg/gawk/trunk/files/0001-Add-inclusion-of-mkdev.h-for-major-minor.patch	2013-10-08 10:04:04 UTC (rev 22164)
@@ -0,0 +1,25 @@
+From db9ef348f2cc44c63e96085210497e373a583497 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 2 Oct 2013 11:15:47 +0200
+Subject: [PATCH] Add inclusion of mkdev.h for major/minor
+
+---
+ extension/filefuncs.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/extension/filefuncs.c b/extension/filefuncs.c
+index 1e8fc8d..f28e041 100644
+--- a/extension/filefuncs.c
++++ b/extension/filefuncs.c
+@@ -46,6 +46,8 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
++#include <sys/mkdev.h>
++
+ #include "gawkapi.h"
+ 
+ #include "gettext.h"
+-- 
+1.8.3.4
+

Added: csw/mgar/pkg/gawk/trunk/files/0001-Allow-null-pointer-on-readline-detect.patch
===================================================================
--- csw/mgar/pkg/gawk/trunk/files/0001-Allow-null-pointer-on-readline-detect.patch	                        (rev 0)
+++ csw/mgar/pkg/gawk/trunk/files/0001-Allow-null-pointer-on-readline-detect.patch	2013-10-08 10:04:04 UTC (rev 22164)
@@ -0,0 +1,25 @@
+From 3924b644d63bcb5f7bbb4c39de13e1c72009e0d5 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 8 Oct 2013 11:21:56 +0200
+Subject: [PATCH] Allow null pointer on readline detect
+
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 5ef6ac8..6408fcd 100755
+--- a/configure
++++ b/configure
+@@ -10437,7 +10437,7 @@ int main(int argc, char **argv)
+ 	dup(fd);
+ 	line = readline("giveittome> ");
+ 
+-	printf("got <%s>\n", line);
++	printf("got <%s>\n", line ? line : "(NULL)");
+ 	return 0;
+ }
+ _ACEOF
+-- 
+1.8.3.4
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.