- Update to 3.2.8

PR:		ports/110768
Submitted by:	nemoliu
Approved by:	maintainer (previous version, with reservations)

10 files changed, 117 insertions, 55 deletions

diff --git a/java/jboss3/Makefile b/java/jboss3/Makefile
index 9d813f0d979f..776d8fa31268 100644
--- a/java/jboss3/Makefile
+++ b/java/jboss3/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	${APP_TITLE:L}
-PORTVERSION=	3.2.7
-PORTREVISION=	1
+PORTVERSION=	3.2.8.SP1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,14 +15,15 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	jonc@chen.org.nz
 COMMENT=	JBoss 3.x, an open-source J2EE application server
 
-BUILD_DEPENDS=	ant:${PORTSDIR}/devel/apache-ant
-
 LATEST_LINK=	jboss3
 USE_JAVA=	yes
 JAVA_VERSION=	1.4
+USE_ANT=	yes
+MAKE_ARGS=	-buildfile build/build.xml
 
-USE_RC_SUBR=	YES
+USE_RC_SUBR=	jboss3
 USE_BZIP2=	YES
+SUB_FILES=	pkg-install pkg-deinstall pkg-message daemonctl.1 daemonctl.c
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
@@ -37,9 +37,8 @@ APP_SHORTNAME=	${UNIQUENAME}
 CONTROL_SCRIPT_NAME=	${APP_SHORTNAME}ctl
 CONTROL_SCRIPT=	${PREFIX}/bin/${CONTROL_SCRIPT_NAME}
 CONTROL_SCRIPT_MANPAGE_TITLE=	${CONTROL_SCRIPT_NAME:U}
-STARTUP_ORDER=	020
-STARTUP_SCRIPT_NAME=	${APP_SHORTNAME}.sh
-STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/${STARTUP_ORDER}.${STARTUP_SCRIPT_NAME}
+STARTUP_SCRIPT_NAME=	${APP_SHORTNAME}${RC_SUBR_SUFFIX}
+STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/${STARTUP_SCRIPT_NAME}
 USER=		www
 GROUP=		www
 STDOUT_LOG=	${LOG_DIR}/stdout.log
@@ -58,47 +57,39 @@ JBOSSOUTPUT=	${WRKSRC}/build/output/${PORTNAME}-${PORTVERSION}
 APP_HOME_FILES=	bin client lib server
 
 PLIST_FILES=	${CONTROL_SCRIPT:S,^${PREFIX}/,,} \
-		${STARTUP_SCRIPT:S,^${PREFIX}/,,} \
 		${STDOUT_LOG:S,^${PREFIX}/,,} \
 		${STDERR_LOG:S,^${PREFIX}/,,}
 
-PKGMESSAGE=	${WRKDIR}/pkg-message.fmt
+SUB_LIST=	APP_HOME=${APP_HOME} \
+		APP_SHORTNAME=${APP_SHORTNAME} \
+		APP_TITLE=${APP_TITLE} \
+		CONTROL_SCRIPT=${CONTROL_SCRIPT} \
+		CONTROL_SCRIPT_MANPAGE_TITLE=${CONTROL_SCRIPT_MANPAGE_TITLE} \
+		CONTROL_SCRIPT_NAME=${CONTROL_SCRIPT_NAME} \
+		GROUP=${GROUP} \
+		JAVA=${JAVA} \
+		JAVA_CP=${JAVA_CP} \
+		JAVA_HOME=${JAVA_HOME} \
+		JAVA_MAIN=${JAVA_MAIN} \
+		JAVA_OPTS=${JAVA_OPTS} \
+		JAVA_PORT_VERSION=${JAVA_PORT_VERSION} \
+		JAVA_PORT_OS_DESCRIPTION=${JAVA_PORT_OS_DESCRIPTION} \
+		JAR_FILE=${JAR_FILE} \
+		LOG_DIR=${LOG_DIR} \
+		PID_FILE=${PID_FILE} \
+		PKGNAME=${PKGNAME} \
+		PORTNAME=${PORTNAME} \
+		PORTVERSION=${PORTVERSION} \
+		PREFIX=${PREFIX} \
+		STARTUP_SCRIPT=${STARTUP_SCRIPT} \
+		STDERR_LOG=${STDERR_LOG} \
+		STDOUT_LOG=${STDOUT_LOG} \
+		STOP_TIMEOUT=${STOP_TIMEOUT} \
+		USER=${USER}
 
 .include <bsd.port.pre.mk>
 
