Convert to use buildlink2, bsd.pkg.install.mk, and java-vm.mk.

4 files changed, 33 insertions, 103 deletions

diff --git a/www/jakarta-tomcat/DEINSTALL b/www/jakarta-tomcat/DEINSTALL
deleted file mode 100644
index 289e2d8ed89..00000000000
--- a/www/jakarta-tomcat/DEINSTALL
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.1 2001/11/01 02:17:07 zuntum Exp $
-#
-
-PKGNAME=$1
-STAGE=$2
-
-case ${STAGE} in
-DEINSTALL)
-	;;
-POST-DEINSTALL)
-	cat << EOF
-===========================================================================
-The configuration and log files for ${PKGNAME} have not been
-removed.  If you will not be using ${PKGNAME} any longer, you
-may wish to completely remove the ${PKG_PREFIX}/tomcat directory.
-===========================================================================
-EOF
-	;;
-*)
-	echo "Unexpected argument: $2"
-	exit 1
-	;;
-esac
-exit 0
diff --git a/www/jakarta-tomcat/INSTALL b/www/jakarta-tomcat/INSTALL
deleted file mode 100644
index 6538891b6bb..00000000000
--- a/www/jakarta-tomcat/INSTALL
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: INSTALL,v 1.1 2001/11/01 02:17:07 zuntum Exp $
-
-PKGNAME=$1
-STAGE=$2
-
-CHMOD="@CHMOD@"
-CP="@CP@"
-
-SERVERROOT=${PKG_PREFIX}/tomcat/conf
-SAMPLECONFDIR=${SERVERROOT}
-CONFDIR=${SERVERROOT}
-CONFFILES="server.xml web.xml tomcat-users.xml jni_server.xml tomcat.policy workers.properties"
-
-case ${STAGE} in
-PRE-INSTALL)
-	;;
-
-POST-INSTALL)
-	echo "Installing configuration files:"
-	for file in ${CONFFILES}
-	do
-		FILE=${CONFDIR}/${file}
-		SAMPLEFILE=${SAMPLECONFDIR}/${file}.default
-		if [ -f ${FILE} ]
-		then
-			echo "    ${FILE} already exists"
-		else
-			echo "    ${FILE}"
-			${CP} ${SAMPLEFILE} ${FILE}
-			${CHMOD} 644 ${FILE}
-		fi
-	done
-	;;
-
-*)
-	echo "Unexpected argument: ${STAGE}"
-	exit 1
-	;;
-esac
-exit 0
diff --git a/www/jakarta-tomcat/Makefile b/www/jakarta-tomcat/Makefile
index c505dabcc6f..85accad7a91 100644
--- a/www/jakarta-tomcat/Makefile
+++ b/www/jakarta-tomcat/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.31 2002/10/10 01:01:12 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2002/12/28 21:35:04 jlam Exp $
 
