4 files changed, 331 insertions, 88 deletions

diff --git a/devel/icu2/Makefile b/devel/icu2/Makefile
index 0c901f49fbb8..277b81c91966 100644
--- a/devel/icu2/Makefile
+++ b/devel/icu2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	icu2
-PORTVERSION=	2.6
-PORTREVISION=	1
+PORTVERSION=	2.8
 CATEGORIES=	devel
 MASTER_SITES=	ftp://www-126.ibm.com/pub/icu/${PORTVERSION}/
 DISTNAME=	icu-${PORTVERSION}
@@ -33,6 +32,11 @@ CONFIGURE_ARGS+=	--enable-static
 CONFIGURE_ARGS+=	--enable-samples=no --enable-tests=no
 .if defined(NO_THREADS)
 CONFIGURE_ARGS+=	--enable-threads=no
+.else
+CONFIGURE_ENV+=		THREADSCPPFLAGS="${PTHREAD_CFLAGS}" \
+			THREADSCFLAGS="${PTHREAD_CFLAGS}" \
+			THREADSCXXFLAGS="${PTHREAD_CFLAGS}" \
+			PTHREAD_LIBS="${PTHREAD_LIBS}"
 .endif
 CONFIGURE_ENV+=		CXXFLAGS="-O3"
 CONFIGURE_ENV+=		CFLAGS="-O3"
@@ -44,15 +48,14 @@ 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+=	genidna.8
 MAN8+=	gennames.8
 MAN8+=	gennorm.8
 MAN8+=	genprops.8
