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>.

19 files changed, 43 insertions, 44 deletions

diff --git a/www/analog/Makefile b/www/analog/Makefile
index aced0546e8d..88c3d11fa7b 100644
--- a/www/analog/Makefile
+++ b/www/analog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2003/01/11 15:23:43 tron Exp $
+# $NetBSD: Makefile,v 1.38 2003/01/28 22:04:25 jlam Exp $
 
 DISTNAME=       analog-5.31
 CATEGORIES=	www
@@ -16,6 +16,7 @@ MAKE_ENV+=	PREFIX=${PREFIX} SYSCONFDIR=${PKG_SYSCONFDIR}
 WRKDISTDIR=	${WRKDIR}/${DISTNAME}
 WRKSRC=		${WRKDISTDIR}/src
 
+USE_PKGINSTALL=	yes
 EGDIR=		${PREFIX}/share/examples
 CONF_FILES=	${EGDIR}/analog.cfg ${PKG_SYSCONFDIR}/analog.cfg
 
@@ -31,5 +32,4 @@ do-install:
 	${INSTALL_DATA} -m 644 ${WRKDISTDIR}/analog.cfg \
 	  ${PREFIX}/share/examples/analog.cfg
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-ruby/Makefile b/www/ap-ruby/Makefile
index 9a8a1f0ed81..12b1ef0e3b9 100644
--- a/www/ap-ruby/Makefile
+++ b/www/ap-ruby/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/10/25 12:58:27 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2003/01/28 22:04:25 jlam Exp $
 #
 
 DISTNAME=	mod_ruby-${VERSION}
@@ -11,6 +11,7 @@ HOMEPAGE=	http://www.modruby.net/
 COMMENT=	Apache module that embeds Ruby interpreter within
 
 USE_BUILDLINK2=	YES
+USE_PKGINSTALL=	YES
 DIST_SUBDIR=	ruby
 USE_RUBY=	YES
 RUBY_REQD=	1.6
@@ -47,5 +48,5 @@ post-install:
 .include "../../lang/ruby-base/buildlink2.mk"
 .include "../../textproc/ruby-eruby/buildlink2.mk"
 .include "../../www/apache/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile
index 4eac9b11ff1..267a6b4b985 100644
--- a/www/ap-ssl/Makefile
+++ b/www/ap-ssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2002/11/19 23:03:53 jlam Exp $
+# $NetBSD: Makefile,v 1.66 2003/01/28 22:04:26 jlam Exp $
 
 DISTNAME=		mod_ssl-2.8.12-1.3.27
 PKGNAME=		ap-ssl-2.8.12
@@ -17,6 +17,7 @@ CONFLICTS=		apache-1.3.[0-9] apache-*modssl-[0-9]* apache6-[0-9]*
 BUILDLINK_DEPENDS.apache=	apache>=1.3.27nb1
 
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 APACHE_MODULE=		YES
 
 GNU_CONFIGURE=		YES
@@ -100,5 +101,4 @@ post-install:
 .include "../../security/openssl/buildlink2.mk"
 .include "../../www/apache/buildlink2.mk"
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/apache/Makefile b/www/apache/Makefile
index 24b0dc28069..05e3ea8c45f 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.119 2003/01/27 11:10:27 abs Exp $
+# $NetBSD: Makefile,v 1.120 2003/01/28 22:04:26 jlam Exp $
 #
 # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of
 # code hooks that allow mod_ssl to be compiled separately later, if desired).
@@ -37,6 +37,7 @@ CONFLICTS=		apache-*ssl-[0-9]* apache6-[0-9]*
 
 EXTRACT_ONLY=		${DISTFILES:N*.gif}
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 HAS_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-layout="${WRKDIR}/config.layout:pkgsrc"
 CONFIGURE_ARGS+=	--enable-module=most				\
@@ -207,5 +208,4 @@ post-install:
 .include "../../devel/libmm/buildlink2.mk"
 .include "../../textproc/expat/buildlink2.mk"
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index a971039f8ac..56ddcec2da6 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/01/28 14:21:56 martti Exp $
+# $NetBSD: Makefile,v 1.19 2003/01/28 22:04:27 jlam Exp $
 
 DISTNAME=		httpd-${APACHE_VERSION}
 PKGNAME=		apache-${APACHE_VERSION}
@@ -20,6 +20,7 @@ CONFLICTS+=		apr-[0-9]*	# devel/apr-devel package
 BUILD_DEFS+=		USE_INET6
 
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 USE_GMAKE=		YES
 
 USE_LIBTOOL=		YES
