Install extension man pages with the extension "3am" into "man3am"

instead of "man3".

Otherwise, time.3am shadows time.3.

Bump PKGREVISION.

4 files changed, 31 insertions, 16 deletions

diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile
index d0906a64c71..d1a41061a78 100644
--- a/lang/gawk/Makefile
+++ b/lang/gawk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.58 2013/12/15 09:42:14 richard Exp $
+# $NetBSD: Makefile,v 1.59 2014/02/05 20:25:09 wiz Exp $
 
 DISTNAME=	gawk-4.1.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU:=gawk/}
 EXTRACT_SUFX=	.tar.xz
@@ -38,7 +38,7 @@ CFLAGS+=	-Dvm_region=vm_region_64
 PLIST_VARS+=		extension
 .if "${OPSYS}" != "MirBSD"
 PLIST.extension=	yes
-.endif 
+.endif
 
 INSTALLATION_DIRS+=	${PKGGNUDIR}bin ${PKGGNUDIR}${PKGMANDIR}/man1
 
diff --git a/lang/gawk/PLIST b/lang/gawk/PLIST
index 7ffa0313e2e..64f3ba6324d 100644
--- a/lang/gawk/PLIST
+++ b/lang/gawk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2013/10/19 19:47:39 bsiegert Exp $
+@comment $NetBSD: PLIST,v 1.21 2014/02/05 20:25:09 wiz Exp $
 bin/gawk
 bin/${PKGNAME}
 bin/igawk
@@ -23,16 +23,16 @@ libexec/awk/grcat
 libexec/awk/pwcat
 man/man1/gawk.1
 man/man1/igawk.1
-${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
+${PLIST.extension}man/man3am/filefuncs.3am
+${PLIST.extension}man/man3am/fnmatch.3am
+${PLIST.extension}man/man3am/fork.3am
+${PLIST.extension}man/man3am/ordchr.3am
+${PLIST.extension}man/man3am/readdir.3am
+${PLIST.extension}man/man3am/readfile.3am
+${PLIST.extension}man/man3am/revoutput.3am
+${PLIST.extension}man/man3am/revtwoway.3am
+${PLIST.extension}man/man3am/rwarray.3am
+${PLIST.extension}man/man3am/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 de816130967..4cb2f2e9311 100644
--- a/lang/gawk/distinfo
+++ b/lang/gawk/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.27 2013/12/26 19:19:31 tron Exp $
+$NetBSD: distinfo,v 1.28 2014/02/05 20:25:09 wiz 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-awk.h) = 2292be5ec392e7fea5688fbb18012a735e43803f
-SHA1 (patch-extension_configure) = f53c897d1931a139a0bdaad69234a7530db6c838
+SHA1 (patch-extension_Makefile.in) = e6ffaf27a1758df026d7315b6714265ec5a7268d
 SHA1 (patch-extension_filefuncs.c) = 959868fabf63beb52014e039de84493dca125a0a
 SHA1 (patch-getopt.c) = ec519d4276fab67b350cb934b2a9959e1dbf8a2f
 SHA1 (patch-test_Makefile.in) = 19ce59a4e72fde4901c83af9b9472b9260fda228
diff --git a/lang/gawk/patches/patch-extension_Makefile.in b/lang/gawk/patches/patch-extension_Makefile.in
new file mode 100644
index 00000000000..caec2b5d5cd
--- /dev/null
+++ b/lang/gawk/patches/patch-extension_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-extension_Makefile.in,v 1.1 2014/02/05 20:25:09 wiz Exp $
+
+Install into a separate directory, otherwise these shadow e.g. time(3).
+
+--- extension/Makefile.in.orig	2013-05-09 13:00:15.000000000 +0000
++++ extension/Makefile.in
+@@ -272,7 +272,7 @@ am__can_run_installinfo = \
+     n|no|NO) false;; \
+     *) (install-info --version) >/dev/null 2>&1;; \
+   esac
+-man3dir = $(mandir)/man3
++man3dir = $(mandir)/man3am
+ NROFF = nroff
+ MANS = $(dist_man_MANS)
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\