Attachment #89719 for bug #126718

View | Details | Raw Unified | Return to bug 126718
Collapse All | Expand All




#

PORTNAME=	${APP_TITLE:L}
PORTVERSION=	5.0.0.cr1
PORTREVISION=	2
PORTEPOCH=	1
CATEGORIES=	java devel
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}
DISTNAME=	${PORTNAME}-${PORTVERSION:U}-src

MAINTAINER=	nemoliu@FreeBSD.org
COMMENT=	Open-source J2EE application server (5.x family)

JAVA_MAIN=	org.jboss.Main
MAN1=		${CONTROL_SCRIPT_NAME}.1

JBOSSOUTPUT=	${WRKSRC}/build/output/${PORTNAME}-${PORTVERSION:R}.CR1
APP_HOME_FILES=	bin client lib server

PKGMESSAGE=	${WRKDIR}/pkg-message

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (jboss-5.0.0.Beta1-src.tar.gz) = 92365ed9bafae925c071e23e723216be	1	MD5 (jboss-5.0.0.CR1-src.tar.gz) = c5bc11b5174dd8cc35b80ccd7e702d2c
2	SHA256 (jboss-5.0.0.Beta1-src.tar.gz) = f0916edce3053a3cc5e689559822b559e0d4b08582eeb606f0208ca7634ef1e5	2	SHA256 (jboss-5.0.0.CR1-src.tar.gz) = 200bfd89cef204af041aec4ace01b53fbc08cb124819a9b30f365da5ff7e30f4
3	SIZE (jboss-5.0.0.Beta1-src.tar.gz) = 114347235	3	SIZE (jboss-5.0.0.CR1-src.tar.gz) = 100025841




--- ./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
@@ -20,6 +20,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>
 
   <fail unless="buildmagic.ant.compatible">
   Unsupported Ant version:
     ${ant.version}




--- ./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"/>

Return to bug 126718

Lines 6-18 Link Here

(-)Makefile (-4 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= ${APP_TITLE:L}	8	PORTNAME= ${APP_TITLE:L}
9	PORTVERSION= 5.0.0.b1	9	PORTVERSION= 5.0.0.cr1
10	PORTREVISION= 2
11	PORTEPOCH= 1	10	PORTEPOCH= 1
12	CATEGORIES= java devel	11	CATEGORIES= java devel
13	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
14	MASTER_SITE_SUBDIR= ${PORTNAME}	13	MASTER_SITE_SUBDIR= ${PORTNAME}
15	DISTNAME= ${PORTNAME}-${PORTVERSION:R}.Beta1-src	14	DISTNAME= ${PORTNAME}-${PORTVERSION:U}-src
16		15
17	MAINTAINER= nemoliu@FreeBSD.org	16	MAINTAINER= nemoliu@FreeBSD.org
18	COMMENT= Open-source J2EE application server (5.x family)	17	COMMENT= Open-source J2EE application server (5.x family)
Lines 55-61 Link Here
55	JAVA_MAIN= org.jboss.Main	54	JAVA_MAIN= org.jboss.Main
56	MAN1= ${CONTROL_SCRIPT_NAME}.1	55	MAN1= ${CONTROL_SCRIPT_NAME}.1
57		56
58	JBOSSOUTPUT= ${WRKSRC}/build/output/${PORTNAME}-${PORTVERSION:R}.Beta1	57	JBOSSOUTPUT= ${WRKSRC}/build/output/${PORTNAME}-${PORTVERSION:R}.CR1
59	APP_HOME_FILES= bin client lib server	58	APP_HOME_FILES= bin client lib server
60		59
61	PKGMESSAGE= ${WRKDIR}/pkg-message	60	PKGMESSAGE= ${WRKDIR}/pkg-message

Lines 1-23 Link Here

(-)files/patch-build-common.xml (-18 / +1 lines)
1	--- ./tools/etc/buildmagic/build-common.xml.orig Sun Mar 25 20:25:52 2007	1	--- ./tools/etc/buildmagic/build-common.xml.orig Sun Mar 25 20:25:52 2007
2	+++ ./tools/etc/buildmagic/build-common.xml Sun Mar 25 20:27:18 2007	2	+++ ./tools/etc/buildmagic/build-common.xml Sun Mar 25 20:27:18 2007
3	@@ -2,7 +2,7 @@	3	@@ -20,6 +20,7 @@
4
5	<!-- Make sure we have the right version of Ant -->
6	<property name="buildmagic.ant16.baseversion" value="1.6"/>
7	-
8	+ <property name="buildmagic.ant17.baseversion" value="1.7"/>
9	<!--
10	\| Add new conditions for other supported Ant versions when they
11	\| become avaialble.
12	@@ -12,13 +12,16 @@
13	<or>
14	<contains string="${ant.version}"
15	substring="Ant version ${buildmagic.ant16.baseversion}"/>
16	+ <contains string="${ant.version}"
17	+ substring="Ant version ${buildmagic.ant17.baseversion}"/>
18	</or>
19	</condition>
20
21	<fail unless="buildmagic.ant.compatible">	4	<fail unless="buildmagic.ant.compatible">
22	Unsupported Ant version:	5	Unsupported Ant version:
23	${ant.version}	6	${ant.version}

Removed Link Here

(-)files/patch-buildmagic.ent (-37 lines)
1	--- ./tools/etc/buildmagic/buildmagic.ent.orig Mon Nov 20 07:45:55 2006
2	+++ ./tools/etc/buildmagic/buildmagic.ent Sun Mar 25 21:28:14 2007
3	@@ -7,34 +7,6 @@
4	<!-- Initialize the build system. -->
5	<target name="_buildmagic:init" unless="init.disable">
6
7	- <!-- Make sure we have the right version of Ant -->
8	- <property name="buildmagic.ant15.baseversion" value="1.5"/>
9	- <property name="buildmagic.ant16.baseversion" value="1.6"/>
10	-
11	- <!--
12	- \| Add new conditions for other supported Ant versions when they
13	- \| become avaialble.
14	- -->
15	-
16	- <condition property="buildmagic.ant.compatible">
17	- <or>
18	- <contains string="${ant.version}"
19	- substring="Ant version ${buildmagic.ant15.baseversion}"/>
20	- <contains string="${ant.version}"
21	- substring="Ant version ${buildmagic.ant16.baseversion}"/>
22	- </or>
23	- </condition>
24	-
25	- <fail unless="buildmagic.ant.compatible">
26	-
27	- Unsupported Ant version:
28	-
29	- ${ant.version}
30	-
31	- Please install a version which is compatible with Ant ${buildmagic.ant15.baseversion} or ${buildmagic.ant16.baseversion}.
32	-
33	- </fail>
34	-
35	<!-- JDK Detection -->
36	<available classname="java.lang.StackTraceElement" property="HAVE_JDK_1.4"/>
37	<available classname="java.lang.Enum" property="HAVE_JDK_1.5"/>