19 files changed, 39 insertions, 46 deletions

diff --git a/japanese/firefox-ja/Makefile b/japanese/firefox-ja/Makefile
index 9f4cfc16b2da..7cd0988a6dc4 100644
--- a/japanese/firefox-ja/Makefile
+++ b/japanese/firefox-ja/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	firefox
 PORTVERSION=	1.5.0.3
+PORTREVISION=	1
 CATEGORIES=	japanese www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${PORTVERSION}/linux-i686/ja
@@ -19,7 +20,6 @@ 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}
diff --git a/japanese/im-ja/Makefile b/japanese/im-ja/Makefile
index 0a43c4d1d4a3..490a67759b83 100644
--- a/japanese/im-ja/Makefile
+++ b/japanese/im-ja/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	im-ja
 PORTVERSION=	1.5
+PORTREVISION=	2
 CATEGORIES=	japanese x11-toolkits
 MASTER_SITES=	http://im-ja.sourceforge.net/
 
@@ -18,7 +19,7 @@ OPTIONS+=	CANNA		"Use Canna" on
 OPTIONS+=	WNN		"Use FreeWnn" on
 OPTIONS+=	GNOMEPANEL	"Build GNOME Panel Applet" off
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GNOME=	gconf2 gnomehack gnomeprefix gnometarget intlhack libglade2
 USE_PERL5_BUILD=	yes
 USE_GMAKE=	yes
@@ -70,7 +71,7 @@ post-patch:
 		${WRKSRC}/data/Makefile.in
 
 post-install:
-	${X11BASE}/bin/gtk-query-immodules-2.0 > \
-	    ${X11BASE}/etc/gtk-2.0/gtk.immodules
+	${LOCALBASE}/bin/gtk-query-immodules-2.0 > \
+	    ${LOCALBASE}/etc/gtk-2.0/gtk.immodules
 
 .include <bsd.port.post.mk>
diff --git a/japanese/im-ja/pkg-plist b/japanese/im-ja/pkg-plist
index 7ae4c28c5907..b18a0e68ea87 100644
--- a/japanese/im-ja/pkg-plist
+++ b/japanese/im-ja/pkg-plist
@@ -1,7 +1,7 @@
 bin/im-ja-conf
 bin/im-ja-xim-server
-lib/gtk-2.0/2.4.0/immodules/im-ja.la
-lib/gtk-2.0/2.4.0/immodules/im-ja.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ja.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ja.so
 %%GNOMEPANEL%%libdata/bonobo/servers/GNOME_ImJaApplet.server
 %%GNOMEPANEL%%libexec/im-ja/im-ja-applet
 libexec/im-ja/im-ja-helper
@@ -46,3 +46,5 @@ share/locale/ja/LC_MESSAGES/im-ja.mo
 @dirrm libexec/im-ja
 @exec if [ -f %D/bin/gtk-query-immodules-2.0 ]; then %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules; fi
 @unexec if [ -f %D/bin/gtk-query-immodules-2.0 ]; then %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules; fi
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/japanese/mozilla-jlp/Makefile b/japanese/mozilla-jlp/Makefile
index 8b9c83d46aa7..8cc8299b7467 100644
--- a/japanese/mozilla-jlp/Makefile
+++ b/japanese/mozilla-jlp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mozilla
 PORTVERSION=	1.7.13
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	japanese www
 MASTER_SITES=	ftp://ftp.mozilla-japan.org/pub/mozilla/mozilla-japan/mozilla/releases/${PORTVERSION}/ \
@@ -19,13 +19,12 @@ EXTRACT_SUFX=	.xpi
 MAINTAINER=	fortune@n.jpn.ph
 COMMENT=	Mozilla Japanese Language Pack (JLP)
 
-BUILD_DEPENDS=	${X11BASE}/lib/${MOZILLA}/regxpcom:${PORTSDIR}/www/${MOZILLA}
+BUILD_DEPENDS=	${LOCALBASE}/lib/${MOZILLA}/regxpcom:${PORTSDIR}/www/${MOZILLA}
 RUN_DEPENDS=	${MOZILLA}:${PORTSDIR}/www/${MOZILLA} \
 		${PKG_DBDIR}/ja-alias-fonts-1.0:${PORTSDIR}/japanese/alias-fonts
 
 WRKSRC=		${WRKDIR}/bin
 
-USE_X_PREFIX=	yes
 USE_ZIP=	yes
 EXTRACT_BEFORE_ARGS=	-qo
 
diff --git a/japanese/scim-anthy/Makefile b/japanese/scim-anthy/Makefile
index 6a81f94444e3..fc4427707ca2 100644
--- a/japanese/scim-anthy/Makefile
+++ b/japanese/scim-anthy/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scim-anthy
 PORTVERSION=	1.2.1
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=scim-imengine/21967
@@ -21,7 +21,7 @@ RUN_DEPENDS=	${BUILD_DEPENDS} \
 		kasumi:${PORTSDIR}/japanese/kasumi
 
 USE_GNOME=	lthack
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/japanese/scim-canna/Makefile b/japanese/scim-canna/Makefile
index cafcef02902e..01f3daf36b7c 100644
--- a/japanese/scim-canna/Makefile
+++ b/japanese/scim-canna/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scim-canna
 PORTVERSION=	1.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=	scim-imengine/18849