-do-configure:
-	@(cd ${DAEMONCTL_DIR} && ${CP} ${DAEMONCTL_FILES} ${WRKDIR})
-	@(cd ${WRKDIR} && ${REINPLACE_CMD} \
-		-e "s|%%RC_SUBR%%|${RC_SUBR}|g;" \
-		-e "s|%%APP_HOME%%|${APP_HOME}|g;" \
-		-e "s|%%APP_SHORTNAME%%|${APP_SHORTNAME}|g;" \
-		-e "s|%%APP_TITLE%%|${APP_TITLE}|g;" \
-		-e "s|%%CONTROL_SCRIPT%%|${CONTROL_SCRIPT}|g;" \
-		-e "s|%%CONTROL_SCRIPT_MANPAGE_TITLE%%|${CONTROL_SCRIPT_MANPAGE_TITLE}|g;" \
-		-e "s|%%CONTROL_SCRIPT_NAME%%|${CONTROL_SCRIPT_NAME}|g;" \
-		-e "s|%%GROUP%%|${GROUP}|g;" \
-		-e "s|%%JAVA%%|${JAVA}|g;" \
-		-e "s|%%JAVA_CP%%|${JAVA_CP}|g;" \
-		-e "s|%%JAVA_HOME%%|${JAVA_HOME}|g;" \
-		-e "s|%%JAVA_MAIN%%|${JAVA_MAIN}|g;" \
-		-e "s|%%JAVA_OPTS%%|${JAVA_OPTS}|g;" \
-		-e "s|%%JAVA_PORT_VERSION%%|${JAVA_PORT_VERSION}|g;" \
-		-e "s|%%JAVA_PORT_OS_DESCRIPTION%%|${JAVA_PORT_OS_DESCRIPTION}|g;" \
-		-e "s|%%JAR_FILE%%|${JAR_FILE}|g;" \
-		-e "s|%%LOG_DIR%%|${LOG_DIR}|g;" \
-		-e "s|%%PID_FILE%%|${PID_FILE}|g;" \
-		-e "s|%%PKGNAME%%|${PKGNAME}|g;" \
-		-e "s|%%PORTNAME%%|${PORTNAME}|g;" \
-		-e "s|%%PORTVERSION%%|${PORTVERSION}|g;" \
-		-e "s|%%PREFIX%%|${PREFIX}|g;" \
-		-e "s|%%STARTUP_SCRIPT%%|${STARTUP_SCRIPT}|g;" \
-		-e "s|%%STDERR_LOG%%|${STDERR_LOG}|g;" \
-		-e "s|%%STDOUT_LOG%%|${STDOUT_LOG}|g;" \
-		-e "s|%%STOP_TIMEOUT%%|${STOP_TIMEOUT}|g;" \
-		-e "s|%%USER%%|${USER}|g;" ${DAEMONCTL_FILES})
-	@${FMT} -s 80 ${WRKDIR}/pkg-message >${PKGMESSAGE}
-
-post-configure:
+post-patch:
 	@${ECHO_MSG} "Installation settings:"
 	@${ECHO_MSG} "   Destination directory:    ${APP_HOME}"
 	@${ECHO_MSG} "   Control program location: ${CONTROL_SCRIPT}"
@@ -112,21 +103,17 @@ post-configure:
 	@${ECHO_MSG} "   Starting after install:   ${AUTO_START}"
 	@${ECHO_MSG} "   Stop time-out:            ${STOP_TIMEOUT} sec."
 
-do-build:
-	(cd ${WRKDIR} && ${CC} ${CFLAGS} -o ${CONTROL_SCRIPT_NAME} daemonctl.c)
-	(cd ${WRKSRC}/build && ${SETENV} JAVA_HOME="${JAVA_HOME}" PATH="${JAVA_HOME}/bin:${PATH}" ${SH} build.sh)
-
 pre-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 do-install:
+	cd ${WRKDIR} && ${CC} ${CFLAGS} -o ${CONTROL_SCRIPT_NAME} daemonctl.c
 	${MKDIR} ${APP_HOME} && ${CHOWN} ${USER}:${GROUP} ${APP_HOME}
 	${MKDIR} ${LOG_DIR} && ${CHOWN} ${USER}:${GROUP} ${LOG_DIR}
 	(cd ${JBOSSOUTPUT} && ${FIND} ${APP_HOME_FILES} |\
 		${CPIO} -pdmu -R ${USER}:${GROUP} ${APP_HOME})
 	${INSTALL} -o ${USER} -g ${GROUP} -m 06754\
 		${WRKDIR}/${CONTROL_SCRIPT_NAME} ${CONTROL_SCRIPT}
