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>.
author: jlam <jlam> 2003-01-28 22:03:00 +0000
committer: jlam <jlam> 2003-01-28 22:03:00 +0000
commit: d9bf9ebd1c4d0cf9334ca40c2f585d4d17f70bdf (patch)
tree: d3bbe0e3f34c0d0b96c3bf5abf2964293c181c7b /net
parent: ebed1329682fd1c81284e9ee1632af9b987050f0 (diff)
download: pkgsrc-d9bf9ebd1c4d0cf9334ca40c2f585d4d17f70bdf.tar.gz
29 files changed, 76 insertions, 79 deletions
diff --git a/net/arla/Makefile b/net/arla/Makefile
index 85a453a9903..555cacb9d29 100644
--- a/net/arla/Makefile
+++ b/net/arla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2003/01/14 12:00:08 wennmach Exp $
+# $NetBSD: Makefile,v 1.31 2003/01/28 22:03:48 jlam Exp $
 
 DISTNAME=		arla-0.35.12pre1
 #PKGREVISION=
@@ -15,9 +15,10 @@ CONFLICTS+=		rx-[0-9]*
 OSVERSION_SPECIFIC=	yes
 INFO_FILES=		arla.info
 
-USE_BUILDLINK2=		# defined
-USE_X11=		# defined
-GNU_CONFIGURE=		# defined
+USE_BUILDLINK2=		yes
+USE_PKGINSTALL=		yes
+USE_X11=		yes
+GNU_CONFIGURE=		yes
 
 .if exists(/usr/lib/libroken.a)
 CONFIGURE_ARGS+=	--with-krb4-lib=/usr/lib
@@ -66,5 +67,4 @@ post-install:
 	${INSTALL_DATA} ${FILESDIR}/fstab ${EGDIR}
 
 .include "../../mk/texinfo.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/bind8/Makefile b/net/bind8/Makefile
index b93cf224ef8..cfc6dee0e9b 100644
--- a/net/bind8/Makefile
+++ b/net/bind8/Makefile
@@ -1,5 +1,5 @@
 #
-# $NetBSD: Makefile,v 1.17 2002/12/07 21:35:10 cjep Exp $
+# $NetBSD: Makefile,v 1.18 2003/01/28 22:03:48 jlam Exp $
 #
 # FreeBSD Id: Makefile,v 1.12 1999/06/28 21:25:07 billf Exp
 #
@@ -21,6 +21,8 @@ BIND_VERSION=	8.3.4
 DIST_SUBDIR=	bind/${BIND_VERSION}
 EXTRACT_ONLY=	${DISTNAME}-src.tar.gz ${DISTNAME}-doc.tar.gz
 
+USE_PKGINSTALL=	yes
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "Linux"
@@ -47,5 +49,4 @@ post-install:
 	(cd ${WRKDIR}/doc/html/; tar Bpcf - .) | (cd ${PREFIX}/share/doc/bind8; tar Bpxf -)
 	${INSTALL_SCRIPT} ${WRKDIR}/named.sh ${PREFIX}/etc/rc.d/named
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/bpalogin/Makefile b/net/bpalogin/Makefile
index 7f12e3f188a..70da9482d72 100644
--- a/net/bpalogin/Makefile
+++ b/net/bpalogin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/11/21 10:02:56 grant Exp $
+# $NetBSD: Makefile,v 1.3 2003/01/28 22:03:49 jlam Exp $
 #
 
 DISTNAME=	bpalogin-2.0.1-src
@@ -15,6 +15,7 @@ WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 
 ALL_TARGET=	bpalogin
 
+USE_PKGINSTALL=	yes
 CONF_FILES+=	${PREFIX}/share/examples/bpalogin/bpalogin.conf \
 		${PKG_SYSCONFDIR}/bpalogin.conf
 RCD_SCRIPTS=	bpalogin
