FreeBSD Mail Archives

Date:      Mon, 18 Sep 2006 16:20:11 -0400
From:      Mikhail Teterin <mi+mx@aldan.algebra.com>
To:        barner@freebsd.org, gnome@freebsd.org, skv@freebsd.org, kuriyama@freebsd.org, kenm@icarz.com, girgen@freebsd.org
Cc:        portmgr@freebsd.org
Subject:   Upgrading devel/icu (HEADS UP)
Message-ID:  <200609181620.13058.mi%2Bmx@aldan.algebra.com>

next in thread | raw e-mail | index | archive | help

--Boundary-00=_99vDFQ/md92Aupq
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

A number of people have reported crashes in the devel/icu's self-tests.
One such failure is even occuring on the packages-building cluster (on
FreeBSD/ia64).

I'd like to upgrade the port to the vendor's most recent version, 3.6 --
software authors dislike having to delve into earlier versions...

Most of the things should be unaffected, but some of you (incorrectly)
demand a particular shared library version in the list of dependencies:

databases/postgresql80-server/Makefile:LIB_DEPENDS=     icudata.34:${PORTSDIR}/devel/icu
databases/postgresql81-server/Makefile:LIB_DEPENDS=     icudata.34:${PORTSDIR}/devel/icu
devel/boost/Makefile:LIB_DEPENDS+=      icuuc.34:${PORTSDIR}/devel/icu

If you do not object, I intend to fix the above dependencies, commit the
devel/icu upgrade in the next few days and await for the build cluster's
test.

If you have the time and inclination, you can try out the attached patch.

Yours,

	-mi

--Boundary-00=_99vDFQ/md92Aupq
Content-Type: text/x-diff;
  charset="us-ascii";
  name="icu.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="icu.patch"

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/icu/Makefile,v
retrieving revision 1.19
diff -U2 -r1.19 Makefile
--- Makefile	22 Aug 2006 14:19:23 -0000	1.19
+++ Makefile	18 Sep 2006 20:18:12 -0000
@@ -7,8 +7,11 @@
 
 PORTNAME=	icu
-PORTVERSION=	3.4.1
+PORTVERSION=	3.6
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.software.ibm.com/software/globalization/icu/${PORTVERSION}/
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}	\
+		ftp://ftp.software.ibm.com/software/globalization/icu/${PORTVERSION}/
+MASTER_SITE_SUBDIR=${PORTNAME}
+DISTNAME=	icu4c-${PORTVERSION:S/./_/g}
+EXTRACT_SUFX=	-src.tgz
 
 MAINTAINER=	mi@aldan.algebra.com
@@ -35,4 +38,5 @@
 MAN1+=	derb.1
 MAN1+=	gencnval.1
+MAN1+=	genctd.1
 MAN1+=	genrb.1
 MAN1+=	icu-config.1
@@ -40,5 +44,4 @@
 MAN1+=	pkgdata.1
 MAN1+=	uconv.1
-MAN8+=	decmn.8
 MAN8+=	genccode.8
 MAN8+=	gencmn.8
@@ -47,5 +50,5 @@
 
 ICUMAJOR=	${PORTVERSION:S/.//:R}
-PLIST_SUB+=	ICUMAJOR=${ICUMAJOR}
+PLIST_SUB+=	ICUMAJOR=${ICUMAJOR} ICUMINOR=0
 PLIST_SUB+=	ICUVER=${PORTVERSION}
 
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/devel/icu/distinfo,v
retrieving revision 1.7
diff -U2 -r1.7 distinfo
--- distinfo	22 Aug 2006 14:18:19 -0000	1.7
+++ distinfo	18 Sep 2006 20:18:12 -0000
@@ -1,3 +1,3 @@
-MD5 (icu-3.4.1.tgz) = 2a16f58bcb26e5010c946dca9ec08d5f
-SHA256 (icu-3.4.1.tgz) = bbeab775bfd46c4882b589bdde3f6e469b7834d4738c44df1cef671dfe436959
-SIZE (icu-3.4.1.tgz) = 9320610
+MD5 (icu4c-3_6-src.tgz) = 6243f7a19e03e05403ce84e597510d4c
+SHA256 (icu4c-3_6-src.tgz) = 5135e8d69d6206d320515df7aeee7027711ab1aef9d8dbf29571a97a9746b041
+SIZE (icu4c-3_6-src.tgz) = 10183358
Index: pkg-descr
===================================================================
RCS file: /home/pcvs/ports/devel/icu/pkg-descr,v
retrieving revision 1.3
diff -U2 -r1.3 pkg-descr
--- pkg-descr	6 Mar 2005 14:11:10 -0000	1.3
+++ pkg-descr	18 Sep 2006 20:18:12 -0000
@@ -4,4 +4,6 @@
 
 More information on ICU can be found on the homepage
+
+WWW: http://icu.sourceforge.net/
 WWW: http://ibm.com/software/globalization/icu
 
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/devel/icu/pkg-plist,v
retrieving revision 1.6
diff -U2 -r1.6 pkg-plist
--- pkg-plist	22 Aug 2006 14:18:19 -0000	1.6
+++ pkg-plist	18 Sep 2006 20:18:12 -0000
@@ -2,4 +2,5 @@
 bin/genbrk
 bin/gencnval
+bin/genctd
 bin/genrb
 bin/icu-config
@@ -7,5 +8,4 @@
 bin/pkgdata
 bin/uconv
-sbin/decmn
 sbin/genccode
 sbin/gencmn
@@ -87,4 +87,5 @@
 include/unicode/ucoleitr.h
 include/unicode/uconfig.h
+include/unicode/ucsdet.h
 include/unicode/ucurr.h
 include/unicode/udat.h
@@ -94,4 +95,5 @@
 include/unicode/uenum.h
 include/unicode/uidna.h
+include/unicode/uintrnal.h
 include/unicode/uiter.h
 include/unicode/uloc.h
@@ -123,4 +125,5 @@
 include/unicode/ustream.h
 include/unicode/ustring.h
+include/unicode/usystem.h
 include/unicode/utext.h
 include/unicode/utf.h
@@ -139,37 +142,37 @@
 lib/icu/Makefile.inc
 lib/libsicudata.a
-lib/libicudata.so.%%ICUMAJOR%%.1
+lib/libicudata.so.%%ICUMAJOR%%.%%ICUMINOR%%
 lib/libicudata.so
 lib/libicudata.so.%%ICUMAJOR%%
 lib/libsicuuc.a
-lib/libicuuc.so.%%ICUMAJOR%%.1
+lib/libicuuc.so.%%ICUMAJOR%%.%%ICUMINOR%%
 lib/libicuuc.so
 lib/libicuuc.so.%%ICUMAJOR%%
 lib/libsicui18n.a
-lib/libicui18n.so.%%ICUMAJOR%%.1
+lib/libicui18n.so.%%ICUMAJOR%%.%%ICUMINOR%%
 lib/libicui18n.so
 lib/libicui18n.so.%%ICUMAJOR%%
 lib/libsicule.a
-lib/libicule.so.%%ICUMAJOR%%.1
+lib/libicule.so.%%ICUMAJOR%%.%%ICUMINOR%%
 lib/libicule.so
 lib/libicule.so.%%ICUMAJOR%%
 lib/libsiculx.a
-lib/libiculx.so.%%ICUMAJOR%%.1
+lib/libiculx.so.%%ICUMAJOR%%.%%ICUMINOR%%
 lib/libiculx.so
 lib/libiculx.so.%%ICUMAJOR%%
 lib/libsicuio.a
-lib/libicuio.so.%%ICUMAJOR%%.1
+lib/libicuio.so.%%ICUMAJOR%%.%%ICUMINOR%%
 lib/libicuio.so
 lib/libicuio.so.%%ICUMAJOR%%
 lib/libsicutu.a
-lib/libicutu.so.%%ICUMAJOR%%.1
+lib/libicutu.so.%%ICUMAJOR%%.%%ICUMINOR%%
 lib/libicutu.so.%%ICUMAJOR%%
 lib/libicutu.so
-share/icu/%%ICUVER%%/config/mh-bsd-gcc
-share/icu/%%ICUVER%%/mkinstalldirs
-share/icu/%%ICUVER%%/license.html
-@dirrm share/icu/%%ICUVER%%/config
-@dirrm share/icu/%%ICUVER%%
-@dirrm share/icu
+%%DATADIR%%/%%ICUVER%%/config/mh-bsd-gcc
+%%DATADIR%%/%%ICUVER%%/mkinstalldirs
+%%DATADIR%%/%%ICUVER%%/license.html
+@dirrm %%DATADIR%%/%%ICUVER%%/config
+@dirrm %%DATADIR%%/%%ICUVER%%
+@dirrm %%DATADIR%%
 @dirrm lib/icu/%%ICUVER%%
 @dirrm lib/icu
Index: files/patch-aa
===================================================================
RCS file: files/patch-aa
diff -N files/patch-aa
--- files/patch-aa	20 Oct 2005 13:27:18 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
---- Makefile.in	Fri Jul  9 11:43:36 2004
-+++ Makefile.in	Wed Nov 17 11:14:49 2004
-@@ -175,11 +175,13 @@
- $(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_SCRIPT) $(top_srcdir)/config/icu-config-top $@
-+	@chmod u+w $@
- 	@echo "# Following from @platform_make_fragment@" >> $@
- 	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` >> $@
-+	@chmod u-w $@
- 
- config.status: $(srcdir)/configure $(srcdir)/common/unicode/uversion.h
- 	@echo

--Boundary-00=_99vDFQ/md92Aupq--

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200609181620.13058.mi%2Bmx>

Header And Logo

Peripheral Links

Site Navigation

Header And Logo

Peripheral Links

Search

Site Navigation