- Remove single-locale firefox l10n ports, please use www/firefox-i18n now

Approved by:	krion (mentor, implicit)

16 files changed, 3 insertions, 255 deletions

diff --git a/CVSROOT/modules b/CVSROOT/modules
index e014164a245..6e7394ad213 100644
--- a/CVSROOT/modules
+++ b/CVSROOT/modules
@@ -5257,7 +5257,6 @@ ko-bitchx	ports/korean/bitchx
 ko-elm		ports/korean/elm
 ko-engdic	ports/korean/engdic
 ko-eterm	ports/korean/eterm
-ko-firefox-ko	ports/korean/firefox-ko
 ko-gau		ports/korean/gau
 ko-gdick	ports/korean/gdick
 ko-ghostscript-gnu-korfont	ports/korean/ghostscript-gnu-korfont
@@ -14795,8 +14794,6 @@ zh-eterm	ports/chinese/eterm
 zh-fcitx	ports/chinese/fcitx
 zh-firebird	ports/chinese/firebird
 zh-fireflyttf	ports/chinese/fireflyttf
-zh-firefox-zh_CN	ports/chinese/firefox-zh_CN
-zh-firefox-zh_TW	ports/chinese/firefox-zh_TW
 zh-fortunetw	ports/chinese/fortunetw
 zh-gb2jis	ports/chinese/gb2jis
 zh-gb2ps	ports/chinese/gb2ps
diff --git a/MOVED b/MOVED
index a12ae98af4b..01b2c1eb87d 100644
--- a/MOVED
+++ b/MOVED
@@ -2355,3 +2355,6 @@ www/firefox-flp|www/firefox-i18n|2006-05-31|Single-locale firefox l10n ports are
 multimedia/xmps-opendivx-plugin||2006-05-31|Has expired: mastersite disappeared, Project Mayo is now part of DivX.com
 devel/dialyzer||2006-05-31|Application was integrated into Erlang/OTP R11B-0
 security/hostapd||2006-05-31|This version was included in base system
+chinese/firefox-zh_CN|www/firefox-i18n|2006-06-01|Single-locale firefox l10n ports are now obsolete
+chinese/firefox-zh_TW|www/firefox-i18n|2006-06-01|Single-locale firefox l10n ports are now obsolete
+korean/firefox-ko|www/firefox-i18n|2006-06-01|Single-locale firefox l10n ports are now obsolete
diff --git a/chinese/Makefile b/chinese/Makefile
index 366a96e6f5e..fa800de4145 100644
--- a/chinese/Makefile
+++ b/chinese/Makefile
@@ -41,8 +41,6 @@
     SUBDIR += fcitx
     SUBDIR += firebird
     SUBDIR += fireflyttf
-    SUBDIR += firefox-zh_CN
-    SUBDIR += firefox-zh_TW
     SUBDIR += fortunetw
     SUBDIR += gb2jis
     SUBDIR += gb2ps