+MAN8+=	gensprep.8
 MAN8+=	genuca.8
 
 ICUMAJOR=	${PORTVERSION:S/.//:R}
diff --git a/devel/icu2/distinfo b/devel/icu2/distinfo
index 4ba4ed044dd6..4ff6f4bd6226 100644
--- a/devel/icu2/distinfo
+++ b/devel/icu2/distinfo
@@ -1 +1,2 @@
-MD5 (icu-2.6.tgz) = 6d316b8a95fec8fb708b38dc2b62aa83
+MD5 (icu-2.8.tgz) = 49b5509c111596e958a87f3b17432cdd
+SIZE (icu-2.8.tgz) = 9194758
diff --git a/devel/icu2/files/patch-ab b/devel/icu2/files/patch-ab
new file mode 100644
index 000000000000..00d45f2574b9
--- /dev/null
+++ b/devel/icu2/files/patch-ab
@@ -0,0 +1,243 @@
+--- source/configure.orig	Tue Feb 17 09:08:47 2004
++++ source/configure	Tue Feb 17 09:13:53 2004
+@@ -1874,236 +1874,10 @@
+ 
+ if test $threads = true; then
+            
+-  echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6
+-echo "configure:1879: checking for pthread_attr_init in -lpthread" >&5
+-ac_lib_var=`echo pthread'_'pthread_attr_init | sed 'y%./+-%__p_%'`
+-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  ac_save_LIBS="$LIBS"
+-LIBS="-lpthread  $LIBS"
+-cat > conftest.$ac_ext <<EOF
+-#line 1887 "configure"
+-#include "confdefs.h"
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-/* We use char because int might match the return type of a gcc2
+-    builtin and then its argument prototype would still apply.  */
+-char pthread_attr_init();
+-
+-int main() {
+-pthread_attr_init()
+-; return 0; }
+-EOF
+-if { (eval echo configure:1898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=yes"
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=no"
+-fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+-
+-fi
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
+-    ac_tr_lib=HAVE_LIB`echo pthread | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+-  cat >> confdefs.h <<EOF
+-#define $ac_tr_lib 1
+-EOF
+-
+-  LIBS="-lpthread $LIBS"
+-
+-else
+-  echo "$ac_t""no" 1>&6
+-fi
+-
+-  if test $ac_cv_lib_pthread_pthread_attr_init = yes; then
+-   ICU_USE_THREADS=1
+-  else
+-               
+-   
+-echo $ac_n "checking for library containing pthread_mutex_destroy""... $ac_c" 1>&6
+-echo "configure:1931: checking for library containing pthread_mutex_destroy" >&5
+-if eval "test \"`echo '$''{'ac_cv_search_pthread_mutex_destroy'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  ac_func_search_save_LIBS="$LIBS"
+-ac_cv_search_pthread_mutex_destroy="no"
+-for i in pthread pthreads c_r ; do
+-LIBS="-l$i  $ac_func_search_save_LIBS"
+-cat > conftest.$ac_ext <<EOF
+-#line 1940 "configure"
+-#include "confdefs.h"
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-/* We use char because int might match the return type of a gcc2
+-    builtin and then its argument prototype would still apply.  */
+-char pthread_mutex_destroy();
+-
+-int main() {
+-pthread_mutex_destroy()
+-; return 0; }
+-EOF
+-if { (eval echo configure:1951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
+-  ac_cv_search_pthread_mutex_destroy="-l$i"
+-break
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-fi
+-rm -f conftest*
+-done
+-if test "$ac_cv_search_pthread_mutex_destroy" = "no"; then
+-cat > conftest.$ac_ext <<EOF
+-#line 1963 "configure"
+-#include "confdefs.h"
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-/* We use char because int might match the return type of a gcc2
+-    builtin and then its argument prototype would still apply.  */
+-char pthread_mutex_destroy();
+-
+-int main() {
+-pthread_mutex_destroy()
+-; return 0; }
+-EOF
+-if { (eval echo configure:1974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
+-  ac_cv_search_pthread_mutex_destroy="none required"
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-fi
+-rm -f conftest*
+-fi
+-LIBS="$ac_func_search_save_LIBS"
+-fi
+-
+-echo "$ac_t""$ac_cv_search_pthread_mutex_destroy" 1>&6
+-if test "$ac_cv_search_pthread_mutex_destroy" != "no"; then
+-  test "$ac_cv_search_pthread_mutex_destroy" = "none required" || LIBS="$ac_cv_search_pthread_mutex_destroy $LIBS"
+-  
+-else :
+-  
+-fi
+-
+-   if test "$ac_cv_search_pthread_mutex_destroy" != no; then
+-    ICU_USE_THREADS=1
+-   else
+-        echo $ac_n "checking for pthread_mutex_init in -lpthread""... $ac_c" 1>&6
+-echo "configure:1998: checking for pthread_mutex_init in -lpthread" >&5
+-ac_lib_var=`echo pthread'_'pthread_mutex_init | sed 'y%./+-%__p_%'`
+-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  ac_save_LIBS="$LIBS"
+-LIBS="-lpthread  $LIBS"
+-cat > conftest.$ac_ext <<EOF
+-#line 2006 "configure"
+-#include "confdefs.h"
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-/* We use char because int might match the return type of a gcc2
+-    builtin and then its argument prototype would still apply.  */
+-char pthread_mutex_init();
+-
+-int main() {
+-pthread_mutex_init()
+-; return 0; }
+-EOF
+-if { (eval echo configure:2017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=yes"
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=no"
+-fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+-
+-fi
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
+-    ac_tr_lib=HAVE_LIB`echo pthread | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+-  cat >> confdefs.h <<EOF
+-#define $ac_tr_lib 1
+-EOF
+-
+-  LIBS="-lpthread $LIBS"
+-
+-else
+-  echo "$ac_t""no" 1>&6
+-fi
+-
+-    if test $ac_cv_lib_pthread_pthread_mutex_init = yes; then
+-      ICU_USE_THREADS=1
+-    fi
+-   fi
+-
+-   echo $ac_n "checking for pthread_mutex_lock""... $ac_c" 1>&6
+-echo "configure:2050: checking for pthread_mutex_lock" >&5
+-if eval "test \"`echo '$''{'ac_cv_func_pthread_mutex_lock'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  cat > conftest.$ac_ext <<EOF
+-#line 2055 "configure"
+-#include "confdefs.h"
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char pthread_mutex_lock(); below.  */
+-#include <assert.h>
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-/* We use char because int might match the return type of a gcc2
+-    builtin and then its argument prototype would still apply.  */
+-char pthread_mutex_lock();
+-
+-int main() {
+-
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_pthread_mutex_lock) || defined (__stub___pthread_mutex_lock)
+-choke me
+-#else
+-pthread_mutex_lock();
+-#endif
+-
+-; return 0; }
+-EOF
+-if { (eval echo configure:2078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
+-  eval "ac_cv_func_pthread_mutex_lock=yes"
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_func_pthread_mutex_lock=no"
+-fi
+-rm -f conftest*
+-fi
+-
+-if eval "test \"`echo '$ac_cv_func_'pthread_mutex_lock`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
+-  :
+-else
+-  echo "$ac_t""no" 1>&6
+-fi
+-
+-
+-   if test $ac_cv_func_pthread_mutex_lock = yes; then
+-     ICU_USE_THREADS=1
+-   fi
+-      case "${host}" in
+-   *-pc-cygwin*|*-pc-mingw*)
+-     if test "$ac_cv_prog_gcc" = no; then
+-              ICU_USE_THREADS=1
+-     fi ;;
+-   esac
+-  fi
++	echo "going to use ... ${PTHREAD_LIBS}" 1>&6
++	echo "configure:1879: going to use ${PTHREAD_LIBS}" >&5
++	LIBS="${PTHREAD_LIBS}  $LIBS"
++	ICU_USE_THREADS=1
+ fi
+ 
+ 
diff --git a/devel/icu2/pkg-plist b/devel/icu2/pkg-plist
index f572580eab6c..d88fe7030082 100644
--- a/devel/icu2/pkg-plist
+++ b/devel/icu2/pkg-plist
@@ -1,34 +1,52 @@
-etc/icu/convrtrs.txt
 bin/derb
-bin/icu-config
-bin/gencnval
 bin/genbrk
+bin/gencnval
 bin/genrb
+bin/icu-config
 bin/makeconv
 bin/pkgdata
 bin/uconv
-include/layout/ArabicLayoutEngine.h
-include/layout/GXLayoutEngine.h
-include/layout/HanLayoutEngine.h
-include/layout/IndicLayoutEngine.h
-include/layout/LayoutEngine.h
-include/layout/OpenTypeLayoutEngine.h
-include/layout/ThaiLayoutEngine.h
+sbin/decmn
+sbin/genccode
+sbin/gencmn
+sbin/gennames
+sbin/gennorm
+sbin/genpname
+sbin/genprops
+sbin/gensprep
+sbin/genuca
+sbin/icuswap
 include/layout/LEFontInstance.h
 include/layout/LEGlyphFilter.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/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/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/locid.h
+include/unicode/loengine.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
@@ -37,131 +55,110 @@ include/unicode/pos400.h
 include/unicode/putil.h
 include/unicode/pwin32.h
 include/unicode/rbbi.h
+include/unicode/rbnf.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/ubidi.h
 include/unicode/ubrk.h
+include/unicode/ucal.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/ucurr.h
+include/unicode/udat.h
 include/unicode/udata.h
 include/unicode/uenum.h
+include/unicode/uidna.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/unifltlg.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/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/utf.h
 include/unicode/utf16.h
 include/unicode/utf32.h
 include/unicode/utf8.h
 include/unicode/utf_old.h
+include/unicode/utrace.h
+include/unicode/utrans.h
 include/unicode/utypes.h
 include/unicode/uversion.h
-include/unicode/calendar.h
-include/unicode/choicfmt.h
-include/unicode/coleitr.h
-include/unicode/coll.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/msgfmt.h
-include/unicode/numfmt.h
-include/unicode/rbnf.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/unum.h
-include/unicode/usearch.h
-include/unicode/utrans.h
-include/unicode/ustdio.h
-include/unicode/ustream.h
-include/unicode/ucat.h
-include/unicode/uidna.h
-include/unicode/loengine.h
+lib/icu/%%ICUVER%%/Makefile.inc
+lib/icu/current
+lib/icu/Makefile.inc
+lib/libsicudata.a
 lib/libicudata.so.%%ICUMAJOR%%.0
-lib/libicudata.so.%%ICUMAJOR%%
 lib/libicudata.so
-lib/libicudata.a
-lib/libicuio.so.%%ICUMAJOR%%.0
-lib/libicuio.so.%%ICUMAJOR%%
-lib/libicuio.so
-lib/libicuio.a
-lib/libicule.so.%%ICUMAJOR%%.0
-lib/libicule.so.%%ICUMAJOR%%
-lib/libicule.so
-lib/libicule.a
-lib/libiculx.so.%%ICUMAJOR%%.0
-lib/libiculx.so.%%ICUMAJOR%%
-lib/libiculx.so
-lib/libiculx.a
+lib/libicudata.so.%%ICUMAJOR%%
+lib/libsicuuc.a
 lib/libicuuc.so.%%ICUMAJOR%%.0
-lib/libicuuc.so.%%ICUMAJOR%%
 lib/libicuuc.so
-lib/libicuuc.a
+lib/libicuuc.so.%%ICUMAJOR%%
+lib/libsicui18n.a
 lib/libicui18n.so.%%ICUMAJOR%%.0
-lib/libicui18n.so.%%ICUMAJOR%%
 lib/libicui18n.so
-lib/libicui18n.a
+lib/libicui18n.so.%%ICUMAJOR%%
+lib/libsicule.a
+lib/libicule.so.%%ICUMAJOR%%.0
+lib/libicule.so
+lib/libicule.so.%%ICUMAJOR%%
+lib/libsiculx.a
+lib/libiculx.so.%%ICUMAJOR%%.0
+lib/libiculx.so
+lib/libiculx.so.%%ICUMAJOR%%
+lib/libsicutoolutil.a
 lib/libicutoolutil.so.%%ICUMAJOR%%.0
 lib/libicutoolutil.so.%%ICUMAJOR%%
 lib/libicutoolutil.so
-lib/libicutoolutil.a
-lib/icu/%%ICUVER%%/Makefile.inc
-lib/icu/current
-lib/icu/Makefile.inc
+lib/libsicuio.a
+lib/libicuio.so.%%ICUMAJOR%%.0
+lib/libicuio.so
+lib/libicuio.so.%%ICUMAJOR%%
 share/icu/%%ICUVER%%/config/mh-bsd-gcc
 share/icu/%%ICUVER%%/mkinstalldirs
-share/icu/%%ICUVER%%/README
-sbin/genidna
-sbin/genuca
-sbin/genccode
-sbin/genpname
-sbin/genprops
-sbin/gennames
-sbin/gennorm
-sbin/gencmn
-sbin/decmn
-sbin/gentz
+share/icu/%%ICUVER%%/license.html
 @dirrm share/icu/%%ICUVER%%/config
 @dirrm share/icu/%%ICUVER%%
 @dirrm share/icu
@@ -169,4 +166,3 @@ sbin/gentz
 @dirrm lib/icu
 @dirrm include/unicode
 @dirrm include/layout
-@dirrm etc/icu