@@ -25,5 +26,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/bpalogin.conf				\
 		${PREFIX}/share/examples/bpalogin
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/chrony/Makefile b/net/chrony/Makefile
index fc784763bda..755cc720ac6 100644
--- a/net/chrony/Makefile
+++ b/net/chrony/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/10/25 17:59:54 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2003/01/28 22:03:49 jlam Exp $
 
 DISTNAME=	chrony-1.17
 CATEGORIES=	net
@@ -9,6 +9,7 @@ HOMEPAGE=	http://chrony.sunsite.dk/index.php
 COMMENT=	Daemon for maintaining the accuracy of computer clocks
 
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 HAS_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 
@@ -32,5 +33,4 @@ post-install:
 
 .include "../../devel/readline/buildlink2.mk"
 .include "../../devel/ncurses/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/coda5_client/Makefile b/net/coda5_client/Makefile
index 184fb7a2e0b..4cc837cab12 100644
--- a/net/coda5_client/Makefile
+++ b/net/coda5_client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2002/09/18 21:15:13 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2003/01/28 22:03:49 jlam Exp $
 
 PKGNAME=	coda-client-${DIST_VERS}
 COMMENT=	client programs for a replicated high-performance network file system
@@ -8,6 +8,7 @@ COMMENT=	client programs for a replicated high-performance network file system
 ALL_TARGET=		coda
 INSTALL_TARGET=		client-install
 
+USE_PKGINSTALL=	yes
 CONF_FILES+=	${EGDIR}/sidekick.intr.ex ${PKG_SYSCONFDIR}/sidekick.intr
 CONF_FILES+=	${EGDIR}/venus.conf.ex ${PKG_SYSCONFDIR}/venus.conf
 
@@ -24,5 +25,4 @@ post-install:
 				-e "s|venus-au\.8|au.8|"`
 	${LN} -sf venus-au.8 ${PREFIX}/man/man8/au.8
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/coda5_server/Makefile b/net/coda5_server/Makefile
index 427a68ce29d..9c1ade83e60 100644
--- a/net/coda5_server/Makefile
+++ b/net/coda5_server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2002/09/18 21:15:14 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2003/01/28 22:03:50 jlam Exp $
 
 PKGNAME=	coda-server-${DIST_VERS}
 COMMENT=	server programs for a replicated high-performance network file system
@@ -8,6 +8,7 @@ COMMENT=	server programs for a replicated high-performance network file system
 ALL_TARGET=		coda
 INSTALL_TARGET=		server-install
 
+USE_PKGINSTALL=	yes
 CONF_FILES+=	${EGDIR}/server.conf.ex ${PKG_SYSCONFDIR}/server.conf
 
 post-install:
@@ -19,5 +20,4 @@ post-install:
 			${SED}	-e "s|^|usr/|"				\
 				-e "s|vice-au\.8|au.8|"`
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ddclient/Makefile b/net/ddclient/Makefile
index 7a77235170c..4115fc9ae06 100644
--- a/net/ddclient/Makefile
+++ b/net/ddclient/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/09/19 09:04:15 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2003/01/28 22:03:50 jlam Exp $
 
 DISTNAME=	ddclient-3.6.2
 CATEGORIES=	net
@@ -9,6 +9,7 @@ HOMEPAGE=	http://burry.ca:4141/ddclient/
 COMMENT=	Client to update dynamic DNS entries
 
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 
 DOCDIR=			${PREFIX}/share/doc/ddclient
 EGDIR=			${PREFIX}/share/examples/ddclient
@@ -40,6 +41,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/sample-* ${EGDIR}
 
 .include "../../lang/perl5/buildlink2.mk"
-
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/dhid/Makefile b/net/dhid/Makefile
index c20112d8c55..01726e2e46d 100644
--- a/net/dhid/Makefile
+++ b/net/dhid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/09/23 07:07:02 grant Exp $
+# $NetBSD: Makefile,v 1.9 2003/01/28 22:03:50 jlam Exp $
 #
 
 DISTNAME=	dhid-4.0.1
@@ -11,6 +11,7 @@ COMMENT=	Dynamic Host Information System client daemon
 
 DEPENDS+=	gmp-[0-9]*:../../devel/gmp
 