diff --git a/chinese/firefox-zh_CN/Makefile b/chinese/firefox-zh_CN/Makefile
deleted file mode 100644
index df329188c76..00000000000
--- a/chinese/firefox-zh_CN/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-# New ports collection makefile for:	zh-firefox-zh_CN
-# Date created:		2005/06/25
-# Whom:			chinsan <chinsan.tw@gmail.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	firefox
-PORTVERSION=	1.5d
-CATEGORIES=	chinese www
-MASTER_SITES=	http://chinsan2.twbbs.org/distfiles/firefox/ \
-		ftp://chinsan2.twbbs.org/distfiles/firefox/
-PKGNAMESUFFIX=	-zh_CN
-DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}.${PORTVERSION}
-DIST_SUBDIR=	${PORTNAME}${PKGNAMESUFFIX}
-
-MAINTAINER=	chinsan.tw@gmail.com
-COMMENT=	Firefox Simplified Chinese(zh-CN) Language Pack
-
-BUILD_DEPENDS=	${FIREFOX}:${PORTSDIR}/www/firefox
-RUN_DEPENDS=	${FIREFOX}:${PORTSDIR}/www/firefox
-
-USE_X_PREFIX=	yes
-NO_BUILD=	yes
-
-FIREFOX=	${PORTNAME}
-WRKSRC=		${WRKDIR}/${FIREFOX}
-FIREFOX_HOME=	${PREFIX}/lib/${FIREFOX}
-PLIST_SUB=	FIREFOX=${FIREFOX}
-
-.include <bsd.port.pre.mk>
-
-do-install:
-	@${ECHO_MSG} "===> Backup setting files..."
-	(cd ${FIREFOX_HOME}; \
-	${CP} -f browserconfig.properties browserconfig.properties.orig)
-	(cd ${FIREFOX_HOME}/defaults/pref; \
-	${CP} -f firefox-l10n.js firefox-l10n.js.orig)
-	(cd ${FIREFOX_HOME}/defaults/profile; \
-	${CP} -f bookmarks.html bookmarks.html.orig)
-
-	@${ECHO_MSG} "===> Copying locale files..."
-	(cd ${WRKSRC}; ${TAR} -cf - *) | \
-	${TAR} -xf - -C ${FIREFOX_HOME}
-
-.include <bsd.port.post.mk>
diff --git a/chinese/firefox-zh_CN/distinfo b/chinese/firefox-zh_CN/distinfo
deleted file mode 100644
index 18fdab90310..00000000000
--- a/chinese/firefox-zh_CN/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (firefox-zh_CN/firefox-zh_CN.1.5d.tar.gz) = 5cd91c20d739f7755a5b802b5004b09d
-SHA256 (firefox-zh_CN/firefox-zh_CN.1.5d.tar.gz) = ab26af58b8b225315b28296d1ad7a43ebd2eed6ac937bc053abfb4faf061ff0d
-SIZE (firefox-zh_CN/firefox-zh_CN.1.5d.tar.gz) = 140772
diff --git a/chinese/firefox-zh_CN/pkg-descr b/chinese/firefox-zh_CN/pkg-descr
deleted file mode 100644
index 239108a782f..00000000000
--- a/chinese/firefox-zh_CN/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Mozilla Firefox is an open-source application suite for web browsing,
-IRC chat, and more.
-
-Firefox Simplified Chinese (zh-CN) Language Pack provides Simplified
-Chinese localized resource for Firefox.
-
-WWW: http://www.mozilla.net.cn/firefox/
diff --git a/chinese/firefox-zh_CN/pkg-plist b/chinese/firefox-zh_CN/pkg-plist
deleted file mode 100644
index 269b7acb4ee..00000000000
--- a/chinese/firefox-zh_CN/pkg-plist
+++ /dev/null
@@ -1,20 +0,0 @@
-@exec mv %D/lib/%%FIREFOX%%/browserconfig.properties %D/lib/%%FIREFOX%%/browserconfig.properties.orig
-@exec mv %D/lib/%%FIREFOX%%/defaults/pref/firefox-l10n.js %D/lib/%%FIREFOX%%/defaults/pref/firefox-l10n.js.orig
-@exec mv %D/lib/%%FIREFOX%%/defaults/profile/bookmarks.html %D/lib/%%FIREFOX%%/defaults/profile/bookmarks.html.orig
-lib/%%FIREFOX%%/browserconfig.properties
-lib/%%FIREFOX%%/updater.ini
-lib/%%FIREFOX%%/chrome/zh-CN.jar
-lib/%%FIREFOX%%/chrome/zh-CN.manifest
-lib/%%FIREFOX%%/defaults/pref/firefox-l10n.js
-lib/%%FIREFOX%%/defaults/profile/bookmarks.html
-lib/%%FIREFOX%%/searchplugins/baidu.gif
-lib/%%FIREFOX%%/searchplugins/baidu.src
-lib/%%FIREFOX%%/searchplugins/eBay-zh-CN.gif
-lib/%%FIREFOX%%/searchplugins/eBay-zh-CN.src
-lib/%%FIREFOX%%/searchplugins/taobao.png
-lib/%%FIREFOX%%/searchplugins/taobao.src
-lib/%%FIREFOX%%/searchplugins/yahoo-cn.gif
-lib/%%FIREFOX%%/searchplugins/yahoo-cn.src
-@unexec mv %D/lib/%%FIREFOX%%/browserconfig.properties.orig %D/lib/%%FIREFOX%%/browserconfig.properties
-@unexec mv %D/lib/%%FIREFOX%%/defaults/pref/firefox-l10n.js.orig %D/lib/%%FIREFOX%%/defaults/pref/firefox-l10n.js
-@unexec mv %D/lib/%%FIREFOX%%/defaults/profile/bookmarks.html.orig %D/lib/%%FIREFOX%%/defaults/profile/bookmarks.html
diff --git a/chinese/firefox-zh_TW/Makefile b/chinese/firefox-zh_TW/Makefile
deleted file mode 100644
index 53151b302be..00000000000
--- a/chinese/firefox-zh_TW/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# New ports collection makefile for:	zh-firefox-zh_TW
-# Date created:		2005/06/25
-# Whom:			chinsan <chinsan.tw@gmail.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	firefox
-PORTVERSION=	1.5c
-PORTREVISION=	1
-CATEGORIES=	chinese www
-MASTER_SITES=	http://chinsan2.twbbs.org/distfiles/firefox/ \
-		ftp://chinsan2.twbbs.org/distfiles/firefox/
-PKGNAMESUFFIX=	-zh_TW
-DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}.${PORTVERSION}
-DIST_SUBDIR=	${PORTNAME}${PKGNAMESUFFIX}
-
-MAINTAINER=	chinsan.tw@gmail.com
-COMMENT=	Firefox Traditional Chinese(zh-TW) Language Pack
-
-BUILD_DEPENDS=	${FIREFOX}:${PORTSDIR}/www/firefox
-RUN_DEPENDS=	${FIREFOX}:${PORTSDIR}/www/firefox
-
-USE_X_PREFIX=	yes
-NO_BUILD=	yes
-
-FIREFOX=	${PORTNAME}
-WRKSRC=		${WRKDIR}/${FIREFOX}
-FIREFOX_HOME=	${PREFIX}/lib/${FIREFOX}
-PLIST_SUB=	FIREFOX=${FIREFOX}
-
-.include <bsd.port.pre.mk>
-
-do-install:
-	@${ECHO_MSG} "===> Backup setting files..."
-	(cd ${FIREFOX_HOME}; \
-	${CP} -f browserconfig.properties browserconfig.properties.orig)
-	(cd ${FIREFOX_HOME}/defaults/pref; \
-	${CP} -f firefox-l10n.js firefox-l10n.js.orig)
-	(cd ${FIREFOX_HOME}/defaults/profile; \
-	${CP} -f bookmarks.html bookmarks.html.orig)
-
-	@${ECHO_MSG} "===> Copying locale files..."
-	(cd ${WRKSRC}; ${TAR} -cf - *) | \
-	${TAR} -xf - -C ${FIREFOX_HOME}
-
-.include <bsd.port.post.mk>
diff --git a/chinese/firefox-zh_TW/distinfo b/chinese/firefox-zh_TW/distinfo
deleted file mode 100644
index 9870e505c57..00000000000
--- a/chinese/firefox-zh_TW/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (firefox-zh_TW/firefox-zh_TW.1.5c.tar.gz) = 604dd19e505664ed99b37974a498c808
-SHA256 (firefox-zh_TW/firefox-zh_TW.1.5c.tar.gz) = 6c10915fd347c522d95d01f17d56783179b6c9f1f5184b4188db1acb55224a7a
-SIZE (firefox-zh_TW/firefox-zh_TW.1.5c.tar.gz) = 139133
diff --git a/chinese/firefox-zh_TW/pkg-descr b/chinese/firefox-zh_TW/pkg-descr
deleted file mode 100644
index 384ce503c9e..00000000000
--- a/chinese/firefox-zh_TW/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-Mozilla Firefox is an open-source application suite for web browsing,
-IRC chat, and more.
-
-Firefox Traditional Chinese (zh-TW) Language Pack provides Traditional
-Chinese localized resource for Firefox.
-
-Contributor: Hung-Te Lin(aka. piaip)
-
-WWW: http://moztw.org/tools/
diff --git a/chinese/firefox-zh_TW/pkg-plist b/chinese/firefox-zh_TW/pkg-plist
deleted file mode 100644
index 676327ccf95..00000000000
--- a/chinese/firefox-zh_TW/pkg-plist
+++ /dev/null
@@ -1,38 +0,0 @@
-@exec mv %D/lib/%%FIREFOX%%/browserconfig.properties %D/lib/%%FIREFOX%%/browserconfig.properties.orig
-@exec mv %D/lib/%%FIREFOX%%/defaults/pref/firefox-l10n.js %D/lib/%%FIREFOX%%/defaults/pref/firefox-l10n.js.orig
-@exec mv %D/lib/%%FIREFOX%%/defaults/profile/bookmarks.html %D/lib/%%FIREFOX%%/defaults/profile/bookmarks.html.orig
-lib/%%FIREFOX%%/browserconfig.properties
-lib/%%FIREFOX%%/updater.ini
-lib/%%FIREFOX%%/chrome/zh-TW.jar
-lib/%%FIREFOX%%/chrome/zh-TW.manifest
-lib/%%FIREFOX%%/defaults/pref/firefox-l10n.js
-lib/%%FIREFOX%%/defaults/profile/bookmarks.html
-lib/%%FIREFOX%%/searchplugins/BahamutSearch.png
-lib/%%FIREFOX%%/searchplugins/BahamutSearch.src
-lib/%%FIREFOX%%/searchplugins/FreeBSD_PR.png
-lib/%%FIREFOX%%/searchplugins/FreeBSD_PR.src
-lib/%%FIREFOX%%/searchplugins/Giga_Cdict.png
-lib/%%FIREFOX%%/searchplugins/Giga_Cdict.src
-lib/%%FIREFOX%%/searchplugins/chineseidioms.png
-lib/%%FIREFOX%%/searchplugins/chineseidioms.src
-lib/%%FIREFOX%%/searchplugins/edudict.gif
-lib/%%FIREFOX%%/searchplugins/edudict.src
-lib/%%FIREFOX%%/searchplugins/findbook.png
-lib/%%FIREFOX%%/searchplugins/findbook.src
-lib/%%FIREFOX%%/searchplugins/freshports.png
-lib/%%FIREFOX%%/searchplugins/freshports.src
-lib/%%FIREFOX%%/searchplugins/php.png
-lib/%%FIREFOX%%/searchplugins/php.src
-lib/%%FIREFOX%%/searchplugins/rexchendict.gif
-lib/%%FIREFOX%%/searchplugins/rexchendict.src
-lib/%%FIREFOX%%/searchplugins/wretch-album.png
-lib/%%FIREFOX%%/searchplugins/wretch-album.src
-lib/%%FIREFOX%%/searchplugins/xuite-album.png
-lib/%%FIREFOX%%/searchplugins/xuite-album.src
-lib/%%FIREFOX%%/searchplugins/yhbid_tw.gif
-lib/%%FIREFOX%%/searchplugins/yhbid_tw.src
-lib/%%FIREFOX%%/searchplugins/yahoo.stock.src
-lib/%%FIREFOX%%/searchplugins/yahoo.stock.png
-@unexec mv %D/lib/%%FIREFOX%%/browserconfig.properties.orig %D/lib/%%FIREFOX%%/browserconfig.properties
-@unexec mv %D/lib/%%FIREFOX%%/defaults/pref/firefox-l10n.js.orig %D/lib/%%FIREFOX%%/defaults/pref/firefox-l10n.js
-@unexec mv %D/lib/%%FIREFOX%%/defaults/profile/bookmarks.html.orig %D/lib/%%FIREFOX%%/defaults/profile/bookmarks.html
diff --git a/korean/Makefile b/korean/Makefile
index 007016f4020..6da03edbe20 100644
--- a/korean/Makefile
+++ b/korean/Makefile
@@ -15,7 +15,6 @@
     SUBDIR += elm
     SUBDIR += engdic
     SUBDIR += eterm
