Chase the GNOME X11BASE to LOCALBASE move, and fix the build with the

new freetype2 where needed.

Submitted by:	mezz, ahze, pav, and many others
Approved by:	portmgr (implicit, kris)

29 files changed, 134 insertions, 95 deletions

diff --git a/textproc/aiksaurus/Makefile b/textproc/aiksaurus/Makefile
index 438b3fad8cd8..ced321b586d4 100644
--- a/textproc/aiksaurus/Makefile
+++ b/textproc/aiksaurus/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Mezz <mezz@FreeBSD.org>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/textproc/aiksaurus/Makefile,v 1.2 2006/09/10 00:51:13 mezz Exp $
 
 PORTNAME=	aiksaurus
 PORTVERSION=	1.2.1
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	aiksaurus
@@ -17,8 +17,7 @@ COMMENT?=	A set of libraries and applications which provide a thesaurus
 
 USE_GMAKE=	yes
 USE_GNOME?=	gnomehack gnometarget
-USE_X_PREFIX=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS?=--without-gtk
 
diff --git a/textproc/gnome-translate/Makefile b/textproc/gnome-translate/Makefile
index e9b15ac8512c..4626b1e27068 100644
--- a/textproc/gnome-translate/Makefile
+++ b/textproc/gnome-translate/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		gnome-translate
 PORTVERSION=		0.99
