Pullup ticket #4247 - requested by bsiegert

lang/gawk: build fix

Revisions pulled up:
- lang/gawk/Makefile                                            1.57
- lang/gawk/PLIST                                               1.20
- lang/gawk/distinfo                                            1.25
- lang/gawk/patches/patch-extension_configure                   1.1

---
   Module Name:    pkgsrc
   Committed By:   bsiegert
   Date:           Sat Oct 19 19:47:39 UTC 2013

   Modified Files:
           pkgsrc/lang/gawk: Makefile PLIST distinfo
   Added Files:
           pkgsrc/lang/gawk/patches: patch-extension_configure

   Log Message:
   Fix build on MirBSD.

   The gawk developers added code to skip building the extensions on MirBSD
   but inserted a syntax error. Also skip the extensions in the PLIST on MirBSD.

4 files changed, 43 insertions, 25 deletions

diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile
index c6c1445a5ab..7e1619beff4 100644
--- a/lang/gawk/Makefile
+++ b/lang/gawk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2013/07/15 02:02:23 ryoon Exp $
+# $NetBSD: Makefile,v 1.56.2.1 2013/10/20 11:11:22 tron Exp $
 
 DISTNAME=	gawk-4.1.0
 CATEGORIES=	lang
@@ -34,6 +34,11 @@ CPPFLAGS.OSF1+=		-D_OSF_SOURCE
 CFLAGS+=	-Dvm_region=vm_region_64
 .endif
 
+PLIST_VARS+=		extension
+.if "${OPSYS}" != "MirBSD"
+PLIST.extension=	yes
+.endif 
+
 INSTALLATION_DIRS+=	${PKGGNUDIR}bin ${PKGGNUDIR}${PKGMANDIR}/man1
 
 post-install:
diff --git a/lang/gawk/PLIST b/lang/gawk/PLIST
index 0f393782ffe..fa0b6758c9d 100644
--- a/lang/gawk/PLIST
+++ b/lang/gawk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2013/05/15 11:55:20 adam Exp $
+@comment $NetBSD: PLIST,v 1.19.4.1 2013/10/20 11:11:22 tron Exp $
 bin/gawk
 bin/${PKGNAME}
 bin/igawk
@@ -7,32 +7,32 @@ gnu/man/man1/awk.1
 include/gawkapi.h
 info/gawk.info
 info/gawkinet.info
-lib/gawk/filefuncs.la
-lib/gawk/fnmatch.la
-lib/gawk/fork.la
-lib/gawk/inplace.la
-lib/gawk/ordchr.la
-lib/gawk/readdir.la
-lib/gawk/readfile.la
-lib/gawk/revoutput.la
-lib/gawk/revtwoway.la
-lib/gawk/rwarray.la
-lib/gawk/testext.la
-lib/gawk/time.la
+${PLIST.extension}lib/gawk/filefuncs.la
+${PLIST.extension}lib/gawk/fnmatch.la
+${PLIST.extension}lib/gawk/fork.la
+${PLIST.extension}lib/gawk/inplace.la
+${PLIST.extension}lib/gawk/ordchr.la
+${PLIST.extension}lib/gawk/readdir.la
+${PLIST.extension}lib/gawk/readfile.la
+${PLIST.extension}lib/gawk/revoutput.la
+${PLIST.extension}lib/gawk/revtwoway.la
+${PLIST.extension}lib/gawk/rwarray.la
+${PLIST.extension}lib/gawk/testext.la
+${PLIST.extension}lib/gawk/time.la
 libexec/awk/grcat
 libexec/awk/pwcat
 man/man1/gawk.1
 man/man1/igawk.1
-man/man3/filefuncs.3am
-man/man3/fnmatch.3am
-man/man3/fork.3am
-man/man3/ordchr.3am
-man/man3/readdir.3am
-man/man3/readfile.3am
-man/man3/revoutput.3am
-man/man3/revtwoway.3am
-man/man3/rwarray.3am
-man/man3/time.3am
+${PLIST.extension}man/man3/filefuncs.3am
+${PLIST.extension}man/man3/fnmatch.3am
+${PLIST.extension}man/man3/fork.3am
+${PLIST.extension}man/man3/ordchr.3am
+${PLIST.extension}man/man3/readdir.3am
+${PLIST.extension}man/man3/readfile.3am
+${PLIST.extension}man/man3/revoutput.3am
+${PLIST.extension}man/man3/revtwoway.3am
+${PLIST.extension}man/man3/rwarray.3am
+${PLIST.extension}man/man3/time.3am
 share/awk/assert.awk
 share/awk/bits2str.awk
 share/awk/cliff_rand.awk
diff --git a/lang/gawk/distinfo b/lang/gawk/distinfo
index 5aaddbeed9f..058c6fe49a4 100644
--- a/lang/gawk/distinfo
+++ b/lang/gawk/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.24 2013/05/15 11:55:20 adam Exp $
+$NetBSD: distinfo,v 1.24.4.1 2013/10/20 11:11:22 tron 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 (patch-Makefile.in) = 12eb8f205fa224634b9f5122cfca55803382516f
+SHA1 (patch-extension_configure) = f53c897d1931a139a0bdaad69234a7530db6c838
diff --git a/lang/gawk/patches/patch-extension_configure b/lang/gawk/patches/patch-extension_configure
new file mode 100644
index 00000000000..9ddb08f96f7
--- /dev/null
+++ b/lang/gawk/patches/patch-extension_configure
@@ -0,0 +1,12 @@
+$NetBSD: patch-extension_configure,v 1.1.2.2 2013/10/20 11:11:23 tron 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
+ 	;;
+ *)