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, 12 deletions

diff --git a/chat/bitchx/Makefile b/chat/bitchx/Makefile
index c8b3173b907..5ca6fbad3df 100644
--- a/chat/bitchx/Makefile
+++ b/chat/bitchx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2002/12/23 14:09:53 grant Exp $
+# $NetBSD: Makefile,v 1.14 2003/01/28 22:03:06 jlam Exp $
 
 DISTNAME=	ircii-pana-1.0c18
 PKGNAME=	bitchx-1.0.3.18
@@ -14,6 +14,7 @@ HOMEPAGE=	http://www.bitchx.org/
 COMMENT=	IRC client based on ircII
 
 USE_BUILDLINK2=		yes
+USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-ssl
 
@@ -51,5 +52,5 @@ post-install:
 
 .include "../../devel/ncurses/buildlink2.mk"
 .include "../../security/openssl/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/gale/Makefile b/chat/gale/Makefile
index 3c66dbce99e..bd2c9f9d75c 100644
--- a/chat/gale/Makefile
+++ b/chat/gale/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/10/09 17:58:39 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2003/01/28 22:03:06 jlam Exp $
 #
 
 DISTNAME=	gale-0.99a
@@ -10,6 +10,7 @@ HOMEPAGE=	http://gale.org
 COMMENT=	secure instant messaging system
 
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 USE_GNU_READLINE=	# needs rl_named_function()
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig ${WRKSRC}/liboopltconfig
@@ -49,5 +50,5 @@ post-install:
 .include "../../net/adns/buildlink2.mk"
 .include "../../security/rsaref/buildlink2.mk"
 .include "../../www/libwww/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/irssi/Makefile b/chat/irssi/Makefile
index 277b69e8c68..cd48e459fd7 100644
--- a/chat/irssi/Makefile
+++ b/chat/irssi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/01/12 17:56:05 veego Exp $
+# $NetBSD: Makefile,v 1.18 2003/01/28 22:03:07 jlam Exp $
 
 DISTNAME=		${IRSSI_DISTNAME}
 PKGREVISION=		1
@@ -17,6 +17,7 @@ BUILD_DEFS+=		USE_INET6
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
+USE_PKGINSTALL=		yes
 
 CONFIGURE_ARGS+=	--with-terminfo \
 			--enable-ipv6 \
@@ -47,5 +48,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/irssi-config ${IRSSI_CONFIG}
 
 .include "../../devel/glib/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/silc-client/Makefile b/chat/silc-client/Makefile
index 13be9c9e344..32a63bf5eed 100644
--- a/chat/silc-client/Makefile
+++ b/chat/silc-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2003/01/26 14:35:07 salo Exp $
+# $NetBSD: Makefile,v 1.22 2003/01/28 22:03:07 jlam Exp $
 
 DISTNAME=		silc-client-0.9.11
 CATEGORIES=		chat security
@@ -13,10 +13,12 @@ MAINTAINER=		salo@netbsd.org
 HOMEPAGE=		http://www.silcnet.org/
 COMMENT=                Client for the Secure Internet Live Conferencing (SILC) protocol
 
+USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
+
 GNU_CONFIGURE=		YES
 USE_GMAKE=		YES
 USE_GNU_ICONV=		YES
-USE_BUILDLINK2=		YES
 USE_LIBTOOL=		YES
 SHLIBTOOL_OVERRIDE=	${WRKSRC}/libtool ${WRKSRC}/irssi/libtool \
 			${WRKSRC}/lib/silcmath/mpi/libtool
@@ -80,5 +82,5 @@ PLIST_SRC+=		${PKGDIR}/PLIST
 
 .include "../../converters/libiconv/buildlink2.mk"
 .include "../../devel/glib/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/silc-server/Makefile b/chat/silc-server/Makefile
index 88551c0afd9..6ae5ab89c0f 100644
--- a/chat/silc-server/Makefile
+++ b/chat/silc-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2003/01/26 14:10:44 salo Exp $
+# $NetBSD: Makefile,v 1.21 2003/01/28 22:03:07 jlam Exp $
 
 DISTNAME=		silc-server-0.9.12
 CATEGORIES=		chat security
@@ -13,9 +13,11 @@ MAINTAINER=		salo@netbsd.org
 HOMEPAGE=		http://www.silcnet.org/
 COMMENT=                Server for the Secure Internet Live Conferencing (SILC) protocol
 
+USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
+
 GNU_CONFIGURE=		YES
 USE_GMAKE=		YES
-USE_BUILDLINK2=		YES
 USE_LIBTOOL=		YES
 SHLIBTOOL_OVERRIDE=	${WRKSRC}/libtool ${WRKSRC}/lib/silcmath/mpi/libtool
 
@@ -76,5 +78,4 @@ post-install:
 		> ${PREFIX}/share/examples/silcd/motd.txt.default
 
 .include "../../devel/glib/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"