1 files changed, 220 insertions, 174 deletions

diff --git a/devel/icu/pkg-plist b/devel/icu/pkg-plist
index 2b9df0bd0602..d3303e19febc 100644
--- a/devel/icu/pkg-plist
+++ b/devel/icu/pkg-plist
@@ -1,187 +1,233 @@
-bin/derb
-bin/genbrk
-bin/gencnval
-bin/genctd
-bin/genrb
-bin/icu-config
-bin/makeconv
-bin/pkgdata
-bin/uconv
-sbin/genccode
-sbin/gencmn
-sbin/gensprep
-sbin/genuca
 sbin/icupkg
-sbin/icuswap
-include/layout/LEFontInstance.h
-include/layout/LEGlyphFilter.h
-include/layout/LEGlyphStorage.h
-include/layout/LEInsertionList.h
-include/layout/LELanguages.h
-include/layout/LEScripts.h
-include/layout/LESwaps.h
-include/layout/LETypes.h
-include/layout/LayoutEngine.h
-include/layout/ParagraphLayout.h
-include/layout/RunArrays.h
-include/layout/loengine.h
-@dirrm include/layout
-include/unicode/basictz.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/curramt.h
-include/unicode/currunit.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/dtptngen.h
-include/unicode/dtrule.h
-include/unicode/fieldpos.h
-include/unicode/fmtable.h
-include/unicode/format.h
-include/unicode/gregocal.h
-include/unicode/locid.h
-include/unicode/measfmt.h
-include/unicode/measunit.h
-include/unicode/measure.h
-include/unicode/msgfmt.h
-include/unicode/normlzr.h
-include/unicode/numfmt.h
-include/unicode/parseerr.h
-include/unicode/parsepos.h
-include/unicode/platform.h
-include/unicode/ppalmos.h
-include/unicode/putil.h
-include/unicode/pwin32.h
-include/unicode/rbbi.h
-include/unicode/rbnf.h
-include/unicode/rbtz.h
-include/unicode/regex.h
-include/unicode/rep.h
-include/unicode/resbund.h
-include/unicode/schriter.h
-include/unicode/search.h
-include/unicode/simpletz.h
-include/unicode/smpdtfmt.h
-include/unicode/sortkey.h
-include/unicode/strenum.h
-include/unicode/stsearch.h
-include/unicode/symtable.h
-include/unicode/tblcoll.h
-include/unicode/timezone.h
-include/unicode/translit.h
-include/unicode/tzrule.h
-include/unicode/tztrans.h
-include/unicode/ubidi.h
-include/unicode/ubrk.h
-include/unicode/ucal.h
-include/unicode/ucasemap.h
-include/unicode/ucat.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/uconfig.h
-include/unicode/ucsdet.h
-include/unicode/ucurr.h
-include/unicode/udat.h
-include/unicode/udata.h
-include/unicode/udatpg.h
-include/unicode/udeprctd.h
-include/unicode/udraft.h
-include/unicode/uenum.h
-include/unicode/uidna.h
-include/unicode/uintrnal.h
-include/unicode/uiter.h
-include/unicode/uloc.h
-include/unicode/ulocdata.h
-include/unicode/umachine.h
-include/unicode/umisc.h
-include/unicode/umsg.h
-include/unicode/unifilt.h
-include/unicode/unifunct.h
-include/unicode/unimatch.h
-include/unicode/unirepl.h
-include/unicode/uniset.h
-include/unicode/unistr.h
-include/unicode/unorm.h
-include/unicode/unum.h
-include/unicode/uobject.h
-include/unicode/uobslete.h
-include/unicode/uregex.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/usprep.h
-include/unicode/ustdio.h
-include/unicode/ustream.h
-include/unicode/ustring.h
-include/unicode/usystem.h
-include/unicode/utext.h
-include/unicode/utf.h
-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
-include/unicode/uversion.h
-include/unicode/vtzone.h
-@dirrm include/unicode
-lib/icu/%%ICUVER%%/Makefile.inc
-lib/icu/current
-lib/icu/Makefile.inc
-lib/libsicudata.a
-lib/libicudata.so.%%ICUMAJOR%%.%%ICUMINOR%%
-lib/libicudata.so
-lib/libicudata.so.%%ICUMAJOR%%
+sbin/gensprep
+sbin/gennorm2
+sbin/gencmn
+sbin/genccode
 lib/libsicuuc.a
+lib/libsicutu.a
+lib/libsicutest.a
+lib/libsiculx.a
+lib/libsicule.a
+lib/libsicuio.a
+lib/libsicui18n.a
+lib/libsicudata.a
 lib/libicuuc.so.%%ICUMAJOR%%.%%ICUMINOR%%