@@ -20,7 +20,7 @@ LIB_DEPENDS+=	canna.1:${PORTSDIR}/japanese/Canna
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_GNOME=	lthack
-USE_X_PREFIX=	yes
+USE_X_LIB=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/japanese/scim-honoka-plugin-romkan/Makefile b/japanese/scim-honoka-plugin-romkan/Makefile
index 2562f135830d..6d10a0999bd1 100644
--- a/japanese/scim-honoka-plugin-romkan/Makefile
+++ b/japanese/scim-honoka-plugin-romkan/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	scim-honoka-plugin-romkan
 PORTVERSION=	0.9.0
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	http://nop.net-p.org/files/honoka/
 DISTNAME=	honoka-plugin-romkan-${PORTVERSION}
@@ -15,12 +16,12 @@ MAINTAINER=	chiba.masashi@gmail.com
 COMMENT=	Honoka plugin for romaji input
 
 BUILD_DEPENDS=	scim:${PORTSDIR}/textproc/scim \
-		${X11BASE}/lib/scim-1.0/IMEngine/honoka.so:${PORTSDIR}/japanese/scim-honoka
+		${LOCALBASE}/lib/scim-1.0/IMEngine/honoka.so:${PORTSDIR}/japanese/scim-honoka
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_GETTEXT=	yes
 USE_GNOME=	lthack gnomehack
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
diff --git a/japanese/scim-honoka-plugin-wnn/Makefile b/japanese/scim-honoka-plugin-wnn/Makefile
index c97c769341c9..a2b5d19a504f 100644
--- a/japanese/scim-honoka-plugin-wnn/Makefile
+++ b/japanese/scim-honoka-plugin-wnn/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	scim-honoka-plugin-wnn
 PORTVERSION=	0.9.0
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	http://nop.net-p.org/files/honoka/
 DISTNAME=	honoka-plugin-wnn-${PORTVERSION}
@@ -15,14 +16,15 @@ MAINTAINER=	chiba.masashi@gmail.com
 COMMENT=	Honoka plugin for using wnn7
 
 BUILD_DEPENDS=	scim:${PORTSDIR}/textproc/scim \
-		${X11BASE}/lib/scim-1.0/IMEngine/honoka.so:${PORTSDIR}/japanese/scim-honoka
+		${LOCALBASE}/lib/scim-1.0/IMEngine/honoka.so:${PORTSDIR}/japanese/scim-honoka
 LIB_DEPENDS=	wnn7.1:${PORTSDIR}/japanese/Wnn7-lib
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-RUN_DEPENDS+=	${X11BASE}/lib/scim-1.0/honoka/plugin-romkan.so:${PORTSDIR}/japanese/scim-honoka-plugin-romkan
+RUN_DEPENDS=	scim:${PORTSDIR}/textproc/scim \
+		${LOCALBASE}/lib/scim-1.0/IMEngine/honoka.so:${PORTSDIR}/japanese/scim-honoka \
+		${LOCALBASE}/lib/scim-1.0/honoka/plugin-romkan.so:${PORTSDIR}/japanese/scim-honoka-plugin-romkan
 
 USE_GETTEXT=	yes
 USE_GNOME=	lthack gnomehack
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
diff --git a/japanese/scim-honoka/Makefile b/japanese/scim-honoka/Makefile
index 869db4ce0fd2..971e372c6cee 100644
--- a/japanese/scim-honoka/Makefile
+++ b/japanese/scim-honoka/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	scim-honoka
 PORTVERSION=	0.9.1
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	http://nop.net-p.org/files/honoka/
 DISTNAME=	honoka-${PORTVERSION}
@@ -20,7 +21,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USE_LDCONFIG=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	lthack gnomehack
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
diff --git a/japanese/scim-prime/Makefile b/japanese/scim-prime/Makefile
index 8696dec4649c..b7120d6d1cd8 100644
--- a/japanese/scim-prime/Makefile
+++ b/japanese/scim-prime/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scim-prime
 PORTVERSION=	0.3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=	scim-imengine/17192
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	scim:${PORTSDIR}/textproc/scim \
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_GNOME=	lthack
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/japanese/scim-skk/Makefile b/japanese/scim-skk/Makefile
index 03491ddb0db6..4e554e3f413b 100644
--- a/japanese/scim-skk/Makefile
+++ b/japanese/scim-skk/Makefile
@@ -3,10 +3,11 @@
 # Whom:			Jun Mukai <mukai@jmuk.org>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/japanese/scim-skk/Makefile,v 1.1 2006/09/30 05:17:05 ahze Exp $
 
 PORTNAME=	scim-skk
 PORTVERSION=	0.5.2
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=	scim-imengine/18121
@@ -17,7 +18,7 @@ COMMENT=	SCIM IMEngine module like SKK
 BUILD_DEPENDS=	scim:${PORTSDIR}/textproc/scim
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-USE_X_PREFIX=	yes
+USE_X_LIB=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/japanese/scim-tables/Makefile b/japanese/scim-tables/Makefile
index cb85beacdded..5fe3b598c6de 100644
--- a/japanese/scim-tables/Makefile
+++ b/japanese/scim-tables/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scim-tables
 PORTVERSION=	0.5.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=scim