@@ -155,5 +156,4 @@ post-install:
 .include "../../lang/perl5/buildlink2.mk"
 .include "../../textproc/expat/buildlink2.mk"
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/apache6/Makefile b/www/apache6/Makefile
index c613e5dc7b4..61c235e69a6 100644
--- a/www/apache6/Makefile
+++ b/www/apache6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2002/12/22 13:04:40 grant Exp $
+# $NetBSD: Makefile,v 1.67 2003/01/28 22:04:27 jlam Exp $
 #
 # This package does not compile in mod_ssl support hooks, as it conflicts
 # with IPv6-enable patch.
@@ -30,6 +30,7 @@ CONFLICTS=		apache-[0-9]* apache-*ssl-[0-9]* apache6-[0-9]*
 
 EXTRACT_ONLY=		${DISTFILES:N*.gif:N*.diff.gz}
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 HAS_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-layout="${WRKDIR}/config.layout:pkgsrc"
 CONFIGURE_ARGS+=	--enable-module=most \
@@ -181,5 +182,4 @@ post-install:
 .include "../../devel/libmm/buildlink2.mk"
 .include "../../textproc/expat/buildlink2.mk"
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/apc-gui/Makefile b/www/apc-gui/Makefile
index f4f7a879cf6..b9e1b546cf5 100644
--- a/www/apc-gui/Makefile
+++ b/www/apc-gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/03/13 17:37:50 fredb Exp $
+# $NetBSD: Makefile,v 1.6 2003/01/28 22:04:28 jlam Exp $
 
 DISTNAME=	apc_gui-1.0.3
 PKGNAME=	${DISTNAME:S/_/-/}
@@ -14,6 +14,7 @@ DEPENDS+=	php-apc>=1.1.0.1:../../www/php4-apc
 DEPENDS+=	php-gd>=4.0.1:../../graphics/php4-gd
 
 NO_BUILD=	YES
+USE_PKGINSTALL=	YES
 
 PKG_SYSCONFSUBDIR?=	httpd
 APC_GUI_DIR=		${PREFIX}/share/${PKGBASE}
@@ -37,5 +38,4 @@ do-install:
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${APC_GUI_DIR}
 	${CHMOD} -R a-w ${APC_GUI_DIR}
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/cvsweb/Makefile b/www/cvsweb/Makefile
index a072decef7f..117b95e1498 100644
--- a/www/cvsweb/Makefile
+++ b/www/cvsweb/Makefile
@@ -1,5 +1,5 @@
 #
-# $NetBSD: Makefile,v 1.15 2002/09/29 12:46:41 martti Exp $
+# $NetBSD: Makefile,v 1.16 2003/01/28 22:04:28 jlam Exp $
 #
 
 DISTNAME=		cvsweb-2.0.6
@@ -11,6 +11,7 @@ HOMEPAGE=		http://www.freebsd.org/projects/cvsweb.html
 COMMENT=		Web interface for browsing a CVS repository
 
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 
 PKG_SYSCONFSUBDIR?=	httpd
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
@@ -57,6 +58,4 @@ do-install:
 .endfor
 
 .include "../../lang/perl5/buildlink2.mk"
-
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/dillo/Makefile b/www/dillo/Makefile
index bb96f3720a4..64bdee90ce1 100644
--- a/www/dillo/Makefile
+++ b/www/dillo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/11/26 15:07:31 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2003/01/28 22:04:28 jlam Exp $
 #
 
 DISTNAME=	dillo-0.6.6
@@ -11,6 +11,7 @@ HOMEPAGE=	http://dillo.cipsga.org.br/
 COMMENT=	Very small and fast graphical web-browser
 
 USE_BUILDLINK2=	yes
+USE_PKGINSTALL=	yes
 USE_X11=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
@@ -28,5 +29,4 @@ post-install:
 .include "../../graphics/png/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/horde/Makefile b/www/horde/Makefile
index 2acb965e357..4ccf1bc4482 100644
--- a/www/horde/Makefile
+++ b/www/horde/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2002/03/06 18:51:17 jdarrow Exp $
+# $NetBSD: Makefile,v 1.21 2003/01/28 22:04:29 jlam Exp $
 
 DISTNAME=	horde-2.0
 CATEGORIES=	www
@@ -24,6 +24,7 @@ MESSAGE_SUBST+=	HORDEDIR=${HORDEDIR}
 
 PKG_SYSCONFSUBDIR?=	httpd
 