+USE_PKGINSTALL=	yes
 RCD_SCRIPTS=	dhid
 
 do-install:
@@ -23,5 +24,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/WHATSNEW ${PREFIX}/share/doc/dhid
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/dhid
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ipa/Makefile b/net/ipa/Makefile
index d7f117ae4b4..3afd26b3a28 100644
--- a/net/ipa/Makefile
+++ b/net/ipa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/01/09 17:38:36 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2003/01/28 22:03:51 jlam Exp $
 
 DISTNAME=	ipa-1.3
 CATEGORIES=	net sysutils
@@ -18,7 +18,8 @@ NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_PACKAGE=		${RESTRICTED}
 
-USE_BUILDLINK2=		# defined
+USE_BUILDLINK2=		yes
+USE_PKGINSTALL=		yes
 ALL_TARGET=		NetBSD
 
 CFLAGS+=		-DCFGFILE=\\\"${PKG_SYSCONFDIR}/ipa.conf\\\"
@@ -31,5 +32,4 @@ RCD_SCRIPTS=		ipa
 pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ipa
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ja-samba/Makefile b/net/ja-samba/Makefile
index 4a7076c9822..ca0bf0cf92d 100644
--- a/net/ja-samba/Makefile
+++ b/net/ja-samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/01/10 07:43:31 cjep Exp $
+# $NetBSD: Makefile,v 1.9 2003/01/28 22:03:51 jlam Exp $
 
 DISTNAME=		samba-${SAMBA_BASE_VERSION}-ja-${SAMBA_JA_VERSION}
 PKGNAME=		ja-samba-${SAMBA_BASE_VERSION}.${SAMBA_JA_VERSION}
@@ -16,11 +16,12 @@ SAMBA_BASE_VERSION=	2.2.4
 SAMBA_JA_VERSION=	1.0
 CONFLICTS+=		samba-[0-9]*
 
-GNU_CONFIGURE=		# defined
-USE_LIBTOOL=		# defined
+GNU_CONFIGURE=		YES
+USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
-USE_BUILDLINK2=		# defined
+USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 USE_PKGLOCALEDIR=	YES
 USE_GNU_READLINE=	# uses rl_event_hook interface to GNU readline
 
@@ -147,5 +148,4 @@ post-install:
 .include "../../devel/readline/buildlink2.mk"
 .include "../../security/openssl/buildlink2.mk"
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/jwhois/Makefile b/net/jwhois/Makefile
index 286591ba93e..6c722bc9de2 100644
--- a/net/jwhois/Makefile
+++ b/net/jwhois/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2003/01/10 07:43:57 cjep Exp $
+# $NetBSD: Makefile,v 1.22 2003/01/28 22:03:52 jlam Exp $
 #
 
 DISTNAME=		jwhois-3.2.0
@@ -9,9 +9,10 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.gnu.org/software/jwhois/
 COMMENT=		Configurable WHOIS client
 
-USE_BUILDLINK2=		# defined
+USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 USE_PKGLOCALEDIR=	YES
-GNU_CONFIGURE=		# defined
+GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--localstatedir=/var/db
 CONFIGURE_ARGS+=	--with-cache
@@ -26,7 +27,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/example/jwhois.conf ${PREFIX}/share/examples
 
 .include "../../devel/gettext-lib/buildlink2.mk"
-
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/lambdamoo/Makefile b/net/lambdamoo/Makefile
index 04040b5aaee..28c4da2f4e9 100644
--- a/net/lambdamoo/Makefile
+++ b/net/lambdamoo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/01/13 13:33:57 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/01/28 22:03:52 jlam Exp $
 
 DISTNAME=		LambdaMOO-1.8.1
 PKGNAME=		lambdamoo-1.8.1
@@ -18,6 +18,7 @@ LAMBDAMOO_USER?=	lambdamoo
 LAMBDAMOO_GROUP?=	lambdamoo
 LAMBDAMOO_HOME?=	${PREFIX}/share/${LAMBDAMOO_USER}
 
