Thu Sep 12 11:18:41 2013 UTC ()
Use CATMAN_SECTION_SUFFIX in packages which perform their own catman
page installation.


(jperkin)
diff -r1.48 -r1.49 pkgsrc/archivers/pax/Makefile
diff -r1.12 -r1.13 pkgsrc/archivers/pax/files/Makefile.in
diff -r1.32 -r1.33 pkgsrc/net/tnftp/Makefile
diff -r1.7 -r1.8 pkgsrc/net/tnftp/files/src/Makefile.in
diff -r1.13 -r1.14 pkgsrc/pkgtools/lintpkgsrc/Makefile
diff -r1.31 -r1.32 pkgsrc/pkgtools/pkgdepgraph/Makefile
diff -r1.80 -r1.81 pkgsrc/pkgtools/pkgdiff/Makefile
diff -r1.433 -r1.434 pkgsrc/pkgtools/pkglint/Makefile
cvs diff -r1.48 -r1.49 pkgsrc/archivers/pax/Makefile (expand / switch to unified diff)

--- pkgsrc/archivers/pax/Makefile 2012/09/11 19:46:59 1.48
+++ pkgsrc/archivers/pax/Makefile 2013/09/12 11:18:40 1.49
@@ -1,28 +1,29 @@ @@ -1,28 +1,29 @@
1# $NetBSD: Makefile,v 1.48 2012/09/11 19:46:59 asau Exp $ 1# $NetBSD: Makefile,v 1.49 2013/09/12 11:18:40 jperkin Exp $
2 2
3DISTNAME= pax-20080110 3DISTNAME= pax-20080110
4PKGREVISION= 2 4PKGREVISION= 2
5CATEGORIES= archivers 5CATEGORIES= archivers
6MASTER_SITES= # empty 6MASTER_SITES= # empty
7DISTFILES= # empty 7DISTFILES= # empty
8 8
9MAINTAINER= joerg@NetBSD.org 9MAINTAINER= joerg@NetBSD.org
10HOMEPAGE= http://www.NetBSD.org/ 10HOMEPAGE= http://www.NetBSD.org/
11COMMENT= POSIX standard archiver with many extensions 11COMMENT= POSIX standard archiver with many extensions
12 12
13BOOTSTRAP_PKG= yes 13BOOTSTRAP_PKG= yes
14CHECK_PERMS= no 14CHECK_PERMS= no
15 15
 16MAKE_ENV+= CATMAN_SECTION_SUFFIX=${CATMAN_SECTION_SUFFIX:Q}
16MAKE_ENV+= MANINSTALL=${MANINSTALL:Q} 17MAKE_ENV+= MANINSTALL=${MANINSTALL:Q}
17 18
18USE_FEATURES= nbcompat 19USE_FEATURES= nbcompat
19 20
20.include "../../mk/bsd.prefs.mk" 21.include "../../mk/bsd.prefs.mk"
21 22
22 23
23.if defined(NBPAX_PROGRAM_PREFIX) && ${NBPAX_PROGRAM_PREFIX} != "" 24.if defined(NBPAX_PROGRAM_PREFIX) && ${NBPAX_PROGRAM_PREFIX} != ""
24CONFIGURE_ARGS+= --program-prefix=${NBPAX_PROGRAM_PREFIX:Q} 25CONFIGURE_ARGS+= --program-prefix=${NBPAX_PROGRAM_PREFIX:Q}
25.endif 26.endif
26 27
27PLIST_SUBST+= NBPAX_PROGRAM_PREFIX=${NBPAX_PROGRAM_PREFIX:Q} 28PLIST_SUBST+= NBPAX_PROGRAM_PREFIX=${NBPAX_PROGRAM_PREFIX:Q}
28BUILD_DEFS+= NBPAX_PROGRAM_PREFIX 29BUILD_DEFS+= NBPAX_PROGRAM_PREFIX
cvs diff -r1.12 -r1.13 pkgsrc/archivers/pax/files/Makefile.in (expand / switch to unified diff)

