From 0888156f21e01be033066b564dc798018954d33c Mon Sep 17 00:00:00 2001
From: jlam <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 <jmmv at menta.net>.

---
 www/jakarta-tomcat/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'www/jakarta-tomcat')

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
-- 
cgit v1.2.3