5 files changed, 47 insertions, 44 deletions
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