- Update to 4.2.0.GA2

PR:		ports/113844
Submitted by:	Jonathan Chen <jonc@chen.org.nz> (maintainer)

9 files changed, 92 insertions, 53 deletions

diff --git a/java/jboss4/Makefile b/java/jboss4/Makefile
index bd7cbf77a048..0ae53f7efb89 100644
--- a/java/jboss4/Makefile
+++ b/java/jboss4/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	${APP_TITLE:L}
-PORTVERSION=	4.0.5.GA
-PORTREVISION=	1
+PORTVERSION=	4.2.0.GA
 PORTEPOCH=	1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -17,13 +16,14 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	jonc@chen.org.nz
 COMMENT=	Open-source J2EE application server (4.x family)
 
-BUILD_DEPENDS=	ant:${PORTSDIR}/devel/apache-ant
-
 LATEST_LINK=	jboss4
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
+USE_ANT=	yes
+MAKE_ARGS=	-buildfile build/build.xml
 
-USE_RC_SUBR=	YES
+USE_RC_SUBR=	jboss4
+SUB_FILES=	pkg-install pkg-deinstall pkg-message daemonctl.c daemonctl.1
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
@@ -37,7 +37,7 @@ 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_SCRIPT_NAME=	${APP_SHORTNAME}.sh
+STARTUP_SCRIPT_NAME=	${APP_SHORTNAME}${RC_SUBR_SUFFIX}
 STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/${STARTUP_SCRIPT_NAME}
 USER=		www
 GROUP=		www
@@ -53,50 +53,42 @@ DAEMONCTL_DIR=	${FILESDIR}
 DAEMONCTL_FILES=daemonctl.c daemonctl.1 startup.sh pkg-message
 MAN1=		${CONTROL_SCRIPT_NAME}.1
 
-JBOSSOUTPUT=	${WRKSRC}/build/output/${PORTNAME}-${PORTVERSION:S/.s/SP/}
+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:
 	@${ECHO_MSG} "Installation settings:"
 	@${ECHO_MSG} "   Destination directory:    ${APP_HOME}"
@@ -111,21 +103,22 @@ 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)
+post-patch:
+	@${ECHO_MSG} -n ">> Removing unneeded files..."
+	@${FIND} ${WRKSRC} -name '*.orig' -delete
+	@${ECHO_MSG} " [ DONE ]"
 
 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/jboss4/distinfo b/java/jboss4/distinfo
index 08c15bfb5eb2..b81a5335e1e0 100644
--- a/java/jboss4/distinfo
+++ b/java/jboss4/distinfo
@@ -1,3 +1,3 @@
-MD5 (jboss-4.0.5.GA-src.tar.gz) = d93ab59f52a5c196520673d272cb7a42
-SHA256 (jboss-4.0.5.GA-src.tar.gz) = 087aa32185d3867c993d3b318675dbb6c4ce71e410730d24e5d358e4206ae3d8
-SIZE (jboss-4.0.5.GA-src.tar.gz) = 78808549
+MD5 (jboss-4.2.0.GA-src.tar.gz) = 1b6d458f1945a6203dfbed87ac83dda3
+SHA256 (jboss-4.2.0.GA-src.tar.gz) = 88a1308b30dbd6fdb6bd6fd69050c55285cf0d410a3ed942646a8593e76003b0
+SIZE (jboss-4.2.0.GA-src.tar.gz) = 108677264
diff --git a/java/jboss4/files/daemonctl.1 b/java/jboss4/files/daemonctl.1.in
index 30547f449ef9..30547f449ef9 100644
--- a/java/jboss4/files/daemonctl.1
+++ b/java/jboss4/files/daemonctl.1.in
diff --git a/java/jboss4/files/daemonctl.c b/java/jboss4/files/daemonctl.c.in
index d5f67318b7cf..7bcdc6b7f5e8 100644
--- a/java/jboss4/files/daemonctl.c
+++ b/java/jboss4/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/jboss4/files/Attic/daemonctl.c,v 1.3 2004-12-22 20:44:23 hq Exp $
+ * $FreeBSD$
  */
 
 #include <assert.h>
diff --git a/java/jboss4/files/startup.sh b/java/jboss4/files/jboss4.in
index be7cff4ca2c7..4bcb6d3fd8a2 100644
--- a/java/jboss4/files/startup.sh
+++ b/java/jboss4/files/jboss4.in
@@ -2,11 +2,12 @@
 #
 # %%APP_TITLE%% startup script.
 #
-# $FreeBSD: /tmp/pcvs/ports/java/jboss4/files/Attic/startup.sh,v 1.4 2006-06-13 17:43:14 glewis Exp $
+# $FreeBSD$
 #
 
 # PROVIDE: %%APP_SHORTNAME%%
 # REQUIRE: NETWORKING SERVERS
+# KEYWORD: shutdown
 
 # Add the following lines to /etc/rc.conf to enable %%APP_SHORTNAME%%:
 # %%APP_SHORTNAME%%_enable (bool):		Set to "NO" by default.
diff --git a/java/jboss4/files/patch-ant-build b/java/jboss4/files/patch-ant-build
new file mode 100644
index 000000000000..9098b48f6520
--- /dev/null
+++ b/java/jboss4/files/patch-ant-build
@@ -0,0 +1,45 @@
+$FreeBSD$
+
+These patches disables the ant version checks.
+
+diff -ruN /tmp/jboss-4.2.0.GA-src/tools/etc/buildmagic/build-common.xml ./tools/etc/buildmagic/build-common.xml
+--- /tmp/jboss-4.2.0.GA-src/tools/etc/buildmagic/build-common.xml	Sat May 12 06:24:27 2007
++++ ./tools/etc/buildmagic/build-common.xml	Tue Jun 19 13:56:11 2007
+@@ -9,10 +9,12 @@
+    -->
+ 
+   <condition property="buildmagic.ant.compatible">
++	<!--
+     <or>
+       <contains string="${ant.version}" 
+ 	        substring="Ant version ${buildmagic.ant16.baseversion}"/>
+     </or>
++	  -->
+   </condition>
+ 
+   <fail unless="buildmagic.ant.compatible">
+diff -ruN /tmp/jboss-4.2.0.GA-src/tools/etc/buildmagic/buildmagic.ent ./tools/etc/buildmagic/buildmagic.ent
+--- /tmp/jboss-4.2.0.GA-src/tools/etc/buildmagic/buildmagic.ent	Sat May 12 06:24:27 2007
++++ ./tools/etc/buildmagic/buildmagic.ent	Tue Jun 19 14:03:55 2007
+@@ -11,19 +11,8 @@
+   <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>
++  <!-- disable ant checks -->
++  <property name="buildmagic.ant.compatible" value="forced"/>
+ 
+   <fail unless="buildmagic.ant.compatible">
+ 
diff --git a/java/jboss4/pkg-deinstall b/java/jboss4/files/pkg-deinstall.in
index 26bcfc578eac..72f7b922c69f 100644
--- a/java/jboss4/pkg-deinstall
+++ b/java/jboss4/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/jboss4/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/jboss4/pkg-install b/java/jboss4/files/pkg-install.in
index 74f40794ebb4..687ec3fc1f9e 100644
--- a/java/jboss4/pkg-install
+++ b/java/jboss4/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/jboss4/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/jboss4/files/pkg-message b/java/jboss4/files/pkg-message.in
index e48411f3028c..e48411f3028c 100644
--- a/java/jboss4/files/pkg-message
+++ b/java/jboss4/files/pkg-message.in