[25538] trunk

[source_changes at macosforge.org]

Revision: 25538
          http://trac.macosforge.org/projects/macports/changeset/25538
Author:   dluke at macports.org
Date:     2007-05-24 12:07:14 -0700 (Thu, 24 May 2007)

Log Message:
-----------
Apply patch from maintainer (fixes 11981)

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

Property Changed:
----------------
    trunk/


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 023a8b07-a327-4f20-9012-67c915bb7b7c:/local/branches/updates:21118
023a8b07-a327-4f20-9012-67c915bb7b7c:/local/trunk:21326
40426cdb-d25d-4106-b89a-567fc1e9311f:/local/trunk:22799
a2b01108-8822-4c85-91cd-1541804339d8:/local/macports:20632
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/libdnet-maintainer:20898
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-app-cli:20923
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-list-moreutils:20919
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-path-class:20929
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/updates:20946
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/trunk:20947
d9146071-5dc1-4620-afc7-8ba4e23d31df:/local/trunk:21690
e4b2a6a8-e742-4924-8f8a-3771363e925e:/local/trunk:25467
f2dd1c64-7982-4318-98ce-263798263e0a:/local:25752
fd7794eb-1723-4a49-8be4-c69b2a184b6d:/local/trunk:24020
   + 023a8b07-a327-4f20-9012-67c915bb7b7c:/local/branches/updates:21118
023a8b07-a327-4f20-9012-67c915bb7b7c:/local/trunk:21326
40426cdb-d25d-4106-b89a-567fc1e9311f:/local/trunk:22799
a2b01108-8822-4c85-91cd-1541804339d8:/local/macports:20632
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/libdnet-maintainer:20898
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-app-cli:20923
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-list-moreutils:20919
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-path-class:20929
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/updates:20946
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/trunk:20947
d9146071-5dc1-4620-afc7-8ba4e23d31df:/local/trunk:21690
e4b2a6a8-e742-4924-8f8a-3771363e925e:/local/trunk:25467
f2dd1c64-7982-4318-98ce-263798263e0a:/local:25782
fd7794eb-1723-4a49-8be4-c69b2a184b6d:/local/trunk:24020

Modified: trunk/dports/devel/icu/Portfile
===================================================================
--- trunk/dports/devel/icu/Portfile	2007-05-24 17:26:22 UTC (rev 25537)
+++ trunk/dports/devel/icu/Portfile	2007-05-24 19:07:14 UTC (rev 25538)
@@ -4,6 +4,7 @@
 
 name		icu
 version		3.6
+revision    1
 categories	devel
 platforms	darwin
 maintainers	n.oxyde at gmail.com
@@ -29,19 +30,24 @@
 worksrcdir	${name}/source
 set docdir  ${prefix}/share/doc/${name}-${version}
 
-pre-configure {
-	reinplace "s;install_name ;install_name ${prefix}/lib/;" ${worksrcpath}/config/mh-darwin
-}
 configure.args	--mandir=${prefix}/share/man \
                 --disable-samples
 
+# Fix bug #11981 that prevents ICU from building when upgrading.
+# The -I default parameter causes utilisation of outdated ICU headers instead of the right ones.
+# As this port has no dependencies, this trick is safe.
+configure.cppflags ""
+
 test.run        yes
+test.target     check
 
+post-patch {
+	reinplace "s;install_name ;install_name ${prefix}/lib/;" ${worksrcpath}/config/mh-darwin
+}
+
 post-destroot {
     xinstall -m 0755 -d ${destroot}${docdir}/html
     xinstall -m 0644 -W ${worksrcpath}/.. license.html readme.html ${destroot}${docdir}/html
-
-    delete ${destroot}${prefix}/share/${name}/${version}/license.html
 }
 
 variant doc {

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070524/3b644b0e/attachment.html