+USE_PKGINSTALL=		yes
 PKG_GROUPS=		${LAMBDAMOO_GROUP}
 PKG_USERS=		${LAMBDAMOO_USER}:${LAMBDAMOO_GROUP}
 _PKG_USER_HOME=		${LAMBDAMOO_HOME}
@@ -50,5 +51,4 @@ post-install:
 	${CHOWN} -R ${LAMBDAMOO_USER}:${LAMBDAMOO_GROUP} ${LAMBDAMOO_HOME}
 	${CHMOD} u+w ${LAMBDAMOO_HOME}
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/lftp/Makefile b/net/lftp/Makefile
index 8e5ebba163b..a80fe472787 100644
--- a/net/lftp/Makefile
+++ b/net/lftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2002/08/25 21:50:01 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2003/01/28 22:03:52 jlam Exp $
 
 DISTNAME=	lftp-2.5.2
 CATEGORIES=	net
@@ -14,6 +14,7 @@ GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-ssl=${SSLBASE} \
 			--sysconfdir=${PKG_SYSCONFDIR}
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
@@ -35,5 +36,4 @@ post-install:
 .include "../../devel/readline/buildlink2.mk"
 .include "../../security/openssl/buildlink2.mk"
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile
index 1975410a5b0..f5e5269b27a 100644
--- a/net/net-snmp/Makefile
+++ b/net/net-snmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/10/24 09:34:07 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2003/01/28 22:03:53 jlam Exp $
 
 DISTNAME=	net-snmp-5.0.6
 CATEGORIES=	net
@@ -21,15 +21,16 @@ NET_SNMP_LOGFILE?=		/var/log/snmpd.log
 NET_SNMP_PERSISTENTDIR?=	/var/net-snmp
 NET_SNMP_MIBDIRS?=		\$$HOME/.snmp/mibs:${PREFIX}/share/snmp/mibs
 
-USE_BUILDLINK2=		# defined
-USE_LIBTOOL=		# defined
+USE_BUILDLINK2=		yes
+USE_PKGINSTALL=		yes
+USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 .if (${OPSYS} == "NetBSD")
 CFLAGS+=		-Dnetbsd1
 .endif
 
-GNU_CONFIGURE=		# defined
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-shared
 .if defined(USE_INET6) && (${USE_INET6} == "YES")
 CONFIGURE_ARGS+=	--enable-ipv6
@@ -95,5 +96,4 @@ post-install:
 .include "../../security/openssl/buildlink2.mk"
 .include "../../security/tcp_wrappers/buildlink2.mk"
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index a21c27eda96..5d5eb8f028e 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2002/09/30 09:25:22 abs Exp $
+# $NetBSD: Makefile,v 1.20 2003/01/28 22:03:53 jlam Exp $
 
 DISTNAME=	netatalk-1.5.5
 CATEGORIES=	net print
@@ -10,6 +10,7 @@ HOMEPAGE=	http://sourceforge.net/projects/netatalk/
 COMMENT=	Netatalk appletalk file and print services
 
 GNU_CONFIGURE=	YES
+USE_PKGINSTALL=	YES
 USE_GMAKE=	YES
 USE_PERL5=	YES
 USE_LIBTOOL=	YES
@@ -39,5 +40,4 @@ pre-install:
 					${PREFIX}/share/examples/netatalk/
 .endfor
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/netsaint-base/Makefile b/net/netsaint-base/Makefile
index 2c7ec9edac8..e51a14f3c11 100644
--- a/net/netsaint-base/Makefile
+++ b/net/netsaint-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2002/08/25 21:50:06 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2003/01/28 22:03:54 jlam Exp $
 #
 
 DISTNAME=		netsaint-0.0.7
@@ -10,7 +10,8 @@ MAINTAINER=		murray@river-styx.org
 HOMEPAGE=		http://www.netsaint.org/
 COMMENT=		network monitor
 
