- Update to 5.0.0.cr1, which also fixes build with jdk16

PR:		ports/126718
Submitted by:	Greg Lewis <glewis@eyesbeyond.com>
Approved by:	maintainer timeout (nemoliu; 14 days)

4 files changed, 7 insertions, 62 deletions

diff --git a/java/jboss5/Makefile b/java/jboss5/Makefile
index 1f0e768f5010..dbb8ab7d9998 100644
--- a/java/jboss5/Makefile
+++ b/java/jboss5/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	${APP_TITLE:L}
-PORTVERSION=	5.0.0.b1
-PORTREVISION=	2
+PORTVERSION=	5.0.0.cr1
 PORTEPOCH=	1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}.Beta1-src
+DISTNAME=	${PORTNAME}-${PORTVERSION:U}-src
 
 MAINTAINER=	nemoliu@FreeBSD.org
 COMMENT=	Open-source J2EE application server (5.x family)
@@ -55,7 +54,7 @@ JAVA_CP=	bin/run.jar:${JAVA_HOME}/lib/tools.jar
 JAVA_MAIN=	org.jboss.Main
 MAN1=		${CONTROL_SCRIPT_NAME}.1
 
-JBOSSOUTPUT=	${WRKSRC}/build/output/${PORTNAME}-${PORTVERSION:R}.Beta1
+JBOSSOUTPUT=	${WRKSRC}/build/output/${PORTNAME}-${PORTVERSION:R}.CR1
 APP_HOME_FILES=	bin client lib server
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
diff --git a/java/jboss5/distinfo b/java/jboss5/distinfo
index a1b5102246ea..6df75fe65b2f 100644
--- a/java/jboss5/distinfo
+++ b/java/jboss5/distinfo
@@ -1,3 +1,3 @@
-MD5 (jboss-5.0.0.Beta1-src.tar.gz) = 92365ed9bafae925c071e23e723216be
-SHA256 (jboss-5.0.0.Beta1-src.tar.gz) = f0916edce3053a3cc5e689559822b559e0d4b08582eeb606f0208ca7634ef1e5
-SIZE (jboss-5.0.0.Beta1-src.tar.gz) = 114347235
+MD5 (jboss-5.0.0.CR1-src.tar.gz) = c5bc11b5174dd8cc35b80ccd7e702d2c
+SHA256 (jboss-5.0.0.CR1-src.tar.gz) = 200bfd89cef204af041aec4ace01b53fbc08cb124819a9b30f365da5ff7e30f4
+SIZE (jboss-5.0.0.CR1-src.tar.gz) = 100025841
diff --git a/java/jboss5/files/patch-build-common.xml b/java/jboss5/files/patch-build-common.xml
index fb2a1c8308c7..0bf67a9c68fc 100644
--- a/java/jboss5/files/patch-build-common.xml
+++ b/java/jboss5/files/patch-build-common.xml
@@ -1,23 +1,6 @@
 --- ./tools/etc/buildmagic/build-common.xml.orig	Sun Mar 25 20:25:52 2007
 +++ ./tools/etc/buildmagic/build-common.xml	Sun Mar 25 20:27:18 2007
-@@ -2,7 +2,7 @@
- 
-   <!-- Make sure we have the right version of Ant -->
-   <property name="buildmagic.ant16.baseversion" value="1.6"/>
--
-+  <property name="buildmagic.ant17.baseversion" value="1.7"/>
-   <!--
-      | Add new conditions for other supported Ant versions when they
-      | become avaialble.
-@@ -12,13 +12,16 @@
-     <or>
-       <contains string="${ant.version}" 
- 	        substring="Ant version ${buildmagic.ant16.baseversion}"/>
-+      <contains string="${ant.version}"
-+        substring="Ant version ${buildmagic.ant17.baseversion}"/>
-     </or>
-   </condition>
- 
+@@ -20,6 +20,7 @@
    <fail unless="buildmagic.ant.compatible">
    Unsupported Ant version:
      ${ant.version}
diff --git a/java/jboss5/files/patch-buildmagic.ent b/java/jboss5/files/patch-buildmagic.ent
deleted file mode 100644
index 2e2eeb500927..000000000000
--- a/java/jboss5/files/patch-buildmagic.ent
+++ /dev/null
@@ -1,37 +0,0 @@
---- ./tools/etc/buildmagic/buildmagic.ent.orig	Mon Nov 20 07:45:55 2006
-+++ ./tools/etc/buildmagic/buildmagic.ent	Sun Mar 25 21:28:14 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.StackTraceElement" property="HAVE_JDK_1.4"/>
-   <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/>