2 files changed, 16 insertions, 131 deletions

diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index 11d40a6f1629..256310c3380c 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -7,41 +7,35 @@
 
 PORTNAME=	uim
 PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	http://uim.freedesktop.org/releases/
 
 MAINTAINER=	nobutaka@FreeBSD.org
-COMMENT=	Input method library
+COMMENT?=	Input method library
 
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 WANT_GNOME=	yes
-USE_GNOME=	gnometarget glib20
+USE_GNOME+=	gnometarget glib20
 USE_GMAKE=	yes
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 
-LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 
+.if !defined(UIM_SLAVE)
 CONFIGURE_ARGS=	--enable-emacs
-CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
+.endif
+CONFIGURE_ENV+=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib  -L${LOCALBASE}/lib"
 
-OPTIONS=	GTK "Enable GTK support" off \
-		QT "Enable QT support" off \
-		GNOME "Enable GNOME support" off \
-		ANTHY "Enable Anthy support" off \
-		CANNA "Enable Canna support" off \
-		M17NLIB "Enable m17lib support" off \
-		PRIME "Enable PRIME support" off \
-		SCIM "Enable SCIM support" off \
-		SKK "Enable SKK support" off
-
+.if !defined(UIM_SLAVE)
 MAN1=		uim-xim.1
 DOCSDIR_JA=	${PREFIX}/share/doc/ja/uim
 PLIST_SUB=	DOCSDIR_JA="${DOCSDIR_JA:S,^${PREFIX}/,,}"
+.endif
 
 .include <bsd.port.pre.mk>
 
@@ -56,90 +50,19 @@ BUILD_DEPENDS+=	${LOCALBASE}/bin/perl:${PORTSDIR}/lang/perl5
 CONFIGURE_ENV+=	INTLTOOL_PERL="${LOCALBASE}/bin/perl"
 .endif
 
-.if defined(WITH_GTK)
-USE_GNOME+=	gtk20
-CONFIGURE_ARGS+=--with-gtk2
-PLIST_SUB+=	GTK=""
-.else
-CONFIGURE_ARGS+=--without-gtk2
-PLIST_SUB+=	GTK="@comment "
-.endif
-
-.if defined(WITH_QT)
-LIB_DEPENDS+=	qt-mt.3:${PORTSDIR}/x11-toolkits/qt33
-CONFIGURE_ARGS+=--with-qt
-CONFIGURE_ENV+=	QTDIR=${X11BASE}/lib QTINCDIR=${X11BASE}/include \
-		CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS} -I${X11BASE}/include" LIBS="${LIBS} ${PTHREAD_LIBS} -L${X11BASE}/lib"
-PLIST_SUB+=	QT=""
-.else
-CONFIGURE_ARGS+=--without-qt
-PLIST_SUB+=	QT="@comment "
-.endif
-
-.if defined(WITH_GNOME)
-USE_GNOME+=	gnomepanel
-CONFIGURE_ARGS+=--with-gnome2 --enable-applet
-PLIST_SUB+=	GNOME=""
-.else
-CONFIGURE_ARGS+=--without-gnome2 --disable-applet
-PLIST_SUB+=	GNOME="@comment "
-.endif
-
-.if defined(WITH_ANTHY)
-LIB_DEPENDS+=	anthy.1:${PORTSDIR}/japanese/anthy
-CONFIGURE_ARGS+=--with-anthy
-PLIST_SUB+=	ANTHY=""
-.else
-CONFIGURE_ARGS+=--without-anthy
-PLIST_SUB+=	ANTHY="@comment "
-.endif
-
-.if defined(WITH_CANNA)
-LIB_DEPENDS+=	canna.1:${PORTSDIR}/japanese/Canna
-CONFIGURE_ARGS+=--with-canna
-PLIST_SUB+=	CANNA=""
-.else
-CONFIGURE_ARGS+=--without-canna
-PLIST_SUB+=	CANNA="@comment "
+.for _x in gtk2 qt gnome2 anthy canna m17nlib prime scim
+.if ${CONFIGURE_ARGS:M--with-${_x}} == ""
+CONFIGURE_ARGS+=--without-${_x}
 .endif
-
-.if defined(WITH_M17NLIB)
-LIB_DEPENDS+=	m17n.1:${PORTSDIR}/devel/m17n-lib
-CONFIGURE_ARGS+=--with-m17nlib
-PLIST_SUB+=	M17NLIB=""
-.else
-CONFIGURE_ARGS+=--without-m17nlib
-PLIST_SUB+=	M17NLIB="@comment "
-.endif
-
-.if defined(WITH_PRIME)
-BUILD_DEPENDS+=	prime:${PORTSDIR}/japanese/prime
-RUN_DEPENDS+=	${BUILD_DEPENDS}
-CONFIGURE_ARGS+=--with-prime
-PLIST_SUB+=	PRIME=""
-.else
-CONFIGURE_ARGS+=--without-prime
-PLIST_SUB+=	PRIME="@comment "
-.endif
-
-.if defined(WITH_SCIM)
-USE_GCC=	3.4
-LIB_DEPENDS+=	scim-1.0.9:${PORTSDIR}/textproc/scim
-CONFIGURE_ARGS+=--with-scim
-PLIST_SUB+=	SCIM=""
-.else
-CONFIGURE_ARGS+=--without-scim
-PLIST_SUB+=	SCIM="@comment "
-.endif
-
-.if defined(WITH_SKK)
-RUN_DEPENDS+=	${LOCALBASE}/share/skk/SKK-JISYO.L:${PORTSDIR}/japanese/skk-jisyo
+.endfor
+.if ${CONFIGURE_ARGS:M--enable-applet} == ""
+CONFIGURE_ARGS+=--disable-applet
 .endif
 
 post-patch:
 	${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},' ${WRKSRC}/scm/skk-custom.scm
 
