[37184] trunk/dports/devel/ice-java

[blair at macports.org]

Revision: 37184
          http://trac.macosforge.org/projects/macports/changeset/37184
Author:   blair at macports.org
Date:     2008-05-28 23:06:50 -0700 (Wed, 28 May 2008)

Log Message:
-----------
New upstream 3.3.0 release of Ice for Java.

* ice-java/files:
  Remove this directory since all patches are in the released version.

* ice-java/Portfile:
  Updated portfile.
  Use Java 1.5 to compile Ice.

Modified Paths:
--------------
    trunk/dports/devel/ice-java/Portfile

Removed Paths:
-------------
    trunk/dports/devel/ice-java/files/

Modified: trunk/dports/devel/ice-java/Portfile
===================================================================
--- trunk/dports/devel/ice-java/Portfile	2008-05-29 06:05:48 UTC (rev 37183)
+++ trunk/dports/devel/ice-java/Portfile	2008-05-29 06:06:50 UTC (rev 37184)
@@ -3,8 +3,7 @@
 PortSystem 1.0
 
 name		ice-java
-version		3.2.1
-revision	1
+version		3.3.0
 categories	devel java
 maintainers	blair
 description	Fast, object-oriented RPC for C++, Java, Python, Ruby, PHP
@@ -28,22 +27,16 @@
 	This Port provides the Java runtime and bindings.
 
 homepage	http://www.zeroc.com/
-master_sites	http://www.zeroc.com/download/Ice/3.2/
-distfiles	IceJ-${version}-java2.tar.gz \
-		IceJ-${version}-java5.tar.gz
-patchfiles	patch-ServantLocator.locate-can-throw-user-exceptions.diff
-checksums	IceJ-${version}-java2.tar.gz \
-			md5 6d6b199608ba8947c1b5f2c8849f3cec \
-			sha1 cfeb9545f1baa71a04e10d45795f0cb677441e35 \
-			rmd160 d5cc4c738b90cf295fc1d1ace2b694a04c86fbcb \
-		IceJ-${version}-java5.tar.gz \
-			md5 2f93e7abed123ea36bbd2b8e2840eb29 \
-			sha1 80c4942b7c0533f5aa2beab7be0bf4f3ed29a117 \
-			rmd160 9b927dab3b7bac08ef8085536466cfafacca1c6f \
-		
+master_sites	http://www.zeroc.com/download/Ice/3.3/
+dist_subdir	ice-cpp
+distname	Ice-${version}
+checksums	md5 0500306d9cdbc0fbb553fbb529de557a \
+		sha1 b599c3a4d1d3006b868bf2cbcd8e2a2d4575fb22 \
+		rmd160 e85b37c93f12d9ae97c6b7b2f64f506fa051e4f8
 platforms	darwin
 
-depends_lib	port:db45 port:ice-cpp
+depends_lib	port:db46 \
+		port:ice-cpp
 depends_build	port:apache-ant \
 		port:jgoodies-forms \
 		port:jgoodies-looks \
@@ -51,55 +44,39 @@
 
 use_configure	no
 
-patch {
-	set cmd "cd ${workpath}/IceJ-${version}-java2 && patch -p2 < ${filespath}/patch-ServantLocator.locate-can-throw-user-exceptions.diff"
-	ui_debug ${cmd}
-	system ${cmd}
+set classpath ${prefix}/lib/db46/db.jar:${prefix}/share/java/forms.jar:${prefix}/share/java/looks.jar:${prefix}/share/java/proguard.jar
 
-	set cmd "cd ${workpath}/IceJ-${version}-java5 && patch -p2 < ${filespath}/patch-ServantLocator.locate-can-throw-user-exceptions.diff"
-	ui_debug ${cmd}
-	system ${cmd}
-}
+build.dir	${worksrcpath}/java
+build.env	JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Home CLASSPATH=${classpath} ICE_HOME=${prefix}
+build.cmd	ant
+build.target	clean all
 
-set classpath ${prefix}/lib/db45/db.jar:${prefix}/share/java/forms.jar:${prefix}/share/java/looks.jar:${prefix}/share/java/proguard.jar
-
-build {
-	set cmd "cd ${workpath}/IceJ-${version}-java2 && JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.4/Home CLASSPATH=${classpath} ICE_HOME=${prefix} ant clean all"
-	ui_debug ${cmd}
-	system ${cmd}
-
-	set cmd "cd ${workpath}/IceJ-${version}-java5 && JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Home CLASSPATH=${classpath} ICE_HOME=${prefix} ant clean all"
-	ui_debug ${cmd}
-	system ${cmd}
-}
-
 test.run	yes
-test {
-	set cmd "cd ${workpath}/IceJ-${version}-java5/test && JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Home CLASSPATH=${classpath} ICE_HOME=${prefix} ant clean all"
-	ui_debug ${cmd}
-	system ${cmd}
-}
+test.dir	${worksrcpath}/java
+test.env	CLASSPATH=${classpath} DYLD_LIBRARY_PATH=${prefix}/lib/db46 ICE_HOME=${prefix}
+test.cmd	python
+test.target	allTests.py
 
 destroot {
-	set ice-java2 ${workpath}/IceJ-${version}-java2
-	set ice-java5 ${workpath}/IceJ-${version}-java5
+	set ice-java ${workpath}/Ice-${version}/java
 	set javadir ${destroot}${prefix}/share/java
 	set docdir ${destroot}${prefix}/share/doc/${name}
 
 	xinstall -d -m 755 ${javadir}
 	xinstall -d -m 755 ${docdir}
 
-	file copy ${ice-java2}/lib/IceGridGUI.jar ${javadir}/
-	file copy ${ice-java2}/ant ${javadir}/ice-ant
-	file copy ${ice-java2}/resources/IceGridAdmin ${docdir}/
+	foreach f {ant-ice.jar Ice.jar IceGridGUI.jar} {
+		file copy ${ice-java}/lib/${f} ${javadir}/
+	}
+	file copy ${ice-java}/resources/IceGridAdmin ${docdir}/
 
-	file copy ${ice-java5}/lib/Ice.jar ${javadir}
-	foreach f {CHANGES ICE_LICENSE INSTALL LICENSE README} {
-		file copy ${ice-java5}/${f} ${docdir}/
+	foreach f {CHANGES ICE_LICENSE LICENSE RELEASE_NOTES} {
+		file copy ${worksrcpath}/${f} ${docdir}
 	}
+	file copy ${worksrcpath}/java/INSTALL ${docdir}
 
 	if {[variant_isset demo_source_code]} {
-		file copy ${ice-java5}/demo ${docdir}/
+		file copy ${ice-java}/demo ${docdir}/
 	}
 }
 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080528/088c9b2c/attachment.htm