Sat Feb 15 10:42:52 2014 UTC ()
Only install the catman page if catinstall is defined.  Noticed by tron@


(jperkin)
diff -r1.64 -r1.65 pkgsrc/devel/bmake/Makefile

cvs diff -r1.64 -r1.65 pkgsrc/devel/bmake/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/bmake/Makefile 2014/02/14 16:09:18 1.64
+++ pkgsrc/devel/bmake/Makefile 2014/02/15 10:42:52 1.65
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.64 2014/02/14 16:09:18 jperkin Exp $ 1# $NetBSD: Makefile,v 1.65 2014/02/15 10:42:52 jperkin Exp $
2 2
3DISTNAME= bmake-20140214 3DISTNAME= bmake-20140214
4CATEGORIES= devel 4CATEGORIES= devel
5MASTER_SITES= # empty 5MASTER_SITES= # empty
6DISTFILES= # empty 6DISTFILES= # empty
7 7
8# distfile obtained from ftp://ftp.NetBSD.org/pub/NetBSD/misc/sjg/ 8# distfile obtained from ftp://ftp.NetBSD.org/pub/NetBSD/misc/sjg/
9# source is kept in files/ for bootstrap purposes 9# source is kept in files/ for bootstrap purposes
10 10
11MAINTAINER= joerg@NetBSD.org 11MAINTAINER= joerg@NetBSD.org
12HOMEPAGE= http://www.crufty.net/help/sjg/bmake.html 12HOMEPAGE= http://www.crufty.net/help/sjg/bmake.html
13COMMENT= Portable (autoconf) version of NetBSD 'make' utility 13COMMENT= Portable (autoconf) version of NetBSD 'make' utility
14LICENSE= modified-bsd 14LICENSE= modified-bsd
@@ -44,24 +44,26 @@ MAKE_ENV+= XDEFS=-DUSE_SELECT @@ -44,24 +44,26 @@ MAKE_ENV+= XDEFS=-DUSE_SELECT
44.if ${OPSYS} == "IRIX" 44.if ${OPSYS} == "IRIX"
45CONFIGURE_ARGS+= --with-machine_arch=${MACHINE_ARCH} 45CONFIGURE_ARGS+= --with-machine_arch=${MACHINE_ARCH}
46.endif 46.endif
47 47
48do-extract: 48do-extract:
49 ${CP} -R ${FILESDIR} ${WRKSRC} 49 ${CP} -R ${FILESDIR} ${WRKSRC}
50 50
51do-build: 51do-build:
52 cd ${WRKSRC} && \ 52 cd ${WRKSRC} && \
53 ${SETENV} ${MAKE_ENV} ${SH} make-bootstrap.sh 53 ${SETENV} ${MAKE_ENV} ${SH} make-bootstrap.sh
54 54
55do-install: 55do-install:
56 ${INSTALL_PROGRAM} ${WRKSRC}/bmake ${DESTDIR}${PREFIX}/bin 56 ${INSTALL_PROGRAM} ${WRKSRC}/bmake ${DESTDIR}${PREFIX}/bin
57.if defined(CATMAN_SECTION_SUFFIX) && !empty(CATMAN_SECTION_SUFFIX:M[Yy][Ee][Ss]) 57.if !empty(MANINSTALL:Mcatinstall)
 58 .if defined(CATMAN_SECTION_SUFFIX) && !empty(CATMAN_SECTION_SUFFIX:M[Yy][Ee][Ss])
58 ${INSTALL_MAN} ${WRKSRC}/bmake.cat1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/bmake.1 59 ${INSTALL_MAN} ${WRKSRC}/bmake.cat1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/bmake.1
59.else 60 .else
60 ${INSTALL_MAN} ${WRKSRC}/bmake.cat1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/bmake.0 61 ${INSTALL_MAN} ${WRKSRC}/bmake.cat1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/bmake.0
 62 .endif
61.endif 63.endif
62 ${INSTALL_MAN} ${WRKSRC}/bmake.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 64 ${INSTALL_MAN} ${WRKSRC}/bmake.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
63 65
64do-test: 66do-test:
65 cd ${WRKSRC}/unit-tests && ${WRKSRC}/bmake test 67 cd ${WRKSRC}/unit-tests && ${WRKSRC}/bmake test
66 68
67.include "../../mk/bsd.pkg.mk" 69.include "../../mk/bsd.pkg.mk"