-PORTREVISION=		5
+PORTREVISION=		6
 CATEGORIES=		textproc
 MASTER_SITES=		${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	libtranslate
diff --git a/textproc/gnome-translate/pkg-plist b/textproc/gnome-translate/pkg-plist
index 142bf96db56e..1c1ba0431126 100644
--- a/textproc/gnome-translate/pkg-plist
+++ b/textproc/gnome-translate/pkg-plist
@@ -30,5 +30,3 @@ share/locale/fr/LC_MESSAGES/gnome-translate.mo
 @dirrm share/gnome/help/gnome-translate/C
 @dirrm share/gnome/help/gnome-translate
 @dirrm share/gnome/omf/gnome-translate
-@dirrmtry share/icons/hicolor/24x24/apps
-@dirrmtry share/icons/hicolor/24x24
diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile
index 93d6e135ec47..3812ac0928cd 100644
--- a/textproc/gtkspell/Makefile
+++ b/textproc/gtkspell/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/textproc/gtkspell/Makefile,v 1.2 2006/09/10 00:51:13 mezz Exp $
 #
 
 PORTNAME=	gtkspell
 PORTVERSION=	2.0.11
-PORTREVISION?=	3
+PORTREVISION?=	4
 CATEGORIES=	textproc gnome
 MASTER_SITES=	http://gtkspell.sourceforge.net/download/
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
@@ -24,8 +25,8 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20
 GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
-USE_X_PREFIX=	yes
-INSTALLS_SHLIB=	yes
+USE_XLIB=	yes
+USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/textproc/gtkspell/pkg-plist b/textproc/gtkspell/pkg-plist
index 9670f1c00ad4..a04d2eb94863 100644
--- a/textproc/gtkspell/pkg-plist
+++ b/textproc/gtkspell/pkg-plist
@@ -30,5 +30,23 @@ share/locale/zh_CN/LC_MESSAGES/gtkspell.mo
 share/locale/zh_TW/LC_MESSAGES/gtkspell.mo
 @dirrm include/gtkspell-2.0/gtkspell
 @dirrm include/gtkspell-2.0
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
 @dirrmtry share/locale/rm/LC_MESSAGES
 @dirrmtry share/locale/rm
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/textproc/gxmlviewer/Makefile b/textproc/gxmlviewer/Makefile
index d517ddcfcb90..65336caa31b8 100644
--- a/textproc/gxmlviewer/Makefile
+++ b/textproc/gxmlviewer/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gxmlviewer
 PORTVERSION=	1.3.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An xmlviewer with a netscape plugin, and now a bonobo control as well
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GNOME=	bonobo gnomehack gnomelibs gnomeprefix libxml2
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
@@ -28,8 +28,8 @@ post-patch:
 		s|/netscape/|/gxmlviewer/|g' ${WRKSRC}/src/nsplugin/Makefile.in
 
 post-install:
-	@${MKDIR} ${X11BASE}/lib/browser_plugins
+	@${MKDIR} ${LOCALBASE}/lib/browser_plugins
 	@${LN} -sf ${PREFIX}/lib/gxmlviewer/plugins/npgxmlviewer.so \
-		${X11BASE}/lib/browser_plugins/npgxmlviewer.so
+		${LOCALBASE}/lib/browser_plugins/npgxmlviewer.so
 
 .include <bsd.port.mk>
diff --git a/textproc/gxmlviewer/pkg-plist b/textproc/gxmlviewer/pkg-plist
index 0fe3f1ea37ca..88fc21b80912 100644
--- a/textproc/gxmlviewer/pkg-plist
+++ b/textproc/gxmlviewer/pkg-plist
@@ -3,9 +3,9 @@ bin/xmlview-control
 bin/xmlformatter
 lib/gxmlviewer/plugins/npgxmlviewer.so
 share/gnome/oaf/GNOME_XMLView.oaf
-@unexec rm -f %%X11BASE%%/lib/browser_plugins/npgxmlviewer.so
-@unexec rmdir %%X11BASE%%/lib/browser_plugins 2>/dev/null || true
-@exec mkdir -p %%X11BASE%%/lib/browser_plugins 2>/dev/null || true
-@exec ln -sf %D/lib/gxmlviewer/plugins/npgxmlviewer.so %%X11BASE%%/lib/browser_plugins/npgxmlviewer.so
+@unexec rm -f %%LOCALBASE%%/lib/browser_plugins/npgxmlviewer.so
+@unexec rmdir %%LOCALBASE%%/lib/browser_plugins 2>/dev/null || true
+@exec mkdir -p %%LOCALBASE%%/lib/browser_plugins 2>/dev/null || true
+@exec ln -sf %D/lib/gxmlviewer/plugins/npgxmlviewer.so %%LOCALBASE%%/lib/browser_plugins/npgxmlviewer.so
 @dirrm lib/gxmlviewer/plugins
 @dirrm lib/gxmlviewer
diff --git a/textproc/iiimf-gnome-im-switcher/Makefile b/textproc/iiimf-gnome-im-switcher/Makefile
index fc944b59d4ad..f5cfe7517793 100644
--- a/textproc/iiimf-gnome-im-switcher/Makefile
+++ b/textproc/iiimf-gnome-im-switcher/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-im-switcher
 PORTVERSION=	12.2
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
@@ -18,16 +18,19 @@ COMMENT=	IIIMF gnome input method switcher
 
 ONLY_FOR_ARCHS=	i386
 
-USE_X_PREFIX=	yes
-
+USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	intltool gconf2 libglade2 libgnomeui \
 		gnomepanel gnomeprefix gnomehack
+INSTALLS_OMF=	yes
+INSTALLS_ICONS=	yes
 USE_AUTOTOOLS=	automake:19:env autoconf:259:env libtool:15:env
 WANT_AUTOHEADER_VER=	259
 
+GCONF_SCHEMAS=	gnome-im-properties.schemas gnome-im-switcher.schemas
+
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/gnome-im-switcher
 
diff --git a/textproc/iiimf-gnome-im-switcher/pkg-plist b/textproc/iiimf-gnome-im-switcher/pkg-plist
index e8643cb990c5..73fe96d5a5d0 100644
--- a/textproc/iiimf-gnome-im-switcher/pkg-plist
+++ b/textproc/iiimf-gnome-im-switcher/pkg-plist
@@ -1,6 +1,19 @@
 bin/gnome-im-properties
 bin/gnome-im-settings-daemon
+libdata/bonobo/servers/GNOME_IMSwitcherApplet.server
 libexec/gnome-im-switcher-applet
+share/gnome/control-center-2.0/capplets/gnome-im-properties.desktop
+share/gnome/control-center-2.0/interfaces/gnome-im-properties.glade2
+share/gnome/gnome-2.0/ui/GNOME_InputMethodSwitcherApplet.xml
+share/gnome/help/imswitcher/C/imswitcher.xml
+share/gnome/help/imswitcher/C/legal.xml
+share/gnome/iiimf-im-switcher/glade/gnome-im-switcher.glade2
+share/gnome/omf/iiimf-im-switcher/imswitcher-C.omf
+share/gnome/pixmaps/gimlet-disable.png
+share/gnome/pixmaps/gimlet-off.png
+share/gnome/pixmaps/gimlet-on.png
+share/gnome/pixmaps/gnome-settings-im.png
+share/icons/hicolor/48x48/apps/gnome-settings-im.png
 share/locale/bn/LC_MESSAGES/iiimf-im-switcher.mo
 share/locale/cs/LC_MESSAGES/iiimf-im-switcher.mo
 share/locale/de/LC_MESSAGES/iiimf-im-switcher.mo
@@ -19,44 +32,23 @@ share/locale/ru/LC_MESSAGES/iiimf-im-switcher.mo
 share/locale/sv/LC_MESSAGES/iiimf-im-switcher.mo
 share/locale/ta/LC_MESSAGES/iiimf-im-switcher.mo
 share/locale/zh_CN/LC_MESSAGES/iiimf-im-switcher.mo
-share/locale/zh_TW/LC_MESSAGES/iiimf-im-switcher.mo
 share/locale/zh_HK/LC_MESSAGES/iiimf-im-switcher.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-share/icons/hicolor/48x48/apps/gnome-settings-im.png
-share/gnome/pixmaps/gnome-settings-im.png
-share/gnome/pixmaps/gimlet-off.png
-share/gnome/pixmaps/gimlet-on.png
-share/gnome/pixmaps/gimlet-disable.png
-share/gnome/control-center-2.0/capplets/gnome-im-properties.desktop
-share/gnome/control-center-2.0/interfaces/gnome-im-properties.glade2
-@dirrmtry share/gnome/control-center-2.0/interfaces
-share/gnome/help/imswitcher/C/legal.xml
-share/gnome/help/imswitcher/C/imswitcher.xml
-@dirrm share/gnome/help/imswitcher/C
-@dirrm share/gnome/help/imswitcher
-share/gnome/iiimf-im-switcher/glade/gnome-im-switcher.glade2
+share/locale/zh_TW/LC_MESSAGES/iiimf-im-switcher.mo
+@dirrm share/gnome/omf/iiimf-im-switcher
 @dirrm share/gnome/iiimf-im-switcher/glade
 @dirrm share/gnome/iiimf-im-switcher
-share/gnome/gnome-2.0/ui/GNOME_InputMethodSwitcherApplet.xml
-@comment
-@comment 'do scrollkeeper'
-@comment
-share/gnome/omf/iiimf-im-switcher/imswitcher-C.omf
-@exec %D/bin/scrollkeeper-install -q %D/share/gnome/omf/gnome-im-switcher/imswitcher-C.omf
-@unexec %D/bin/scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-im-switcher/imswitcher-C.omf
-@dirrm share/gnome/omf/iiimf-im-switcher
-@comment
-@comment 'do gconftool-2'
-@comment
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults %D/bin/gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-im-switcher.schemas > /dev/null || true
-etc/gconf/schemas/gnome-im-switcher.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults %D/bin/gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-im-switcher.schemas > /dev/null || true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults %D/bin/gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-im-properties.schemas > /dev/null || true
-etc/gconf/schemas/gnome-im-properties.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults %D/bin/gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-im-properties.schemas > /dev/null || true
-@comment
-@comment 'rm files in LOCALBASE.'
-@comment
-@cwd %%LOCALBASE%%
-libdata/bonobo/servers/GNOME_IMSwitcherApplet.server
+@dirrm share/gnome/help/imswitcher/C
+@dirrm share/gnome/help/imswitcher
+@dirrmtry share/gnome/control-center-2.0/interfaces
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
diff --git a/textproc/iiimf-gtk/Makefile b/textproc/iiimf-gtk/Makefile
index 32b8cbf67c9a..969868b485a0 100644
--- a/textproc/iiimf-gtk/Makefile
+++ b/textproc/iiimf-gtk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk
 PORTVERSION=	12.2
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
@@ -21,8 +21,7 @@ LIB_DEPENDS=	iiimp.1:${PORTSDIR}/textproc/iiimf-protocol-lib \
 
 ONLY_FOR_ARCHS=	i386
 
-USE_X_PREFIX=	yes
-
+USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_GETTEXT=	yes
@@ -59,7 +58,7 @@ do-configure:
 	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
 
 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/textproc/iiimf-gtk/pkg-plist b/textproc/iiimf-gtk/pkg-plist
index 34ee650d9127..76f956b133db 100644
--- a/textproc/iiimf-gtk/pkg-plist
+++ b/textproc/iiimf-gtk/pkg-plist
@@ -1,6 +1,6 @@
-lib/gtk-2.0/2.4.0/immodules/im-iiim.a
-lib/gtk-2.0/2.4.0/immodules/im-iiim.la
-lib/gtk-2.0/2.4.0/immodules/im-iiim.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-iiim.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-iiim.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-iiim.so
 @exec %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
 @unexec %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
 share/locale/ja/LC_MESSAGES/iiimgcf.mo
@@ -8,5 +8,11 @@ share/locale/ko/LC_MESSAGES/iiimgcf.mo
 share/locale/zh_CN/LC_MESSAGES/iiimgcf.mo
 share/locale/zh_TW/LC_MESSAGES/iiimgcf.mo
 share/locale/zh_HK/LC_MESSAGES/iiimgcf.mo
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
diff --git a/textproc/meld/Makefile b/textproc/meld/Makefile
index ee9cc9dca610..8610713e2ed6 100644
--- a/textproc/meld/Makefile
+++ b/textproc/meld/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	meld
 PORTVERSION=	0.9.4.1
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	textproc devel python
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.9
@@ -18,7 +18,6 @@ COMMENT=	GNOME 2 visual diff and merge tool
 USE_BZIP2=	yes
 USE_GNOME=	pygnome2
 USE_PYTHON=	yes
-USE_X_PREFIX=	yes
 NO_BUILD=	yes
 USE_GMAKE=	yes
 
diff --git a/textproc/meld/pkg-plist b/textproc/meld/pkg-plist
index ea49d682b0da..07b68e8481c7 100644
--- a/textproc/meld/pkg-plist
+++ b/textproc/meld/pkg-plist
@@ -88,6 +88,15 @@ share/pixmaps/meld.png
 @dirrm share/meld/glade2/pixmaps
 @dirrm share/meld/glade2
 @dirrm share/meld
-@dirrm share/applications
-@dirrm share/application-registry
+@dirrmtry share/pixmaps
+@dirrmtry share/applications
+@dirrmtry share/application-registry
 @dirrm %%DOCSDIR%%
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
diff --git a/textproc/openvanilla-modules/Makefile b/textproc/openvanilla-modules/Makefile
index f4f4ad4f6cff..46d655752df1 100644
--- a/textproc/openvanilla-modules/Makefile
+++ b/textproc/openvanilla-modules/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	openvanilla-modules
 PORTVERSION=	0.7.2.b20060214
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.csie.org/~llwang/	\
 		http://www.infor.org/~llwang/
@@ -16,9 +17,8 @@ MAINTAINER=	llwang@infor.org
 COMMENT=	Input method modules for OpenVanilla
 
 BUILD_DEPENDS=	${X11BASE}/include/OpenVanilla/OpenVanilla.h:${PORTSDIR}/textproc/openvanilla-framework
-RUN_DEPENDS=	${X11BASE}/lib/scim-1.0/IMEngine/OVLoader-SCIM.so:${PORTSDIR}/textproc/scim-openvanilla
+RUN_DEPENDS=	${LOCALBASE}/lib/scim-1.0/IMEngine/OVLoader-SCIM.so:${PORTSDIR}/textproc/scim-openvanilla
 
-USE_X_PREFIX=	yes
 USE_AUTOTOOLS=	libtool:15:env
 USE_GMAKE=	yes
 USE_PERL5_BUILD=	yes
diff --git a/textproc/scim-input-pad/Makefile b/textproc/scim-input-pad/Makefile
index 554418dd74c7..f8ab33c6e21f 100644
--- a/textproc/scim-input-pad/Makefile
+++ b/textproc/scim-input-pad/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scim-input-pad
 PORTVERSION=	0.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=scim
@@ -18,7 +18,6 @@ COMMENT=	SCIM add-on to input various symbols with on-screen pad
 BUILD_DEPENDS=	scim:${PORTSDIR}/textproc/scim
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/textproc/scim-openvanilla/Makefile b/textproc/scim-openvanilla/Makefile
index ed961a7a90bd..ce3140e5282d 100644
--- a/textproc/scim-openvanilla/Makefile
+++ b/textproc/scim-openvanilla/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	scim-openvanilla
 PORTVERSION=	0.7.2.b20060214
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.csie.org/~llwang/	\
 		http://www.infor.org/~llwang/
@@ -19,7 +20,6 @@ BUILD_DEPENDS=	scim:${PORTSDIR}/textproc/scim	\
 		${X11BASE}/include/OpenVanilla/OpenVanilla.h:${PORTSDIR}/textproc/openvanilla-framework
 RUN_DEPENDS=	scim:${PORTSDIR}/textproc/scim
 
-USE_X_PREFIX=	yes
 USE_AUTOTOOLS=	libltdl:15
 WRKSRC=		${WRKDIR}/${DISTNAME}/Loaders/SCIM
 USE_GMAKE=	yes
diff --git a/textproc/scim-table-imengine/Makefile b/textproc/scim-table-imengine/Makefile
index 88a76413a41b..4440a3aaa06d 100644
--- a/textproc/scim-table-imengine/Makefile
+++ b/textproc/scim-table-imengine/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scim-table-imengine
 PORTVERSION=	0.5.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=scim
@@ -19,7 +19,6 @@ COMMENT=	SCIM table based input method engine
 BUILD_DEPENDS=	scim:${PORTSDIR}/textproc/scim
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	intlhack
diff --git a/textproc/scim-table-imengine/pkg-plist b/textproc/scim-table-imengine/pkg-plist
index af08215854a2..b93d72c4218f 100644
--- a/textproc/scim-table-imengine/pkg-plist
+++ b/textproc/scim-table-imengine/pkg-plist
@@ -33,6 +33,11 @@ share/locale/pa/LC_MESSAGES/scim-tables.mo
 %%SKIM%%@dirrmtry share/apps/skim
 %%SKIM%%@dirrmtry share/config.kcfg
 %%SKIM%%@dirrmtry share/services/skimconfiguredialog
-%%SKIM%%@cwd %%X11BASE%%
 @dirrmtry lib/scim-1.0/IMEngine
 @dirrmtry lib/scim-1.0/SetupUI
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
diff --git a/textproc/scim/Makefile b/textproc/scim/Makefile
index 684e351eb81f..4de2ac4beca8 100644
--- a/textproc/scim/Makefile
+++ b/textproc/scim/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scim
 PORTVERSION=	1.4.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=scim
@@ -17,7 +17,7 @@ COMMENT=	Smart Common Input Method platform
 
 USE_GNOME=	gnomehack gnomehier gtk20 intlhack
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
@@ -48,7 +48,7 @@ post-patch:
 			${WRKSRC}/extras/setup/Makefile.in
 
 post-install:
-	@gtk-query-immodules-2.0 > ${PREFIX}/etc/gtk-2.0/gtk.immodules
+	@gtk-query-immodules-2.0 > ${LOCALBASE}/etc/gtk-2.0/gtk.immodules
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO} To display this message again, type pkg_info -D ${PKGNAME}
 
