diff -ruN www/jakarta-tomcat41/Makefile.orig www/jakarta-tomcat41/Makefile
--- www/jakarta-tomcat41/Makefile.orig	Sat Apr  3 13:22:22 2004
+++ www/jakarta-tomcat41/Makefile	Thu Nov 25 01:30:46 2004
@@ -7,7 +7,7 @@
 
 PORTNAME=	jakarta-tomcat
 PORTVERSION=	4.1.30
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	www java
 MASTER_SITES=	http://www.apache.org/dist/jakarta/tomcat-4/v${PORTVERSION}/bin/ \
 		${MASTER_SITE_LOCAL}
@@ -30,6 +30,7 @@
 APP_TITLE=	Jakarta Tomcat
 APP_SHORTNAME=	tomcat${MAJOR_VER:S/.//}
 CONTROL_SCRIPT_NAME=	${APP_SHORTNAME}ctl
+CONTROL_SCRIPT_CONF=	conf/${APP_SHORTNAME}ctl.conf
 CONTROL_SCRIPT=	${PREFIX}/bin/${CONTROL_SCRIPT_NAME}
 CONTROL_SCRIPT_MANPAGE_TITLE=	${CONTROL_SCRIPT_NAME:U}
 STARTUP_ORDER?=	020
@@ -48,6 +49,7 @@
 STOP_TIMEOUT?=	5
 PID_FILE=	/var/run/${APP_SHORTNAME}.pid
 REPLACE_FILES=	${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.c \
+		${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.conf \
 		${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.1 \
 		${PORTSDIR}/www/jakarta-tomcat4/files/startup.sh \
 		${WRKSRC}/conf/server.xml
@@ -72,7 +74,7 @@
 	@${ECHO_CMD} "   Logfile stderr:           ${STDERR_LOG}"
 	@${ECHO_CMD} "   Starting after install:   ${AUTO_START}"
 	@${ECHO_CMD} "   Stop time-out:            ${STOP_TIMEOUT} sec."
-	@PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL
+	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-patch:
 	@${ECHO_CMD} -n ">> Removing unneeded files..."
@@ -124,11 +126,12 @@
 
 	@${ECHO_CMD} -n ">> Compiling and installing control program..."
 	@${SED} \
-	-e "/%%JAVA_ARGS%%/s//\"-Dcatalina.home=${APP_HOME:S/\//\\\//g}\",/g" \
-	-e "/%%JAR_ARGS%%/s//\"start\",/g" \
-	${WRKDIR}/daemonctl.c > ${WRKDIR}/daemonctl_.c
+		-e "/%%CONTROL_SCRIPT_CONF%%/s//${CONTROL_SCRIPT_CONF:S/\//\\\//g}/g" \
+		-e "/%%JAR_ARGS%%/s//\"start\"/g" \
+		${WRKDIR}/daemonctl.c > ${WRKDIR}/daemonctl_.c
 	@cd ${WRKDIR} && ${CC} -ansi -o ${CONTROL_SCRIPT_NAME} daemonctl_.c
 	@${CP} ${WRKDIR}/${CONTROL_SCRIPT_NAME} ${CONTROL_SCRIPT}
+	@${CP} ${WRKDIR}/daemonctl.conf ${APP_HOME}/${CONTROL_SCRIPT_CONF}
 	@${CHOWN} ${USER}:${GROUP} ${CONTROL_SCRIPT}
 	@${CHMOD} 6754 ${CONTROL_SCRIPT}
 	@${ECHO_CMD} " [ DONE ]"