4 files changed, 164 insertions, 99 deletions

diff --git a/devel/icu2/Makefile b/devel/icu2/Makefile
index 15befa6b4852..0dc326dc632e 100644
--- a/devel/icu2/Makefile
+++ b/devel/icu2/Makefile
@@ -1,27 +1,71 @@
-# New ports collection makefile for:    icu2
-# Date created:		18 Jan 2002
-# Whom:			andrew@ids.pl
+# New ports collection makefile for:	icu
+# Date created:				22 Jan 2001
+# Whom:					dwm
 #
 # $FreeBSD$
 #
 
-PORTNAME=	icu
-PORTVERSION=	2.0
+PORTNAME=	icu2
+PORTVERSION=	2.4
 CATEGORIES=	devel
-MASTER_SITES=	http://oss.software.ibm.com/icu/download/2.0/
+MASTER_SITES=	http://oss.software.ibm.com/icu/download/${PORTVERSION}/
+DISTNAME=	icu-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	andrew@ids.pl
+MAINTAINER?=	andrew@ids.pl
 COMMENT=	International Components for Unicode
 
-BUILD_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf
+INSTALLS_SHLIB=		yes
+NO_FILTER_SHLIBS=	yes
 
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--enable-threads=no
+WRKSRC=			${WRKDIR}/icu
+ICUWRKSRC=		${WRKSRC}/source
+CONFIGURE_WRKSRC=	${ICUWRKSRC}
+BUILD_WRKSRC=		${ICUWRKSRC}
+INSTALL_WRKSRC=		${ICUWRKSRC}
 
-INSTALLS_SHLIB= yes
+GNU_CONFIGURE=		yes
+CONFIGURE_SCRIPT=	runConfigureICU
+CONFIGURE_ARGS=		FreeBSD
+CONFIGURE_ARGS+=	--enable-shared
+CONFIGURE_ARGS+=	--enable-static
+CONFIGURE_ARGS+=	--enable-samples=no --enable-tests=no
+.if defined(NO_THREADS)
+CONFIGURE_ARGS+=	--enable-threads=no
+.endif
+CONFIGURE_ENV+=		CXXFLAGS="-O3"
+CONFIGURE_ENV+=		CFLAGS="-O3"
+USE_GMAKE=		yes
 
