[52979] trunk/dports/devel/ice-cpp/Portfile

[blair at macports.org]

Revision: 52979
          http://trac.macports.org/changeset/52979
Author:   blair at macports.org
Date:     2009-06-26 17:35:04 -0700 (Fri, 26 Jun 2009)
Log Message:
-----------
Switch from using a local build of mcpp that is statically linked into
libSlice.dylib to using the mcpp port and dynamically linking to it.
Partially resolves #19921.

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

Modified: trunk/dports/devel/ice-cpp/Portfile
===================================================================
--- trunk/dports/devel/ice-cpp/Portfile	2009-06-27 00:28:13 UTC (rev 52978)
+++ trunk/dports/devel/ice-cpp/Portfile	2009-06-27 00:35:04 UTC (rev 52979)
@@ -4,7 +4,7 @@
 
 name		ice-cpp
 version		3.3.1
-revision	2
+revision	3
 categories	devel
 maintainers	blair
 description	Fast, object-oriented RPC for C++, Java, Python, Ruby, PHP
@@ -30,45 +30,28 @@
 	other languages: slice2cs, slice2java, slice2py, slice2rb and slice2vb.
 
 homepage	http://www.zeroc.com/
-master_sites	http://www.zeroc.com/download/Ice/3.3/:ice \
-		sourceforge:mcpp
+master_sites	http://www.zeroc.com/download/Ice/3.3/
 
-set mcpp_version 2.7
 set ice_dist	Ice-${version}${extract.suffix}
-set mcpp_dist	mcpp-${mcpp_version}${extract.suffix}
 
 distname	Ice-${version}
-distfiles	${ice_dist}:ice \
-		${mcpp_dist}:mcpp
+distfiles	${ice_dist}
 patchfiles	patch-ice.cpp.config.Make.rules.diff \
-		patch-ice.cpp.config.Make.rules.Darwin.diff \
-		patch-mcpp-${mcpp_version}-1.diff \
-		patch-mcpp-${mcpp_version}-2.diff
+		patch-ice.cpp.config.Make.rules.Darwin.diff
 checksums	${ice_dist} \
 			md5 1f37dfcec4662fcde030553fb447d064 \
 			sha1 08d0f32bdb7d909b4a531d45cccfa97bdde649aa \
-			rmd160 d64d52c35640cebe1145e62f57618473d17cbeb5 \
-		${mcpp_dist} \
-			md5 14f9e4155aeb5812fc3ced6345caee02 \
-			sha1 3bb1c2a2f0fae9c73c2c4edaf98354b2140f4f53 \
-			rmd160 0ff924d66c383dcdd092df0f7e165a7f59a8754a
+			rmd160 d64d52c35640cebe1145e62f57618473d17cbeb5
 platforms	darwin
 
 depends_lib	port:libiconv \
 		port:db46 \
 		port:expat \
 		port:openssl \
-		port:readline
+		port:readline \
+		port:mcpp
 
 patch {
-	set cmd "cd ${workpath}/mcpp-${mcpp_version} && patch -p0 < ${filespath}/patch-mcpp-${mcpp_version}-1.diff"
-	ui_debug ${cmd}
-	system ${cmd}
-
-	set cmd "cd ${workpath}/mcpp-${mcpp_version} && patch -p0 < ${filespath}/patch-mcpp-${mcpp_version}-2.diff"
-	ui_debug ${cmd}
-	system ${cmd}
-
 	set cmd "cd ${workpath}/Ice-${version} && patch -p0 < ${filespath}/patch-ice.cpp.config.Make.rules.diff"
 	ui_debug ${cmd}
 	system ${cmd}
@@ -106,20 +89,12 @@
 	}
 }
 
-configure {
-	set cmd "cd ${workpath}/mcpp-${mcpp_version} && CC='${configure.cc}' CXX='${configure.cxx}' CFLAGS='-O2 -g -fno-common' ./configure --enable-mcpplib"
-	ui_debug ${cmd}
-	system ${cmd}
-}
+use_configure	no
 
 build {
-	set cmd "cd ${workpath}/mcpp-${mcpp_version} && make"
+	set cmd "cd ${workpath}/Ice-${version}/cpp && make prefix='${prefix}' embedded_runpath_prefix='${prefix}' CC='${configure.cc}' CXX='${configure.cxx}' OPTIMIZE='yes' BZIP2_HOME='${prefix}' DB_HOME='${prefix}' EXPAT_HOME='${prefix}' OPENSSL_HOME='${prefix}' READLINE_HOME='${prefix}' USE_READLINE=yes MCPP_HOME='${prefix}' LDPLATFORMFLAGS= all && cd doc && make"
 	ui_debug ${cmd}
 	system ${cmd}
-
-	set cmd "cd ${workpath}/Ice-${version}/cpp && make prefix='${prefix}' embedded_runpath_prefix='${prefix}' CC='${configure.cc}' CXX='${configure.cxx}' OPTIMIZE='yes' BZIP2_HOME='${prefix}' DB_HOME='${prefix}' EXPAT_HOME='${prefix}' OPENSSL_HOME='${prefix}' READLINE_HOME='${prefix}' USE_READLINE=yes MCPP_LIBS='${workpath}/mcpp-${mcpp_version}/src/.libs/*.o' LDPLATFORMFLAGS= all && cd doc && make"
-	ui_debug ${cmd}
-	system ${cmd}
 }
 
 test.dir	${worksrcpath}/cpp
@@ -136,6 +111,7 @@
 		OPENSSL_HOME="${prefix}" \
 		READLINE_HOME="${prefix}" \
 		USE_READLINE=yes \
+		MCPP_HOME="${prefix}" \
 		install
 
 post-destroot {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090626/be044b14/attachment.html>