[73849] trunk/dports/devel/icu
takanori at macports.org
takanori at macports.org
Sat Nov 27 00:37:24 PST 2010
Revision: 73849
http://trac.macports.org/changeset/73849
Author: takanori at macports.org
Date: 2010-11-27 00:37:19 -0800 (Sat, 27 Nov 2010)
Log Message:
-----------
icu:
- Updated to the latest stable version (4.4.2). (#26044)
- Fixed a broken static library problem. (#26435)
- Added +with_doxygen for better API docs.
Modified Paths:
--------------
trunk/dports/devel/icu/Portfile
trunk/dports/devel/icu/files/patch-config-mh-darwin.diff
trunk/dports/devel/icu/files/patch-configure.diff
Added Paths:
-----------
trunk/dports/devel/icu/files/patch-Makefile.in.diff
Modified: trunk/dports/devel/icu/Portfile
===================================================================
--- trunk/dports/devel/icu/Portfile 2010-11-27 05:37:54 UTC (rev 73848)
+++ trunk/dports/devel/icu/Portfile 2010-11-27 08:37:19 UTC (rev 73849)
@@ -6,7 +6,7 @@
name icu
set my_name icu4c
-version 4.3.4
+version 4.4.2
categories devel textproc
platforms darwin freebsd
maintainers nox openmaintainer
@@ -24,21 +24,31 @@
distname ${my_name}-[join [split ${version} .] _]
extract.suffix .tgz
distfiles ${distname}-src${extract.suffix}
-
+patchfiles patch-configure.diff \
+ patch-config-mh-darwin.diff \
+ patch-Makefile.in.diff
checksums ${distname}-src${extract.suffix} \
- md5 9736a1e69bce0e5322af6986008d89bc \
- sha1 99c95f924f82b48c97f9e1e57ea2568cef22d6ef \
- rmd160 2c1a42379a6d14bea2ac1585532e3a7b8a4fe836
+ md5 314e582264c36b3735466c522899aa07 \
+ sha1 adc19231810eff2836a08b0e1f1a31a128d7a834 \
+ rmd160 eb228e6fa9606855bbd881d98da738a61d72b74b
worksrcdir ${name}/source
set docdir ${prefix}/share/doc/${name}
-patchfiles patch-configure.diff \
- patch-config-mh-darwin.diff
+pre-fetch {
+ if {[variant_isset universal]} {
+ if {${os.platform} != "darwin"} {
+ return -code error "Sorry, building universal ICU library is not supported on your platform."
+ }
+ if {${build_arch} != "x86_64"} {
+ return -code error "Sorry, building universal ICU library is now supported on x86_64 Macs only."
+ }
+ }
+}
post-patch {
- reinplace "s;install_name ;install_name ${prefix}/lib/;" ${worksrcpath}/config/mh-darwin
- reinplace "s|`date`|[exec date]|g" ${worksrcpath}/Makefile.in
+ 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}}]
@@ -85,27 +95,42 @@
post-destroot {
xinstall -d ${destroot}${docdir}
- xinstall -m 0644 -W ${worksrcpath}/.. readme.html ${destroot}${docdir}
+ eval xinstall -m 0644 [glob ${worksrcpath}/../*.{css,html,txt}] ${destroot}${docdir}
}
-variant doc description {Install extra documentation} {
+# The official doc archive seems to be a bit incomplete.
+# (For examples, it doesn't contain any files in 'search/' directory.)
+variant doc conflicts with_doxygen description {Install extra documentation} {
depends_extract-append bin:unzip:unzip
extract.only ${distname}-src${extract.suffix}
distfiles-append ${distname}-docs.zip
checksums-append ${distname}-docs.zip \
- md5 df164cba867cd293c4041352496537fa \
- sha1 1ec70bb0bdb101d569cc3f164ba3dfa5a62e2fe4 \
- rmd160 0f7f479197e1bf1993d6369e859388ade239a112
+ md5 2312c2f5292c39dd01836d95e018efa6 \
+ sha1 fc913f674366f9f36000f6e01f305f3cfc146695 \
+ rmd160 5f354d9dfded256e28d66e6b8c189d15028eeab6
post-extract {
- system "unzip -q ${distpath}/${distname}-docs.zip -d ${workpath}/doc"
+ xinstall -m 0755 -d ${worksrcpath}/doc/html
+ system "unzip -q ${distpath}/${distname}-docs.zip -d ${worksrcpath}/doc/html"
}
post-destroot {
- eval xinstall -m 0644 [glob ${workpath}/doc/*.{css,gif,html,png}] ${destroot}${docdir}
+ 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
}
}
+variant with_doxygen conflicts doc universal description {Build and install API documentation} {
+ depends_build port:doxygen
+ post-build {
+ system "cd ${worksrcpath} && ${build.cmd} doc"
+ }
+ post-destroot {
+ system "cd ${worksrcpath} && ${build.cmd} install-doc DESTDIR=${destroot}"
+ }
+}
+
platform freebsd {
build.env MAKE=/usr/local/bin/gmake
destroot.env MAKE=/usr/local/bin/gmake
Added: trunk/dports/devel/icu/files/patch-Makefile.in.diff
===================================================================
--- trunk/dports/devel/icu/files/patch-Makefile.in.diff (rev 0)
+++ trunk/dports/devel/icu/files/patch-Makefile.in.diff 2010-11-27 08:37:19 UTC (rev 73849)
@@ -0,0 +1,20 @@
+--- 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-config-mh-darwin.diff
===================================================================
--- trunk/dports/devel/icu/files/patch-config-mh-darwin.diff 2010-11-27 05:37:54 UTC (rev 73848)
+++ trunk/dports/devel/icu/files/patch-config-mh-darwin.diff 2010-11-27 08:37:19 UTC (rev 73849)
@@ -1,12 +1,11 @@
---- config/mh-darwin.orig 2009-10-02 12:56:30.000000000 +0200
-+++ config/mh-darwin 2009-10-02 12:57:01.000000000 +0200
-@@ -31,6 +31,9 @@
- LD_RPATH=
- LD_RPATH_PRE=
+--- config/mh-darwin.orig 2010-09-30 03:37:36.000000000 +0900
++++ config/mh-darwin 2010-11-26 13:02:12.000000000 +0900
+@@ -25,7 +25,7 @@
+ SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) $(LD_SOOPTIONS)
-+# The stubdata directory is the same directory as the normal data library.
-+STUBDATA_LIBDIR = $(LIBDIR)/
-+
- ## Environment variable to set a runtime search path
- LDLIBRARYPATH_ENVVAR = DYLD_LIBRARY_PATH
+ ## Compiler switches to embed a library name and version information
+-LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET))
++LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name __PREFIX__/$(notdir $(MIDDLE_SO_TARGET))
+ ## Compiler switch to embed a runtime search path
+ LD_RPATH=
Modified: trunk/dports/devel/icu/files/patch-configure.diff
===================================================================
--- trunk/dports/devel/icu/files/patch-configure.diff 2010-11-27 05:37:54 UTC (rev 73848)
+++ trunk/dports/devel/icu/files/patch-configure.diff 2010-11-27 08:37:19 UTC (rev 73849)
@@ -1,6 +1,6 @@
--- configure.orig 2009-10-02 11:50:49.000000000 +0200
+++ configure 2009-10-02 11:54:38.000000000 +0200
-@@ -7034,52 +7034,6 @@
+@@ -7963,52 +7963,6 @@
$as_echo_n "(cached) " >&6
else
ac_cv_c_bigendian=unknown
@@ -53,7 +53,7 @@
if test $ac_cv_c_bigendian = unknown; then
# See if sys/param.h defines the BYTE_ORDER macro.
cat >conftest.$ac_ext <<_ACEOF
-@@ -7418,19 +7372,6 @@
+@@ -8347,13 +8301,6 @@
;; #(
no)
;; #(
@@ -64,12 +64,6 @@
-_ACEOF
-
- ;; #(
-- *)
-- { { $as_echo "$as_me:$LINENO: error: unknown endianness
-- presetting ac_cv_c_bigendian=no (or yes) will help" >&5
--$as_echo "$as_me: error: unknown endianness
-- presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
-- { (exit 1); exit 1; }; } ;;
- esac
-
- if test $ac_cv_c_bigendian = no; then
+ *)
+ { { $as_echo "$as_me:$LINENO: error: unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" >&5
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101127/142b8b3a/attachment-0001.html>
More information about the macports-changes
mailing list