-lib/libicuuc.so
 lib/libicuuc.so.%%ICUMAJOR%%
-lib/libsicui18n.a
-lib/libicui18n.so.%%ICUMAJOR%%.%%ICUMINOR%%
-lib/libicui18n.so
-lib/libicui18n.so.%%ICUMAJOR%%
-lib/libsicule.a
-lib/libicule.so.%%ICUMAJOR%%.%%ICUMINOR%%
-lib/libicule.so
-lib/libicule.so.%%ICUMAJOR%%
-lib/libsiculx.a
+lib/libicuuc.so
+lib/libicutu.so.%%ICUMAJOR%%.%%ICUMINOR%%
+lib/libicutu.so.%%ICUMAJOR%%
+lib/libicutu.so
+lib/libicutest.so.%%ICUMAJOR%%.%%ICUMINOR%%
+lib/libicutest.so.%%ICUMAJOR%%
+lib/libicutest.so
 lib/libiculx.so.%%ICUMAJOR%%.%%ICUMINOR%%
-lib/libiculx.so
 lib/libiculx.so.%%ICUMAJOR%%
-lib/libsicuio.a
+lib/libiculx.so
+lib/libicule.so.%%ICUMAJOR%%.%%ICUMINOR%%
+lib/libicule.so.%%ICUMAJOR%%
+lib/libicule.so
 lib/libicuio.so.%%ICUMAJOR%%.%%ICUMINOR%%
-lib/libicuio.so
 lib/libicuio.so.%%ICUMAJOR%%
