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 <jmmv at menta.net>.

5 files changed, 17 insertions, 16 deletions

diff --git a/comms/conserver/Makefile b/comms/conserver/Makefile
index f1677339814..942390c5665 100644
--- a/comms/conserver/Makefile
+++ b/comms/conserver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/09/21 10:12:30 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/01/28 22:03:08 jlam Exp $
 # FreeBSD Id: ports/comms/conserver-com/Makefile,v 1.1 2001/12/09 14:40:12 kur iyama Exp
 
 DISTNAME=      conserver-7.2.1
@@ -10,6 +10,7 @@ HOMEPAGE=      http://www.conserver.com/
 COMMENT=       Application that allows multiple users to watch serial consoles
 
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
@@ -31,6 +32,4 @@ pre-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 
 .include "../../security/tcp_wrappers/buildlink2.mk"
-
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/efax-gtk/Makefile b/comms/efax-gtk/Makefile
index 45516cde508..7cc7effecfc 100644
--- a/comms/efax-gtk/Makefile
+++ b/comms/efax-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/12/25 13:18:24 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/01/28 22:03:08 jlam Exp $
 
 DISTNAME=		efax-gtk-1.0.1b.src
 PKGNAME=		efax-gtk-1.0.1b
@@ -16,6 +16,7 @@ DEPENDS+=		efax>=0.9:../../comms/efax
 WRKSRC=			${WRKDIR}/efax-gtk
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2= 	YES
+USE_PKGINSTALL=		YES
 
 CONFIGURE_ARGS+=	--with-spooldir=/var/spool/efax
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
@@ -34,5 +35,5 @@ pre-install:
 .include "../../devel/libsigc++/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
 .include "../../x11/gtk--/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/fidogate/Makefile b/comms/fidogate/Makefile
index 6daa8b65519..4cead14a2f5 100644
--- a/comms/fidogate/Makefile
+++ b/comms/fidogate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2002/11/14 23:55:33 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2003/01/28 22:03:09 jlam Exp $
 #
 
 DISTNAME=	fidogate-4.4.5
@@ -9,8 +9,9 @@ MAINTAINER=	tv@pobox.com
 HOMEPAGE=	http://www.fidogate.org/
 COMMENT=	FidoNet (FTN) <-> Internet mail and news gateway
 
-USE_BUILDLINK2=		# defined
-USE_GMAKE=		# defined
+USE_BUILDLINK2=		yes
+USE_PKGINSTALL=		yes
+USE_GMAKE=		yes
 MAKE_ENV=		DEBUG="${CFLAGS} -Werror"
 BUILDLINK_SETENV.CC=	CC="cc ${_STRIPFLAG_CC}"
 
@@ -63,5 +64,4 @@ post-install:
 
 .include "../../lang/perl5/buildlink2.mk"
 .include "../../mk/texinfo.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile
index 20a326b62ad..51641c3c287 100644
--- a/comms/hylafax/Makefile
+++ b/comms/hylafax/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2002/09/19 09:04:06 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2003/01/28 22:03:09 jlam Exp $
 #
 
 DISTNAME=	hylafax-4.1
@@ -19,6 +19,8 @@ DIST_SUBDIR=	hylafax
 
 CONFLICTS=	mgetty-[0-9]*
 
+USE_PKGINSTALL=	yes
+
 FAXUSER?=	uucp
 FAXGROUP?=	dialer
 RCD_SCRIPTS=	hylafax
@@ -36,5 +38,4 @@ post-install:
 	${CHMOD} 4555 ${SUID_EXES}
 
 .include "../../mk/ghostscript.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile
index 6f173cbb05e..49b7b6925f1 100644
--- a/comms/minicom/Makefile
+++ b/comms/minicom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2002/12/23 16:15:03 cjep Exp $
+# $NetBSD: Makefile,v 1.27 2003/01/28 22:03:10 jlam Exp $
 # FreeBSD Id: Makefile,v 1.13 1998/01/03 10:58:40 obrien Exp
 #
 
@@ -16,9 +16,10 @@ BUILD_USES_MSGFMT=	yes
 DEPENDS+=	gkermit-[0-9]*:../../comms/gkermit
 DEPENDS+=	lrzsz-[0-9]*:../../comms/lrzsz
 
-USE_BUILDLINK2=		# defined
-USE_GMAKE=		# defined
-NO_CONFIGURE=		# defined
+USE_BUILDLINK2=		yes
+USE_PKGINSTALL=		yes
+USE_GMAKE=		yes
+NO_CONFIGURE=		yes
 
 WRKSRC=			${WRKDIR}/${PKGNAME}/src
 PKG_SYSCONFSUBDIR=	minicom
@@ -41,5 +42,4 @@ pre-install:
 .endif
 
 .include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"