-	${INSTALL_SCRIPT} ${WRKDIR}/startup.sh ${STARTUP_SCRIPT}
 	${INSTALL} -o ${USER} -g ${GROUP} -m 0640 /dev/null ${STDOUT_LOG}
 	${INSTALL} -o ${USER} -g ${GROUP} -m 0640 /dev/null ${STDERR_LOG}
 	${INSTALL} -o ${USER} -g ${GROUP} -m 0640 /dev/null ${PID_FILE}
diff --git a/java/jboss3/distinfo b/java/jboss3/distinfo
index 41d4a8c34565..cc00e45fbaad 100644
--- a/java/jboss3/distinfo
+++ b/java/jboss3/distinfo
@@ -1,3 +1,3 @@
-MD5 (jboss-3.2.7-src.tar.bz2) = 1d3d66d1d779af0d47ef0ba1c189bffc
-SHA256 (jboss-3.2.7-src.tar.bz2) = 1da0dfb592e5baa4e41f272ce3dcb65f0f65e290cef9e009f9644527bad86c54
-SIZE (jboss-3.2.7-src.tar.bz2) = 48688133
+MD5 (jboss-3.2.8.SP1-src.tar.bz2) = a3e2c2409465a2276aa584d9100026b7
+SHA256 (jboss-3.2.8.SP1-src.tar.bz2) = ed4e45fa5f51cd8a2a3643f3676580724b5c6bf68a347bb3aee1702d4d384914
+SIZE (jboss-3.2.8.SP1-src.tar.bz2) = 37995227
diff --git a/java/jboss3/files/daemonctl.1 b/java/jboss3/files/daemonctl.1.in
index 30547f449ef9..30547f449ef9 100644
--- a/java/jboss3/files/daemonctl.1
+++ b/java/jboss3/files/daemonctl.1.in
diff --git a/java/jboss3/files/daemonctl.c b/java/jboss3/files/daemonctl.c.in
index 169b30521a0f..7bcdc6b7f5e8 100644
--- a/java/jboss3/files/daemonctl.c
+++ b/java/jboss3/files/daemonctl.c.in
@@ -7,7 +7,7 @@
  *	Original by Ernst de Haan <znerd@freebsd.org>
  *	www/jakarta-tomcat4/files/daemonctl.c
  *
- * $FreeBSD: /tmp/pcvs/ports/java/jboss3/files/Attic/daemonctl.c,v 1.2 2005-01-13 01:55:13 hq Exp $
+ * $FreeBSD$
  */
 
 #include <assert.h>
diff --git a/java/jboss3/files/startup.sh b/java/jboss3/files/jboss3.in
index 94d5b0fa41b8..b77e6479d88d 100644
--- a/java/jboss3/files/startup.sh
+++ b/java/jboss3/files/jboss3.in
@@ -2,7 +2,7 @@
 #
 # %%APP_TITLE%% startup script.
 #
-# $FreeBSD: /tmp/pcvs/ports/java/jboss3/files/Attic/startup.sh,v 1.2 2005-01-13 01:55:13 hq Exp $
+# $FreeBSD$
 #
 
 # PROVIDE: %%APP_SHORTNAME%%
