[109411] trunk/dports/devel/icu

[ryandesign at macports.org]

Revision: 109411
          https://trac.macports.org/changeset/109411
Author:   ryandesign at macports.org
Date:     2013-08-14 23:31:31 -0700 (Wed, 14 Aug 2013)
Log Message:
-----------
icu: remove -arch flags from icu-config, pkgconfig files, etc. (#40069)

Modified Paths:
--------------
    trunk/dports/devel/icu/Portfile
    trunk/dports/devel/icu/files/patch-universal.diff

Modified: trunk/dports/devel/icu/Portfile
===================================================================
--- trunk/dports/devel/icu/Portfile	2013-08-15 02:36:01 UTC (rev 109410)
+++ trunk/dports/devel/icu/Portfile	2013-08-15 06:31:31 UTC (rev 109411)
@@ -9,6 +9,7 @@
 # Don't forget to increase the revision number of the dependents (e.g. boost)
 # whenever the library version number changes. Thanks.
 version         51.2
+revision        1
 categories      devel textproc
 platforms       darwin freebsd
 license         MIT
@@ -101,6 +102,22 @@
 
 use_parallel_build  yes
 
+post-build {
+    if {[variant_isset universal]} {
+        set dirs {}
+        foreach arch ${universal_archs_to_use} {
+            lappend dirs ${worksrcpath}-${arch}
+        }
+    } else {
+        set dirs ${worksrcpath}
+    }
+    foreach dir ${dirs} {
+        foreach f {Makefile.inc icu-config icu-i18n.pc icu-io.pc icu-le.pc icu-lx.pc icu-uc.pc icu.pc pkgdata.inc} {
+            reinplace -E {s|-arch [a-z0-9_]+||g} ${dir}/config/${f}
+        }
+    }
+}
+
 test.run        yes
 test.target     check
 
@@ -112,10 +129,8 @@
         # Ticket #23773
         foreach a ${universal_archs_to_use} {
             reinplace "s|/Makefile.inc|/Makefile-${a}.inc|g" ${destroot}${prefix}/bin/icu-config-${a}
-            reinplace "s|/pkgdata.inc|/pkgdata-${a}.inc|g" ${destroot}${prefix}/bin/icu-config-${a}
         }
         ln -s current/Makefile.inc ${destroot}${prefix}/lib/icu/Makefile.inc
-        ln -s current/pkgdata.inc ${destroot}${prefix}/lib/icu/pkgdata.inc
     }
 }
 
@@ -141,7 +156,6 @@
         }
         foreach {p q} [list "${prefix}/bin/icu-config-${a}" "${prefix}/bin/icu-config" \
                             "${prefix}/lib/icu/${version}/Makefile-${a}.inc" "${prefix}/lib/icu/${version}/Makefile.inc" \
-                            "${prefix}/lib/icu/${version}/pkgdata-${a}.inc" "${prefix}/lib/icu/${version}/pkgdata.inc" \
                             "${prefix}/lib/pkgconfig/icu-i18n-${a}.pc" "${prefix}/lib/pkgconfig/icu-i18n.pc" \
                             "${prefix}/lib/pkgconfig/icu-io-${a}.pc" "${prefix}/lib/pkgconfig/icu-io.pc" \
                             "${prefix}/lib/pkgconfig/icu-le-${a}.pc" "${prefix}/lib/pkgconfig/icu-le.pc" \
@@ -154,6 +168,9 @@
     }
 }
 
+# icu @51.2_0 and earlier also installed the following files directly, bypassing destroot:
+#   ${prefix}/lib/icu/${version}/pkgdata.inc
+# These files can be removed from the below deactivation block after August 2014.
 pre-deactivate {
     if {[variant_isset universal]} {
         # Ticket #23773

Modified: trunk/dports/devel/icu/files/patch-universal.diff
===================================================================
--- trunk/dports/devel/icu/files/patch-universal.diff	2013-08-15 02:36:01 UTC (rev 109410)
+++ trunk/dports/devel/icu/files/patch-universal.diff	2013-08-15 06:31:31 UTC (rev 109411)
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2012-06-01 09:56:18.000000000 -0500
-+++ Makefile.in	2012-09-15 14:02:15.000000000 -0500
-@@ -160,16 +160,19 @@
+--- Makefile.in.orig	2013-05-23 15:06:32.000000000 -0500
++++ Makefile.in	2013-08-15 01:22:22.000000000 -0500
+@@ -169,15 +169,18 @@
  	$(INSTALL_SCRIPT) $(top_srcdir)/install-sh $(DESTDIR)$(pkgdatadir)/install-sh
  	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir)/pkgconfig
  	$(INSTALL_DATA) $(ALL_PKGCONFIG_FILES) $(DESTDIR)$(libdir)/pkgconfig/
@@ -10,18 +10,15 @@
  	$(INSTALL_DATA) $(top_srcdir)/../license.html $(DESTDIR)$(pkgdatadir)/license.html
 -	$(INSTALL_SCRIPT) $(top_builddir)/config/icu-config $(DESTDIR)$(bindir)/icu-config
 -	$(INSTALL_DATA) $(top_builddir)/config/Makefile.inc $(DESTDIR)$(pkglibdir)/Makefile.inc
--	$(INSTALL_DATA) $(top_builddir)/config/pkgdata.inc $(DESTDIR)$(pkglibdir)/pkgdata.inc
 +	$(INSTALL_SCRIPT) $(top_builddir)/config/icu-config $(DESTDIR)$(bindir)/icu-config-__ARCH__
 +	$(INSTALL_DATA) $(top_builddir)/config/Makefile.inc $(DESTDIR)$(pkglibdir)/Makefile-__ARCH__.inc
-+	$(INSTALL_DATA) $(top_builddir)/config/pkgdata.inc $(DESTDIR)$(pkglibdir)/pkgdata-__ARCH__.inc
+ 	$(INSTALL_DATA) $(top_builddir)/config/pkgdata.inc $(DESTDIR)$(pkglibdir)/pkgdata.inc
  #	@echo icuinfo.xml is built after make check.
  #	-$(INSTALL_DATA) $(top_builddir)/config/icuinfo.xml $(DESTDIR)$(pkglibdir)/icuinfo.xml
  	cd $(DESTDIR)$(pkglibdir)/..; \
  	    $(RM) current && ln -s $(VERSION) current; \
 -	    $(RM) Makefile.inc && ln -s current/Makefile.inc Makefile.inc; \
--	    $(RM) pkgdata.inc && ln -s current/pkgdata.inc pkgdata.inc
 +#	    $(RM) Makefile.inc && ln -s current/Makefile.inc Makefile.inc; \
-+#	    $(RM) pkgdata.inc && ln -s current/pkgdata.inc pkgdata.inc
+ 	    $(RM) pkgdata.inc && ln -s current/pkgdata.inc pkgdata.inc
  
  ifeq ($(DOXYGEN),)
- install-doc:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130814/3b5ed201/attachment.html>