--- pkgsrc/archivers/pax/files/Makefile.in 2012/03/04 19:50:21 1.12
+++ pkgsrc/archivers/pax/files/Makefile.in 2013/09/12 11:18:40 1.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.in,v 1.12 2012/03/04 19:50:21 joerg Exp $ 1# $NetBSD: Makefile.in,v 1.13 2013/09/12 11:18:40 jperkin Exp $
2 2
3srcdir= @srcdir@ 3srcdir= @srcdir@
4 4
5DESTDIR=  5DESTDIR=
6prefix= @prefix@ 6prefix= @prefix@
7program_transform_name= @program_transform_name@ 7program_transform_name= @program_transform_name@
8exec_prefix= @exec_prefix@ 8exec_prefix= @exec_prefix@
9bindir= @bindir@ 9bindir= @bindir@
10mandir= @mandir@ 10mandir= @mandir@
11 11
12man1dir= $(mandir)/man1 12man1dir= $(mandir)/man1
13cat1dir= $(mandir)/cat1 13cat1dir= $(mandir)/cat1
14 14
@@ -45,17 +45,23 @@ distclean: clean @@ -45,17 +45,23 @@ distclean: clean
45 rm -f configure.lineno config.log 45 rm -f configure.lineno config.log
46 46
47install: 47install:
48 $(INSTALL) -m 755 -d $(DESTDIR)$(bindir) 48 $(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
49 $(INSTALL) -m 755 -d $(DESTDIR)$(man1dir) 49 $(INSTALL) -m 755 -d $(DESTDIR)$(man1dir)
50 $(INSTALL) $(PROG) $(DESTDIR)$(bindir)/$$(echo $(PROG) | sed '$(program_transform_name)') 50 $(INSTALL) $(PROG) $(DESTDIR)$(bindir)/$$(echo $(PROG) | sed '$(program_transform_name)')
51 ln -f $(DESTDIR)$(bindir)/$$(echo $(PROG) | sed '$(program_transform_name)') $(DESTDIR)$(bindir)/$$(echo cpio | sed '$(program_transform_name)') 51 ln -f $(DESTDIR)$(bindir)/$$(echo $(PROG) | sed '$(program_transform_name)') $(DESTDIR)$(bindir)/$$(echo cpio | sed '$(program_transform_name)')
52 ln -f $(DESTDIR)$(bindir)/$$(echo $(PROG) | sed '$(program_transform_name)') $(DESTDIR)$(bindir)/$$(echo tar | sed '$(program_transform_name)') 52 ln -f $(DESTDIR)$(bindir)/$$(echo $(PROG) | sed '$(program_transform_name)') $(DESTDIR)$(bindir)/$$(echo tar | sed '$(program_transform_name)')
53 $(INSTALL) -m 444 $(PROG).1 $(DESTDIR)$(man1dir)/$$(echo $(PROG) | sed '$(program_transform_name)').1 53 $(INSTALL) -m 444 $(PROG).1 $(DESTDIR)$(man1dir)/$$(echo $(PROG) | sed '$(program_transform_name)').1
54 $(INSTALL) -m 444 cpio.1 $(DESTDIR)$(man1dir)/$$(echo cpio | sed '$(program_transform_name)').1 54 $(INSTALL) -m 444 cpio.1 $(DESTDIR)$(man1dir)/$$(echo cpio | sed '$(program_transform_name)').1
55 $(INSTALL) -m 444 tar.1 $(DESTDIR)$(man1dir)/$$(echo tar | sed '$(program_transform_name)').1 55 $(INSTALL) -m 444 tar.1 $(DESTDIR)$(man1dir)/$$(echo tar | sed '$(program_transform_name)').1
56.if !empty(MANINSTALL:Mcatinstall) 56.if !empty(MANINSTALL:Mcatinstall)
57 $(INSTALL) -m 755 -d $(DESTDIR)$(cat1dir) 57 $(INSTALL) -m 755 -d $(DESTDIR)$(cat1dir)
 58. if defined(CATMAN_SECTION_SUFFIX) && !empty(CATMAN_SECTION_SUFFIX:M[Yy][Ee][Ss])
 59 $(INSTALL) -m 444 $(PROG).cat1 $(DESTDIR)$(cat1dir)/$$(echo $(PROG) | sed '$(program_transform_name)').1
 60 $(INSTALL) -m 444 cpio.cat1 $(DESTDIR)$(cat1dir)/$$(echo cpio | sed '$(program_transform_name)').1
 61 $(INSTALL) -m 444 tar.cat1 $(DESTDIR)$(cat1dir)/$$(echo tar | sed '$(program_transform_name)').1
 62. else
58 $(INSTALL) -m 444 $(PROG).cat1 $(DESTDIR)$(cat1dir)/$$(echo $(PROG) | sed '$(program_transform_name)').0 63 $(INSTALL) -m 444 $(PROG).cat1 $(DESTDIR)$(cat1dir)/$$(echo $(PROG) | sed '$(program_transform_name)').0
59 $(INSTALL) -m 444 cpio.cat1 $(DESTDIR)$(cat1dir)/$$(echo cpio | sed '$(program_transform_name)').0 64 $(INSTALL) -m 444 cpio.cat1 $(DESTDIR)$(cat1dir)/$$(echo cpio | sed '$(program_transform_name)').0
60 $(INSTALL) -m 444 tar.cat1 $(DESTDIR)$(cat1dir)/$$(echo tar | sed '$(program_transform_name)').0 65 $(INSTALL) -m 444 tar.cat1 $(DESTDIR)$(cat1dir)/$$(echo tar | sed '$(program_transform_name)').0
 66. endif
61.endif 67.endif
cvs diff -r1.32 -r1.33 pkgsrc/net/tnftp/Makefile (expand / switch to unified diff)

--- pkgsrc/net/tnftp/Makefile 2013/07/15 02:02:27 1.32
+++ pkgsrc/net/tnftp/Makefile 2013/09/12 11:18:40 1.33
@@ -1,38 +1,39 @@ @@ -1,38 +1,39 @@
1# $NetBSD: Makefile,v 1.32 2013/07/15 02:02:27 ryoon Exp $ 1# $NetBSD: Makefile,v 1.33 2013/09/12 11:18:40 jperkin Exp $
2 2
3DISTNAME= tnftp-20070806 3DISTNAME= tnftp-20070806
4SVR4_PKGNAME= tnftp 4SVR4_PKGNAME= tnftp
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= # empty 6MASTER_SITES= # empty
7DISTFILES= # empty 7DISTFILES= # empty
8 8
9# distfile obtained from: ftp://ftp.NetBSD.org/pub/NetBSD/misc/tnftp 9# distfile obtained from: ftp://ftp.NetBSD.org/pub/NetBSD/misc/tnftp
10 10
11CONFLICTS+= kth-krb4-[0-9]* 11CONFLICTS+= kth-krb4-[0-9]*
12CONFLICTS+= lukemftp-[0-9]* 12CONFLICTS+= lukemftp-[0-9]*
13 13
14MAINTAINER= lukem@NetBSD.org 14MAINTAINER= lukem@NetBSD.org
15COMMENT= The enhanced FTP client in NetBSD 15COMMENT= The enhanced FTP client in NetBSD
16LICENSE= original-bsd 16LICENSE= original-bsd
17 17
18BOOTSTRAP_PKG= yes 18BOOTSTRAP_PKG= yes
19 19
20GNU_CONFIGURE= yes 20GNU_CONFIGURE= yes
21CHECK_PERMS= no 21CHECK_PERMS= no
22 22
23OPSYSVARS+= MAKE_ENV 23OPSYSVARS+= MAKE_ENV
24MAKE_ENV.SunOS+= CPPFLAGS="" 24MAKE_ENV.SunOS+= CPPFLAGS=""
25 25
 26MAKE_ENV+= CATMAN_SECTION_SUFFIX=${CATMAN_SECTION_SUFFIX:Q}
26MAKE_ENV+= MANINSTALL=${MANINSTALL:Q} 27MAKE_ENV+= MANINSTALL=${MANINSTALL:Q}
27 28
28.include "options.mk" 29.include "options.mk"
29 30
30do-extract: 31do-extract:
31 @${CP} -R ${FILESDIR} ${WRKSRC} 32 @${CP} -R ${FILESDIR} ${WRKSRC}
32 @${RM} -f ${WRKSRC}/INSTALL 33 @${RM} -f ${WRKSRC}/INSTALL
33 34
34# Use mk/readline.builtin.mk to check for an editline library on the 35# Use mk/readline.builtin.mk to check for an editline library on the
35# system. If we use the system editline library, then use the built-in 36# system. If we use the system editline library, then use the built-in
36# termcap library. 37# termcap library.
37# 38#
38CHECK_BUILTIN.readline:= yes 39CHECK_BUILTIN.readline:= yes
cvs diff -r1.7 -r1.8 pkgsrc/net/tnftp/files/src/Attic/Makefile.in (expand / switch to unified diff)

--- pkgsrc/net/tnftp/files/src/Attic/Makefile.in 2012/03/04 19:49:41 1.7
+++ pkgsrc/net/tnftp/files/src/Attic/Makefile.in 2013/09/12 11:18:40 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.in,v 1.7 2012/03/04 19:49:41 joerg Exp $ 1# $NetBSD: Makefile.in,v 1.8 2013/09/12 11:18:40 jperkin Exp $
2# 2#
3 3
4srcdir = @srcdir@ 4srcdir = @srcdir@
5VPATH = @srcdir@ 5VPATH = @srcdir@
6SHELL = /bin/sh 6SHELL = /bin/sh
7 7
8DESTDIR = 8DESTDIR =
9prefix = @prefix@ 9prefix = @prefix@
10exec_prefix = @exec_prefix@ 10exec_prefix = @exec_prefix@
11bindir = @bindir@ 11bindir = @bindir@
12datarootdir = @datarootdir@ 12datarootdir = @datarootdir@
13mandir = @mandir@ 13mandir = @mandir@
14transform = @program_transform_name@ 14transform = @program_transform_name@
@@ -34,21 +34,25 @@ all: ${PROG} @@ -34,21 +34,25 @@ all: ${PROG}
34${PROG}: ${OBJS} @LIBDEPENDS@ 34${PROG}: ${OBJS} @LIBDEPENDS@
35 ${CC} ${CFLAGS} ${LDFLAGS} -o ${PROG} ${OBJS} ${LIBS} 35 ${CC} ${CFLAGS} ${LDFLAGS} -o ${PROG} ${OBJS} ${LIBS}
36 36
37${OBJS}: ${srcdir}/../tnftp.h ../config.h 37${OBJS}: ${srcdir}/../tnftp.h ../config.h
38 38
39.c.o: 39.c.o:
40 ${CC} ${CFLAGS} ${CPPFLAGS} -c $< 40 ${CC} ${CFLAGS} ${CPPFLAGS} -c $<
41 41
42install: all 42install: all
43 -mkdir -p ${DESTDIR}${bindir} 43 -mkdir -p ${DESTDIR}${bindir}
44 ${INSTALL} -m 555 ${PROG} ${DESTDIR}${bindir}/`echo ${PROG}|sed '$(transform)'` 44 ${INSTALL} -m 555 ${PROG} ${DESTDIR}${bindir}/`echo ${PROG}|sed '$(transform)'`
45.if !empty(MANINSTALL:Mcatinstall) 45.if !empty(MANINSTALL:Mcatinstall)
46 -mkdir -p ${DESTDIR}${mandircat1} 46 -mkdir -p ${DESTDIR}${mandircat1}
 47. if defined(CATMAN_SECTION_SUFFIX) && !empty(CATMAN_SECTION_SUFFIX:M[Yy][Ee][Ss])
 48 ${INSTALL} -m 444 ${srcdir}/${PROG}.cat1 ${DESTDIR}${mandircat1}/`echo ${PROG}|sed '$(transform)'`.1
 49. else
47 ${INSTALL} -m 444 ${srcdir}/${PROG}.cat1 ${DESTDIR}${mandircat1}/`echo ${PROG}|sed '$(transform)'`.0 50 ${INSTALL} -m 444 ${srcdir}/${PROG}.cat1 ${DESTDIR}${mandircat1}/`echo ${PROG}|sed '$(transform)'`.0
 51. endif
48.endif 52.endif
49 53
50clean: 54clean:
51 rm -f core ${PROG} ${OBJS} 55 rm -f core ${PROG} ${OBJS}
52 56
53distclean: clean 57distclean: clean
54 rm -f Makefile 58 rm -f Makefile
cvs diff -r1.13 -r1.14 pkgsrc/pkgtools/lintpkgsrc/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/lintpkgsrc/Makefile 2013/05/31 12:41:46 1.13
+++ pkgsrc/pkgtools/lintpkgsrc/Makefile 2013/09/12 11:18:40 1.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.13 2013/05/31 12:41:46 wiz Exp $ 1# $NetBSD: Makefile,v 1.14 2013/09/12 11:18:40 jperkin Exp $
2 2
3DISTNAME= lintpkgsrc-4.86 3DISTNAME= lintpkgsrc-4.86
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= pkgtools 5CATEGORIES= pkgtools
6MASTER_SITES= # none 6MASTER_SITES= # none
7DISTFILES= # none 7DISTFILES= # none
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.NetBSD.org/Documentation/pkgsrc/ 10HOMEPAGE= http://www.NetBSD.org/Documentation/pkgsrc/
11COMMENT= Sanity checks on the complete pkgsrc tree 11COMMENT= Sanity checks on the complete pkgsrc tree
12 12
13DEPENDS+= digest>=20010101:../../pkgtools/digest 13DEPENDS+= digest>=20010101:../../pkgtools/digest
14CONFLICTS+= pkglint<4.82 14CONFLICTS+= pkglint<4.82
@@ -32,20 +32,24 @@ SUBST_SED.lp+= -e s\|@PKGSRCDIR@\|${PKGS @@ -32,20 +32,24 @@ SUBST_SED.lp+= -e s\|@PKGSRCDIR@\|${PKGS
32.endif 32.endif
33SUBST_SED.lp+= -e s\|@PREFIX@\|${PREFIX}\|g 33SUBST_SED.lp+= -e s\|@PREFIX@\|${PREFIX}\|g
34SUBST_SED.lp+= -e s\|@MAKE@\|${MAKE:Q}\|g 34SUBST_SED.lp+= -e s\|@MAKE@\|${MAKE:Q}\|g
35SUBST_SED.lp+= -e s\|@PERL@\|${PERL5:Q}\|g 35SUBST_SED.lp+= -e s\|@PERL@\|${PERL5:Q}\|g
36 36
37.include "../../mk/bsd.prefs.mk" 37.include "../../mk/bsd.prefs.mk"
38 38
39do-extract: 39do-extract:
40 cd ${FILESDIR} && cp lintpkgsrc.* ${WRKSRC}/ 40 cd ${FILESDIR} && cp lintpkgsrc.* ${WRKSRC}/
41 41
42do-install: 42do-install:
43 ${INSTALL_SCRIPT} ${WRKSRC}/lintpkgsrc.pl ${DESTDIR}${PREFIX}/bin/lintpkgsrc 43 ${INSTALL_SCRIPT} ${WRKSRC}/lintpkgsrc.pl ${DESTDIR}${PREFIX}/bin/lintpkgsrc
44.if !empty(MANINSTALL:Mcatinstall) 44.if !empty(MANINSTALL:Mcatinstall)
 45. if defined(CATMAN_SECTION_SUFFIX) && !empty(CATMAN_SECTION_SUFFIX:M[Yy][Ee][Ss])
 46 ${INSTALL_MAN} ${WRKSRC}/lintpkgsrc.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/lintpkgsrc.1
 47. else
45 ${INSTALL_MAN} ${WRKSRC}/lintpkgsrc.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1 48 ${INSTALL_MAN} ${WRKSRC}/lintpkgsrc.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1
 49. endif
46.endif 50.endif
47.if !empty(MANINSTALL:Mmaninstall) 51.if !empty(MANINSTALL:Mmaninstall)
48 ${INSTALL_MAN} ${WRKSRC}/lintpkgsrc.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 52 ${INSTALL_MAN} ${WRKSRC}/lintpkgsrc.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
49.endif 53.endif
50 54
51.include "../../mk/bsd.pkg.mk" 55.include "../../mk/bsd.pkg.mk"
cvs diff -r1.31 -r1.32 pkgsrc/pkgtools/pkgdepgraph/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkgdepgraph/Makefile 2013/05/31 12:41:46 1.31
+++ pkgsrc/pkgtools/pkgdepgraph/Makefile 2013/09/12 11:18:40 1.32
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.31 2013/05/31 12:41:46 wiz Exp $ 1# $NetBSD: Makefile,v 1.32 2013/09/12 11:18:40 jperkin Exp $
2# 2#
3 3
4DISTNAME= pkgdepgraph-2.8 4DISTNAME= pkgdepgraph-2.8
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= pkgtools devel 6CATEGORIES= pkgtools devel
7MASTER_SITES= # empty 7MASTER_SITES= # empty
8DISTFILES= # empty 8DISTFILES= # empty
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html 11HOMEPAGE= ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html
12COMMENT= Visual representation of installed NetBSD packages 12COMMENT= Visual representation of installed NetBSD packages
13 13
14# removed so that pkgdepgraph can be used on "client" machines -- @@@ 14# removed so that pkgdepgraph can be used on "client" machines -- @@@
@@ -43,20 +43,24 @@ do-build: @@ -43,20 +43,24 @@ do-build:
43 ${SED} -e 's|@PKG_DBDIR@|${PKG_DBDIR}|g' \ 43 ${SED} -e 's|@PKG_DBDIR@|${PKG_DBDIR}|g' \
44 -e 's|@PKGSRCDIR@|${PKGSRCDIR}|g' \ 44 -e 's|@PKGSRCDIR@|${PKGSRCDIR}|g' \
45 < ${WRKSRC}/${file}.in \ 45 < ${WRKSRC}/${file}.in \
46 > ${WRKSRC}/${file} 46 > ${WRKSRC}/${file}
47.endfor 47.endfor
48.if ${OPSYS} == "SunOS" || ${OPSYS} == "AIX" 48.if ${OPSYS} == "SunOS" || ${OPSYS} == "AIX"
49 # the pre-generated man-pages are 'mandoc'; these OS need 'man' 49 # the pre-generated man-pages are 'mandoc'; these OS need 'man'
50 nroff -man ${WRKSRC}/pkgdepgraph.1 > ${WRKSRC}/pkgdepgraph.0 50 nroff -man ${WRKSRC}/pkgdepgraph.1 > ${WRKSRC}/pkgdepgraph.0
51.endif 51.endif
52 52
53do-install: 53do-install:
54 ${INSTALL_SCRIPT} ${WRKSRC}/pkgdepgraph ${DESTDIR}${PREFIX}/bin/pkgdepgraph 54 ${INSTALL_SCRIPT} ${WRKSRC}/pkgdepgraph ${DESTDIR}${PREFIX}/bin/pkgdepgraph
55.if !empty(MANINSTALL:Mcatinstall) 55.if !empty(MANINSTALL:Mcatinstall)
 56. if defined(CATMAN_SECTION_SUFFIX) && !empty(CATMAN_SECTION_SUFFIX:M[Yy][Ee][Ss])
 57 ${INSTALL_MAN} ${WRKSRC}/pkgdepgraph.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/pkgdepgraph.1
 58. else
56 ${INSTALL_MAN} ${WRKSRC}/pkgdepgraph.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1 59 ${INSTALL_MAN} ${WRKSRC}/pkgdepgraph.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1
 60. endif
57.endif 61.endif
58.if !empty(MANINSTALL:Mmaninstall) 62.if !empty(MANINSTALL:Mmaninstall)
59 ${INSTALL_MAN} ${WRKSRC}/pkgdepgraph.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 63 ${INSTALL_MAN} ${WRKSRC}/pkgdepgraph.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
60.endif 64.endif
61 65
62.include "../../mk/bsd.pkg.mk" 66.include "../../mk/bsd.pkg.mk"
cvs diff -r1.80 -r1.81 pkgsrc/pkgtools/pkgdiff/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkgdiff/Makefile 2013/05/31 12:41:46 1.80
+++ pkgsrc/pkgtools/pkgdiff/Makefile 2013/09/12 11:18:40 1.81
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.80 2013/05/31 12:41:46 wiz Exp $ 1# $NetBSD: Makefile,v 1.81 2013/09/12 11:18:40 jperkin Exp $
2# 2#
3 3
4DISTNAME= pkgdiff-1.4 4DISTNAME= pkgdiff-1.4
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= pkgtools devel 6CATEGORIES= pkgtools devel
7MASTER_SITES= # empty 7MASTER_SITES= # empty
8DISTFILES= # empty 8DISTFILES= # empty
9 9
10MAINTAINER= wiz@NetBSD.org 10MAINTAINER= wiz@NetBSD.org
11HOMEPAGE= ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html 11HOMEPAGE= ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html
12COMMENT= Tools to create, maintain, and send back patches for pkgsrc 12COMMENT= Tools to create, maintain, and send back patches for pkgsrc
13LICENSE= 2-clause-bsd AND original-bsd 13LICENSE= 2-clause-bsd AND original-bsd
14 14
@@ -58,21 +58,25 @@ do-build: @@ -58,21 +58,25 @@ do-build:
58 > ${WRKSRC}/pkgdiff 58 > ${WRKSRC}/pkgdiff
59 ${CP} ${FILESDIR}/pkgvi ${WRKSRC} 59 ${CP} ${FILESDIR}/pkgvi ${WRKSRC}
60 ${CP} ${FILESDIR}/feedback-patches ${WRKSRC} 60 ${CP} ${FILESDIR}/feedback-patches ${WRKSRC}
61.if !empty(MANINSTALL:Mcatinstall) 61.if !empty(MANINSTALL:Mcatinstall)
62. for f in mkpatches patchdiff pkgdiff pkgvi feedback-patches 62. for f in mkpatches patchdiff pkgdiff pkgvi feedback-patches
63 ${CP} ${FILESDIR}/${f}.0 ${WRKSRC}/${f}.0 63 ${CP} ${FILESDIR}/${f}.0 ${WRKSRC}/${f}.0
64. endfor 64. endfor
65.endif 65.endif
66 66
67do-install: 67do-install:
68.for f in mkpatches patchdiff pkgdiff pkgvi feedback-patches 68.for f in mkpatches patchdiff pkgdiff pkgvi feedback-patches
69 ${INSTALL_SCRIPT} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/bin 69 ${INSTALL_SCRIPT} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/bin
70. if !empty(MANINSTALL:Mcatinstall) 70. if !empty(MANINSTALL:Mcatinstall)
 71. if defined(CATMAN_SECTION_SUFFIX) && !empty(CATMAN_SECTION_SUFFIX:M[Yy][Ee][Ss])
 72 ${INSTALL_MAN} ${WRKSRC}/${f}.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/${f}.1
 73. else
71 ${INSTALL_MAN} ${WRKSRC}/${f}.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1 74 ${INSTALL_MAN} ${WRKSRC}/${f}.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1
 75. endif
72. endif 76. endif
73. if !empty(MANINSTALL:Mmaninstall) 77. if !empty(MANINSTALL:Mmaninstall)
74 ${INSTALL_MAN} ${FILESDIR}/${f}.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 78 ${INSTALL_MAN} ${FILESDIR}/${f}.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
75. endif 79. endif
76.endfor 80.endfor
77 81
78.include "../../mk/bsd.pkg.mk" 82.include "../../mk/bsd.pkg.mk"
cvs diff -r1.433 -r1.434 pkgsrc/pkgtools/pkglint/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkglint/Makefile 2013/08/15 17:57:44 1.433
+++ pkgsrc/pkgtools/pkglint/Makefile 2013/09/12 11:18:41 1.434
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.433 2013/08/15 17:57:44 wiz Exp $ 1# $NetBSD: Makefile,v 1.434 2013/09/12 11:18:41 jperkin Exp $
2 2
3# Note: if you update the version number, please have a look at the 3# Note: if you update the version number, please have a look at the
4# changes between the CVS tag "pkglint_current" and HEAD. 4# changes between the CVS tag "pkglint_current" and HEAD.
5# After updating, please re-set the CVS tag to HEAD. 5# After updating, please re-set the CVS tag to HEAD.
6DISTNAME= pkglint-4.132 6DISTNAME= pkglint-4.132
7CATEGORIES= pkgtools 7CATEGORIES= pkgtools
8MASTER_SITES= # none 8MASTER_SITES= # none
9DISTFILES= # none 9DISTFILES= # none
10 10
11OWNER= wiz@NetBSD.org 11OWNER= wiz@NetBSD.org
12HOMEPAGE= http://www.NetBSD.org/docs/pkgsrc/ 12HOMEPAGE= http://www.NetBSD.org/docs/pkgsrc/
13COMMENT= Verifier for NetBSD packages 13COMMENT= Verifier for NetBSD packages
14 14
@@ -61,25 +61,29 @@ do-extract: @@ -61,25 +61,29 @@ do-extract:
61 cd ${FILESDIR} && ${CP} PkgLint/*.pm ${WRKSRC}/PkgLint 61 cd ${FILESDIR} && ${CP} PkgLint/*.pm ${WRKSRC}/PkgLint
62 62
63do-build: 63do-build:
64 cd ${WRKSRC} && ${PERL5} build.pl < pkglint.pl > pkglint.pl.inlined \ 64 cd ${WRKSRC} && ${PERL5} build.pl < pkglint.pl > pkglint.pl.inlined \
65 && mv pkglint.pl.inlined pkglint.pl 65 && mv pkglint.pl.inlined pkglint.pl
66 66
67do-test: 67do-test:
68 cd ${WRKSRC} && prove pkglint.t 68 cd ${WRKSRC} && prove pkglint.t
69 69
70do-install: 70do-install:
71 ${INSTALL_SCRIPT} ${WRKSRC}/pkglint.pl ${DESTDIR}${PREFIX}/bin/pkglint 71 ${INSTALL_SCRIPT} ${WRKSRC}/pkglint.pl ${DESTDIR}${PREFIX}/bin/pkglint
72 ${INSTALL_SCRIPT} ${WRKSRC}/plist-clash.pl ${DESTDIR}${PREFIX}/bin/plist-clash 72 ${INSTALL_SCRIPT} ${WRKSRC}/plist-clash.pl ${DESTDIR}${PREFIX}/bin/plist-clash
73.if !empty(MANINSTALL:Mcatinstall) 73.if !empty(MANINSTALL:Mcatinstall)
 74. if defined(CATMAN_SECTION_SUFFIX) && !empty(CATMAN_SECTION_SUFFIX:M[Yy][Ee][Ss])
 75 ${INSTALL_MAN} ${WRKSRC}/pkglint.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/pkglint.1
 76. else
74 ${INSTALL_MAN} ${WRKSRC}/pkglint.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1 77 ${INSTALL_MAN} ${WRKSRC}/pkglint.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1
 78. endif
75.endif 79.endif
76.if !empty(MANINSTALL:Mmaninstall) 80.if !empty(MANINSTALL:Mmaninstall)
77 ${INSTALL_MAN} ${WRKSRC}/pkglint.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 81 ${INSTALL_MAN} ${WRKSRC}/pkglint.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
78.endif 82.endif
79 ${INSTALL_DATA} ${FILESDIR}/makevars.map ${DESTDIR}${PREFIX}/share/pkglint/ 83 ${INSTALL_DATA} ${FILESDIR}/makevars.map ${DESTDIR}${PREFIX}/share/pkglint/
80 ${INSTALL_DATA} ${FILESDIR}/deprecated.map ${DESTDIR}${PREFIX}/share/pkglint/ 84 ${INSTALL_DATA} ${FILESDIR}/deprecated.map ${DESTDIR}${PREFIX}/share/pkglint/
81 85
82selftest: .PHONY 86selftest: .PHONY
83 ${PREFIX}/bin/pkglint 87 ${PREFIX}/bin/pkglint
84 88
85.include "../../mk/bsd.pkg.mk" 89.include "../../mk/bsd.pkg.mk"