diff --git a/java/jboss3/files/patch-build.xml b/java/jboss3/files/patch-build.xml
new file mode 100644
index 000000000000..52d4e964fda1
--- /dev/null
+++ b/java/jboss3/files/patch-build.xml
@@ -0,0 +1,38 @@
+--- ./build/build.xml.orig	Sun Mar 25 22:55:20 2007
++++ ./build/build.xml	Sun Mar 25 22:58:57 2007
+@@ -43,6 +43,35 @@
+    -->
+ 
+   <target name="init" unless="init.disable" depends="_buildmagic:init">
++  <!-- Make sure we have the right version of Ant -->
++  <property name="buildmagic.ant15.baseversion" value="1.5"/>
++  <property name="buildmagic.ant16.baseversion" value="1.6"/>
++  <property name="buildmagic.ant16.baseversion" value="1.7"/>
++  <!--
++      | Add new conditions for other supported Ant versions when they
++      | become avaialble.
++   -->
++
++   <condition property="buildmagic.ant.compatible">
++     <or>
++        <contains string="${ant.version}"
++		  substring="Ant version ${buildmagic.ant15.baseversion}"/>
++	<contains string="${ant.version}"
++	    	  substring="Ant version ${buildmagic.ant16.baseversion}"/>
++	<contains string="${ant.version}"
++	          substring="Ant version ${buildmagic.ant17.baseversion}"/>
++     </or>
++   </condition>
++
++   <fail unless="buildmagic.ant.compatible">
++
++      Unsupported Ant version:
++
++       ${ant.version}
++
++      Please install a version which is compatible with Ant ${buildmagic.ant15.baseversion} or ${buildmagic.ant16.baseversion} or ${buildmagic.ant17.baseversion}.
++
++   </fail>
+   </target>
+ 
+ 
diff --git a/java/jboss3/files/patch-buildmagic.ent b/java/jboss3/files/patch-buildmagic.ent
new file mode 100644
index 000000000000..175827a80bc5
--- /dev/null
+++ b/java/jboss3/files/patch-buildmagic.ent
@@ -0,0 +1,37 @@
+--- ./tools/etc/buildmagic/buildmagic.ent.orig	Sun Mar 25 22:53:51 2007
++++ ./tools/etc/buildmagic/buildmagic.ent	Sun Mar 25 22:54:21 2007
+@@ -7,34 +7,6 @@
+ <!-- Initialize the build system. -->
+ <target name="_buildmagic:init" unless="init.disable">
+ 
+-  <!-- Make sure we have the right version of Ant -->
+-  <property name="buildmagic.ant15.baseversion" value="1.5"/>
+-  <property name="buildmagic.ant16.baseversion" value="1.6"/>
+-
+-  <!--
+-     | Add new conditions for other supported Ant versions when they
+-     | become avaialble.
+-   -->
+-
+-  <condition property="buildmagic.ant.compatible">
+-    <or>
+-      <contains string="${ant.version}"
+-        substring="Ant version ${buildmagic.ant15.baseversion}"/>
+-      <contains string="${ant.version}"
+-        substring="Ant version ${buildmagic.ant16.baseversion}"/>
+-    </or>
+-  </condition>
+-
+-  <fail unless="buildmagic.ant.compatible">
+-
+-  Unsupported Ant version:
+-
+-    ${ant.version}
+-
+-  Please install a version which is compatible with Ant ${buildmagic.ant15.baseversion} or ${buildmagic.ant16.baseversion}.
+-
+-  </fail>
+-
+   <!-- JDK Detection -->
+   <available classname="java.lang.StrictMath" property="HAVE_JDK_1.3"/>
+   <available classname="java.lang.StackTraceElement" property="HAVE_JDK_1.4"/>
diff --git a/java/jboss3/pkg-deinstall b/java/jboss3/files/pkg-deinstall.in
index 719f7100134e..72f7b922c69f 100644
--- a/java/jboss3/pkg-deinstall
+++ b/java/jboss3/files/pkg-deinstall.in
@@ -5,7 +5,7 @@
 # * Checks if the JBoss PID file exists. If it does, it kills the
 #   JBoss process and removes the PID file.
 #
-# $FreeBSD: /tmp/pcvs/ports/java/jboss3/Attic/pkg-deinstall,v 1.2 2003-07-14 10:03:13 des Exp $
+# $FreeBSD$
 #
 
 # Make sure we're in the right stage of the process
diff --git a/java/jboss3/pkg-install b/java/jboss3/files/pkg-install.in
index 5632cdce4961..687ec3fc1f9e 100644
--- a/java/jboss3/pkg-install
+++ b/java/jboss3/files/pkg-install.in
@@ -3,7 +3,7 @@
 # Checks if the 'www' user and group exist. If they don't, then
 # an attempt is made to create both.
 #
-# $FreeBSD: /tmp/pcvs/ports/java/jboss3/Attic/pkg-install,v 1.1 2002-04-26 21:54:15 znerd Exp $
+# $FreeBSD$
 #
 
 # Make sure we're called during the 'make install' process
diff --git a/java/jboss3/files/pkg-message b/java/jboss3/files/pkg-message.in
index e48411f3028c..e48411f3028c 100644
--- a/java/jboss3/files/pkg-message
+++ b/java/jboss3/files/pkg-message.in