IIIMF-related ports

  textproc/iiimf-le-unit:
    - fix build fail
    - add libxml2 use
    - remove unneed gtk-check

  iiimf-le-newpy:
    - remove unneed gtk/xlib-check

  iiimf-gnome-im-switcher:
    - fix uninstall problem

Submitted by:	maintainer
Pointed out by:	pointyhat via kris

3 files changed, 40 insertions, 5 deletions

diff --git a/textproc/iiimf-gnome-im-switcher/Makefile b/textproc/iiimf-gnome-im-switcher/Makefile
index 1ee8652681fd..c6507aa0b45f 100644
--- a/textproc/iiimf-gnome-im-switcher/Makefile
+++ b/textproc/iiimf-gnome-im-switcher/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnome-im-switcher
 PORTVERSION=	12.2
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
@@ -58,8 +59,6 @@ post-patch:
 		${BUILDDIR}/configure.ac
 	${REINPLACE_CMD} -e "/^GNOMECC_.*_DIR=/s,[(]datadir[)]/,&gnome/,g" \
 		${BUILDDIR}/configure.ac
-	${REINPLACE_CMD} -e "/^omf_dest_dir/s,[(]datadir[)]/,&gnome/,g" \
-		${BUILDDIR}/help/omf.make
 
 do-configure:
 	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} bootstrap
diff --git a/textproc/iiimf-gnome-im-switcher/files/patch-gnome_help_omf.make b/textproc/iiimf-gnome-im-switcher/files/patch-gnome_help_omf.make
new file mode 100644
index 000000000000..20ba08efe479
--- /dev/null
+++ b/textproc/iiimf-gnome-im-switcher/files/patch-gnome_help_omf.make
@@ -0,0 +1,33 @@
+--- gnome-im-switcher/help/omf.make.orig	Thu Sep 23 06:31:15 2004
++++ gnome-im-switcher/help/omf.make		Sun May 29 22:04:45 2005
+@@ -26,7 +26,7 @@
+ # 	Version: 0.1.3 (last updated: March 20, 2002)
+ #
+ 
+-omf_dest_dir=$(datadir)/omf/@PACKAGE@
++omf_dest_dir=$(datadir)/gnome/omf/@PACKAGE@
+ scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
+ 
+ # At some point, it may be wise to change to something like this:
+@@ -45,7 +45,9 @@
+ 	for file in $(omffile); do \
+ 		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
+ 	done
+-	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
++	-for file in $(omffile); do \
++		scrollkeeper-install $(DESTDIR)$(omf_dest_dir)/$$file; \
++	done
+ 
+ uninstall-local-omf:
+ 	-for file in $(srcdir)/*.omf; do \
+@@ -53,7 +55,9 @@
+ 		rm -f $(omf_dest_dir)/$$basefile; \
+ 	done
+ 	-rmdir $(omf_dest_dir)
+-	-scrollkeeper-update -p $(scrollkeeper_localstate_dir)
++	-for file in $(omffile); do \
++		scrollkeeper-uninstall $(DESTDIR)$(omf_dest_dir)/$$file; \
++	done
+ 
+ clean-local-omf:
+ 	-for file in $(omffile); do \
diff --git a/textproc/iiimf-gnome-im-switcher/pkg-plist b/textproc/iiimf-gnome-im-switcher/pkg-plist
index ea1ddd711017..eed25201edff 100644
--- a/textproc/iiimf-gnome-im-switcher/pkg-plist
+++ b/textproc/iiimf-gnome-im-switcher/pkg-plist
@@ -21,6 +21,8 @@ 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
+@unexec rmdir %D/share/locale/zh_HK/LC_MESSAGES > /dev/null 2>&1 || true
+@unexec rmdir %D/share/locale/zh_HK > /dev/null 2>&1 || true
 share/icons/hicolor/48x48/apps/gnome-settings-im.png
 share/gnome/pixmaps/gnome-settings-im.png
 share/gnome/pixmaps/gimlet-off.png
@@ -28,6 +30,7 @@ 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
+@unexec rmdir %D/share/gnome/control-center-2.0/interfaces > /dev/null 2>&1 || true
 share/gnome/help/imswitcher/C/legal.xml
 share/gnome/help/imswitcher/C/imswitcher.xml
 @dirrm share/gnome/help/imswitcher/C
@@ -37,11 +40,11 @@ share/gnome/iiimf-im-switcher/glade/gnome-im-switcher.glade2
 @dirrm share/gnome/iiimf-im-switcher
 share/gnome/gnome-2.0/ui/GNOME_InputMethodSwitcherApplet.xml
 @comment
-@comment 'do scrollkeeper-update'
+@comment 'do scrollkeeper'
 @comment
 share/gnome/omf/iiimf-im-switcher/imswitcher-C.omf
-@exec %D/bin/scrollkeeper-update -p %D/var/scrollkeeper -o %D/share/gnome/omf/gnome-im-switcher
-@unexec %D/bin/scrollkeeper-update -p %D/var/scrollkeeper -o %D/share/gnome/omf/gnome-im-switcher
+@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'