+USE_PKGINSTALL=	yes
 CONF_FILES=	${EGDIR}/horde.conf ${PKG_SYSCONFDIR}/horde.conf
 CONF_FILES+=	${HORDEDIR}/config/horde.php.dist ${HORDEDIR}/config/horde.php
 SUPPORT_FILES+=	${HORDEDIR}/config/html.php.dist ${HORDEDIR}/config/html.php
@@ -62,5 +63,4 @@ do-install:
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${HORDEDIR}
 	${CHMOD} -R a-w ${HORDEDIR}
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/iasp/Makefile b/www/iasp/Makefile
index 78df06cc70c..2dbf3920c05 100644
--- a/www/iasp/Makefile
+++ b/www/iasp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/01/02 06:40:32 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2003/01/28 22:04:29 jlam Exp $
 
 .include "../iasp/Makefile.common"
 
@@ -26,6 +26,7 @@ FILES_SUBST+=	IASP_GROUP=${IASP_GROUP}
 PKG_USERS=	${IASP_USER}:${IASP_GROUP}
 PKG_GROUPS=	${IASP_GROUP}
 
+USE_PKGINSTALL=	yes
 OWN_DIRS=	${IASP_DESTDIR}
 OWN_DIRS_PERMS=	${IASP_DESTDIR}/logs ${IASP_USER} ${IASP_GROUP} 0750
 CONFDIR=	${IASP_DESTDIR}/properties
@@ -61,5 +62,4 @@ do-install:
 	cd ${WRKDIR}; ${CP} -R ${IASP_DIR} ${IASP_DESTDIR:H}
 
 .include "../../mk/java-vm.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/jakarta-tomcat/Makefile b/www/jakarta-tomcat/Makefile
index c8414545ac8..92cca949548 100644
--- a/www/jakarta-tomcat/Makefile
+++ b/www/jakarta-tomcat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2002/12/28 22:34:13 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2003/01/28 22:04:29 jlam Exp $
 
 DISTNAME=	jakarta-tomcat-${TOMCAT_VERSION}-src
 PKGNAME=	${DISTNAME:S/-src$//}
@@ -16,7 +16,7 @@ DEPENDS+=	jakarta-ant>=1.4.1:../../devel/jakarta-ant
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
-USE_BUILDLINK2=	# defined
+USE_BUILDLINK2=	yes
 MAKEFILE=	build.xml
 ALL_TARGET=	main
 INSTALL_TARGET=	dist
@@ -24,6 +24,7 @@ INSTALL_TARGET=	dist
 SAMPLECONFDIR=			${PREFIX}/tomcat/conf
 PKG_SYSCONFDIR.jakarta-tomcat=	${SAMPLECONFDIR}
 
+USE_PKGINSTALL=	yes
 OWN_DIRS=	${PREFIX}/tomcat
 MAKE_DIRS=	${PREFIX}/tomcat/conf
 MAKE_DIRS=	${PREFIX}/tomcat/logs
@@ -52,7 +53,6 @@ post-install:
 	${RM} ${PREFIX}/tomcat/webapps/examples.war
 
 .include "../../mk/java-vm.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
 
 MAKE_PROGRAM=	${LOCALBASE}/bin/ant
diff --git a/www/p5-Apache-Gallery/Makefile b/www/p5-Apache-Gallery/Makefile
index 70f228ce485..0dd64c2f5f9 100644
--- a/www/p5-Apache-Gallery/Makefile
+++ b/www/p5-Apache-Gallery/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/10/27 19:54:29 seb Exp $
+# $NetBSD: Makefile,v 1.3 2003/01/28 22:04:30 jlam Exp $
 #
 
 DISTNAME=	Apache-Gallery-0.4.1
@@ -19,6 +19,7 @@ DEPENDS+=	p5-Inline-[0-9]*:../../devel/p5-Inline
 DEPENDS+=	p5-libapreq-[0-9]*:../../www/p5-libapreq
 
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 USE_X11=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Apache/Gallery/.packlist
 
@@ -84,5 +85,5 @@ post-install:
 .include "../../graphics/imlib2/buildlink2.mk"
 .include "../../www/ap-perl/buildlink2.mk"
 .include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.install.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/php3/Makefile b/www/php3/Makefile
index a50a4e52de6..07024e53517 100644
--- a/www/php3/Makefile
+++ b/www/php3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2002/10/23 06:09:41 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2003/01/28 22:04:30 jlam Exp $
 
 PKGNAME=		php-${BASE_VERS}
 PKGREVISION?=		2
@@ -20,6 +20,7 @@ CGIDIR=			${PREFIX}/libexec/cgi-bin
 EGDIR=			${PREFIX}/share/examples/php3
 DATADIR=		${PREFIX}/share/php3
 
+USE_PKGINSTALL=		yes
 OWN_DIRS=		${PREFIX}/${PHP_EXTENSION_DIR}
 CONF_FILES=		${EGDIR}/php3.ini.example ${PKG_SYSCONFDIR}/php3.ini
 
@@ -39,5 +40,4 @@ do-install:
 	cd ${WRKSRC}/examples; ${INSTALL_DATA} README* *.php3 ${EGDIR}
 	${INSTALL_DATA} ${WRKDIR}/php3.ini.example ${EGDIR}
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/php4/Makefile b/www/php4/Makefile
index 3c7da7cdb70..6ab60f41be9 100644
--- a/www/php4/Makefile
+++ b/www/php4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2003/01/08 01:52:43 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2003/01/28 22:04:31 jlam Exp $
 
 PKGNAME=		php-${PHP_BASE_VERS}
 CATEGORIES+=		lang
@@ -7,6 +7,7 @@ COMMENT=		HTML-embedded scripting language
 CONFLICTS+=		ap-php-4.0.3pl1
 
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 .include "Makefile.php"
@@ -41,5 +42,4 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/php
 	${INSTALL_DATA} ${WRKSRC}/php.gif ${PREFIX}/share/php
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/squid/Makefile b/www/squid/Makefile
index d1195e2f021..8150a2c4cb5 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2002/12/02 03:09:01 grant Exp $
+# $NetBSD: Makefile,v 1.75 2003/01/28 22:04:31 jlam Exp $
 
 DISTNAME=	squid-2.5.STABLE1
 PKGNAME=	squid-2.5.1
@@ -46,8 +46,9 @@ PKG_SYSCONFSUBDIR?=	squid
 
 .include "../../mk/bsd.prefs.mk"
 
-GNU_CONFIGURE=		# defined
-USE_BUILDLINK2=		# defined
+USE_BUILDLINK2=		yes
+USE_PKGINSTALL=		yes
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR} \
 			--localstatedir=/var/squid \
 			${SQUID_CONFIGURE_ARGS}
@@ -118,6 +119,4 @@ post-install:
 	) >>${PLIST_SRC}
 
 .include "../../security/openssl/buildlink2.mk"
-
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/surfraw/Makefile b/www/surfraw/Makefile
index 0c9fb9edacc..9666b0a4dd8 100644
--- a/www/surfraw/Makefile
+++ b/www/surfraw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2002/08/25 21:52:22 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2003/01/28 22:04:32 jlam Exp $
 #
 
 DISTNAME=	surfraw-1.0.7
@@ -12,6 +12,7 @@ COMMENT=	Shell Users' Revolutionary Front Rage Against the Web
 CONFLICTS+=	surfaw-[0-9]*
 
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
@@ -31,5 +32,4 @@ post-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/thttpd/Makefile b/www/thttpd/Makefile
index f8b77252dd7..8ecd44d96a7 100644
--- a/www/thttpd/Makefile
+++ b/www/thttpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2002/09/19 09:04:34 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2003/01/28 22:04:32 jlam Exp $
 
 DISTNAME=	thttpd-2.23beta1
 PKGNAME=	thttpd-2.23.0.1
@@ -17,6 +17,7 @@ GNU_CONFIGURE=	# defined
 # Note: this pkg auto-detects IPv6 without regarding USE_INET6.
 BUILD_DEFS+=	USE_INET6
 
+USE_PKGINSTALL=	yes
 EGDIR=		${PREFIX}/share/examples
 CONF_FILES=	${EGDIR}/thttpd.conf ${PKG_SYSCONFDIR}/thttpd.conf
 RCD_SCRIPTS=	thttpd
@@ -44,5 +45,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/index.html ${PREFIX}/share/thttpd
 	${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/thttpd
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile
index 94687e85b9c..b50adcd9448 100644
--- a/www/webalizer/Makefile
+++ b/www/webalizer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2002/08/25 21:52:25 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2003/01/28 22:04:33 jlam Exp $
 #
 
 DISTNAME=	webalizer-2.01-09-src
@@ -17,6 +17,7 @@ COMMENT=	Web server log file analysis program
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 USE_X11=		YES
 GNU_CONFIGURE=  	YES
 CONFIGURE_ARGS+=	--with-etcdir=${PKG_SYSCONFDIR}
@@ -34,6 +35,4 @@ post-build:
 	done
 
 .include "../../graphics/gd/buildlink2.mk"
-
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"