-    SUBDIR += firefox-ko
     SUBDIR += gau
     SUBDIR += gdick
     SUBDIR += ghostscript-gnu-korfont
diff --git a/korean/firefox-ko/Makefile b/korean/firefox-ko/Makefile
deleted file mode 100644
index 90808ba2e90..00000000000
--- a/korean/firefox-ko/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-# New ports collection makefile for:	ko-firefox-ko
-# Date created:		2005/12/19
-# Whom:			chinsan <chinsan.tw@gmail.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	firefox
-PORTVERSION=	1.5a
-CATEGORIES=	korean www
-MASTER_SITES=	http://chinsan2.twbbs.org/distfiles/firefox/ \
-		ftp://chinsan2.twbbs.org/distfiles/firefox/
-PKGNAMESUFFIX=	-ko
-DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}.${PORTVERSION}
-DIST_SUBDIR=	${PORTNAME}${PKGNAMESUFFIX}
-
-MAINTAINER=	chinsan.tw@gmail.com
-COMMENT=	Firefox Korean(ko) Language Pack
-
-BUILD_DEPENDS=	${FIREFOX}:${PORTSDIR}/www/firefox
-RUN_DEPENDS=	${FIREFOX}:${PORTSDIR}/www/firefox
-
-USE_X_PREFIX=	yes
-NO_BUILD=	yes
-
-FIREFOX=	${PORTNAME}
-WRKSRC=		${WRKDIR}/${FIREFOX}
-FIREFOX_HOME=	${PREFIX}/lib/${FIREFOX}
-PLIST_SUB=	FIREFOX=${FIREFOX}
-
-.include <bsd.port.pre.mk>
-
-do-install:
-	@${ECHO_MSG} "===> Backup setting files..."
-	(cd ${FIREFOX_HOME}; \
-	${CP} -f browserconfig.properties browserconfig.properties.orig)
-	(cd ${FIREFOX_HOME}/defaults/pref; \
-	${CP} -f firefox-l10n.js firefox-l10n.js.orig)
-	(cd ${FIREFOX_HOME}/defaults/profile; \
-	${CP} -f bookmarks.html bookmarks.html.orig)
-
-	@${ECHO_MSG} "===> Copying locale files..."
-	(cd ${WRKSRC}; ${TAR} -cf - *) | \
-	${TAR} -xf - -C ${FIREFOX_HOME}
-
-.include <bsd.port.post.mk>
diff --git a/korean/firefox-ko/distinfo b/korean/firefox-ko/distinfo
deleted file mode 100644
index ca683bfd6e6..00000000000
--- a/korean/firefox-ko/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (firefox-ko/firefox-ko.1.5a.tar.gz) = 07c4403889bcbe20be01930b2a877c9a
-SHA256 (firefox-ko/firefox-ko.1.5a.tar.gz) = 07ae09906d88e3caf93de85a190f23fc42b1d25e1780540978d6fec681cd19b7
-SIZE (firefox-ko/firefox-ko.1.5a.tar.gz) = 155717
diff --git a/korean/firefox-ko/pkg-descr b/korean/firefox-ko/pkg-descr
deleted file mode 100644
index ef84b2c190e..00000000000
--- a/korean/firefox-ko/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Mozilla Firefox is an open-source application suite for web browsing,
-IRC chat, and more.
-
-Firefox Korean(ko) Language Pack provides Korean
-localized resource for Firefox.
-
-WWW: http://www.mozilla.or.kr/
diff --git a/korean/firefox-ko/pkg-plist b/korean/firefox-ko/pkg-plist
deleted file mode 100644
index 73db96d7b0c..00000000000
--- a/korean/firefox-ko/pkg-plist
+++ /dev/null
@@ -1,20 +0,0 @@
-@exec mv %D/lib/%%FIREFOX%%/browserconfig.properties %D/lib/%%FIREFOX%%/browserconfig.properties.orig
-@exec mv %D/lib/%%FIREFOX%%/defaults/pref/firefox-l10n.js %D/lib/%%FIREFOX%%/defaults/pref/firefox-l10n.js.orig
-@exec mv %D/lib/%%FIREFOX%%/defaults/profile/bookmarks.html %D/lib/%%FIREFOX%%/defaults/profile/bookmarks.html.orig
-lib/%%FIREFOX%%/browserconfig.properties
-lib/%%FIREFOX%%/updater.ini
-lib/%%FIREFOX%%/chrome/ko.jar
-lib/%%FIREFOX%%/chrome/ko.manifest
-lib/%%FIREFOX%%/defaults/pref/firefox-l10n.js
-lib/%%FIREFOX%%/defaults/profile/bookmarks.html
-lib/%%FIREFOX%%/searchplugins/daum-ko.gif
-lib/%%FIREFOX%%/searchplugins/daum-ko.src
-lib/%%FIREFOX%%/searchplugins/google-ko.gif
-lib/%%FIREFOX%%/searchplugins/google-ko.src
-lib/%%FIREFOX%%/searchplugins/naver-ko.gif
-lib/%%FIREFOX%%/searchplugins/naver-ko.src
-lib/%%FIREFOX%%/searchplugins/yahoo-kr.gif
-lib/%%FIREFOX%%/searchplugins/yahoo-kr.src
-@unexec mv %D/lib/%%FIREFOX%%/browserconfig.properties.orig %D/lib/%%FIREFOX%%/browserconfig.properties
-@unexec mv %D/lib/%%FIREFOX%%/defaults/pref/firefox-l10n.js.orig %D/lib/%%FIREFOX%%/defaults/pref/firefox-l10n.js
-@unexec mv %D/lib/%%FIREFOX%%/defaults/profile/bookmarks.html.orig %D/lib/%%FIREFOX%%/defaults/profile/bookmarks.html