ports/69815: Update port: japanese/im-ja to 1.2

[KATO Tsuguru]

>Number:         69815
>Category:       ports
>Synopsis:       Update port: japanese/im-ja to 1.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jul 30 18:10:25 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.10-RELEASE-p2 i386
>Organization:
>Environment:
>Description:
- Update to version 1.2

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/japanese/im-ja/Makefile japanese/im-ja/Makefile
--- /usr/ports/japanese/im-ja/Makefile	Sat Jul 10 08:49:46 2004
+++ japanese/im-ja/Makefile	Mon Jul 26 23:55:37 2004
@@ -6,13 +6,14 @@
 #
 
 PORTNAME=	im-ja
-PORTVERSION=	1.0
+PORTVERSION=	1.2
 CATEGORIES=	japanese x11-toolkits
 MASTER_SITES=	http://im-ja.sourceforge.net/
 
 MAINTAINER=	nectar at FreeBSD.org
 COMMENT=	A Japanese input module for GTK2
 
+OPTIONS+=	ANTHY	"Use Anthy" on
 OPTIONS+=	CANNA	"Use Canna" on
 OPTIONS+=	WNN	"Use FreeWnn" on
 
@@ -20,7 +21,7 @@
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_INC_LIBTOOL_VER=13
-USE_GNOME=	gnomeprefix gnomehack gnomepanel
+USE_GNOME=	gnomeprefix gnomehack gnomepanel lthack
 GNU_CONFIGURE=	yes
 
 LIBS+=		-L${LOCALBASE}/lib -L${X11BASE}/lib
@@ -33,15 +34,20 @@
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_CANNA)
-LIB_DEPENDS+=	RKC.1:${PORTSDIR}/japanese/Canna
+.if defined(WITHOUT_ANTHY)
+CONFIGURE_ARGS+=	--disable-anthy
 .else
-CONFIGURE_ARGS+=	--disable-canna
+LIB_DEPENDS+=	anthy.1:${PORTSDIR}/japanese/anthy
 .endif
-.if defined(WITH_WNN)
-LIB_DEPENDS+=	wnn.0:${PORTSDIR}/japanese/FreeWnn-lib
+.if defined(WITHOUT_CANNA)
+CONFIGURE_ARGS+=	--disable-canna
 .else
+LIB_DEPENDS+=	RKC.1:${PORTSDIR}/japanese/Canna
+.endif
+.if defined(WITHOUT_WNN)
 CONFIGURE_ARGS+=	--disable-wnn
+.else
+LIB_DEPENDS+=	wnn.0:${PORTSDIR}/japanese/FreeWnn-lib
 .endif
 
 post-patch:
diff -urN /usr/ports/japanese/im-ja/distinfo japanese/im-ja/distinfo
--- /usr/ports/japanese/im-ja/distinfo	Tue Apr 13 14:15:09 2004
+++ japanese/im-ja/distinfo	Mon Jul 26 23:53:20 2004
@@ -1,2 +1,2 @@
-MD5 (im-ja-1.0.tar.gz) = 0adc0e09db96ba416ce6ce72a77680e6
-SIZE (im-ja-1.0.tar.gz) = 663614
+MD5 (im-ja-1.2.tar.gz) = c299678e2af6b4676b3ae29c6eea89af
+SIZE (im-ja-1.2.tar.gz) = 667509
diff -urN /usr/ports/japanese/im-ja/files/patch-configure japanese/im-ja/files/patch-configure
--- /usr/ports/japanese/im-ja/files/patch-configure	Tue Apr 13 14:15:10 2004
+++ japanese/im-ja/files/patch-configure	Mon Jul 26 23:48:34 2004
@@ -1,16 +1,6 @@
 *** configure.orig	Mon Apr 12 09:41:56 2004
 --- configure	Mon Apr 12 09:42:55 2004
 ***************
-*** 8185,8190 ****
---- 8185,8191 ----
-  
-  # This can be used to rebuild libtool when needed
-  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+ $ac_aux_dir/ltconfig $LIBTOOL_DEPS
-  
-  # Always use our own libtool.
-  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-***************
 *** 14905,14911 ****
   #define IM_JA_BINDIR "$IM_JA_BINDIR"
   _ACEOF
diff -urN /usr/ports/japanese/im-ja/pkg-plist japanese/im-ja/pkg-plist
--- /usr/ports/japanese/im-ja/pkg-plist	Tue Apr 13 14:15:10 2004
+++ japanese/im-ja/pkg-plist	Tue Jul 27 00:22:50 2004
@@ -1,6 +1,8 @@
 bin/im-ja-conf
 bin/im-ja-xim-server
+ at unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/im-ja.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/im-ja.schemas
+ at exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/im-ja.schemas > /dev/null || /usr/bin/true
 lib/gtk-2.0/2.4.0/immodules/im-ja.so
 lib/im-ja/im-ja-applet
 lib/im-ja/kpengine
>Release-Note:
>Audit-Trail:
>Unformatted: