- Update to 4.4

- Sort PLIST

PR:		ports/147464
Submitted by:	Sunpoet Po-Chuan Hsieh <sunpoet AT sunpoet.net>
Approved by:	maintainer timeout
Feature safe:	yes

3 files changed, 47 insertions, 35 deletions

diff --git a/devel/icu4/Makefile b/devel/icu4/Makefile
index 7707bdb3e955..29f41f47066e 100644
--- a/devel/icu4/Makefile
+++ b/devel/icu4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	icu
-PORTVERSION=	4.3.3
+PORTVERSION=	4.4
 CATEGORIES=	devel
 MASTER_SITES=	http://download.icu-project.org/files/icu4c/${PORTVERSION}/
 DISTNAME=	icu4c-${PORTVERSION:S/./_/g}
@@ -51,8 +51,11 @@ MAN8+=	gensprep.8
 MAN8+=	genuca.8
 
 ICUMAJOR=	${PORTVERSION:S/.//:R}
-PLIST_SUB+=	ICUMAJOR=${ICUMAJOR} ICUMINOR=${PORTVERSION:E}
-PLIST_SUB+=	ICUVER=${PORTVERSION}
+ICUMINOR=	${PORTVERSION:S/.//:E}
+.if ${ICUMINOR} == ""
+ICUMINOR=	0
+.endif
+PLIST_SUB+=	ICUMAJOR=${ICUMAJOR} ICUMINOR=${ICUMINOR} ICUVER=${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
diff --git a/devel/icu4/distinfo b/devel/icu4/distinfo
index 9c20bcce2a43..25a41bd0dfe5 100644
--- a/devel/icu4/distinfo
+++ b/devel/icu4/distinfo
@@ -1,3 +1,3 @@
-MD5 (icu4c-4_3_3-src.tgz) = 69b1fdaa7c7ea720673f322a5e07fe8f
-SHA256 (icu4c-4_3_3-src.tgz) = 6c961f29e90c2e490e51cdb4f74475d9901b4258f4521679cb2a4468c5917508
-SIZE (icu4c-4_3_3-src.tgz) = 15799640
+MD5 (icu4c-4_4-src.tgz) = 36b77e68e73f0ee9f7bb862629e33342
+SHA256 (icu4c-4_4-src.tgz) = 96caab011e784b004ce5867665fe711402a53eb6d19a8817f582c819711f93f3
+SIZE (icu4c-4_4-src.tgz) = 16428350
diff --git a/devel/icu4/pkg-plist b/devel/icu4/pkg-plist
index 67c1527ce231..4cd450c24b3f 100644
--- a/devel/icu4/pkg-plist
+++ b/devel/icu4/pkg-plist
@@ -5,14 +5,10 @@ bin/gencnval
 bin/genctd
 bin/genrb
 bin/icu-config
+bin/icuinfo
 bin/makeconv
 bin/pkgdata
 bin/uconv
-sbin/genccode
-sbin/gencmn
-sbin/gensprep
-sbin/genuca
-sbin/icupkg
 include/layout/LEFontInstance.h
 include/layout/LEGlyphFilter.h
 include/layout/LEGlyphStorage.h
@@ -27,7 +23,6 @@ include/layout/RunArrays.h
 include/layout/loengine.h
 include/layout/playout.h
 include/layout/plruns.h
-@dirrm include/layout
 include/unicode/basictz.h
 include/unicode/bms.h
 include/unicode/bmsearch.h
@@ -58,14 +53,18 @@ include/unicode/errorcode.h
 include/unicode/fieldpos.h
 include/unicode/fmtable.h
 include/unicode/format.h
+include/unicode/fpositer.h
 include/unicode/gregocal.h
 include/unicode/icudataver.h
-include/unicode/locid.h
+include/unicode/icuplug.h
 include/unicode/localpointer.h
+include/unicode/locdspnm.h
+include/unicode/locid.h
 include/unicode/measfmt.h
 include/unicode/measunit.h
 include/unicode/measure.h
 include/unicode/msgfmt.h
+include/unicode/normalizer2.h
 include/unicode/normlzr.h
 include/unicode/numfmt.h
 include/unicode/numsys.h
@@ -86,6 +85,7 @@ include/unicode/rep.h
 include/unicode/resbund.h
 include/unicode/schriter.h
 include/unicode/search.h
+include/unicode/selfmt.h
 include/unicode/simpletz.h
 include/unicode/smpdtfmt.h
 include/unicode/sortkey.h
@@ -128,6 +128,7 @@ include/unicode/uenum.h
 include/unicode/uidna.h
 include/unicode/uintrnal.h
 include/unicode/uiter.h
+include/unicode/uldnames.h
 include/unicode/uloc.h
 include/unicode/ulocdata.h
 include/unicode/umachine.h
@@ -140,6 +141,7 @@ include/unicode/unirepl.h
 include/unicode/uniset.h
 include/unicode/unistr.h
 include/unicode/unorm.h
+include/unicode/unorm2.h
 include/unicode/unum.h
 include/unicode/uobject.h
 include/unicode/uobslete.h
@@ -168,48 +170,55 @@ include/unicode/utmscale.h
 include/unicode/utrace.h
 include/unicode/utrans.h
 include/unicode/utypes.h
-include/unicode/uversion.h
 include/unicode/uvernum.h
+include/unicode/uversion.h
 include/unicode/vtzone.h
-@dirrm include/unicode
 lib/icu/%%ICUVER%%/Makefile.inc
 lib/icu/%%ICUVER%%/pkgdata.inc
-lib/icu/current
 lib/icu/Makefile.inc
+lib/icu/current
 lib/icu/pkgdata.inc
-lib/libsicudata.a
-lib/libicudata.so.%%ICUMAJOR%%.%%ICUMINOR%%
 lib/libicudata.so
 lib/libicudata.so.%%ICUMAJOR%%
-lib/libsicuuc.a
-lib/libicuuc.so.%%ICUMAJOR%%.%%ICUMINOR%%
-lib/libicuuc.so
-lib/libicuuc.so.%%ICUMAJOR%%
-lib/libsicui18n.a
-lib/libicui18n.so.%%ICUMAJOR%%.%%ICUMINOR%%
+lib/libicudata.so.%%ICUMAJOR%%.%%ICUMINOR%%
 lib/libicui18n.so
 lib/libicui18n.so.%%ICUMAJOR%%
-lib/libsicule.a
-lib/libicule.so.%%ICUMAJOR%%.%%ICUMINOR%%
+lib/libicui18n.so.%%ICUMAJOR%%.%%ICUMINOR%%
+lib/libicuio.so
+lib/libicuio.so.%%ICUMAJOR%%
+lib/libicuio.so.%%ICUMAJOR%%.%%ICUMINOR%%
 lib/libicule.so
 lib/libicule.so.%%ICUMAJOR%%
-lib/libsiculx.a
-lib/libiculx.so.%%ICUMAJOR%%.%%ICUMINOR%%
+lib/libicule.so.%%ICUMAJOR%%.%%ICUMINOR%%
 lib/libiculx.so
 lib/libiculx.so.%%ICUMAJOR%%
+lib/libiculx.so.%%ICUMAJOR%%.%%ICUMINOR%%
+lib/libicutu.so
+lib/libicutu.so.%%ICUMAJOR%%
+lib/libicutu.so.%%ICUMAJOR%%.%%ICUMINOR%%
+lib/libicuuc.so
+lib/libicuuc.so.%%ICUMAJOR%%
+lib/libicuuc.so.%%ICUMAJOR%%.%%ICUMINOR%%
+lib/libsicudata.a
+lib/libsicui18n.a
 lib/libsicuio.a
+lib/libsicule.a
+lib/libsiculx.a
 lib/libsicutu.a
-lib/libicuio.so.%%ICUMAJOR%%.%%ICUMINOR%%
-lib/libicuio.so
-lib/libicuio.so.%%ICUMAJOR%%
-lib/libicutu.so.%%ICUMAJOR%%.%%ICUMINOR%%
-lib/libicutu.so.%%ICUMAJOR%%
-lib/libicutu.so
+lib/libsicuuc.a
+sbin/genccode
+sbin/gencmn
+sbin/gennorm2
+sbin/gensprep
+sbin/genuca
+sbin/icupkg
 %%DATADIR%%/%%ICUVER%%/config/mh-bsd-gcc
-%%DATADIR%%/%%ICUVER%%/mkinstalldirs
 %%DATADIR%%/%%ICUVER%%/license.html
+%%DATADIR%%/%%ICUVER%%/mkinstalldirs
 @dirrm %%DATADIR%%/%%ICUVER%%/config
 @dirrm %%DATADIR%%/%%ICUVER%%
 @dirrm %%DATADIR%%
+@dirrm include/unicode
+@dirrm include/layout
 @dirrm lib/icu/%%ICUVER%%
 @dirrm lib/icu