diff --git a/textproc/scim/pkg-plist b/textproc/scim/pkg-plist
index dd22c48a4531..22b95e8475c6 100644
--- a/textproc/scim/pkg-plist
+++ b/textproc/scim/pkg-plist
@@ -150,3 +150,11 @@ share/locale/zh_TW/LC_MESSAGES/scim.mo
 @dirrm %%DATADIR%%
 @exec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
 @unexec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
diff --git a/textproc/skim/Makefile b/textproc/skim/Makefile
index 0238aa901be9..db683b279335 100644
--- a/textproc/skim/Makefile
+++ b/textproc/skim/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	skim
 PORTVERSION=	1.4.4
+PORTREVISION=	1
 CATEGORIES=	textproc kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	scim
diff --git a/textproc/skim/pkg-plist b/textproc/skim/pkg-plist
index 1995354a791e..016d28e80342 100644
--- a/textproc/skim/pkg-plist
+++ b/textproc/skim/pkg-plist
@@ -137,7 +137,7 @@ share/servicetypes/skimkcmplugin.desktop
 share/servicetypes/skimplugin.desktop
 share/servicetypes/skimsetupcategory.desktop
 share/servicetypes/skimui.desktop
-@cwd %%X11BASE%%
+@cwd %%LOCALBASE%%
 lib/scim-1.0/1.4.0/Config/kconfig.la
 lib/scim-1.0/1.4.0/Config/kconfig.so
 @cwd %%LOCALBASE%%
