From 0888156f21e01be033066b564dc798018954d33c Mon Sep 17 00:00:00 2001 From: jlam Date: Tue, 28 Jan 2003 22:03:00 +0000 Subject: Instead of including bsd.pkg.install.mk directly in a package Makefile, have it be automatically included by bsd.pkg.mk if USE_PKGINSTALL is set to "YES". This enforces the requirement that bsd.pkg.install.mk be included at the end of a package Makefile. Idea suggested by Julio M. Merino Vidal . --- print/a2ps/Makefile | 4 ++-- print/apsfilter/Makefile | 4 ++-- print/auctex/Makefile | 6 +++--- print/cups/Makefile | 14 +++++++------- print/ghostscript-esp/Makefile.common | 10 +++++----- print/pnm2ppa/Makefile | 4 ++-- print/psutils/Makefile | 4 ++-- print/teTeX-bin/Makefile | 4 ++-- print/xpdf/Makefile | 4 ++-- 9 files changed, 27 insertions(+), 27 deletions(-) (limited to 'print') diff --git a/print/a2ps/Makefile b/print/a2ps/Makefile index 6c3144faff2..ddb7bb08ea3 100644 --- a/print/a2ps/Makefile +++ b/print/a2ps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2003/01/10 07:45:23 cjep Exp $ +# $NetBSD: Makefile,v 1.40 2003/01/28 22:03:59 jlam Exp $ DISTNAME= a2ps-4.13b PKGNAME= a2ps-4.13.0.2 @@ -22,6 +22,7 @@ USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/auxdir/ltconfig USE_BUILDLINK2= YES +USE_PKGINSTALL= YES USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES CONFIGURE_ENV+= LPR=lpr @@ -41,5 +42,4 @@ pre-build: .include "../../devel/gettext-lib/buildlink2.mk" .include "../../mk/texinfo.mk" -.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile index 393ceeea46e..3750b739bad 100644 --- a/print/apsfilter/Makefile +++ b/print/apsfilter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2002/11/26 11:26:32 jmmv Exp $ +# $NetBSD: Makefile,v 1.9 2003/01/28 22:03:59 jlam Exp $ # DISTNAME= apsfilter-7.2.2 @@ -22,6 +22,7 @@ WRKSRC= ${WRKDIR}/apsfilter HAS_CONFIGURE= YES USE_BZIP2= YES +USE_PKGINSTALL= YES CONFIGURE_ARGS+=--prefix=${LOCALBASE} CONFIGURE_ARGS+=--with-shell=${SH} @@ -47,5 +48,4 @@ post-patch: # > ${DEINSTALL_FILE} .include "../../mk/ghostscript.mk" -.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/auctex/Makefile b/print/auctex/Makefile index 33b76fc3f10..68fda42f1d7 100644 --- a/print/auctex/Makefile +++ b/print/auctex/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2003/01/11 10:02:03 uebayasi Exp $ +# $NetBSD: Makefile,v 1.11 2003/01/28 22:04:00 jlam Exp $ DISTNAME= auctex-11.13 CATEGORIES= print @@ -10,7 +10,8 @@ COMMENT= Enhanced LaTeX mode for Emacs DEPENDS+= teTeX-[0-9]*:../../print/teTeX -USE_GMAKE= #defined +USE_GMAKE= yes +USE_PKGINSTALL= yes TEX_PREFIX_DEFAULT= ${LOCALBASE} EVAL_PREFIX+= TEX_PREFIX=teTeX @@ -59,5 +60,4 @@ do-install: .include "../../mk/emacs.mk" .include "../../mk/texinfo.mk" -.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/cups/Makefile b/print/cups/Makefile index 5764848b583..f856e575bad 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2003/01/23 23:05:10 jlam Exp $ +# $NetBSD: Makefile,v 1.59 2003/01/28 22:04:00 jlam Exp $ # # The CUPS author is very good about taking back changes into the main # CUPS distribution. The correct place to send patches or bug-fixes is: @@ -26,11 +26,12 @@ COMMENT= Common UNIX Printing System CONFLICTS+= LPRng-[0-9]* LPRng-core-[0-9]* -USE_BUILDLINK2= # defined -USE_PKGLOCALEDIR= # defined -USE_GMAKE= # defined -USE_LIBTOOL= # defined -GNU_CONFIGURE= # defined +USE_BUILDLINK2= yes +USE_PKGINSTALL= yes +USE_PKGLOCALEDIR= yes +USE_GMAKE= yes +USE_LIBTOOL= yes +GNU_CONFIGURE= yes UNLIMIT_RESOURCES= datasize memorysize CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} CONFIGURE_ARGS+= --localstatedir=/var @@ -131,5 +132,4 @@ post-install: .include "../../security/openssl/buildlink2.mk" .include "../../mk/autoconf.mk" -.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/ghostscript-esp/Makefile.common b/print/ghostscript-esp/Makefile.common index a33853ab8fd..4042e7477f5 100644 --- a/print/ghostscript-esp/Makefile.common +++ b/print/ghostscript-esp/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.3 2002/10/24 20:08:22 bouyer Exp $ +# $NetBSD: Makefile.common,v 1.4 2003/01/28 22:04:01 jlam Exp $ DISTNAME= espgs-${GS_VERS}-source BASEGS_VERS= 7.05 @@ -22,9 +22,10 @@ CONFLICTS+= ghostscript-gnu{,-nox11,-x11}-[0-9]* DEPENDS+= ghostscript-fonts-6.0:../../fonts/ghostscript-fonts -USE_BUILDLINK2= # defined -USE_GMAKE= # defined -GNU_CONFIGURE= # defined +USE_BUILDLINK2= yes +USE_PKGINSTALL= yes +USE_GMAKE= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-ijs CONFIGURE_ARGS+= --with-gimp-print CONFIGURE_ARGS+= --without-omni @@ -93,7 +94,6 @@ post-install: .include "../../print/cups/buildlink2.mk" .include "../../print/gimp-print-lib/buildlink2.mk" -.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" .if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "arm32" diff --git a/print/pnm2ppa/Makefile b/print/pnm2ppa/Makefile index 3509cc5704b..9ad5d9ced9b 100644 --- a/print/pnm2ppa/Makefile +++ b/print/pnm2ppa/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/01/19 08:45:38 salo Exp $ +# $NetBSD: Makefile,v 1.5 2003/01/28 22:04:01 jlam Exp $ # DISTNAME= pnm2ppa-1.04 @@ -10,6 +10,7 @@ MAINTAINER= kei@netbsd.org HOMEPAGE= http://pnm2ppa.sourceforge.net/ COMMENT= filter to convert PNM file to PPA used by some HP DJ printer +USE_PKGINSTALL= yes CONF_FILES+= ${PREFIX}/share/examples/pnm2ppa/pnm2ppa.conf.default \ ${PKG_SYSCONFDIR}/pnm2ppa.conf @@ -30,5 +31,4 @@ post-install: ${INSTALL_DATA} docs/en/CALIBRATION.txt docs/en/COLOR.txt \ ${PREFIX}/share/doc/pnm2ppa -.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/psutils/Makefile b/print/psutils/Makefile index af3ec3fd17f..e4162076704 100644 --- a/print/psutils/Makefile +++ b/print/psutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2002/11/26 10:13:20 jmmv Exp $ +# $NetBSD: Makefile,v 1.22 2003/01/28 22:04:01 jlam Exp $ # FreeBSD Id: Makefile,v 1.15 1998/01/08 18:52:13 fenner Exp # @@ -16,6 +16,7 @@ DEPENDS+= papersize-[0-9]*:../../print/papersize WRKSRC= ${WRKDIR}/psutils USE_PERL5= yes +USE_PKGINSTALL= yes .include "../../mk/bsd.prefs.mk" @@ -57,5 +58,4 @@ post-install: low=`${ECHO} ${PAPERSIZE} | ${TR} '[A-Z]' '[a-z]'`; \ ${ECHO} "PAPERSIZE=$$low" > ${EGDIR}/psutils.cfg; -.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/teTeX-bin/Makefile b/print/teTeX-bin/Makefile index dd8edf0b68c..88a33d38839 100644 --- a/print/teTeX-bin/Makefile +++ b/print/teTeX-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2002/11/19 02:47:19 mrg Exp $ +# $NetBSD: Makefile,v 1.39 2003/01/28 22:04:02 jlam Exp $ # FreeBSD Id: Makefile,v 1.20 1997/08/05 06:56:41 tg Exp # @@ -24,6 +24,7 @@ ALL_TARGET= all INSTALL_TARGET= install strip USE_BUILDLINK2= yes +USE_PKGINSTALL= yes USE_GMAKE= yes USE_X11= yes CFLAGS+= -Dunix @@ -80,5 +81,4 @@ post-install: .include "../../www/libwww/buildlink2.mk" .include "../../mk/texinfo.mk" -.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/xpdf/Makefile b/print/xpdf/Makefile index ab1a677990d..721b7fe829d 100644 --- a/print/xpdf/Makefile +++ b/print/xpdf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2002/12/31 02:31:53 uebayasi Exp $ +# $NetBSD: Makefile,v 1.16 2003/01/28 22:04:03 jlam Exp $ # DISTNAME= xpdf-2.01 @@ -20,6 +20,7 @@ DEPENDS+= ghostscript-fonts-[0-9]*:../../fonts/ghostscript-fonts CONFLICTS= xpdf-crypto-[0-9]* USE_BUILDLINK2= YES +USE_PKGINSTALL= YES USE_X11BASE= YES GNU_CONFIGURE= YES @@ -43,7 +44,6 @@ CONF_FILES= ${EGDIR}/xpdfrc ${PKG_SYSCONFDIR}/xpdfrc .include "../../graphics/xpm/buildlink2.mk" .include "../../mk/motif.buildlink2.mk" -.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" .if !empty(MACHINE_PLATFORM:MNetBSD-*-mipsel) -- cgit v1.2.3