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

[blair at macports.org]

Revision: 37234
          http://trac.macosforge.org/projects/macports/changeset/37234
Author:   blair at macports.org
Date:     2008-05-31 12:13:54 -0700 (Sat, 31 May 2008)

Log Message:
-----------
Ice uses libiconv, so add a dependency on it.

The installed version of iconv.h differs on 10.4 and 10.5 and the Ice
compile breaks if the wrong #define is set, so grep for the installed
version.

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

Modified: trunk/dports/devel/ice-cpp/Portfile
===================================================================
--- trunk/dports/devel/ice-cpp/Portfile	2008-05-31 18:11:45 UTC (rev 37233)
+++ trunk/dports/devel/ice-cpp/Portfile	2008-05-31 19:13:54 UTC (rev 37234)
@@ -4,6 +4,7 @@
 
 name		ice-cpp
 version		3.3.0
+revision	1
 categories	devel
 maintainers	blair
 description	Fast, object-oriented RPC for C++, Java, Python, Ruby, PHP
@@ -49,7 +50,8 @@
 			rmd160 0ff924d66c383dcdd092df0f7e165a7f59a8754a
 platforms	darwin
 
-depends_lib	port:db46 \
+depends_lib	port:libiconv \
+		port:db46 \
 		port:expat \
 		port:openssl \
 		port:readline
@@ -76,7 +78,21 @@
 	system ${cmd}
 
 	reinplace "s/-O2/-g -O2/" ${workpath}/Ice-${version}/cpp/config/Make.rules.Darwin
-	reinplace "s/_LIBICONV_VERSION < 0x010B/_LIBICONV_VERSION <= 0x010B/" ${workpath}/Ice-${version}/cpp/include/Ice/IconvStringConverter.h
+
+	# It appears that 10.4 and 10.5 installed versions of
+	# ${prefix}/include/iconv.h have different definitions of
+	# the inbuf parameter to iconv(), one is 'const char* * inbuf'
+	# and the other is 'char* * inbuf'.  The Ice compile will
+	# fail if the 
+	set fl [open ${prefix}/include/iconv.h]
+	set data [read $fl]
+	close $fl
+	foreach line [split $data \n] {
+		if {[string match "extern size_t iconv*const*" $line]} {
+			reinplace "s/_LIBICONV_VERSION < 0x010B/_LIBICONV_VERSION <= 0x010B/" ${workpath}/Ice-${version}/cpp/include/Ice/IconvStringConverter.h
+			break
+		}
+	}
 }
 
 configure {

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080531/2786ef35/attachment.htm