-.if !defined(NOPORTDOCS)
+.if !defined(UIM_SLAVE) && !defined(NOPORTDOCS)
 post-install:
 	${MKDIR} ${DOCSDIR}
 	${MKDIR} ${DOCSDIR_JA}
diff --git a/textproc/uim/pkg-plist b/textproc/uim/pkg-plist
index 04ddf38895f2..6ae53b2567c0 100644
--- a/textproc/uim/pkg-plist
+++ b/textproc/uim/pkg-plist
@@ -1,19 +1,8 @@
-%%QT%%bin/uim-chardict-qt
 bin/uim-el-agent
 bin/uim-fep
 bin/uim-fep-tick
-%%GTK%%bin/uim-helper-toolbar-gtk
-%%GTK%%bin/uim-helper-toolbar-gtk-systray
-%%GTK%%bin/uim-im-switcher-gtk
-%%QT%%bin/uim-im-switcher-qt
-%%GTK%%bin/uim-input-pad-ja
 bin/uim-module-manager
-%%GTK%%bin/uim-pref-gtk
-%%QT%%bin/uim-pref-qt
 bin/uim-sh
-%%GTK%%bin/uim-toolbar-gtk
-%%GTK%%bin/uim-toolbar-gtk-systray
-%%QT%%bin/uim-toolbar-qt
 bin/uim-xim
 include/uim/plugin.h
 include/uim/uim-compat-scm.h
@@ -23,10 +12,6 @@ include/uim/uim-im-switcher.h
 include/uim/uim-scm.h
 include/uim/uim-util.h
 include/uim/uim.h
-%%GNOME%%libdata/bonobo/servers/GNOME_UimApplet.server
-%%GTK%%lib/gtk-2.0/2.4.0/immodules/im-uim.a
-%%GTK%%lib/gtk-2.0/2.4.0/immodules/im-uim.la
-%%GTK%%lib/gtk-2.0/2.4.0/immodules/im-uim.so
 lib/libuim-custom.a
 lib/libuim-custom.la
 lib/libuim-custom.so
@@ -35,33 +20,14 @@ lib/libuim.a
 lib/libuim.la
 lib/libuim.so
 lib/libuim.so.1
-%%ANTHY%%lib/uim/plugin/libuim-anthy.a
-%%ANTHY%%lib/uim/plugin/libuim-anthy.la
-%%ANTHY%%lib/uim/plugin/libuim-anthy.so
-%%CANNA%%lib/uim/plugin/libuim-canna.a
-%%CANNA%%lib/uim/plugin/libuim-canna.la
-%%CANNA%%lib/uim/plugin/libuim-canna.so
 lib/uim/plugin/libuim-custom-enabler.a
 lib/uim/plugin/libuim-custom-enabler.la
 lib/uim/plugin/libuim-custom-enabler.so
-%%M17NLIB%%lib/uim/plugin/libuim-m17nlib.a
-%%M17NLIB%%lib/uim/plugin/libuim-m17nlib.la
-%%M17NLIB%%lib/uim/plugin/libuim-m17nlib.so
-%%PRIME%%lib/uim/plugin/libuim-prime.a
-%%PRIME%%lib/uim/plugin/libuim-prime.la
-%%PRIME%%lib/uim/plugin/libuim-prime.so
-%%SCIM%%lib/uim/plugin/libuim-scim.a
-%%SCIM%%lib/uim/plugin/libuim-scim.la
-%%SCIM%%lib/uim/plugin/libuim-scim.so
 lib/uim/plugin/libuim-skk.a
 lib/uim/plugin/libuim-skk.la
 lib/uim/plugin/libuim-skk.so
 libdata/pkgconfig/uim.pc
-%%GTK%%libexec/uim-candwin-gtk
-%%QT%%libexec/uim-candwin-qt
 libexec/uim-helper-server
-%%GNOME%%libexec/uim-helper-applet
-%%GNOME%%libexec/uim-toolbar-applet
 share/applications/uim.desktop
 share/locale/fr/LC_MESSAGES/uim.mo
 share/locale/ja/LC_MESSAGES/uim.mo
@@ -93,7 +59,6 @@ share/locale/ko/LC_MESSAGES/uim.mo
 %%DATADIR%%/hangul.scm
 %%DATADIR%%/hangul2.scm
 %%DATADIR%%/hangul3.scm
-%%GNOME%%%%DATADIR%%/helperdata/bushu.t
 %%DATADIR%%/i18n.scm
 %%DATADIR%%/im-custom.scm
 %%DATADIR%%/im.scm
@@ -148,10 +113,7 @@ share/locale/ko/LC_MESSAGES/uim.mo
 @dirrm lib/uim/plugin
 @dirrm lib/uim
 @dirrmtry share/applications
-%%GNOME%%@dirrm %%DATADIR%%/helperdata
 %%PORTDOCS%%@dirrm %%DOCSDIR_JA%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%
-%%GTK%%@exec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
-%%GTK%%@unexec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules