Wed Feb 5 20:25:09 2014 UTC ()
Install extension man pages with the extension "3am" into "man3am"
instead of "man3".

Otherwise, time.3am shadows time.3.

Bump PKGREVISION.


(wiz)
diff -r1.58 -r1.59 pkgsrc/lang/gawk/Makefile
diff -r1.20 -r1.21 pkgsrc/lang/gawk/PLIST
diff -r1.27 -r1.28 pkgsrc/lang/gawk/distinfo
diff -r0 -r1.1 pkgsrc/lang/gawk/patches/patch-extension_Makefile.in
cvs diff -r1.58 -r1.59 pkgsrc/lang/gawk/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/gawk/Makefile 2013/12/15 09:42:14 1.58
+++ pkgsrc/lang/gawk/Makefile 2014/02/05 20:25:09 1.59
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.58 2013/12/15 09:42:14 richard Exp $ 1# $NetBSD: Makefile,v 1.59 2014/02/05 20:25:09 wiz Exp $
2 2
3DISTNAME= gawk-4.1.0 3DISTNAME= gawk-4.1.0
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= lang 5CATEGORIES= lang
6MASTER_SITES= ${MASTER_SITE_GNU:=gawk/} 6MASTER_SITES= ${MASTER_SITE_GNU:=gawk/}
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= bouyer@NetBSD.org 9MAINTAINER= bouyer@NetBSD.org
10HOMEPAGE= http://www.gnu.org/software/gawk/gawk.html 10HOMEPAGE= http://www.gnu.org/software/gawk/gawk.html
11COMMENT= GNU awk 11COMMENT= GNU awk
12LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
13 13
14CONFLICTS= ja-gawk-[0-9]* 14CONFLICTS= ja-gawk-[0-9]*
15 15
16PKG_INSTALLATION_TYPES= overwrite pkgviews 16PKG_INSTALLATION_TYPES= overwrite pkgviews
17 17
@@ -28,27 +28,27 @@ LDFLAGS.IRIX+= -lgen @@ -28,27 +28,27 @@ LDFLAGS.IRIX+= -lgen
28CPPFLAGS.OSF1+= -D_OSF_SOURCE 28CPPFLAGS.OSF1+= -D_OSF_SOURCE
29 29
30.include "../../mk/bsd.prefs.mk" 30.include "../../mk/bsd.prefs.mk"
31 31
32.include "options.mk" 32.include "options.mk"
33 33
34.if !empty(MACHINE_PLATFORM:MDarwin-*-x86_64) 34.if !empty(MACHINE_PLATFORM:MDarwin-*-x86_64)
35CFLAGS+= -Dvm_region=vm_region_64 35CFLAGS+= -Dvm_region=vm_region_64
36.endif 36.endif
37 37
38PLIST_VARS+= extension 38PLIST_VARS+= extension
39.if "${OPSYS}" != "MirBSD" 39.if "${OPSYS}" != "MirBSD"
40PLIST.extension= yes 40PLIST.extension= yes
41.endif  41.endif
42 42
43INSTALLATION_DIRS+= ${PKGGNUDIR}bin ${PKGGNUDIR}${PKGMANDIR}/man1 43INSTALLATION_DIRS+= ${PKGGNUDIR}bin ${PKGGNUDIR}${PKGMANDIR}/man1
44 44
45post-install: 45post-install:
46 ${LN} -fs ${PREFIX}/bin/gawk ${DESTDIR}${PREFIX}/${PKGGNUDIR}bin/awk 46 ${LN} -fs ${PREFIX}/bin/gawk ${DESTDIR}${PREFIX}/${PKGGNUDIR}bin/awk
47 ${LN} -fs ${PREFIX}/${PKGMANDIR}/man1/gawk.1 ${DESTDIR}${PREFIX}/${PKGGNUDIR}${PKGMANDIR}/man1/awk.1 47 ${LN} -fs ${PREFIX}/${PKGMANDIR}/man1/gawk.1 ${DESTDIR}${PREFIX}/${PKGGNUDIR}${PKGMANDIR}/man1/awk.1
48 48
49BUILDLINK_API_DEPENDS.gettext+= gettext-lib>=0.10.36 49BUILDLINK_API_DEPENDS.gettext+= gettext-lib>=0.10.36
50 50
51.include "../../devel/gettext-lib/buildlink3.mk" 51.include "../../devel/gettext-lib/buildlink3.mk"
52.include "../../devel/gmp/buildlink3.mk" 52.include "../../devel/gmp/buildlink3.mk"
53.include "../../math/mpfr/buildlink3.mk" 53.include "../../math/mpfr/buildlink3.mk"
54.include "../../mk/bsd.pkg.mk" 54.include "../../mk/bsd.pkg.mk"
cvs diff -r1.20 -r1.21 pkgsrc/lang/gawk/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/gawk/PLIST 2013/10/19 19:47:39 1.20
+++ pkgsrc/lang/gawk/PLIST 2014/02/05 20:25:09 1.21
@@ -1,48 +1,48 @@ @@ -1,48 +1,48 @@
1@comment $NetBSD: PLIST,v 1.20 2013/10/19 19:47:39 bsiegert Exp $ 1@comment $NetBSD: PLIST,v 1.21 2014/02/05 20:25:09 wiz Exp $
2bin/gawk 2bin/gawk
3bin/${PKGNAME} 3bin/${PKGNAME}
4bin/igawk 4bin/igawk
5gnu/bin/awk 5gnu/bin/awk
6gnu/man/man1/awk.1 6gnu/man/man1/awk.1
7include/gawkapi.h 7include/gawkapi.h
8info/gawk.info 8info/gawk.info
9info/gawkinet.info 9info/gawkinet.info
10${PLIST.extension}lib/gawk/filefuncs.la 10${PLIST.extension}lib/gawk/filefuncs.la
11${PLIST.extension}lib/gawk/fnmatch.la 11${PLIST.extension}lib/gawk/fnmatch.la
12${PLIST.extension}lib/gawk/fork.la 12${PLIST.extension}lib/gawk/fork.la
13${PLIST.extension}lib/gawk/inplace.la 13${PLIST.extension}lib/gawk/inplace.la
14${PLIST.extension}lib/gawk/ordchr.la 14${PLIST.extension}lib/gawk/ordchr.la
15${PLIST.extension}lib/gawk/readdir.la 15${PLIST.extension}lib/gawk/readdir.la
16${PLIST.extension}lib/gawk/readfile.la 16${PLIST.extension}lib/gawk/readfile.la
17${PLIST.extension}lib/gawk/revoutput.la 17${PLIST.extension}lib/gawk/revoutput.la
18${PLIST.extension}lib/gawk/revtwoway.la 18${PLIST.extension}lib/gawk/revtwoway.la
19${PLIST.extension}lib/gawk/rwarray.la 19${PLIST.extension}lib/gawk/rwarray.la
20${PLIST.extension}lib/gawk/testext.la 20${PLIST.extension}lib/gawk/testext.la
21${PLIST.extension}lib/gawk/time.la 21${PLIST.extension}lib/gawk/time.la
22libexec/awk/grcat 22libexec/awk/grcat
23libexec/awk/pwcat 23libexec/awk/pwcat
24man/man1/gawk.1 24man/man1/gawk.1
25man/man1/igawk.1 25man/man1/igawk.1
26${PLIST.extension}man/man3/filefuncs.3am 26${PLIST.extension}man/man3am/filefuncs.3am
27${PLIST.extension}man/man3/fnmatch.3am 27${PLIST.extension}man/man3am/fnmatch.3am
28${PLIST.extension}man/man3/fork.3am 28${PLIST.extension}man/man3am/fork.3am
29${PLIST.extension}man/man3/ordchr.3am 29${PLIST.extension}man/man3am/ordchr.3am
30${PLIST.extension}man/man3/readdir.3am 30${PLIST.extension}man/man3am/readdir.3am
31${PLIST.extension}man/man3/readfile.3am 31${PLIST.extension}man/man3am/readfile.3am
32${PLIST.extension}man/man3/revoutput.3am 32${PLIST.extension}man/man3am/revoutput.3am
33${PLIST.extension}man/man3/revtwoway.3am 33${PLIST.extension}man/man3am/revtwoway.3am
34${PLIST.extension}man/man3/rwarray.3am 34${PLIST.extension}man/man3am/rwarray.3am
35${PLIST.extension}man/man3/time.3am 35${PLIST.extension}man/man3am/time.3am
36share/awk/assert.awk 36share/awk/assert.awk
37share/awk/bits2str.awk 37share/awk/bits2str.awk
38share/awk/cliff_rand.awk 38share/awk/cliff_rand.awk
39share/awk/ctime.awk 39share/awk/ctime.awk
40share/awk/ftrans.awk 40share/awk/ftrans.awk
41share/awk/getopt.awk 41share/awk/getopt.awk
42share/awk/gettime.awk 42share/awk/gettime.awk
43share/awk/group.awk 43share/awk/group.awk
44share/awk/inplace.awk 44share/awk/inplace.awk
45share/awk/join.awk 45share/awk/join.awk
46share/awk/libintl.awk 46share/awk/libintl.awk
47share/awk/noassign.awk 47share/awk/noassign.awk
48share/awk/ord.awk 48share/awk/ord.awk
cvs diff -r1.27 -r1.28 pkgsrc/lang/gawk/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/gawk/distinfo 2013/12/26 19:19:31 1.27
+++ pkgsrc/lang/gawk/distinfo 2014/02/05 20:25:09 1.28
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.27 2013/12/26 19:19:31 tron Exp $ 1$NetBSD: distinfo,v 1.28 2014/02/05 20:25:09 wiz Exp $
2 2
3SHA1 (gawk-4.1.0.tar.xz) = caabca3c1a59d05807c826c45a4639b82cad612a 3SHA1 (gawk-4.1.0.tar.xz) = caabca3c1a59d05807c826c45a4639b82cad612a
4RMD160 (gawk-4.1.0.tar.xz) = 71267e56aabed02ecc77f26661171a7b626dc71d 4RMD160 (gawk-4.1.0.tar.xz) = 71267e56aabed02ecc77f26661171a7b626dc71d
5Size (gawk-4.1.0.tar.xz) = 2049080 bytes 5Size (gawk-4.1.0.tar.xz) = 2049080 bytes
6SHA1 (patch-Makefile.in) = 12eb8f205fa224634b9f5122cfca55803382516f 6SHA1 (patch-Makefile.in) = 12eb8f205fa224634b9f5122cfca55803382516f
7SHA1 (patch-awk.h) = 2292be5ec392e7fea5688fbb18012a735e43803f 7SHA1 (patch-awk.h) = 2292be5ec392e7fea5688fbb18012a735e43803f
8SHA1 (patch-extension_configure) = f53c897d1931a139a0bdaad69234a7530db6c838 8SHA1 (patch-extension_Makefile.in) = e6ffaf27a1758df026d7315b6714265ec5a7268d
9SHA1 (patch-extension_filefuncs.c) = 959868fabf63beb52014e039de84493dca125a0a 9SHA1 (patch-extension_filefuncs.c) = 959868fabf63beb52014e039de84493dca125a0a
10SHA1 (patch-getopt.c) = ec519d4276fab67b350cb934b2a9959e1dbf8a2f 10SHA1 (patch-getopt.c) = ec519d4276fab67b350cb934b2a9959e1dbf8a2f
11SHA1 (patch-test_Makefile.in) = 19ce59a4e72fde4901c83af9b9472b9260fda228 11SHA1 (patch-test_Makefile.in) = 19ce59a4e72fde4901c83af9b9472b9260fda228
File Added: pkgsrc/lang/gawk/patches/patch-extension_Makefile.in
$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	\