-USE_BUILDLINK2=		# defined
+USE_BUILDLINK2=		yes
+USE_PKGINSTALL=		yes
 
 .include "../../net/netsaint-base/Makefile.common"
 
@@ -34,6 +35,4 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/sblogo.gif ${PREFIX}/share/netsaint/images
 
 .include "../../graphics/gd/buildlink2.mk"
-
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/openh323/Makefile b/net/openh323/Makefile
index 42225b0c6e8..c7614b8d950 100644
--- a/net/openh323/Makefile
+++ b/net/openh323/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/12/23 15:05:34 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2003/01/28 22:03:54 jlam Exp $
 #
 
 DISTNAME=	openh323_1.10.4
@@ -20,6 +20,7 @@ WRKSRC=		${WRKDIR}/openh323
 MAKE_ENV+=	PWLIBDIR=${PREFIX} OPENH323DIR=${WRKSRC}
 
 USE_BUILDLINK2=	yes
+USE_PKGINSTALL=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 ALL_TARGET=	opt
@@ -46,5 +47,4 @@ do-install:
 
 .include "../../devel/pwlib/buildlink2.mk"
 .include "../../mk/pthread.buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/openslp/Makefile b/net/openslp/Makefile
index 8190c895d1f..cc045c89e9e 100644
--- a/net/openslp/Makefile
+++ b/net/openslp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/12/19 20:33:21 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2003/01/28 22:03:54 jlam Exp $
 
 DISTNAME=	openslp-1.0.10
 CATEGORIES=	net
@@ -9,6 +9,7 @@ HOMEPAGE=	http://www.openslp.org/
 COMMENT=	Open-source implementation of the Service Location Protocol
 
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--localstatedir=/var
@@ -42,5 +43,4 @@ post-install:
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCDIR} ${HTMLDIR}
 	${CHMOD} -R a+rx,a-w ${DOCDIR} ${HTMLDIR}
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/pureftpd/Makefile b/net/pureftpd/Makefile
index ead2b1c98e7..568afc07e6b 100644
--- a/net/pureftpd/Makefile
+++ b/net/pureftpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/01/16 09:14:51 grant Exp $
+# $NetBSD: Makefile,v 1.8 2003/01/28 22:03:55 jlam Exp $
 #
 
 DISTNAME=	pure-ftpd-1.0.12
@@ -10,6 +10,7 @@ MAINTAINER=	dawszy@arhea.net
 HOMEPAGE=	http://www.pureftpd.org/
 COMMENT=	FTP daemon with optional SQL support
 
+USE_PKGINSTALL=	YES
 GNU_CONFIGURE=	YES
 
 CONFIGURE_ARGS+=	--with-sysquotas	\
@@ -26,5 +27,4 @@ BUILD_DEFS+=	PURE_FTPD_USE_MYSQL
 
 RCD_SCRIPTS=	pure_ftpd
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/rp-pppoe/Makefile b/net/rp-pppoe/Makefile
index 0c6d9d33a09..9be73d9ff5f 100644
--- a/net/rp-pppoe/Makefile
+++ b/net/rp-pppoe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2003/01/16 09:27:59 grant Exp $
+# $NetBSD: Makefile,v 1.21 2003/01/28 22:03:55 jlam Exp $
 
 DISTNAME=	rp-pppoe-3.5
 CATEGORIES=	net
@@ -11,6 +11,7 @@ COMMENT=	Roaring Penguin's PPP over Ethernet client
 
 CONFLICTS+=	mouse_pppoe<20000912nb1
 
+USE_PKGINSTALL=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ENV+=	PPPD=${PPPD}
 
@@ -24,5 +25,4 @@ post-install:
 	${INSTALL_DATA} pppoe.conf pppoe-server-options \
 	  ${PREFIX}/share/examples/rp-pppoe
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 007e2248786..7d1bfd1e383 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2002/11/21 08:09:07 martti Exp $
+# $NetBSD: Makefile,v 1.93 2003/01/28 22:03:55 jlam Exp $
 
 .include "Makefile.common"
 
