[53468] trunk/dports/devel/mono

[nox at macports.org]

Revision: 53468
          http://trac.macports.org/changeset/53468
Author:   nox at macports.org
Date:     2009-07-06 06:57:13 -0700 (Mon, 06 Jul 2009)
Log Message:
-----------
mono (closes #19929):
 * Fix data-config.in dllmap paths.
 * Depend on xorg-libX11 instead of xorg-libs.
 * Remove useless configure env variables.
 * Depend on ICU even on Leopard.

Modified Paths:
--------------
    trunk/dports/devel/mono/Portfile

Added Paths:
-----------
    trunk/dports/devel/mono/files/patch-data-config.in.diff

Modified: trunk/dports/devel/mono/Portfile
===================================================================
--- trunk/dports/devel/mono/Portfile	2009-07-06 13:53:03 UTC (rev 53467)
+++ trunk/dports/devel/mono/Portfile	2009-07-06 13:57:13 UTC (rev 53468)
@@ -4,6 +4,7 @@
 
 name             mono
 version          2.4.2
+revision         1
 categories       devel lang mono
 platforms        darwin
 maintainers      mww
@@ -23,11 +24,11 @@
 
 depends_build    port:pkgconfig port:gawk
 depends_lib      port:gettext port:glib2 port:icu \
-                 port:libiconv port:zlib port:libgdiplus port:xorg-libs
+                 port:libiconv port:zlib port:libgdiplus port:xorg-libX11
 
-patchfiles       patch-configure.diff
+patchfiles       patch-configure.diff \
+                 patch-data-config.in.diff
 
-configure.env-append    ACLOCAL_FLAGS="-I ${prefix}/share/aclocal"
 # Do NOT pick up external boehmgc (prefixing CPPFLAGS or CFLAGS does not suffice -- ugly++)
 configure.cc-append	"-I${worksrcpath}/libgc/include"
 
@@ -40,7 +41,10 @@
 test.run         yes
 test.target      check
 
-post-patch       { reinplace "s/-pthread/-lpthread/g" ${worksrcpath}/configure }
+post-patch {
+    reinplace "s/-pthread/-lpthread/g" ${worksrcpath}/configure
+    reinplace s|@PREFIX@|$prefix|g $worksrcpath/data/config.in
+}
 
 post-destroot {
     set docdir ${prefix}/share/doc/${name}-${version}
@@ -67,7 +71,6 @@
 }
 
 platform darwin 9 {
-    depends_lib-delete    port:icu
     configure.cflags-append    -D_NONSTD_SOURCE
     configure.cxxflags-append    -D_NONSTD_SOURCE
     patchfiles-append patch-interp.h.diff patch-sys-mman.c.diff \

Added: trunk/dports/devel/mono/files/patch-data-config.in.diff
===================================================================
--- trunk/dports/devel/mono/files/patch-data-config.in.diff	                        (rev 0)
+++ trunk/dports/devel/mono/files/patch-data-config.in.diff	2009-07-06 13:57:13 UTC (rev 53468)
@@ -0,0 +1,32 @@
+--- data/config.in.orig	2008-11-04 15:54:12.000000000 +0100
++++ data/config.in	2008-11-04 15:56:30.000000000 +0100
+@@ -1,22 +1,22 @@
+ <configuration>
+ 	<dllmap dll="i:cygwin1.dll" target="@LIBC@" os="!windows" />
+ 	<dllmap dll="libc" target="@LIBC@" os="!windows"/>
+-	<dllmap dll="intl" target="@INTL@" os="!windows"/>
++	<dllmap dll="intl" target="@PREFIX@/lib/@INTL@" os="!windows"/>
+ 	<dllmap dll="intl" name="bind_textdomain_codeset" target="@LIBC@" os="solaris"/>
+ 	<dllmap dll="libintl" name="bind_textdomain_codeset" target="@LIBC@" os="solaris"/>
+-	<dllmap dll="libintl" target="@INTL@" os="!windows"/>
+-	<dllmap dll="i:libxslt.dll" target="libxslt at libsuffix@" os="!windows"/>
++	<dllmap dll="libintl" target="@PREFIX@/lib/@INTL@" os="!windows"/>
++	<dllmap dll="i:libxslt.dll" target="@PREFIX@/lib/libxslt at libsuffix@" os="!windows"/>
+ 	<dllmap dll="i:odbc32.dll" target="libodbc at libsuffix@" os="!windows"/>
+ 	<dllmap dll="i:odbc32.dll" target="libiodbc.dylib" os="osx"/>
+ 	<dllmap dll="oci" target="libclntsh at libsuffix@" os="!windows"/>
+ 	<dllmap dll="db2cli" target="libdb2_36 at libsuffix@" os="!windows"/>
+-	<dllmap dll="MonoPosixHelper" target="libMonoPosixHelper at libsuffix@" os="!windows" />
++	<dllmap dll="MonoPosixHelper" target="@PREFIX@/lib/libMonoPosixHelper at libsuffix@" os="!windows" />
+ 	<dllmap dll="i:msvcrt" target="@LIBC@" os="!windows"/>
+ 	<dllmap dll="i:msvcrt.dll" target="@LIBC@" os="!windows"/>
+-	<dllmap dll="sqlite" target="@SQLITE@" os="!windows"/>
+-	<dllmap dll="sqlite3" target="@SQLITE3@" os="!windows"/>
++	<dllmap dll="sqlite" target="@PREFIX@/lib/@SQLITE@" os="!windows"/>
++	<dllmap dll="sqlite3" target="@PREFIX@/lib/@SQLITE3@" os="!windows"/>
+ 	<dllmap dll="libX11" target="@X11@" os="!windows" />
+-	<dllmap dll="libcairo-2.dll" target="libcairo.so.2" os="!windows"/>
++	<dllmap dll="libcairo-2.dll" target="@PREFIX@/lib/libcairo at libsuffix@" os="!windows"/>
+ 	<dllmap dll="i:kernel32.dll">
+ 		<dllentry dll="__Internal" name="CopyMemory" target="mono_win32_compat_CopyMemory"/>
+ 		<dllentry dll="__Internal" name="FillMemory" target="mono_win32_compat_FillMemory"/>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090706/f958f619/attachment.html>