- Install files necessary for viewing pages in Asian languages using ports

  based on mozilla-embedded (galeon, skipstone etc.);
- remove commented out line from unixcharset.properties;
- add few `@unexec rm -f' into mozilla-embedded plist to ensure complete
  removal of package even if the port based on mozilla-embedded was executed
  with root privileges (mozilla has a bad habit of updating files in
  ${PREFIX}/lib/mozilla* wherever it's possible).

Submitted by:	Takashi KANAMARU <kanamaru@sekine-lab.ei.tuat.ac.jp> (Asian langs)
		sobomax (the rest)

16 files changed, 145 insertions, 31 deletions

diff --git a/www/mozilla-devel/files/patch-embedding::config::basebrowser-unix b/www/mozilla-devel/files/patch-embedding::config::basebrowser-unix
index 64c8ac9cddcf..bd9b0b8bc67c 100644
--- a/www/mozilla-devel/files/patch-embedding::config::basebrowser-unix
+++ b/www/mozilla-devel/files/patch-embedding::config::basebrowser-unix
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- embedding/config/basebrowser-unix	2001/12/26 07:19:52	1.1
-+++ embedding/config/basebrowser-unix	2001/12/26 07:24:15
+--- embedding/config/basebrowser-unix.orig	Wed Nov 21 00:21:59 2001
++++ embedding/config/basebrowser-unix	Tue Jan 15 15:26:55 2002
 @@ -119,6 +119,7 @@
  
  ; layout
@@ -11,3 +11,22 @@ $FreeBSD$
  components/libgklayout.so                   
  components/libhtmlpars.so                 
  components/libgkview.so                   
+@@ -196,12 +197,12 @@
+ components/unicharutil.xpt
+ components/libchardet.so
+ ; optional - on english only systems
+-; components/libucvja.so for japanese
+-; components/libucvko.so for korean
+-; components/libucvcn.so for simplified chinese
+-; components/libucvtw.so for traditional chinese
+-; components/libucvtw2.so for traditional chinese
+-; components/libucvibm.so for ibm
++components/libucvja.so
++components/libucvko.so
++components/libucvcn.so
++components/libucvtw.so
++components/libucvtw2.so
++components/libucvibm.so
+ 
+ 
+ res/language.properties
diff --git a/www/mozilla-devel/files/patch-intl::uconv::src::unixcharset.properties b/www/mozilla-devel/files/patch-intl::uconv::src::unixcharset.properties
index 28e44597c11b..21f81552faad 100644
--- a/www/mozilla-devel/files/patch-intl::uconv::src::unixcharset.properties
+++ b/www/mozilla-devel/files/patch-intl::uconv::src::unixcharset.properties
@@ -2,8 +2,8 @@
 $FreeBSD$
 
 --- intl/uconv/src/unixcharset.properties.orig	Fri Dec 14 16:40:50 2001
-+++ intl/uconv/src/unixcharset.properties	Mon Jan 14 20:48:52 2002
-@@ -174,6 +174,70 @@
++++ intl/uconv/src/unixcharset.properties	Tue Jan 15 13:10:35 2002
+@@ -174,6 +174,69 @@
  locale.all.en_US.ISO8859-1=ISO-8859-1
  #FreeBSD
  locale.all.en_US.ISO_8859-1=ISO-8859-1
@@ -14,7 +14,6 @@ $FreeBSD$
 +locale.all.en_AU.ISO_8859-1=ISO-8859-1
 +locale.all.en_CA.ISO_8859-1=ISO-8859-1
 +locale.all.en_GB.ISO_8859-1=ISO-8859-1
-+#locale.all.en_US.ISO_8859-1=ISO-8859-1
 +locale.all.es_ES.ISO_8859-1=ISO-8859-1
 +locale.all.fi_FI.ISO_8859-1=ISO-8859-1
 +locale.all.fr_BE.ISO_8859-1=ISO-8859-1
diff --git a/www/mozilla-embedded-devel/Makefile b/www/mozilla-embedded-devel/Makefile
index 3d8ee01f08eb..df0bbcc4de0c 100644
--- a/www/mozilla-embedded-devel/Makefile
+++ b/www/mozilla-embedded-devel/Makefile
@@ -24,7 +24,8 @@ USE_X_PREFIX=	yes
 
 MAINDIR=	${.CURDIR}/../mozilla
 PORTVERSION!=	${PORTVERSION}
-PORTREVISION!=	${PORTREVISION}
+#PORTREVISION!=	${PORTREVISION}
+PORTREVISION=	3
 PORTEPOCH!=	${PORTEPOCH}
 RUN_DEPENDS!=	${RUN_DEPENDS}
 LIB_DEPENDS!=	${LIB_DEPENDS}
diff --git a/www/mozilla-embedded-devel/pkg-plist b/www/mozilla-embedded-devel/pkg-plist
index 3805d766afb5..9f4e37046578 100644
--- a/www/mozilla-embedded-devel/pkg-plist
+++ b/www/mozilla-embedded-devel/pkg-plist
@@ -7,6 +7,7 @@ lib/mozilla-embedded/chrome/overlayinfo/navigator/content/overlays.rdf
 lib/mozilla-embedded/chrome/pipnss.jar
 lib/mozilla-embedded/chrome/pippki.jar
 lib/mozilla-embedded/component.reg
+@unexec rm -f %D/lib/mozilla-embedded/component.reg || true
 lib/mozilla-embedded/components/appshell.xpt
 lib/mozilla-embedded/components/caps.xpt
 lib/mozilla-embedded/components/chrome.xpt
@@ -69,7 +70,13 @@ lib/mozilla-embedded/components/libstrres.so
 lib/mozilla-embedded/components/libtimer_gtk.so
 lib/mozilla-embedded/components/libtxtsvc.so
 lib/mozilla-embedded/components/libuconv.so
+lib/mozilla-embedded/components/libucvcn.so
+lib/mozilla-embedded/components/libucvibm.so
+lib/mozilla-embedded/components/libucvja.so
+lib/mozilla-embedded/components/libucvko.so
 lib/mozilla-embedded/components/libucvlatin.so
+lib/mozilla-embedded/components/libucvtw.so
+lib/mozilla-embedded/components/libucvtw2.so
 lib/mozilla-embedded/components/libunicharutil.so
 lib/mozilla-embedded/components/liburiloader.so
 lib/mozilla-embedded/components/libwallet.so
@@ -108,7 +115,7 @@ lib/mozilla-embedded/components/xpcom_io.xpt
 lib/mozilla-embedded/components/xpcom_threads.xpt
 lib/mozilla-embedded/components/xpcom_xpti.xpt
 lib/mozilla-embedded/components/xpconnect.xpt
-lib/mozilla-embedded/components/xpti.dat
+@unexec rm -f %D/lib/mozilla-embedded/components/xpti.dat || true
 lib/mozilla-embedded/defaults/pref/all.js
 lib/mozilla-embedded/defaults/pref/initpref.js
 lib/mozilla-embedded/defaults/pref/security-prefs.js
diff --git a/www/mozilla-embedded-vendor/Makefile b/www/mozilla-embedded-vendor/Makefile
index 3d8ee01f08eb..df0bbcc4de0c 100644
--- a/www/mozilla-embedded-vendor/Makefile
+++ b/www/mozilla-embedded-vendor/Makefile
@@ -24,7 +24,8 @@ USE_X_PREFIX=	yes
 
 MAINDIR=	${.CURDIR}/../mozilla
 PORTVERSION!=	${PORTVERSION}
-PORTREVISION!=	${PORTREVISION}
+#PORTREVISION!=	${PORTREVISION}
+PORTREVISION=	3
 PORTEPOCH!=	${PORTEPOCH}
 RUN_DEPENDS!=	${RUN_DEPENDS}
 LIB_DEPENDS!=	${LIB_DEPENDS}
diff --git a/www/mozilla-embedded-vendor/pkg-plist b/www/mozilla-embedded-vendor/pkg-plist
index 3805d766afb5..9f4e37046578 100644
--- a/www/mozilla-embedded-vendor/pkg-plist
+++ b/www/mozilla-embedded-vendor/pkg-plist
@@ -7,6 +7,7 @@ lib/mozilla-embedded/chrome/overlayinfo/navigator/content/overlays.rdf
 lib/mozilla-embedded/chrome/pipnss.jar
 lib/mozilla-embedded/chrome/pippki.jar
 lib/mozilla-embedded/component.reg
+@unexec rm -f %D/lib/mozilla-embedded/component.reg || true
 lib/mozilla-embedded/components/appshell.xpt
 lib/mozilla-embedded/components/caps.xpt
 lib/mozilla-embedded/components/chrome.xpt
@@ -69,7 +70,13 @@ lib/mozilla-embedded/components/libstrres.so
 lib/mozilla-embedded/components/libtimer_gtk.so
 lib/mozilla-embedded/components/libtxtsvc.so
 lib/mozilla-embedded/components/libuconv.so
+lib/mozilla-embedded/components/libucvcn.so
+lib/mozilla-embedded/components/libucvibm.so
+lib/mozilla-embedded/components/libucvja.so
+lib/mozilla-embedded/components/libucvko.so
 lib/mozilla-embedded/components/libucvlatin.so
+lib/mozilla-embedded/components/libucvtw.so
+lib/mozilla-embedded/components/libucvtw2.so
 lib/mozilla-embedded/components/libunicharutil.so
 lib/mozilla-embedded/components/liburiloader.so
 lib/mozilla-embedded/components/libwallet.so
@@ -108,7 +115,7 @@ lib/mozilla-embedded/components/xpcom_io.xpt
 lib/mozilla-embedded/components/xpcom_threads.xpt
 lib/mozilla-embedded/components/xpcom_xpti.xpt
 lib/mozilla-embedded/components/xpconnect.xpt
-lib/mozilla-embedded/components/xpti.dat
+@unexec rm -f %D/lib/mozilla-embedded/components/xpti.dat || true
 lib/mozilla-embedded/defaults/pref/all.js
 lib/mozilla-embedded/defaults/pref/initpref.js
 lib/mozilla-embedded/defaults/pref/security-prefs.js
diff --git a/www/mozilla-embedded/Makefile b/www/mozilla-embedded/Makefile
index 3d8ee01f08eb..df0bbcc4de0c 100644
--- a/www/mozilla-embedded/Makefile
+++ b/www/mozilla-embedded/Makefile
@@ -24,7 +24,8 @@ USE_X_PREFIX=	yes
 
 MAINDIR=	${.CURDIR}/../mozilla
 PORTVERSION!=	${PORTVERSION}
-PORTREVISION!=	${PORTREVISION}
+#PORTREVISION!=	${PORTREVISION}
+PORTREVISION=	3
 PORTEPOCH!=	${PORTEPOCH}
 RUN_DEPENDS!=	${RUN_DEPENDS}
 LIB_DEPENDS!=	${LIB_DEPENDS}
diff --git a/www/mozilla-embedded/pkg-plist b/www/mozilla-embedded/pkg-plist
index 3805d766afb5..9f4e37046578 100644
--- a/www/mozilla-embedded/pkg-plist
+++ b/www/mozilla-embedded/pkg-plist
@@ -7,6 +7,7 @@ lib/mozilla-embedded/chrome/overlayinfo/navigator/content/overlays.rdf
 lib/mozilla-embedded/chrome/pipnss.jar
 lib/mozilla-embedded/chrome/pippki.jar
 lib/mozilla-embedded/component.reg
+@unexec rm -f %D/lib/mozilla-embedded/component.reg || true
 lib/mozilla-embedded/components/appshell.xpt
 lib/mozilla-embedded/components/caps.xpt
 lib/mozilla-embedded/components/chrome.xpt
@@ -69,7 +70,13 @@ lib/mozilla-embedded/components/libstrres.so
 lib/mozilla-embedded/components/libtimer_gtk.so
 lib/mozilla-embedded/components/libtxtsvc.so
 lib/mozilla-embedded/components/libuconv.so
+lib/mozilla-embedded/components/libucvcn.so
+lib/mozilla-embedded/components/libucvibm.so
+lib/mozilla-embedded/components/libucvja.so
+lib/mozilla-embedded/components/libucvko.so
 lib/mozilla-embedded/components/libucvlatin.so
+lib/mozilla-embedded/components/libucvtw.so
+lib/mozilla-embedded/components/libucvtw2.so
 lib/mozilla-embedded/components/libunicharutil.so
 lib/mozilla-embedded/components/liburiloader.so
 lib/mozilla-embedded/components/libwallet.so
@@ -108,7 +115,7 @@ lib/mozilla-embedded/components/xpcom_io.xpt
 lib/mozilla-embedded/components/xpcom_threads.xpt
 lib/mozilla-embedded/components/xpcom_xpti.xpt
 lib/mozilla-embedded/components/xpconnect.xpt
-lib/mozilla-embedded/components/xpti.dat
+@unexec rm -f %D/lib/mozilla-embedded/components/xpti.dat || true
 lib/mozilla-embedded/defaults/pref/all.js
 lib/mozilla-embedded/defaults/pref/initpref.js
 lib/mozilla-embedded/defaults/pref/security-prefs.js
diff --git a/www/mozilla-vendor/files/patch-embedding::config::basebrowser-unix b/www/mozilla-vendor/files/patch-embedding::config::basebrowser-unix
index 64c8ac9cddcf..bd9b0b8bc67c 100644
--- a/www/mozilla-vendor/files/patch-embedding::config::basebrowser-unix
+++ b/www/mozilla-vendor/files/patch-embedding::config::basebrowser-unix
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- embedding/config/basebrowser-unix	2001/12/26 07:19:52	1.1
-+++ embedding/config/basebrowser-unix	2001/12/26 07:24:15
+--- embedding/config/basebrowser-unix.orig	Wed Nov 21 00:21:59 2001
++++ embedding/config/basebrowser-unix	Tue Jan 15 15:26:55 2002
 @@ -119,6 +119,7 @@
  
  ; layout
@@ -11,3 +11,22 @@ $FreeBSD$
  components/libgklayout.so                   
  components/libhtmlpars.so                 
  components/libgkview.so                   
+@@ -196,12 +197,12 @@
+ components/unicharutil.xpt
+ components/libchardet.so
+ ; optional - on english only systems
+-; components/libucvja.so for japanese
+-; components/libucvko.so for korean
+-; components/libucvcn.so for simplified chinese
+-; components/libucvtw.so for traditional chinese
+-; components/libucvtw2.so for traditional chinese
+-; components/libucvibm.so for ibm
++components/libucvja.so
++components/libucvko.so
++components/libucvcn.so
++components/libucvtw.so
++components/libucvtw2.so
++components/libucvibm.so
+ 
+ 
+ res/language.properties
diff --git a/www/mozilla-vendor/files/patch-intl::uconv::src::unixcharset.properties b/www/mozilla-vendor/files/patch-intl::uconv::src::unixcharset.properties
index 28e44597c11b..21f81552faad 100644
--- a/www/mozilla-vendor/files/patch-intl::uconv::src::unixcharset.properties
+++ b/www/mozilla-vendor/files/patch-intl::uconv::src::unixcharset.properties
@@ -2,8 +2,8 @@
 $FreeBSD$
 
 --- intl/uconv/src/unixcharset.properties.orig	Fri Dec 14 16:40:50 2001
-+++ intl/uconv/src/unixcharset.properties	Mon Jan 14 20:48:52 2002
-@@ -174,6 +174,70 @@
++++ intl/uconv/src/unixcharset.properties	Tue Jan 15 13:10:35 2002
+@@ -174,6 +174,69 @@
  locale.all.en_US.ISO8859-1=ISO-8859-1
  #FreeBSD
  locale.all.en_US.ISO_8859-1=ISO-8859-1
@@ -14,7 +14,6 @@ $FreeBSD$
 +locale.all.en_AU.ISO_8859-1=ISO-8859-1
 +locale.all.en_CA.ISO_8859-1=ISO-8859-1
 +locale.all.en_GB.ISO_8859-1=ISO-8859-1
-+#locale.all.en_US.ISO_8859-1=ISO-8859-1
 +locale.all.es_ES.ISO_8859-1=ISO-8859-1
 +locale.all.fi_FI.ISO_8859-1=ISO-8859-1
 +locale.all.fr_BE.ISO_8859-1=ISO-8859-1
diff --git a/www/mozilla/files/patch-embedding::config::basebrowser-unix b/www/mozilla/files/patch-embedding::config::basebrowser-unix
index 64c8ac9cddcf..bd9b0b8bc67c 100644
--- a/www/mozilla/files/patch-embedding::config::basebrowser-unix
+++ b/www/mozilla/files/patch-embedding::config::basebrowser-unix
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- embedding/config/basebrowser-unix	2001/12/26 07:19:52	1.1
-+++ embedding/config/basebrowser-unix	2001/12/26 07:24:15
+--- embedding/config/basebrowser-unix.orig	Wed Nov 21 00:21:59 2001
++++ embedding/config/basebrowser-unix	Tue Jan 15 15:26:55 2002
 @@ -119,6 +119,7 @@
  
  ; layout
@@ -11,3 +11,22 @@ $FreeBSD$
  components/libgklayout.so                   
  components/libhtmlpars.so                 
  components/libgkview.so                   
+@@ -196,12 +197,12 @@
+ components/unicharutil.xpt
+ components/libchardet.so
+ ; optional - on english only systems
+-; components/libucvja.so for japanese
+-; components/libucvko.so for korean
+-; components/libucvcn.so for simplified chinese
+-; components/libucvtw.so for traditional chinese
+-; components/libucvtw2.so for traditional chinese
+-; components/libucvibm.so for ibm
++components/libucvja.so
++components/libucvko.so
++components/libucvcn.so
++components/libucvtw.so
++components/libucvtw2.so
++components/libucvibm.so
+ 
+ 
+ res/language.properties
diff --git a/www/mozilla/files/patch-intl::uconv::src::unixcharset.properties b/www/mozilla/files/patch-intl::uconv::src::unixcharset.properties
index 28e44597c11b..21f81552faad 100644
--- a/www/mozilla/files/patch-intl::uconv::src::unixcharset.properties
+++ b/www/mozilla/files/patch-intl::uconv::src::unixcharset.properties
@@ -2,8 +2,8 @@
 $FreeBSD$
 
 --- intl/uconv/src/unixcharset.properties.orig	Fri Dec 14 16:40:50 2001
-+++ intl/uconv/src/unixcharset.properties	Mon Jan 14 20:48:52 2002
-@@ -174,6 +174,70 @@
++++ intl/uconv/src/unixcharset.properties	Tue Jan 15 13:10:35 2002
+@@ -174,6 +174,69 @@
  locale.all.en_US.ISO8859-1=ISO-8859-1
  #FreeBSD
  locale.all.en_US.ISO_8859-1=ISO-8859-1
@@ -14,7 +14,6 @@ $FreeBSD$
 +locale.all.en_AU.ISO_8859-1=ISO-8859-1
 +locale.all.en_CA.ISO_8859-1=ISO-8859-1
 +locale.all.en_GB.ISO_8859-1=ISO-8859-1
-+#locale.all.en_US.ISO_8859-1=ISO-8859-1
 +locale.all.es_ES.ISO_8859-1=ISO-8859-1
 +locale.all.fi_FI.ISO_8859-1=ISO-8859-1
 +locale.all.fr_BE.ISO_8859-1=ISO-8859-1
diff --git a/www/seamonkey/files/patch-embedding::config::basebrowser-unix b/www/seamonkey/files/patch-embedding::config::basebrowser-unix
index 64c8ac9cddcf..bd9b0b8bc67c 100644
--- a/www/seamonkey/files/patch-embedding::config::basebrowser-unix
+++ b/www/seamonkey/files/patch-embedding::config::basebrowser-unix
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- embedding/config/basebrowser-unix	2001/12/26 07:19:52	1.1
-+++ embedding/config/basebrowser-unix	2001/12/26 07:24:15
+--- embedding/config/basebrowser-unix.orig	Wed Nov 21 00:21:59 2001
++++ embedding/config/basebrowser-unix	Tue Jan 15 15:26:55 2002
 @@ -119,6 +119,7 @@
  
  ; layout
@@ -11,3 +11,22 @@ $FreeBSD$
  components/libgklayout.so                   
  components/libhtmlpars.so                 
  components/libgkview.so                   
+@@ -196,12 +197,12 @@
+ components/unicharutil.xpt
+ components/libchardet.so
+ ; optional - on english only systems
+-; components/libucvja.so for japanese
+-; components/libucvko.so for korean
+-; components/libucvcn.so for simplified chinese
+-; components/libucvtw.so for traditional chinese
+-; components/libucvtw2.so for traditional chinese
+-; components/libucvibm.so for ibm
++components/libucvja.so
++components/libucvko.so
++components/libucvcn.so
++components/libucvtw.so
++components/libucvtw2.so
++components/libucvibm.so
+ 
+ 
+ res/language.properties
diff --git a/www/seamonkey/files/patch-intl::uconv::src::unixcharset.properties b/www/seamonkey/files/patch-intl::uconv::src::unixcharset.properties
index 28e44597c11b..21f81552faad 100644
--- a/www/seamonkey/files/patch-intl::uconv::src::unixcharset.properties
+++ b/www/seamonkey/files/patch-intl::uconv::src::unixcharset.properties
@@ -2,8 +2,8 @@
 $FreeBSD$
 
 --- intl/uconv/src/unixcharset.properties.orig	Fri Dec 14 16:40:50 2001
-+++ intl/uconv/src/unixcharset.properties	Mon Jan 14 20:48:52 2002
-@@ -174,6 +174,70 @@
++++ intl/uconv/src/unixcharset.properties	Tue Jan 15 13:10:35 2002
+@@ -174,6 +174,69 @@
  locale.all.en_US.ISO8859-1=ISO-8859-1
  #FreeBSD
  locale.all.en_US.ISO_8859-1=ISO-8859-1
@@ -14,7 +14,6 @@ $FreeBSD$
 +locale.all.en_AU.ISO_8859-1=ISO-8859-1
 +locale.all.en_CA.ISO_8859-1=ISO-8859-1
 +locale.all.en_GB.ISO_8859-1=ISO-8859-1
-+#locale.all.en_US.ISO_8859-1=ISO-8859-1
 +locale.all.es_ES.ISO_8859-1=ISO-8859-1
 +locale.all.fi_FI.ISO_8859-1=ISO-8859-1
 +locale.all.fr_BE.ISO_8859-1=ISO-8859-1
diff --git a/www/seamonkey2/files/patch-embedding::config::basebrowser-unix b/www/seamonkey2/files/patch-embedding::config::basebrowser-unix
index 64c8ac9cddcf..bd9b0b8bc67c 100644
--- a/www/seamonkey2/files/patch-embedding::config::basebrowser-unix
+++ b/www/seamonkey2/files/patch-embedding::config::basebrowser-unix
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- embedding/config/basebrowser-unix	2001/12/26 07:19:52	1.1
-+++ embedding/config/basebrowser-unix	2001/12/26 07:24:15
+--- embedding/config/basebrowser-unix.orig	Wed Nov 21 00:21:59 2001
++++ embedding/config/basebrowser-unix	Tue Jan 15 15:26:55 2002
 @@ -119,6 +119,7 @@
  
  ; layout
@@ -11,3 +11,22 @@ $FreeBSD$
  components/libgklayout.so                   
  components/libhtmlpars.so                 
  components/libgkview.so                   
+@@ -196,12 +197,12 @@
+ components/unicharutil.xpt
+ components/libchardet.so
+ ; optional - on english only systems
+-; components/libucvja.so for japanese
+-; components/libucvko.so for korean
+-; components/libucvcn.so for simplified chinese
+-; components/libucvtw.so for traditional chinese
+-; components/libucvtw2.so for traditional chinese
+-; components/libucvibm.so for ibm
++components/libucvja.so
++components/libucvko.so
++components/libucvcn.so
++components/libucvtw.so
++components/libucvtw2.so
++components/libucvibm.so
+ 
+ 
+ res/language.properties
diff --git a/www/seamonkey2/files/patch-intl::uconv::src::unixcharset.properties b/www/seamonkey2/files/patch-intl::uconv::src::unixcharset.properties
index 28e44597c11b..21f81552faad 100644
--- a/www/seamonkey2/files/patch-intl::uconv::src::unixcharset.properties
+++ b/www/seamonkey2/files/patch-intl::uconv::src::unixcharset.properties
@@ -2,8 +2,8 @@
 $FreeBSD$
 
 --- intl/uconv/src/unixcharset.properties.orig	Fri Dec 14 16:40:50 2001
-+++ intl/uconv/src/unixcharset.properties	Mon Jan 14 20:48:52 2002
-@@ -174,6 +174,70 @@
++++ intl/uconv/src/unixcharset.properties	Tue Jan 15 13:10:35 2002
+@@ -174,6 +174,69 @@
  locale.all.en_US.ISO8859-1=ISO-8859-1
  #FreeBSD
  locale.all.en_US.ISO_8859-1=ISO-8859-1
@@ -14,7 +14,6 @@ $FreeBSD$
 +locale.all.en_AU.ISO_8859-1=ISO-8859-1
 +locale.all.en_CA.ISO_8859-1=ISO-8859-1
 +locale.all.en_GB.ISO_8859-1=ISO-8859-1
-+#locale.all.en_US.ISO_8859-1=ISO-8859-1
 +locale.all.es_ES.ISO_8859-1=ISO-8859-1
 +locale.all.fi_FI.ISO_8859-1=ISO-8859-1
 +locale.all.fr_BE.ISO_8859-1=ISO-8859-1