@@ -6,7 +6,8 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.samba.org/
 COMMENT=		SMB/CIFS protocol server suite for UNIX
 
-USE_BUILDLINK2=		# defined
+USE_BUILDLINK2=		yes
+USE_PKGINSTALL=		yes
 
 USE_GNU_READLINE=	# uses rl_event_hook interface to GNU readline
 CONFIGURE_ARGS+=	--with-readline
@@ -90,5 +91,4 @@ post-install:
 .include "../../devel/readline/buildlink2.mk"
 .include "../../security/openssl/buildlink2.mk"
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/samba20/Makefile b/net/samba20/Makefile
index 9a3b05e9a2a..23f41de292f 100644
--- a/net/samba20/Makefile
+++ b/net/samba20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/09/19 09:04:18 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2003/01/28 22:03:56 jlam Exp $
 
 DISTNAME=		samba-2.0.10
 WRKSRC=			${WRKDIR}/${DISTNAME}/source
@@ -11,9 +11,10 @@ MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://www.samba.org/
 COMMENT=		SMB/CIFS protocol server suite for UNIX
 
-BUILD_USES_MSGFMT=	# defined
-GNU_CONFIGURE=		# defined
-USE_BUILDLINK2=		# defined
+BUILD_USES_MSGFMT=	yes
+GNU_CONFIGURE=		yes
+USE_BUILDLINK2=		yes
+USE_PKGINSTALL=		yes
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -91,5 +92,4 @@ post-install:
 .include "../../devel/readline/buildlink2.mk"
 .include "../../security/openssl/buildlink2.mk"
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/socks5/Makefile b/net/socks5/Makefile
index 0fa3376e526..42031188e97 100644
--- a/net/socks5/Makefile
+++ b/net/socks5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2002/10/02 13:27:11 grant Exp $
+# $NetBSD: Makefile,v 1.26 2003/01/28 22:03:56 jlam Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/08/28 06:49:06 obrien Exp
 #
 
@@ -29,6 +29,7 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 #			--with-passwd
 
 USE_BUILDLINK2=		yes
+USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--with-libconffile=${PREFIX}/etc/libsocks5.conf \
 			--with-srvconffile=${PREFIX}/etc/socks5.conf \
@@ -44,5 +45,4 @@ post-install:
 	${LN} -sf libsocks5_sh.so.0.0 ${PREFIX}/lib/libsocks5_sh.so.0
 	${LN} -sf libsocks5_sh.so.0.0 ${PREFIX}/lib/libsocks5_sh.so
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/speedtouch/Makefile b/net/speedtouch/Makefile
index 1981eb247fd..8848a15143b 100644
--- a/net/speedtouch/Makefile
+++ b/net/speedtouch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/09/19 09:04:19 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/01/28 22:03:56 jlam Exp $
 #
 
 DISTNAME=	speedtouch-1.1
@@ -13,6 +13,7 @@ COMMENT=	Alcatel SpeedTouch USB ADSL modem driver
 
 DEPENDS+=	userppp-001107:../../net/userppp
 
+USE_PKGINSTALL=	yes
 GNU_CONFIGURE=	yes
 
 RCD_SCRIPTS=	adsl
@@ -20,5 +21,4 @@ RCD_SCRIPTS=	adsl
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/mgmt/mgmt.o ${PREFIX}/libdata/alcaudsl.sys
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/tspc/Makefile b/net/tspc/Makefile
index 6fd0794f6dd..e11be87a7eb 100644
--- a/net/tspc/Makefile
+++ b/net/tspc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/08/22 18:14:51 grant Exp $
+# $NetBSD: Makefile,v 1.2 2003/01/28 22:03:57 jlam Exp $
 #
 
 DISTNAME=	freenet6-0.9.6
@@ -11,6 +11,7 @@ MAINTAINER=	grant@netbsd.org
 HOMEPAGE=	http://www.freenet6.net/
 COMMENT=	freenet6 IPv6 tunnel server protocol client
 
