5 files changed, 1 insertions, 87 deletions

diff --git a/japanese/Makefile b/japanese/Makefile
index 2b331f634400..032142c778a9 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -78,7 +78,7 @@
     SUBDIR += ewipe
     SUBDIR += exmh2
     SUBDIR += expect
-    SUBDIR += firefox-ja_JP
+    SUBDIR += firefox-ja
     SUBDIR += flower-fpw
     SUBDIR += foldoc-fpw
     SUBDIR += freepwing
diff --git a/japanese/firefox-ja_JP/Makefile b/japanese/firefox-ja_JP/Makefile
deleted file mode 100644
index 58e2317562d6..000000000000
--- a/japanese/firefox-ja_JP/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-# New ports collection makefile for:	ja-firefox-ja_JP
-# Date created:		2005/07/16
-# Whom:			chinsan <chinsan.tw@gmail.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	firefox
-PORTVERSION=	1.5
-CATEGORIES=	japanese www
-MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${PORTVERSION}/linux-i686/ja
-PKGNAMESUFFIX=	-ja
-DIST_SUBDIR=	${PORTNAME}${PKGNAMESUFFIX}
-
-MAINTAINER=	hiroto.kagotani@gmail.com
-COMMENT=	Firefox Japanese(ja) 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}
-LOCALE_FILES=	browserconfig.properties \
-		chrome/ja.jar \
-		chrome/ja.manifest \
-		defaults/pref/firefox-l10n.js \
-		defaults/profile/bookmarks.html \
-		searchplugins/*
-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 - ${LOCALE_FILES}) | \
-	${TAR} -xf - -C ${FIREFOX_HOME}
-
-.include <bsd.port.post.mk>
diff --git a/japanese/firefox-ja_JP/distinfo b/japanese/firefox-ja_JP/distinfo
deleted file mode 100644
index 8ac4b2b40766..000000000000
--- a/japanese/firefox-ja_JP/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (firefox-ja/firefox-1.5.tar.gz) = 07da35c41c43d3c9fc711f6159362732
-SHA256 (firefox-ja/firefox-1.5.tar.gz) = 448a87f381aed597adacdf8f486083f015a2b19ce12c14e9f5d39f43c33db366
-SIZE (firefox-ja/firefox-1.5.tar.gz) = 8473253
diff --git a/japanese/firefox-ja_JP/pkg-descr b/japanese/firefox-ja_JP/pkg-descr
deleted file mode 100644
index 96c34fb4c362..000000000000
--- a/japanese/firefox-ja_JP/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Mozilla Firefox is an open-source application suite for web browsing,
-IRC chat, and more.
-
-Firefox Japanese (ja) Language Pack provides Japanese
-localized resource for Firefox.
-
-WWW: http://www.mozilla-japan.org/products/firefox/
diff --git a/japanese/firefox-ja_JP/pkg-plist b/japanese/firefox-ja_JP/pkg-plist
deleted file mode 100644
index 00209b549d2a..000000000000
--- a/japanese/firefox-ja_JP/pkg-plist
+++ /dev/null
@@ -1,25 +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%%/chrome/ja.jar
-lib/%%FIREFOX%%/chrome/ja.manifest
-lib/%%FIREFOX%%/defaults/pref/firefox-l10n.js
-lib/%%FIREFOX%%/defaults/profile/bookmarks.html
-lib/%%FIREFOX%%/searchplugins/amazon-jp.png
-lib/%%FIREFOX%%/searchplugins/amazon-jp.src
-lib/%%FIREFOX%%/searchplugins/goo.gif
-lib/%%FIREFOX%%/searchplugins/goo.src
-lib/%%FIREFOX%%/searchplugins/google-jp.gif
-lib/%%FIREFOX%%/searchplugins/google-jp.src
-lib/%%FIREFOX%%/searchplugins/rakuten.gif
-lib/%%FIREFOX%%/searchplugins/rakuten.src
-lib/%%FIREFOX%%/searchplugins/yahoo-jp-auctions.gif
-lib/%%FIREFOX%%/searchplugins/yahoo-jp-auctions.src
-lib/%%FIREFOX%%/searchplugins/yahoo-jp-shopping.gif
-lib/%%FIREFOX%%/searchplugins/yahoo-jp-shopping.src
-lib/%%FIREFOX%%/searchplugins/yahoo-jp.gif
-lib/%%FIREFOX%%/searchplugins/yahoo-jp.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