From 20e7a30204da93077ef3a4a01ca5c9ad3cf0aa72 Mon Sep 17 00:00:00 2001 From: Daichi GOTO Date: Sun, 29 May 2005 16:06:01 +0000 Subject: [PATCH] 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 --- chinese/iiimf-le-newpy/Makefile | 1 + .../files/patch-leif_configure.ac | 33 +++++++++++++++++-- textproc/iiimf-gnome-im-switcher/Makefile | 3 +- .../files/patch-gnome_help_omf.make | 33 +++++++++++++++++++ textproc/iiimf-gnome-im-switcher/pkg-plist | 9 +++-- textproc/iiimf-le-unit/Makefile | 3 +- .../files/patch-leif_configure.ac | 30 +++++++++++++++-- 7 files changed, 102 insertions(+), 10 deletions(-) create mode 100644 textproc/iiimf-gnome-im-switcher/files/patch-gnome_help_omf.make diff --git a/chinese/iiimf-le-newpy/Makefile b/chinese/iiimf-le-newpy/Makefile index f1dd1cf3ba83..20cad28e0c78 100644 --- a/chinese/iiimf-le-newpy/Makefile +++ b/chinese/iiimf-le-newpy/Makefile @@ -7,6 +7,7 @@ PORTNAME= le-newpy PORTVERSION= 12.2 +PORTREVISION= 1 CATEGORIES= chinese textproc MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/ PKGNAMEPREFIX= iiimf- diff --git a/chinese/iiimf-le-newpy/files/patch-leif_configure.ac b/chinese/iiimf-le-newpy/files/patch-leif_configure.ac index db087f1857a0..09cbbd1dc9ee 100644 --- a/chinese/iiimf-le-newpy/files/patch-leif_configure.ac +++ b/chinese/iiimf-le-newpy/files/patch-leif_configure.ac @@ -1,5 +1,34 @@ ---- leif/configure.ac.orig Wed May 11 13:01:08 2005 -+++ leif/configure.ac Wed May 11 13:02:22 2005 +--- leif/configure.ac.orig Mon May 2 22:16:12 2005 ++++ leif/configure.ac Sun May 29 16:36:25 2005 +@@ -46,17 +46,17 @@ + + IM_CHECK_SYSTEM + IM_CHECK_DLOPEN +-IM_CHECK_CANNA +-IM_CHECK_FREEWNN +-IM_CHECK_CHEWING +- +-IM_CHECK_X +-IM_CHECK_GTK +-IM_CHECK_MOTIF +-IM_CHECK_XML +-PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0) +-AC_SUBST(GTK2_CFLAGS) +-AC_SUBST(GTK2_LIBS) ++#IM_CHECK_CANNA ++#IM_CHECK_FREEWNN ++#IM_CHECK_CHEWING ++ ++#IM_CHECK_X ++#IM_CHECK_GTK ++#IM_CHECK_MOTIF ++#IM_CHECK_XML ++#PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0) ++#AC_SUBST(GTK2_CFLAGS) ++#AC_SUBST(GTK2_LIBS) + + dnl -------------------------------------------------------------------------------- + dnl Section 5: compilation options @@ -75,16 +75,16 @@ LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}" 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' diff --git a/textproc/iiimf-le-unit/Makefile b/textproc/iiimf-le-unit/Makefile index 4da731cbfc82..cc9edcc1dfff 100644 --- a/textproc/iiimf-le-unit/Makefile +++ b/textproc/iiimf-le-unit/Makefile @@ -7,7 +7,7 @@ PORTNAME= le-unit PORTVERSION= 12.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/ PKGNAMEPREFIX= iiimf- @@ -27,6 +27,7 @@ USE_BZIP2= yes USE_ICONV= yes USE_REINPLACE= yes USE_GMAKE= yes +USE_GNOME= libxml2 USE_XLIB= yes WANT_AUTOCONF_VER= 259 WANT_AUTOHEADER_VER= 259 diff --git a/textproc/iiimf-le-unit/files/patch-leif_configure.ac b/textproc/iiimf-le-unit/files/patch-leif_configure.ac index 836f246b6ba7..68dc0763874a 100644 --- a/textproc/iiimf-le-unit/files/patch-leif_configure.ac +++ b/textproc/iiimf-le-unit/files/patch-leif_configure.ac @@ -1,5 +1,31 @@ ---- leif/configure.ac.orig Wed May 11 13:01:08 2005 -+++ leif/configure.ac Wed May 11 13:02:22 2005 +--- leif/configure.ac.orig Mon May 2 22:16:12 2005 ++++ leif/configure.ac Sun May 29 16:25:53 2005 +@@ -46,17 +46,17 @@ + + IM_CHECK_SYSTEM + IM_CHECK_DLOPEN +-IM_CHECK_CANNA +-IM_CHECK_FREEWNN +-IM_CHECK_CHEWING ++#IM_CHECK_CANNA ++#IM_CHECK_FREEWNN ++#IM_CHECK_CHEWING + + IM_CHECK_X +-IM_CHECK_GTK +-IM_CHECK_MOTIF ++#IM_CHECK_GTK ++#IM_CHECK_MOTIF + IM_CHECK_XML +-PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0) +-AC_SUBST(GTK2_CFLAGS) +-AC_SUBST(GTK2_LIBS) ++#PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0) ++#AC_SUBST(GTK2_CFLAGS) ++#AC_SUBST(GTK2_LIBS) + + dnl -------------------------------------------------------------------------------- + dnl Section 5: compilation options @@ -75,16 +75,16 @@ LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"