[74049] trunk/dports/devel/icu
takanori at macports.org
takanori at macports.org
Thu Dec 2 21:33:28 PST 2010
Revision: 74049
http://trac.macports.org/changeset/74049
Author: takanori at macports.org
Date: 2010-12-02 21:33:23 -0800 (Thu, 02 Dec 2010)
Log Message:
-----------
icu: version 4.6
Modified Paths:
--------------
trunk/dports/devel/icu/Portfile
trunk/dports/devel/icu/files/patch-configure.diff
trunk/dports/devel/icu/files/patch-universal.diff
Removed Paths:
-------------
trunk/dports/devel/icu/files/patch-Makefile.in.diff
Modified: trunk/dports/devel/icu/Portfile
===================================================================
--- trunk/dports/devel/icu/Portfile 2010-12-03 02:58:28 UTC (rev 74048)
+++ trunk/dports/devel/icu/Portfile 2010-12-03 05:33:23 UTC (rev 74049)
@@ -6,8 +6,7 @@
name icu
set my_name icu4c
-version 4.4.2
-revision 2
+version 4.6
categories devel textproc
platforms darwin freebsd
maintainers nox openmaintainer
@@ -27,12 +26,11 @@
distfiles ${distname}-src${extract.suffix}
patchfiles patch-configure.diff \
patch-config-mh-darwin.diff \
- patch-Makefile.in.diff \
patch-tools_icuinfo_Makefile.in.diff
checksums ${distname}-src${extract.suffix} \
- md5 314e582264c36b3735466c522899aa07 \
- sha1 adc19231810eff2836a08b0e1f1a31a128d7a834 \
- rmd160 eb228e6fa9606855bbd881d98da738a61d72b74b
+ md5 43e56b71c407be5154de681eaa646a4a \
+ sha1 efc68a73a424d5822565feaf4468336f77294e8e \
+ rmd160 1cb84839384af5cba75bda6358c8bdaa82adaa9c
worksrcdir ${name}/source
set docdir ${prefix}/share/doc/${name}
@@ -44,7 +42,6 @@
post-patch {
reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/config/mh-darwin
- reinplace "s|__DATE__|[exec date]|g" ${worksrcpath}/Makefile.in
}
set platform [switch ${os.platform} {darwin {format MacOSX} freebsd {format FreeBSD}}]
@@ -65,8 +62,8 @@
post-configure {
if {[variant_isset universal]} {
# Ticket #23773
- foreach arch ${universal_archs_to_use} {
- reinplace "s|__ARCH__|${arch}|g" ${worksrcpath}-${arch}/Makefile
+ foreach a ${universal_archs_to_use} {
+ reinplace "s|__ARCH__|${a}|g" ${worksrcpath}-${a}/Makefile
}
}
}
@@ -84,9 +81,9 @@
if {[variant_isset universal]} {
# Ticket #23773
- foreach arch ${universal_archs_to_use} {
- reinplace "s|/Makefile.inc|/Makefile-${arch}.inc|g" ${destroot}${prefix}/bin/icu-config-${arch}
- reinplace "s|/pkgdata.inc|/pkgdata-${arch}.inc|g" ${destroot}${prefix}/bin/icu-config-${arch}
+ 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
@@ -115,7 +112,12 @@
}
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/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" \
+ "${prefix}/lib/pkgconfig/icu-lx-${a}.pc" "${prefix}/lib/pkgconfig/icu-lx.pc" \
+ "${prefix}/lib/pkgconfig/icu-uc-${a}.pc" "${prefix}/lib/pkgconfig/icu-uc.pc"] {
if {[file exists ${p}]} {
ln -s ${p} ${q}
}
@@ -123,27 +125,30 @@
}
}
-post-deactivate {
+pre-deactivate {
if {[variant_isset universal]} {
# Ticket #23773
foreach f [list "${prefix}/bin/icu-config" \
"${prefix}/lib/icu/${version}/Makefile.inc" \
- "${prefix}/lib/icu/${version}/pkgdata.inc"] {
+ "${prefix}/lib/icu/${version}/pkgdata.inc" \
+ "${prefix}/lib/pkgconfig/icu-i18n.pc" \
+ "${prefix}/lib/pkgconfig/icu-io.pc" \
+ "${prefix}/lib/pkgconfig/icu-le.pc" \
+ "${prefix}/lib/pkgconfig/icu-lx.pc" \
+ "${prefix}/lib/pkgconfig/icu-uc.pc"] {
delete ${f}
}
}
}
-# The official doc archive seems to be a bit incomplete.
-# (For examples, it doesn't contain any files in 'search/' directory.)
-variant doc conflicts doxygen description {Install extra documentation} {
+variant doc conflicts doxygen description {Install pre-built API documentation} {
depends_extract-append bin:unzip:unzip
extract.only ${distname}-src${extract.suffix}
distfiles-append ${distname}-docs.zip
checksums-append ${distname}-docs.zip \
- md5 2312c2f5292c39dd01836d95e018efa6 \
- sha1 fc913f674366f9f36000f6e01f305f3cfc146695 \
- rmd160 5f354d9dfded256e28d66e6b8c189d15028eeab6
+ md5 854045e188d37036e637e037e832c91a \
+ sha1 c56518ffededdebea15525e1e25499e3e58aaec3 \
+ rmd160 ac5bc160bdb0f183ab0c5aa31324fa197b1a43f5
post-extract {
xinstall -m 0755 -d ${worksrcpath}/doc/html
@@ -152,8 +157,10 @@
post-destroot {
xinstall -m 0755 -d ${destroot}${docdir}/html/search
- eval xinstall -m 0644 [glob ${worksrcpath}/doc/html/*] ${destroot}${docdir}/html
- #eval xinstall -m 0644 [glob ${worksrcpath}/doc/html/search/*] ${destroot}${docdir}/html/search
+ foreach f {*.css *.html *.png *.tag installdox} {
+ eval xinstall -m 0644 [glob ${worksrcpath}/doc/html/${f}] ${destroot}${docdir}/html
+ }
+ eval xinstall -m 0644 [glob ${worksrcpath}/doc/html/search/*] ${destroot}${docdir}/html/search
}
}
Deleted: trunk/dports/devel/icu/files/patch-Makefile.in.diff
===================================================================
--- trunk/dports/devel/icu/files/patch-Makefile.in.diff 2010-12-03 02:58:28 UTC (rev 74048)
+++ trunk/dports/devel/icu/files/patch-Makefile.in.diff 2010-12-03 05:33:23 UTC (rev 74049)
@@ -1,20 +0,0 @@
---- Makefile.in.orig 2010-09-30 03:38:38.000000000 +0900
-+++ Makefile.in 2010-11-26 12:57:14.000000000 +0900
-@@ -18,7 +18,7 @@
- docsubdir = $(PACKAGE)$(ICULIBDASHSUFFIX)/html
- docsubsrchdir = $(docsubdir)/search
- docfilesdir = doc/html
--docfiles = $(docfilesdir)/*.gif $(docfilesdir)/*.png $(docfilesdir)/*.html $(docfilesdir)/*.css $(docfilesdir)/*.tag $(docfilesdir)/installdox
-+docfiles = $(docfilesdir)/*.png $(docfilesdir)/*.html $(docfilesdir)/*.css $(docfilesdir)/*.tag $(docfilesdir)/installdox
- docsrchdir = $(docfilesdir)/search
- docsrchfiles = $(docsrchdir)/*
-
-@@ -222,7 +222,7 @@
- sed -f $(top_srcdir)/config/make2sh.sed < $(top_builddir)/config/Makefile.inc | grep -v '#M#' | uniq >> $@
- sed -f $(top_srcdir)/config/make2sh.sed < @platform_make_fragment@ | grep -v '#M#' | uniq >> $@
- cat $(top_srcdir)/config/icu-config-bottom >> $@
-- echo "# Rebuilt on "`date` >> $@
-+ echo "# Rebuilt on __DATE__" >> $@
- chmod u-w $@
-
- config.status: $(srcdir)/configure $(srcdir)/common/unicode/uvernum.h
Modified: trunk/dports/devel/icu/files/patch-configure.diff
===================================================================
--- trunk/dports/devel/icu/files/patch-configure.diff 2010-12-03 02:58:28 UTC (rev 74048)
+++ trunk/dports/devel/icu/files/patch-configure.diff 2010-12-03 05:33:23 UTC (rev 74049)
@@ -1,15 +1,11 @@
---- configure.orig 2009-10-02 11:50:49.000000000 +0200
-+++ configure 2009-10-02 11:54:38.000000000 +0200
-@@ -7963,52 +7963,6 @@
+--- ./configure.orig 2010-10-07 12:34:53.000000000 +0900
++++ ./configure 2010-12-03 09:47:00.000000000 +0900
+@@ -6419,40 +6419,6 @@
$as_echo_n "(cached) " >&6
else
ac_cv_c_bigendian=unknown
- # See if we're dealing with a universal compiler.
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#ifndef __APPLE_CC__
- not a universal capable compiler
@@ -17,53 +13,43 @@
- typedef int dummy;
-
-_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
+-if ac_fn_c_try_compile "$LINENO"; then :
-
- # Check for potential -arch flags. It is not universal unless
-- # there are some -arch flags. Note that *ppc* also matches
-- # ppc64. This check is also rather less than ideal.
-- case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in #(
-- *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
-- esac
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
+- # there are at least two -arch flags with different values.
+- ac_arch=
+- ac_prev=
+- for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
+- if test -n "$ac_prev"; then
+- case $ac_word in
+- i?86 | x86_64 | ppc | ppc64)
+- if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
+- ac_arch=$ac_word
+- else
+- ac_cv_c_bigendian=universal
+- break
+- fi
+- ;;
+- esac
+- ac_prev=
+- elif test "x$ac_word" = "x-arch"; then
+- ac_prev=arch
+- fi
+- done
-fi
--
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_c_bigendian = unknown; then
# See if sys/param.h defines the BYTE_ORDER macro.
- cat >conftest.$ac_ext <<_ACEOF
-@@ -8347,13 +8301,6 @@
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -6627,11 +6593,6 @@
;; #(
no)
;; #(
- universal)
-
--cat >>confdefs.h <<\_ACEOF
--#define AC_APPLE_UNIVERSAL_BUILD 1
--_ACEOF
+-$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
-
- ;; #(
*)
- { { $as_echo "$as_me:$LINENO: error: unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" >&5
+ as_fn_error $? "unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
Modified: trunk/dports/devel/icu/files/patch-universal.diff
===================================================================
--- trunk/dports/devel/icu/files/patch-universal.diff 2010-12-03 02:58:28 UTC (rev 74048)
+++ trunk/dports/devel/icu/files/patch-universal.diff 2010-12-03 05:33:23 UTC (rev 74049)
@@ -1,8 +1,12 @@
---- Makefile.in.orig 2010-09-30 03:38:38.000000000 +0900
-+++ Makefile.in 2010-12-01 06:16:12.000000000 +0900
-@@ -137,13 +137,13 @@
- $(INSTALL_SCRIPT) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(pkgdatadir)/mkinstalldirs
+--- Makefile.in.orig 2010-10-07 09:23:38.000000000 +0900
++++ Makefile.in 2010-12-03 10:53:07.000000000 +0900
+@@ -149,14 +149,17 @@
$(INSTALL_SCRIPT) $(top_srcdir)/install-sh $(DESTDIR)$(pkgdatadir)/install-sh
+ @$(MKINSTALLDIRS) $(DESTDIR)$(libdir)/pkgconfig
+ $(INSTALL_DATA) $(ALL_PKGCONFIG_FILES) $(DESTDIR)$(libdir)/pkgconfig/
++ @for f in $(ALL_PKGCONFIG_SUFFIX); do \
++ mv "$(DESTDIR)$(libdir)/pkgconfig/icu-$${f}.pc" "$(DESTDIR)$(libdir)/pkgconfig/icu-$${f}-__ARCH__.pc"; \
++ done;
$(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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101202/43fb2b13/attachment-0001.html>
More information about the macports-changes
mailing list