@@ -18,7 +18,7 @@ COMMENT=	SCIM table based Japanese input methods
 BUILD_DEPENDS=	scim-make-table:${PORTSDIR}/textproc/scim-table-imengine
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-USE_X_PREFIX=	yes
+USE_X_LIB=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/japanese/scim-tomoe/Makefile b/japanese/scim-tomoe/Makefile
index 60543c50d02f..73f563a4451f 100644
--- a/japanese/scim-tomoe/Makefile
+++ b/japanese/scim-tomoe/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scim-tomoe
 PORTVERSION=	0.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=scim-imengine/17173
@@ -20,7 +20,7 @@ LIB_DEPENDS=	tomoe.1:${PORTSDIR}/japanese/tomoe \
 		tomoe-gtk.0:${PORTSDIR}/japanese/libtomoe-gtk
 
 USE_GNOME=	lthack
-USE_X_PREFIX=	yes
+USE_X_LIB=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/japanese/scim-uim/Makefile b/japanese/scim-uim/Makefile
index 3ebe98657b33..660a029fbc63 100644
--- a/japanese/scim-uim/Makefile
+++ b/japanese/scim-uim/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scim-uim
 PORTVERSION=	0.1.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://freedesktop.org/~suzhe/sources/
@@ -21,7 +21,7 @@ LIB_DEPENDS=	uim:${PORTSDIR}/textproc/uim
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_GNOME=	lthack
-USE_X_PREFIX=	yes
+USE_X_LIB=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/japanese/stardict-dict-ja/Makefile b/japanese/stardict-dict-ja/Makefile
index b4c8bae0b740..6763e3c960a0 100644
--- a/japanese/stardict-dict-ja/Makefile
+++ b/japanese/stardict-dict-ja/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	stardict2-dict-ja
 PORTVERSION=	2.4.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	stardict
@@ -20,7 +20,6 @@ COMMENT=	English-Japanese/Japanese-English dictionaries for StarDict
 RUN_DEPENDS=	stardict:${PORTSDIR}/textproc/stardict2
 
 NO_BUILD=	yes
-USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 
 do-install:
diff --git a/japanese/stardict2-dict-ja/Makefile b/japanese/stardict2-dict-ja/Makefile
index b4c8bae0b740..6763e3c960a0 100644
--- a/japanese/stardict2-dict-ja/Makefile
+++ b/japanese/stardict2-dict-ja/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	stardict2-dict-ja
 PORTVERSION=	2.4.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	stardict
@@ -20,7 +20,6 @@ COMMENT=	English-Japanese/Japanese-English dictionaries for StarDict
 RUN_DEPENDS=	stardict:${PORTSDIR}/textproc/stardict2
 
 NO_BUILD=	yes
-USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 
 do-install:
diff --git a/japanese/uim-anthy/Makefile b/japanese/uim-anthy/Makefile
index e93b176d72de..6120cb33c2bc 100644
--- a/japanese/uim-anthy/Makefile
+++ b/japanese/uim-anthy/Makefile
@@ -48,10 +48,6 @@ do-install:
 .endif
 
 post-install:
-.if defined(WITHOUT_X11)
 	${LOCALBASE}/bin/uim-module-manager --register anthy
-.else
-	${X11BASE}/bin/uim-module-manager --register anthy
-.endif
 
 .include "${MASTERDIR}/Makefile"
diff --git a/japanese/uim-canna/Makefile b/japanese/uim-canna/Makefile
index 71f617e76921..2b9906700f99 100644
--- a/japanese/uim-canna/Makefile
+++ b/japanese/uim-canna/Makefile
@@ -33,10 +33,6 @@ do-install:
 	${GMAKE} uim_plugin_LTLIBRARIES=libuim-canna.la install-uim_pluginLTLIBRARIES)
 
 post-install:
-.if defined(WITHOUT_X11)
 	${LOCALBASE}/bin/uim-module-manager --register canna
-.else
-	${X11BASE}/bin/uim-module-manager --register canna
-.endif
 
 .include "${MASTERDIR}/Makefile"
diff --git a/japanese/uim-prime/Makefile b/japanese/uim-prime/Makefile
index 35e623fbf508..156995a6c907 100644
--- a/japanese/uim-prime/Makefile
+++ b/japanese/uim-prime/Makefile
@@ -34,10 +34,6 @@ do-install:
 	${GMAKE} uim_plugin_LTLIBRARIES=libuim-prime.la install-uim_pluginLTLIBRARIES)
 
 post-install:
-.if defined(WITHOUT_X11)
 	${LOCALBASE}/bin/uim-module-manager --register prime
-.else
-	${X11BASE}/bin/uim-module-manager --register prime
-.endif
 
 .include "${MASTERDIR}/Makefile"