From d7f69e47ce32be7271733bcdf48d28468f400ab9 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 . --- sysutils/amanda-common/Makefile | 4 ++-- sysutils/amanda-dev-common/Makefile | 4 ++-- sysutils/apcupsd/Makefile | 11 +++++------ sysutils/gentoo/Makefile | 11 ++++++----- sysutils/libirman/Makefile | 6 +++--- sysutils/rox-base/Makefile | 4 ++-- sysutils/sysbuild/Makefile | 4 ++-- sysutils/ups-nut-cgi/Makefile | 4 ++-- sysutils/ups-nut/Makefile | 4 ++-- sysutils/xcdroast/Makefile | 7 ++++--- 10 files changed, 30 insertions(+), 29 deletions(-) (limited to 'sysutils') diff --git a/sysutils/amanda-common/Makefile b/sysutils/amanda-common/Makefile index 2f92955e696..2ac8aa5e753 100644 --- a/sysutils/amanda-common/Makefile +++ b/sysutils/amanda-common/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2002/08/25 21:50:53 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2003/01/28 22:04:14 jlam Exp $ # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp # @@ -13,6 +13,7 @@ HOMEPAGE= http://www.amanda.org/ COMMENT= Libraries and binaries used by both the client and server parts of amanda USE_BUILDLINK2= YES +USE_PKGINSTALL= YES .include "../../mk/bsd.prefs.mk" .include "../../sysutils/amanda-common/Makefile.common" @@ -39,5 +40,4 @@ PKG_USERS= ${AMANDA_USER}:${AMANDA_GROUP}::Amanda\\ user::${SH} OWN_DIRS_PERMS= ${AMANDA_VAR} ${AMANDA_USER} ${AMANDA_GROUP} 0700 OWN_DIRS_PERMS+= ${AMANDA_VAR}/gnutar-lists ${AMANDA_USER} ${AMANDA_GROUP} 0700 -.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/amanda-dev-common/Makefile b/sysutils/amanda-dev-common/Makefile index a5b565a6926..4cc0c16f03f 100644 --- a/sysutils/amanda-dev-common/Makefile +++ b/sysutils/amanda-dev-common/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/08/25 21:50:54 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2003/01/28 22:04:15 jlam Exp $ # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp # @@ -8,6 +8,7 @@ SVR4_PKGNAME= amaco COMMENT= Libraries and binaries used by both the client and server parts of amanda USE_BUILDLINK2= YES +USE_PKGINSTALL= YES .include "../../mk/bsd.prefs.mk" .include "../../sysutils/amanda-dev-common/Makefile.common" @@ -34,5 +35,4 @@ PKG_USERS= ${AMANDA_USER}:${AMANDA_GROUP}::Amanda\\ user::${SH} OWN_DIRS_PERMS= ${AMANDA_VAR} ${AMANDA_USER} ${AMANDA_GROUP} 0700 OWN_DIRS_PERMS+= ${AMANDA_VAR}/gnutar-lists ${AMANDA_USER} ${AMANDA_GROUP} 0700 -.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile index 37065017a74..916d442bd75 100644 --- a/sysutils/apcupsd/Makefile +++ b/sysutils/apcupsd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2002/12/23 16:31:29 cjep Exp $ +# $NetBSD: Makefile,v 1.20 2003/01/28 22:04:15 jlam Exp $ DISTNAME= apcupsd-3.8.5 CATEGORIES= sysutils @@ -10,10 +10,11 @@ COMMENT= UPS power management for APCC Products BUILD_USES_MSGFMT= yes -USE_BUILDLINK2= # defined -USE_GMAKE= # defined +USE_BUILDLINK2= yes +USE_PKGINSTALL= yes +USE_GMAKE= yes -GNU_CONFIGURE= # defined +GNU_CONFIGURE= yes PKG_SYSCONFSUBDIR= apcupsd @@ -106,6 +107,4 @@ post-install: .endfor .include "../../devel/gettext-lib/buildlink2.mk" - -.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/gentoo/Makefile b/sysutils/gentoo/Makefile index 5b98ce86255..f186006e77a 100644 --- a/sysutils/gentoo/Makefile +++ b/sysutils/gentoo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2002/12/07 10:12:42 jmmv Exp $ +# $NetBSD: Makefile,v 1.8 2003/01/28 22:04:15 jlam Exp $ # DISTNAME= gentoo-0.11.34 @@ -11,10 +11,11 @@ COMMENT= Two-pane filemanager using GTK+, 100% GUI configurable BUILD_USES_MSGFMT= YES -GNU_CONFIGURE= YES -USE_BUILDLINK2= YES +GNU_CONFIGURE= YES +USE_BUILDLINK2= YES +USE_PKGINSTALL= YES USE_PKGLOCALEDIR= YES -USE_X11= YES +USE_X11= YES CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} @@ -24,5 +25,5 @@ CONF_FILES+= ${EGDIR}/gentoogtkrc ${PKG_SYSCONFDIR}/gentoogtkrc .include "../../devel/gettext-lib/buildlink2.mk" .include "../../x11/gtk/buildlink2.mk" -.include "../../mk/bsd.pkg.install.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/libirman/Makefile b/sysutils/libirman/Makefile index 0bef5b864ab..785715358a3 100644 --- a/sysutils/libirman/Makefile +++ b/sysutils/libirman/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2002/09/26 02:03:58 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2003/01/28 22:04:18 jlam Exp $ # DISTNAME= libirman-0.4.1b @@ -11,7 +11,8 @@ MAINTAINER= abs@netbsd.org HOMEPAGE= http://www.evation.com/libirman/libirman.html COMMENT= Programming library for Irman - infrared control -GNU_CONFIGURE= YES +USE_PKGINSTALL= YES +GNU_CONFIGURE= YES CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} EGDIR= ${PREFIX}/share/examples @@ -35,5 +36,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/libirman.README \ ${PREFIX}/share/doc/libirman.README -.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/rox-base/Makefile b/sysutils/rox-base/Makefile index 408d47d0504..932cb54a188 100644 --- a/sysutils/rox-base/Makefile +++ b/sysutils/rox-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/10/05 10:01:00 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2003/01/28 22:04:18 jlam Exp $ # DISTNAME= rox-base-1.0.2 @@ -14,6 +14,7 @@ COMMENT= Shared ROX resources DIST_SUBDIR= rox USE_BUILDLINK2= yes +USE_PKGINSTALL= yes NO_CONFIGURE= yes NO_BUILD= yes @@ -28,5 +29,4 @@ do-install: ${CP} -Rf ${WRKSRC}/Choices ${PREFIX}/share/rox ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/rox -.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/sysbuild/Makefile b/sysutils/sysbuild/Makefile index 231924508ce..54f760290bd 100644 --- a/sysutils/sysbuild/Makefile +++ b/sysutils/sysbuild/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2003/01/08 17:45:09 jmmv Exp $ +# $NetBSD: Makefile,v 1.12 2003/01/28 22:04:18 jlam Exp $ # DISTNAME= sysbuild-1.9 @@ -35,6 +35,7 @@ FILES_SUBST+= SYSBUILD_SRCGROUP=${SYSBUILD_SRCGROUP} FILES_SUBST+= EGDIR=${EGDIR} MESSAGE_SUBST+= SYSBUILD_USER=${SYSBUILD_USER} +USE_PKGINSTALL= yes DEINSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL INSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL @@ -66,5 +67,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/crontab ${EGDIR}/crontab ${INSTALL_DATA} ${WRKSRC}/profile ${EGDIR}/profile -.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/ups-nut-cgi/Makefile b/sysutils/ups-nut-cgi/Makefile index c652566c1b6..61e6b1d956e 100644 --- a/sysutils/ups-nut-cgi/Makefile +++ b/sysutils/ups-nut-cgi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2002/12/17 12:03:01 lukem Exp $ +# $NetBSD: Makefile,v 1.23 2003/01/28 22:04:19 jlam Exp $ DISTNAME= nut-1.2.1 PKGREVISION= 1 @@ -16,6 +16,7 @@ ALL_TARGET= cgi INSTALL_TARGET= install-cgi USE_BUILDLINK2= yes +USE_PKGINSTALL= yes USE_X11= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${NUT_CONFDIR} \ @@ -38,5 +39,4 @@ CONF_FILES+= ${NUT_EGDIR}/upsstats.html.sample \ ${NUT_CONFDIR}/upsstats.html .include "../../graphics/gd/buildlink2.mk" -.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/ups-nut/Makefile b/sysutils/ups-nut/Makefile index 5f7cb4822bb..f9e524d83b2 100644 --- a/sysutils/ups-nut/Makefile +++ b/sysutils/ups-nut/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2002/12/31 22:47:05 lukem Exp $ +# $NetBSD: Makefile,v 1.27 2003/01/28 22:04:19 jlam Exp $ # DISTNAME= nut-1.2.1 @@ -12,6 +12,7 @@ HOMEPAGE= http://www.exploits.org/nut/ COMMENT= Network UPS Tools USE_BUILDLINK2= yes +USE_PKGINSTALL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${NUT_CONFDIR} \ --with-user=${NUT_USER} \ @@ -71,5 +72,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/docs/cables/*.txt ${NUT_DOCDIR}/cables ${INSTALL_DATA} ${WRKSRC}/docs/drivers/*.txt ${NUT_DOCDIR}/drivers -.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile index bb7f51643ae..ca347c7682b 100644 --- a/sysutils/xcdroast/Makefile +++ b/sysutils/xcdroast/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2003/01/23 16:12:43 drochner Exp $ +# $NetBSD: Makefile,v 1.14 2003/01/28 22:04:20 jlam Exp $ DISTNAME= xcdroast-0.98alpha13 PKGNAME= xcdroast-0.98a13 @@ -14,9 +14,10 @@ DEPENDS+= cdrecord-xcdroast-0.98a13.*:../cdrecord-xcdroast .include "../../mk/bsd.prefs.mk" USE_BUILDLINK2= YES +USE_PKGINSTALL= YES USE_PKGLOCALEDIR= YES USE_X11= YES -GNU_CONFIGURE= yes +GNU_CONFIGURE= YES CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} .if ${_OPSYS_HAS_OSSAUDIO} == "yes" @@ -43,5 +44,5 @@ post-install: # gdk-pixbuf implies gtk, glib, gettext-lib .include "../../graphics/gdk-pixbuf/buildlink2.mk" .include "../../mk/ossaudio.buildlink2.mk" -.include "../../mk/bsd.pkg.install.mk" + .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3