-WRKSRC=		${WRKDIR}/icu/source
+MAN1+=	gencnval.1
+MAN1+=	genrb.1
+MAN1+=	icu-config.1
+MAN1+=	makeconv.1
+MAN1+=	pkgdata.1
+MAN1+=	uconv.1
+MAN5+=	cnvalias.dat.5
+MAN5+=	convrtrs.txt.5
+MAN8+=	decmn.8
+MAN8+=	genccode.8
+MAN8+=	gencmn.8
+MAN8+=	gennames.8
+MAN8+=	gennorm.8
+MAN8+=	genprops.8
+MAN8+=	genuca.8
+
+ICUMAJOR=	${PORTVERSION:S/.//:R}
+PLIST_SUB+=	ICUMAJOR=${ICUMAJOR}
+PLIST_SUB+=	ICUVER=${PORTVERSION}
+
+pre-fetch:
+.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
+	@${ECHO} ''
+	@${ECHO} 'You may use the following build options by defining'
+	@${ECHO} 'them on the command line with -D'
+	@${ECHO} ''
+	@${ECHO} 'NO_THREADS	do not build a thread enabled library'
+	@${ECHO} ''
+	@/bin/sleep 2
+.endif
 
 .include <bsd.port.mk>
diff --git a/devel/icu2/distinfo b/devel/icu2/distinfo
index dcd30e69ff2f..6398c2897492 100644
--- a/devel/icu2/distinfo
+++ b/devel/icu2/distinfo
@@ -1 +1 @@
-MD5 (icu-2.0.tgz) = 77a52af541c116aa9574677f949df5cb
+MD5 (icu-2.4.tgz) = 77d56e4dca9ec0fd635151ce1dc72137
diff --git a/devel/icu2/pkg-descr b/devel/icu2/pkg-descr
index 7412fc1f5a42..3d4012191430 100644
--- a/devel/icu2/pkg-descr
+++ b/devel/icu2/pkg-descr
@@ -1,5 +1,9 @@
-The International Components for Unicode(ICU) is a C and C++ library that
-provides Unicode support (character sets conversion, transliteration, 
-formation etc)
+The International Components for Unicode (ICU) is a C and C++ library
+providing Unicode support (p.ex. character set conversions, locales,
+normalization, transliteration, etc.).
 
+More information on ICU can be found on the homepage
 WWW: http://oss.software.ibm.com/icu/
+
+- Bjoern A. Zeeb
+bzeeb+freebsdports@zabbadoz.net
diff --git a/devel/icu2/pkg-plist b/devel/icu2/pkg-plist
index 269f44e3c8ad..287bc8ea7c0e 100644
--- a/devel/icu2/pkg-plist
+++ b/devel/icu2/pkg-plist
@@ -1,139 +1,156 @@
-bin/uconv
 etc/icu/convrtrs.txt
+bin/derb
+bin/icu-config
+bin/gencnval
+bin/genbrk
+bin/genrb
+bin/makeconv
+bin/pkgdata
+bin/uconv
 include/unicode/bidi.h
 include/unicode/brkiter.h
-include/unicode/calendar.h
+include/unicode/caniter.h
 include/unicode/chariter.h
-include/unicode/choicfmt.h
-include/unicode/coleitr.h
-include/unicode/coll.h
 include/unicode/convert.h
-include/unicode/cpdtrans.h
-include/unicode/datefmt.h
 include/unicode/dbbi.h
-include/unicode/dcfmtsym.h
-include/unicode/decimfmt.h
 include/unicode/docmain.h
-include/unicode/dtfmtsym.h
-include/unicode/fieldpos.h
-include/unicode/fmtable.h
-include/unicode/format.h
-include/unicode/gregocal.h
-include/unicode/hextouni.h
 include/unicode/locid.h
-include/unicode/msgfmt.h
 include/unicode/normlzr.h
-include/unicode/nultrans.h
-include/unicode/numfmt.h
 include/unicode/parseerr.h
 include/unicode/parsepos.h
 include/unicode/platform.h
 include/unicode/pmacos.h
-include/unicode/pos2.h
 include/unicode/pos400.h
 include/unicode/putil.h
 include/unicode/pwin32.h
 include/unicode/rbbi.h
-include/unicode/rbnf.h
-include/unicode/rbt.h
+include/unicode/regex.h
 include/unicode/rep.h
 include/unicode/resbund.h
 include/unicode/schriter.h
-include/unicode/scsu.h
-include/unicode/search.h
-include/unicode/simpletz.h
-include/unicode/smpdtfmt.h
-include/unicode/sortkey.h
-include/unicode/stsearch.h
-include/unicode/tblcoll.h
-include/unicode/timezone.h
-include/unicode/translit.h
+include/unicode/strenum.h
 include/unicode/ubidi.h
 include/unicode/ubrk.h
-include/unicode/ucal.h
 include/unicode/uchar.h
 include/unicode/uchriter.h
 include/unicode/uclean.h
 include/unicode/ucnv.h
 include/unicode/ucnv_cb.h
 include/unicode/ucnv_err.h
-include/unicode/ucol.h
-include/unicode/ucoleitr.h
-include/unicode/udat.h
+include/unicode/uconfig.h
 include/unicode/udata.h
+include/unicode/uenum.h
+include/unicode/uiter.h
 include/unicode/uloc.h
 include/unicode/umachine.h
 include/unicode/umisc.h
-include/unicode/umsg.h
 include/unicode/unicode.h
 include/unicode/unifilt.h
-include/unicode/unifltlg.h
+include/unicode/unifunct.h
 include/unicode/unimatch.h
 include/unicode/uniset.h
 include/unicode/unistr.h
-include/unicode/unitohex.h
 include/unicode/unorm.h
-include/unicode/unum.h
+include/unicode/uobject.h
 include/unicode/urename.h
 include/unicode/urep.h
 include/unicode/ures.h
 include/unicode/uscript.h
-include/unicode/usearch.h
+include/unicode/uset.h
+include/unicode/usetiter.h
 include/unicode/ushape.h
-include/unicode/ustdio.h 
-include/unicode/ustream.h 
 include/unicode/ustring.h
 include/unicode/utf.h
 include/unicode/utf16.h
 include/unicode/utf32.h
 include/unicode/utf8.h
-include/unicode/utrans.h
+include/unicode/utf_old.h
 include/unicode/utypes.h
 include/unicode/uversion.h
-lib/libicuctestfw.so
-lib/libicuctestfw.so.20.0
-lib/libicudata.so
-lib/libicudt20l.so
-lib/libicui18n.so
-lib/libicui18n.so.20.0
-lib/libicutoolutil.so
-lib/libicutoolutil.so.20.0
-lib/libicuuc.so
-lib/libicuuc.so.20.0
+include/unicode/calendar.h
+include/unicode/choicfmt.h
+include/unicode/coleitr.h
+include/unicode/coll.h
+include/unicode/cpdtrans.h
+include/unicode/datefmt.h
+include/unicode/dcfmtsym.h
+include/unicode/decimfmt.h
+include/unicode/dtfmtsym.h
+include/unicode/fieldpos.h
+include/unicode/fmtable.h
+include/unicode/format.h
+include/unicode/gregocal.h
+include/unicode/hextouni.h
+include/unicode/msgfmt.h
+include/unicode/nultrans.h
+include/unicode/numfmt.h
+include/unicode/rbnf.h
+include/unicode/rbt.h
+include/unicode/search.h
+include/unicode/simpletz.h
+include/unicode/smpdtfmt.h
+include/unicode/sortkey.h
+include/unicode/stsearch.h
+include/unicode/tblcoll.h
+include/unicode/timezone.h
+include/unicode/translit.h
+include/unicode/ucal.h
+include/unicode/ucol.h
+include/unicode/ucoleitr.h
+include/unicode/ucurr.h
+include/unicode/udat.h
+include/unicode/umsg.h
+include/unicode/unifltlg.h
+include/unicode/unirepl.h
+include/unicode/unitohex.h
+include/unicode/unum.h
+include/unicode/usearch.h
+include/unicode/utrans.h
+include/unicode/ustdio.h
+include/unicode/ustream.h
+lib/libicudata.a
+lib/libicudata.so.%%ICUMAJOR%%.0
+lib/libicuuc.a
+lib/libicuuc.so.%%ICUMAJOR%%.0
+lib/libicui18n.a
+lib/libicui18n.so.%%ICUMAJOR%%.0
+lib/libicuctestfw.a
+lib/libicuctestfw.so.%%ICUMAJOR%%.0
+lib/libicutoolutil.a
+lib/libicutoolutil.so.%%ICUMAJOR%%.0
+lib/libustdio.a
+lib/libustdio.so.%%ICUMAJOR%%.0
+lib/icu/%%ICUVER%%/Makefile.inc
 lib/icu/current
 lib/icu/Makefile.inc
-lib/icu/2.0/Makefile.inc
-man/man1/uconv.1
-man/man5/cnvalias.dat.5
-man/man5/convrtrs.txt.5
-man/man8/decmn.8
-man/man8/genccode.8
-man/man8/gencmn.8
-man/man8/gencnval.8
-man/man8/gennames.8
-man/man8/genrb.8
-man/man8/genuca.8
-man/man8/makeconv.8
-sbin/decmn
+share/icu/%%ICUVER%%/config/mh-bsd-gcc
+share/icu/%%ICUVER%%/mkinstalldirs
+share/icu/%%ICUVER%%/README
+sbin/genuca
 sbin/genccode
-sbin/gencmn
-sbin/gencnval
+sbin/genpname
+sbin/genprops
 sbin/gennames
 sbin/gennorm
-sbin/genprops
-sbin/genrb
+sbin/gencmn
+sbin/decmn
 sbin/gentz
-sbin/genuca
-sbin/makeconv
-sbin/pkgdata
-share/icu/2.0/README
-share/icu/2.0/config/mh-bsd-gcc
-share/icu/2.0/mkinstalldirs
-share/icu/2.0/uconvmsg.dat
-@dirrm etc/icu
-@dirrm include/unicode
-@dirrm lib/icu/2.0
-@dirrm lib/icu
-@dirrm share/icu/2.0/config
-@dirrm share/icu/2.0
+@exec if test -r %D/lib/libicudata.so.%%ICUMAJOR%%.0; then { ln -sf %D/lib/libicudata.so.%%ICUMAJOR%%.0 %D/lib/libicudata.so.%%ICUMAJOR%%; ln -sf %D/lib/libicudata.so.%%ICUMAJOR%%.0 %D/lib/libicudata.so; } fi
+@exec if test -r %D/lib/libicuuc.so.%%ICUMAJOR%%.0; then { ln -sf %D/lib/libicuuc.so.%%ICUMAJOR%%.0 %D/lib/libicuuc.so.%%ICUMAJOR%%; ln -sf %D/lib/libicuuc.so.%%ICUMAJOR%%.0 %D/lib/libicuuc.so; } fi
+@exec if test -r %D/lib/libicui18n.so.%%ICUMAJOR%%.0; then { ln -sf %D/lib/libicui18n.so.%%ICUMAJOR%%.0 %D/lib/libicui18n.so.%%ICUMAJOR%%; ln -sf %D/lib/libicui18n.so.%%ICUMAJOR%%.0 %D/lib/libicui18n.so; } fi
+@exec if test -r %D/lib/libicuctestfw.so.%%ICUMAJOR%%.0; then { ln -sf %D/lib/libicuctestfw.so.%%ICUMAJOR%%.0 %D/lib/libicuctestfw.so.%%ICUMAJOR%%; ln -sf %D/lib/libicuctestfw.so.%%ICUMAJOR%%.0 %D/lib/libicuctestfw.so; } fi
+@exec if test -r %D/lib/libicutoolutil.so.%%ICUMAJOR%%.0; then { ln -sf %D/lib/libicutoolutil.so.%%ICUMAJOR%%.0 %D/lib/libicutoolutil.so.%%ICUMAJOR%%; ln -sf %D/lib/libicutoolutil.so.%%ICUMAJOR%%.0 %D/lib/libicutoolutil.so; } fi
+@exec if test -r %D/lib/libustdio.so.%%ICUMAJOR%%.0; then { ln -sf %D/lib/libustdio.so.%%ICUMAJOR%%.0 %D/lib/libustdio.so.%%ICUMAJOR%%; ln -sf %D/lib/libustdio.so.%%ICUMAJOR%%.0 %D/lib/libustdio.so; } fi
+@unexec if test ! -r %D/lib/libicudata.so.%%ICUMAJOR%%.0; then		{ rm -f %D/lib/libicudata.so.%%ICUMAJOR%%;	rm -f %D/lib/libicudata.so;	} fi
+@unexec if test ! -r %D/lib/libicuuc.so.%%ICUMAJOR%%.0; then		{ rm -f %D/lib/libicuuc.so.%%ICUMAJOR%%;	rm -f %D/lib/libicuuc.so;	} fi
+@unexec if test ! -r %D/lib/libicui18n.so.%%ICUMAJOR%%.0; then		{ rm -f %D/lib/libicui18n.so.%%ICUMAJOR%%;	rm -f %D/lib/libicui18n.so;	} fi
+@unexec if test ! -r %D/lib/libicuctestfw.so.%%ICUMAJOR%%.0; then	{ rm -f %D/lib/libicuctestfw.so.%%ICUMAJOR%%;	rm -f %D/lib/libicuctestfw.so;	} fi
+@unexec if test ! -r %D/lib/libicutoolutil.so.%%ICUMAJOR%%.0; then	{ rm -f %D/lib/libicutoolutil.so.%%ICUMAJOR%%;	rm -f %D/lib/libicutoolutil.so;	} fi
+@unexec if test ! -r %D/lib/libustdio.so.%%ICUMAJOR%%.0; then		{ rm -f %D/lib/libustdio.so.%%ICUMAJOR%%;	rm -f %D/lib/libustdio.so;	} fi
+@dirrm share/icu/%%ICUVER%%/config
+@dirrm share/icu/%%ICUVER%%
 @dirrm share/icu
+@dirrm lib/icu/%%ICUVER%%
+@dirrm lib/icu
+@dirrm include/unicode
+@dirrm etc/icu