+USE_PKGINSTALL=		yes
 NO_CONFIGURE=		yes
 INTERACTIVE_STAGE=	fetch
 ONLY_FOR_PLATFORM=	NetBSD-*-* Linux-*-* SunOS-5.[8-9]-*
@@ -63,5 +64,4 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/template/${template} ${PREFIX}/share/tspc/template
 .endfor
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/userppp/Makefile b/net/userppp/Makefile
index 19de1a15dec..1fd09784e6b 100644
--- a/net/userppp/Makefile
+++ b/net/userppp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/08/12 12:14:40 agc Exp $
+# $NetBSD: Makefile,v 1.10 2003/01/28 22:03:57 jlam Exp $
 
 DISTNAME=		ppp-001107.src
 PKGNAME=		userppp-001107
@@ -27,7 +27,7 @@ post-patch:
 USERPPP_GROUP?=	network
 BUILD_DEFS+=	USERPPP_GROUP
 
+USE_PKGINSTALL=	yes
 PKG_GROUPS=	${USERPPP_GROUP}
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/vtun/Makefile b/net/vtun/Makefile
index 201c31e7eeb..e0adacf2388 100644
--- a/net/vtun/Makefile
+++ b/net/vtun/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2002/08/25 21:50:18 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2003/01/28 22:03:57 jlam Exp $
 
 DISTNAME=	vtun-2.5
 CATEGORIES=	net
@@ -9,6 +9,7 @@ HOMEPAGE=	http://vtun.sourceforge.net/
 COMMENT=	Virtual Tunnels over TCP/IP networks with traffic shaping
 
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--localstatedir=/var
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
@@ -52,5 +53,4 @@ do-install:
 .include "../../devel/zlib/buildlink2.mk"
 .include "../../security/openssl/buildlink2.mk"
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/wget/Makefile b/net/wget/Makefile
index 815d9b613ad..cec0f3546db 100644
--- a/net/wget/Makefile
+++ b/net/wget/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2002/12/17 15:57:31 tron Exp $
+# $NetBSD: Makefile,v 1.57 2003/01/28 22:03:57 jlam Exp $
 
 DISTNAME=	wget-1.8.2
 CATEGORIES=	net
@@ -12,6 +12,7 @@ USE_PERL5=	build
 
 BUILD_USES_MSGFMT=	YES
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 
 USE_GMAKE=		YES
 GNU_CONFIGURE=		YES
@@ -35,7 +36,5 @@ CONFIGURE_ARGS+=--with-ssl=${SSLBASE}
 CONFIGURE_ARGS+=--with-ssl=${SSLBASE}
 
 .include "../../devel/gettext-lib/buildlink2.mk"
-
 .include "../../mk/texinfo.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ytalk/Makefile b/net/ytalk/Makefile
index 63fae7f0177..c8813f4ca96 100644
--- a/net/ytalk/Makefile
+++ b/net/ytalk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/12/22 19:39:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2003/01/28 22:03:58 jlam Exp $
 
 DISTNAME=       ytalk-3.1.1
 PKGREVISION=	1
@@ -11,11 +11,11 @@ COMMENT=	Multi-user replacement for UNIX talk
 
 GNU_CONFIGURE=	yes
 USE_X11=	yes
+USE_PKGINSTALL=	yes
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
 EGDIR=		${PREFIX}/share/examples/ytalk
 CONF_FILES=	${EGDIR}/ytalkrc ${PKG_SYSCONFDIR}/ytalkrc
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
author	jlam <jlam>	2003-01-28 22:03:00 +0000
committer	jlam <jlam>	2003-01-28 22:03:00 +0000
commit	d9bf9ebd1c4d0cf9334ca40c2f585d4d17f70bdf (patch)
tree	d3bbe0e3f34c0d0b96c3bf5abf2964293c181c7b /net
parent	ebed1329682fd1c81284e9ee1632af9b987050f0 (diff)
download	pkgsrc-d9bf9ebd1c4d0cf9334ca40c2f585d4d17f70bdf.tar.gz