diff options
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/icu/Makefile | 6 | ||||
| -rw-r--r-- | textproc/icu/PLIST | 49 | ||||
| -rw-r--r-- | textproc/icu/buildlink3.mk | 4 | ||||
| -rw-r--r-- | textproc/icu/distinfo | 13 | ||||
| -rw-r--r-- | textproc/icu/patches/patch-aa | 8 | ||||
| -rw-r--r-- | textproc/icu/patches/patch-ab | 13 | ||||
| -rw-r--r-- | textproc/icu/patches/patch-ae | 10 |
7 files changed, 59 insertions, 44 deletions
diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile index 3c733ab78ef..f3637a1f4f0 100644 --- a/textproc/icu/Makefile +++ b/textproc/icu/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.36 2005/03/23 15:47:17 wiz Exp $ +# $NetBSD: Makefile,v 1.37 2005/03/27 10:27:20 recht Exp $ # -DISTNAME= icu-3.0 +DISTNAME= icu-3.2 CATEGORIES= textproc MASTER_SITES= ftp://ftp.software.ibm.com/software/globalization/icu/${PKGVERSION}/ EXTRACT_SUFX= .tgz MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= http://ibm.com/software/globalization/icu +HOMEPAGE= http://ibm.com/software/globalization/icu/ COMMENT= Robust and full-featured Unicode services WRKSRC= ${WRKDIR}/${PKGBASE}/source diff --git a/textproc/icu/PLIST b/textproc/icu/PLIST index 010ca9286b5..fedc853baa0 100644 --- a/textproc/icu/PLIST +++ b/textproc/icu/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2004/06/26 20:18:50 recht Exp $ +@comment $NetBSD: PLIST,v 1.9 2005/03/27 10:27:20 recht Exp $ bin/derb bin/genbrk bin/gencnval @@ -48,8 +48,6 @@ include/unicode/numfmt.h include/unicode/parseerr.h include/unicode/parsepos.h include/unicode/platform.h -include/unicode/pmacos.h -include/unicode/pos400.h include/unicode/putil.h include/unicode/pwin32.h include/unicode/rbbi.h @@ -122,6 +120,7 @@ include/unicode/utf16.h include/unicode/utf32.h include/unicode/utf8.h include/unicode/utf_old.h +include/unicode/utmscale.h include/unicode/utrace.h include/unicode/utrans.h include/unicode/utypes.h @@ -129,27 +128,27 @@ include/unicode/uversion.h lib/icu/${PKGVERSION}/Makefile.inc lib/icu/Makefile.inc lib/icu/current -lib/libicudata.so -lib/libicudata.so.30 -lib/libicudata.so.30.0 -lib/libicui18n.so -lib/libicui18n.so.30 -lib/libicui18n.so.30.0 -lib/libicuio.so -lib/libicuio.so.30 -lib/libicuio.so.30.0 -lib/libicule.so -lib/libicule.so.30 -lib/libicule.so.30.0 -lib/libiculx.so -lib/libiculx.so.30 -lib/libiculx.so.30.0 -lib/libicutu.so -lib/libicutu.so.30 -lib/libicutu.so.30.0 -lib/libicuuc.so -lib/libicuuc.so.30 -lib/libicuuc.so.30.0 +lib/libicudata.dylib +lib/libicudata.dylib.32 +lib/libicudata.dylib.32.0 +lib/libicui18n.dylib +lib/libicui18n.dylib.32 +lib/libicui18n.dylib.32.0 +lib/libicuio.dylib +lib/libicuio.dylib.32 +lib/libicuio.dylib.32.0 +lib/libicule.dylib +lib/libicule.dylib.32 +lib/libicule.dylib.32.0 +lib/libiculx.dylib +lib/libiculx.dylib.32 +lib/libiculx.dylib.32.0 +lib/libicutu.dylib +lib/libicutu.dylib.32 +lib/libicutu.dylib.32.0 +lib/libicuuc.dylib +lib/libicuuc.dylib.32 +lib/libicuuc.dylib.32.0 lib/libsicudata.a lib/libsicui18n.a lib/libsicuio.a @@ -165,6 +164,7 @@ man/man1/makeconv.1 man/man1/pkgdata.1 man/man1/uconv.1 man/man8/decmn.8 +man/man8/gencase.8 man/man8/genccode.8 man/man8/gencmn.8 man/man8/gennames.8 @@ -173,6 +173,7 @@ man/man8/genprops.8 man/man8/gensprep.8 man/man8/genuca.8 sbin/decmn +sbin/gencase sbin/genccode sbin/gencmn sbin/gennames diff --git a/textproc/icu/buildlink3.mk b/textproc/icu/buildlink3.mk index 18f0194aab1..520a97a8e70 100644 --- a/textproc/icu/buildlink3.mk +++ b/textproc/icu/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2004/06/26 20:18:50 recht Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2005/03/27 10:27:20 recht Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ ICU_BUILDLINK3_MK:= ${ICU_BUILDLINK3_MK}+ @@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nicu} BUILDLINK_PACKAGES+= icu .if !empty(ICU_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.icu+= icu>=3.0 +BUILDLINK_DEPENDS.icu+= icu>=3.2 BUILDLINK_PKGSRCDIR.icu?= ../../textproc/icu .endif # ICU_BUILDLINK3_MK diff --git a/textproc/icu/distinfo b/textproc/icu/distinfo index 40c18a0de18..6ac6572837e 100644 --- a/textproc/icu/distinfo +++ b/textproc/icu/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.9 2005/02/24 14:48:42 agc Exp $ +$NetBSD: distinfo,v 1.10 2005/03/27 10:27:20 recht Exp $ -SHA1 (icu-3.0.tgz) = 4259db5d5d2813494990a784bbf29a00ecd7c624 -RMD160 (icu-3.0.tgz) = dae5aaeb62a5dcf684f31c1bccd20b52ca7378ab -Size (icu-3.0.tgz) = 9486138 bytes -SHA1 (patch-aa) = 1d17054b99f8866085cb7fa548cfbdc66b32ca96 -SHA1 (patch-ae) = c7e9d86a0799bfac79495f93b4f71608dfefef00 +SHA1 (icu-3.2.tgz) = 23fa1feb893a562408e6f13fcf968a6177d8aa6e +RMD160 (icu-3.2.tgz) = 69720d12c5076de4f7ff865a6709d405ce3f1bb5 +Size (icu-3.2.tgz) = 9587961 bytes +SHA1 (patch-aa) = 108ac871bfbf72c97ef2241e2d7294f3084f9c8b +SHA1 (patch-ab) = 86ca3d2cd4ba2e71132b41f3a1d26fb2778448cf +SHA1 (patch-ae) = 39ea97c492859e09386dde595004927a2d4537c8 diff --git a/textproc/icu/patches/patch-aa b/textproc/icu/patches/patch-aa index 19063bed847..2b4dae2b5c2 100644 --- a/textproc/icu/patches/patch-aa +++ b/textproc/icu/patches/patch-aa @@ -1,12 +1,12 @@ -$NetBSD: patch-aa,v 1.8 2004/06/26 20:18:50 recht Exp $ +$NetBSD: patch-aa,v 1.9 2005/03/27 10:27:21 recht Exp $ ---- Makefile.in.orig 2004-05-06 01:03:04.000000000 +0200 -+++ Makefile.in 2004-06-26 14:28:22.000000000 +0200 +--- Makefile.in.orig Sun Feb 27 14:19:42 2005 ++++ Makefile.in Sun Feb 27 14:19:58 2005 @@ -174,7 +174,7 @@ $(top_builddir)/config/icu-config: $(top_builddir)/Makefile $(top_srcdir)/config/icu-config-top $(top_srcdir)/config/icu-config-bottom $(top_builddir)/config/Makefile.inc @platform_make_fragment@ $(top_srcdir)/config/make2sh.sed -$(RMV) $@ -- $(INSTALL_DATA) $(top_srcdir)/config/icu-config-top $@ +- $(INSTALL_SCRIPT) $(top_srcdir)/config/icu-config-top $@ + cp -f $(top_srcdir)/config/icu-config-top $@ @echo "# Following from @platform_make_fragment@" >> $@ sed -f $(top_srcdir)/config/make2sh.sed < $(top_builddir)/config/Makefile.inc | grep -v '#M#' | uniq >> $@ diff --git a/textproc/icu/patches/patch-ab b/textproc/icu/patches/patch-ab new file mode 100644 index 00000000000..bfd8ac92c5d --- /dev/null +++ b/textproc/icu/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.7 2005/03/27 10:27:21 recht Exp $ + +--- config/mh-darwin.orig Wed Mar 23 21:28:45 2005 ++++ config/mh-darwin Wed Mar 23 21:28:48 2005 +@@ -25,7 +25,7 @@ + SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) + + ## 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}/lib/$(notdir $(MIDDLE_SO_TARGET)) + + ## Compiler switch to embed a runtime search path + LD_RPATH= diff --git a/textproc/icu/patches/patch-ae b/textproc/icu/patches/patch-ae index 4bd6d3c17e2..c465112a32a 100644 --- a/textproc/icu/patches/patch-ae +++ b/textproc/icu/patches/patch-ae @@ -1,7 +1,7 @@ -$NetBSD: patch-ae,v 1.5 2003/04/10 15:32:01 kent Exp $ +$NetBSD: patch-ae,v 1.6 2005/03/27 10:27:21 recht Exp $ ---- common/unicode/umachine.h.orig 2003-04-10 15:56:38.000000000 +0900 -+++ common/unicode/umachine.h +--- common/unicode/umachine.h.orig Tue Jun 22 23:03:34 2004 ++++ common/unicode/umachine.h Sun Feb 27 14:15:50 2005 @@ -41,7 +41,7 @@ /* which are contained in the platform-specific file platform.h */ /*==========================================================================*/ @@ -9,5 +9,5 @@ $NetBSD: patch-ae,v 1.5 2003/04/10 15:32:01 kent Exp $ -#if defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64) +#if (defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)) && !defined(__NetBSDPE__) # include "unicode/pwin32.h" - #elif defined(__OS400__) - # include "unicode/pos400.h" + #else + # include "unicode/platform.h" |