-lib/libicutu.so.%%ICUMAJOR%%.%%ICUMINOR%%
-lib/libicutu.so.%%ICUMAJOR%%
-lib/libicutu.so
-%%DATADIR%%/%%ICUVER%%/config/mh-bsd-gcc
+lib/libicuio.so
+lib/libicui18n.so.%%ICUMAJOR%%.%%ICUMINOR%%
+lib/libicui18n.so.%%ICUMAJOR%%
+lib/libicui18n.so
+lib/libicudata.so.%%ICUMAJOR%%.%%ICUMINOR%%
+lib/libicudata.so.%%ICUMAJOR%%
+lib/libicudata.so
+lib/icu/pkgdata.inc
+lib/icu/current
+lib/icu/Makefile.inc
+lib/icu/%%ICUVER%%/pkgdata.inc
+lib/icu/%%ICUVER%%/Makefile.inc
+libdata/pkgconfig/icu-io.pc
+libdata/pkgconfig/icu-le.pc
+libdata/pkgconfig/icu-i18n.pc
+libdata/pkgconfig/icu-lx.pc
+libdata/pkgconfig/icu-uc.pc
+include/unicode/vtzone.h
+include/unicode/uversion.h
+include/unicode/uvernum.h
+include/unicode/utypes.h
+include/unicode/utrans.h
+include/unicode/utrace.h
+include/unicode/utmscale.h
+include/unicode/utf_old.h
+include/unicode/utf8.h
+include/unicode/utf32.h
+include/unicode/utf16.h
+include/unicode/utf.h
+include/unicode/utext.h
+include/unicode/usystem.h
+include/unicode/ustring.h
+include/unicode/ustream.h
+include/unicode/ustdio.h
+include/unicode/usprep.h
+include/unicode/uspoof.h
+include/unicode/ushape.h
+include/unicode/usetiter.h
+include/unicode/uset.h
+include/unicode/usearch.h
+include/unicode/uscript.h
+include/unicode/ures.h
+include/unicode/urep.h
+include/unicode/urename.h
+include/unicode/uregex.h
+include/unicode/uobslete.h
+include/unicode/uobject.h
+include/unicode/unum.h
+include/unicode/unorm2.h
+include/unicode/unorm.h
+include/unicode/unistr.h
+include/unicode/uniset.h
+include/unicode/unirepl.h
+include/unicode/unimatch.h
+include/unicode/unifunct.h
+include/unicode/unifilt.h
+include/unicode/umsg.h
+include/unicode/umisc.h
+include/unicode/umachine.h
+include/unicode/ulocdata.h
+include/unicode/uloc.h
+include/unicode/uldnames.h
+include/unicode/uiter.h
+include/unicode/uintrnal.h
+include/unicode/uidna.h
+include/unicode/uenum.h
+include/unicode/udraft.h
+include/unicode/udeprctd.h
+include/unicode/udatpg.h
+include/unicode/udata.h
+include/unicode/udat.h
+include/unicode/ucurr.h
+include/unicode/ucsdet.h
+include/unicode/uconfig.h
+include/unicode/ucoleitr.h
+include/unicode/ucol.h
+include/unicode/ucnvsel.h
+include/unicode/ucnv_err.h
+include/unicode/ucnv_cb.h
+include/unicode/ucnv.h
+include/unicode/uclean.h
+include/unicode/uchriter.h
+include/unicode/uchar.h
+include/unicode/ucat.h
+include/unicode/ucasemap.h
+include/unicode/ucal.h
+include/unicode/ubrk.h
+include/unicode/ubidi.h
+include/unicode/tztrans.h
+include/unicode/tzrule.h
+include/unicode/translit.h
+include/unicode/tmutfmt.h
+include/unicode/tmutamt.h
+include/unicode/tmunit.h
+include/unicode/timezone.h
+include/unicode/tblcoll.h
+include/unicode/symtable.h
+include/unicode/stsearch.h
+include/unicode/stringpiece.h
+include/unicode/strenum.h
+include/unicode/std_string.h
+include/unicode/sortkey.h
+include/unicode/smpdtfmt.h
+include/unicode/simpletz.h
+include/unicode/selfmt.h
+include/unicode/search.h
+include/unicode/schriter.h
+include/unicode/resbund.h
+include/unicode/rep.h
+include/unicode/regex.h
+include/unicode/rbtz.h
+include/unicode/rbnf.h
+include/unicode/rbbi.h
+include/unicode/pwin32.h
+include/unicode/putil.h
+include/unicode/ptypes.h
+include/unicode/ppalmos.h
+include/unicode/plurrule.h
+include/unicode/plurfmt.h
+include/unicode/platform.h
+include/unicode/parsepos.h
+include/unicode/parseerr.h
+include/unicode/numsys.h
+include/unicode/numfmt.h
+include/unicode/normlzr.h
+include/unicode/normalizer2.h
+include/unicode/msgfmt.h
+include/unicode/measure.h
+include/unicode/measunit.h
+include/unicode/measfmt.h
+include/unicode/locid.h
+include/unicode/locdspnm.h
+include/unicode/localpointer.h
+include/unicode/idna.h
+include/unicode/icuplug.h
+include/unicode/icudataver.h
+include/unicode/gregocal.h
+include/unicode/fpositer.h
+include/unicode/format.h
+include/unicode/fmtable.h
+include/unicode/fieldpos.h
+include/unicode/errorcode.h
+include/unicode/dtrule.h
+include/unicode/dtptngen.h
+include/unicode/dtitvinf.h
+include/unicode/dtitvfmt.h
+include/unicode/dtintrv.h
+include/unicode/dtfmtsym.h
+include/unicode/docmain.h
+include/unicode/decimfmt.h
+include/unicode/dcfmtsym.h
+include/unicode/dbbi.h
+include/unicode/datefmt.h
+include/unicode/currunit.h
+include/unicode/currpinf.h
+include/unicode/curramt.h
+include/unicode/colldata.h
+include/unicode/coll.h
+include/unicode/coleitr.h
+include/unicode/choicfmt.h
+include/unicode/chariter.h
+include/unicode/caniter.h
+include/unicode/calendar.h
+include/unicode/bytestream.h
+include/unicode/brkiter.h
+include/unicode/bmsearch.h
+include/unicode/bms.h
+include/unicode/basictz.h
+include/layout/plruns.h
+include/layout/playout.h
+include/layout/loengine.h
+include/layout/RunArrays.h
+include/layout/ParagraphLayout.h
+include/layout/LayoutEngine.h
+include/layout/LETypes.h
+include/layout/LESwaps.h
+include/layout/LEScripts.h
+include/layout/LELanguages.h
+include/layout/LEInsertionList.h
+include/layout/LEGlyphStorage.h
+include/layout/LEGlyphFilter.h
+include/layout/LEFontInstance.h
+bin/uconv
+bin/pkgdata
+bin/makeconv
+bin/icuinfo
+bin/icu-config
+bin/genrb
+bin/genctd
+bin/gencnval
+bin/gencfu
+bin/genbrk
+bin/derb
 %%DATADIR%%/%%ICUVER%%/mkinstalldirs
 %%DATADIR%%/%%ICUVER%%/license.html
+%%DATADIR%%/%%ICUVER%%/config/mh-bsd-gcc
+@dirrm lib/icu/%%ICUVER%%
+@dirrm lib/icu
+@dirrm include/unicode
+@dirrm include/layout
 @dirrm %%DATADIR%%/%%ICUVER%%/config
 @dirrm %%DATADIR%%/%%ICUVER%%
 @dirrm %%DATADIR%%
-@dirrm lib/icu/%%ICUVER%%
-@dirrm lib/icu