-DISTNAME=	jakarta-tomcat-3.2.4-src
-PKGNAME=	jakarta-tomcat-3.2.4
+DISTNAME=	jakarta-tomcat-${TOMCAT_VERSION}-src
+PKGNAME=	${DISTNAME:S/-src$//}
+TOMCAT_VERSION=	3.2.4
 PKGREVISION=	1
 CATEGORIES=	www
-MASTER_SITES=	http://jakarta.apache.org/builds/jakarta-tomcat/release/v3.2.4/src/
+MASTER_SITES=	http://jakarta.apache.org/builds/jakarta-tomcat/release/v${TOMCAT_VERSION}/src/
 
 MAINTAINER=	jwise@netbsd.org
 HOMEPAGE=	http://jakarta.apache.org/
@@ -13,42 +14,45 @@ COMMENT=	the Apache Project's Java Servlet 2.2 and JSP 1.1 server
 DEPENDS+=	jakarta-servletapi-[0-9]*:../../www/jakarta-servletapi
 DEPENDS+=	jakarta-ant>=1.4.1:../../devel/jakarta-ant
 
-USE_JAVA=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
-CLASSPATH:=	${LOCALBASE}/lib/java/servlet.jar:${LOCALBASE}/lib/jaxp.jar:${LOCALBASE}/lib/parser.jar:${CLASSPATH}
+USE_BUILDLINK2=	# defined
 MAKEFILE=	build.xml
 ALL_TARGET=	main
 INSTALL_TARGET=	dist
 
-DEINSTALL_FILE=		${PKGDIR}/DEINSTALL
-INSTALL_FILE=		${WRKDIR}/INSTALL
+SAMPLECONFDIR=			${PREFIX}/tomcat/conf
+PKG_SYSCONFDIR.jakarta-tomcat=	${SAMPLECONFDIR}
+
+OWN_DIRS=	${PREFIX}/tomcat
+MAKE_DIRS=	${PREFIX}/tomcat/conf
+MAKE_DIRS=	${PREFIX}/tomcat/logs
+MAKE_DIRS=	${PREFIX}/tomcat/webapps
+CFILES=		server.xml web.xml tomcat-users.xml jni_server.xml
+CFILES+=	tomcat.policy workers.properties
+
+CONF_FILES=	# empty
+.for FILE in ${CFILES}
+CONF_FILES+=	${SAMPLECONFDIR}/${FILE}.default ${PKG_SYSCONFDIR}/${FILE}
+.endfor
+RCD_SCRIPTS=	tomcat
 
 post-patch:
-	${SED}	-e "s|@PREFIX@|${PREFIX}|g"				\
-		-e "s|@JAVA_HOME@|${PKG_JAVA_HOME}|g"			\
-		${WRKSRC}/src/etc/workers.properties > ${WRKSRC}/src/etc/workers.properties.tmp
-		${MV} ${WRKSRC}/src/etc/workers.properties.tmp ${WRKSRC}/src/etc/workers.properties
-	${RM} -f ${WRKSRC}/src/etc/workers.properties.orig
-	${RM} -f ${WRKSRC}/src/share/org/apache/tomcat/facade/RequestDispatcherImpl.java.orig
-	${RM} -f ${WRKSRC}/src/share/org/apache/tomcat/task/ApacheConfig.java.orig
-	${RM} -f ${WRKSRC}/src/share/org/apache/tomcat/loader/AdaptiveClassLoader.java.orig
-
-post-build:
-	${SED}	-e "s|@PREFIX@|${PREFIX}|g"				\
-		${FILESDIR}/tomcat.sh > ${WRKDIR}/tomcat.sh
-
-pre-install:
-	${SED}	-e "s|@CAT@|${CAT}|g"					\
-		-e "s|@CHMOD@|${CHMOD}|g"				\
-		-e "s|@CP@|${CP}|g"					\
-		${PKGDIR}/INSTALL > ${INSTALL_FILE}
+	${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} -f
+	for file in ${WRKSRC}/src/etc/workers.properties; do		\
+		${SED}	-e "s|@PREFIX@|${PREFIX}|g"			\
+			-e "s|@JAVA_HOME@|${PKG_JAVA_HOME}|g"		\
+			$$file > $$file.tmp;				\
+		${MV} -f $$file.tmp $$file;				\
+	done
 
 post-install:
 	${RM} ${PREFIX}/tomcat/webapps/examples.war
-	${INSTALL_SCRIPT} ${WRKDIR}/tomcat.sh ${PREFIX}/etc/rc.d/tomcat
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
+.include "../../mk/java-vm.mk"
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
+
 MAKE_PROGRAM=	${LOCALBASE}/bin/ant
 MAKE_FLAGS=	-Dpkgsrc.prefix=${PREFIX}
+CLASSPATH:=	${LOCALBASE}/lib/java/servlet.jar:${LOCALBASE}/lib/jaxp.jar:${LOCALBASE}/lib/parser.jar:${CLASSPATH}
diff --git a/www/jakarta-tomcat/PLIST b/www/jakarta-tomcat/PLIST
index 93aa18dfb97..ca793db9aa3 100644
--- a/www/jakarta-tomcat/PLIST
+++ b/www/jakarta-tomcat/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/12/26 22:59:32 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/12/28 21:35:04 jlam Exp $
 etc/rc.d/tomcat
 tomcat/KEYS
 tomcat/LICENSE
@@ -8,26 +8,20 @@ tomcat/bin/shutdown.sh
 tomcat/bin/startup.sh
 tomcat/bin/tomcat.sh
 tomcat/conf/build.xml
-tomcat/conf/jni_server.xml
 tomcat/conf/jni_server.xml.default
 tomcat/conf/jni_workers.properties
 tomcat/conf/manifest.servlet
 tomcat/conf/mod_jk.conf
 tomcat/conf/obj.conf
-tomcat/conf/server.xml
 tomcat/conf/server.xml.default
 tomcat/conf/test-tomcat.xml
-tomcat/conf/tomcat-users.xml
 tomcat/conf/tomcat-users.xml.default
 tomcat/conf/tomcat.conf
-tomcat/conf/tomcat.policy
 tomcat/conf/tomcat.policy.default
 tomcat/conf/tomcat.properties
 tomcat/conf/uriworkermap.properties
 tomcat/conf/web.dtd
-tomcat/conf/web.xml
 tomcat/conf/web.xml.default
-tomcat/conf/workers.properties
 tomcat/conf/workers.properties.default
 tomcat/conf/wrapper.properties
 tomcat/doc/AJPv13.html