@@ -148,3 +148,9 @@ lib/scim-1.0/1.4.0/Config/kconfig.so
 @dirrm share/doc/HTML/de/skim
 @dirrm share/apps/skim/pics
 @dirrm share/apps/skim
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
diff --git a/textproc/stardict2-dictd_mova/Makefile b/textproc/stardict2-dictd_mova/Makefile
index b02f0a61f092..f5bec3499e45 100644
--- a/textproc/stardict2-dictd_mova/Makefile
+++ b/textproc/stardict2-dictd_mova/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	stardict
 PORTVERSION=	2.4.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	stardict
@@ -19,7 +19,6 @@ COMMENT=	Dictionaries from www.mova.org for StarDict
 RUN_DEPENDS=	stardict:${PORTSDIR}/textproc/stardict2
 
 NO_BUILD=	yes
-USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 
 LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
diff --git a/textproc/stardict2-quick/Makefile b/textproc/stardict2-quick/Makefile
index 59eaa1149875..a6e98023a794 100644
--- a/textproc/stardict2-quick/Makefile
+++ b/textproc/stardict2-quick/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	stardict
 PORTVERSION=	2.4.2
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	stardict
@@ -19,7 +19,6 @@ COMMENT=	Dictionaries from Quick for StarDict
 RUN_DEPENDS=	stardict:${PORTSDIR}/textproc/stardict2
 
 NO_BUILD=	yes
-USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 
 LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
diff --git a/textproc/uim-gtk/Makefile b/textproc/uim-gtk/Makefile
index 3302c4fd7296..437f420b9099 100644
--- a/textproc/uim-gtk/Makefile
+++ b/textproc/uim-gtk/Makefile
@@ -5,6 +5,7 @@
 # $FreeBSD$
 #
 
+PORTREVISION=	1
 PKGNAMESUFFIX=	-gtk
 
 COMMENT=	GTK+ modules of uim input method
diff --git a/textproc/uim-gtk/pkg-plist b/textproc/uim-gtk/pkg-plist
index 0dde94188390..93c6650cdb02 100644
--- a/textproc/uim-gtk/pkg-plist
+++ b/textproc/uim-gtk/pkg-plist
@@ -3,8 +3,8 @@ bin/uim-input-pad-ja
 bin/uim-pref-gtk
 bin/uim-toolbar-gtk
 bin/uim-toolbar-gtk-systray
-lib/gtk-2.0/2.4.0/immodules/im-uim.a
-lib/gtk-2.0/2.4.0/immodules/im-uim.la
-lib/gtk-2.0/2.4.0/immodules/im-uim.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-uim.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-uim.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-uim.so
 @exec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
 @unexec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
diff --git a/textproc/uim-m17nlib/Makefile b/textproc/uim-m17nlib/Makefile
index 9a877f17aa82..cb3f35446c8c 100644
--- a/textproc/uim-m17nlib/Makefile
+++ b/textproc/uim-m17nlib/Makefile
@@ -34,10 +34,6 @@ do-install:
 	${GMAKE} uim_plugin_LTLIBRARIES=libuim-m17nlib.la install-uim_pluginLTLIBRARIES)
 
 post-install:
-.if defined(WITHOUT_X11)
 	${LOCALBASE}/bin/uim-module-manager --register m17nlib
-.else
-	${X11BASE}/bin/uim-module-manager --register m17nlib
-.endif
 
 .include "${MASTERDIR}/Makefile"
diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index d0a53950b99f..b0252a9e2a73 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	uim
 PORTVERSION=	1.2.1
+PORTREVISION?=	1
 CATEGORIES?=	textproc
 MASTER_SITES=	http://uim.freedesktop.org/releases/
 .if !defined(UIM_SLAVE) && defined(WITHOUT_X11)
@@ -26,7 +27,6 @@ USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 
 .if !defined(WITHOUT_X11)
-USE_X_PREFIX=	yes
 LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 CONFIGURE_ARGS+=	--with-x --with-xft
 .endif
diff --git a/textproc/uim/pkg-plist b/textproc/uim/pkg-plist
index d3ff2e315178..475f2f0900b3 100644
--- a/textproc/uim/pkg-plist
+++ b/textproc/uim/pkg-plist
@@ -197,3 +197,5 @@ share/locale/ko/LC_MESSAGES/uim.mo
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko