3 files changed, 35 insertions, 24 deletions

diff --git a/japanese/im-ja/Makefile b/japanese/im-ja/Makefile
index 68931e588bac..0a43c4d1d4a3 100644
--- a/japanese/im-ja/Makefile
+++ b/japanese/im-ja/Makefile
@@ -6,33 +6,31 @@
 #
 
 PORTNAME=	im-ja
-PORTVERSION=	1.4
-PORTREVISION=	2
+PORTVERSION=	1.5
 CATEGORIES=	japanese x11-toolkits
 MASTER_SITES=	http://im-ja.sourceforge.net/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Japanese input module for GTK2
 
-OPTIONS+=	ANTHY	"Use Anthy" on
-OPTIONS+=	CANNA	"Use Canna" on
-OPTIONS+=	WNN	"Use FreeWnn" on
+OPTIONS+=	ANTHY		"Use Anthy" on
+OPTIONS+=	CANNA		"Use Canna" on
+OPTIONS+=	WNN		"Use FreeWnn" on
+OPTIONS+=	GNOMEPANEL	"Build GNOME Panel Applet" off
 
-USE_PERL5_BUILD=	yes
 USE_X_PREFIX=	yes
+USE_GNOME=	gconf2 gnomehack gnomeprefix gnometarget intlhack libglade2
+USE_PERL5_BUILD=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomepanel lthack intlhack
 GNU_CONFIGURE=	yes
-
-LIBS+=		-L${LOCALBASE}/lib -L${X11BASE}/lib
-CPPFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include
-CPPFLAGS+=	-DNO_MALLOC_H
-CONFIGURE_ENV+=	LIBS="${LIBS}" CPPFLAGS="${CPPFLAGS}"
-CONFIGURE_ENV+=	INTLTOOL_PERL="${PERL}"
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		im-ja-conf.1 im-ja-xim-server.1
 GCONF_SCHEMAS=	im-ja.schemas
 
+CPPFLAGS=	-I${LOCALBASE}/include -I${X11BASE}/include -DNO_MALLOC_H
+LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib
+
 .include <bsd.port.pre.mk>
 
 .if defined(WITHOUT_ANTHY)
@@ -40,17 +38,27 @@ CONFIGURE_ARGS+=	--disable-anthy
 .else
 LIB_DEPENDS+=	anthy.1:${PORTSDIR}/japanese/anthy
 .endif
+
 .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
 
+.if defined(WITH_GNOMEPANEL)
+USE_GNOME+=	gnomepanel      
+PLIST_SUB+=	GNOMEPANEL=""   
+.else
+CONFIGURE_ARGS+=	--disable-gnome
+PLIST_SUB+=	GNOMEPANEL="@comment "
+.endif
+
 post-patch:
 	${FIND} ${WRKSRC} -name configure.in | ${XARGS} ${TOUCH}
 	${FIND} ${WRKSRC} -name aclocal.m4 | ${XARGS} ${TOUCH}
@@ -58,6 +66,8 @@ post-patch:
 	${FIND} ${WRKSRC} -name config.h.in | ${XARGS} ${TOUCH}
 	${FIND} ${WRKSRC} -name Makefile.am | ${XARGS} ${TOUCH}
 	${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${TOUCH}
+	@${REINPLACE_CMD} -e 's|$$(datadir)/gconf|$$(sysconfdir)/gconf|g' \
+		${WRKSRC}/data/Makefile.in
 
 post-install:
 	${X11BASE}/bin/gtk-query-immodules-2.0 > \
diff --git a/japanese/im-ja/distinfo b/japanese/im-ja/distinfo
index 39b0efef2233..e9f5b08b5991 100644
--- a/japanese/im-ja/distinfo
+++ b/japanese/im-ja/distinfo
@@ -1,3 +1,3 @@
-MD5 (im-ja-1.4.tar.gz) = 8442d54e8e24d749ab1a8aeb8c6bef64
-SHA256 (im-ja-1.4.tar.gz) = a7fd8aac969a6836b487efe2cbd0414f52f334edd68add333cf7677f80d8e9d4
-SIZE (im-ja-1.4.tar.gz) = 805128
+MD5 (im-ja-1.5.tar.gz) = 8986574373d03e685730e16d8f15ade9
+SHA256 (im-ja-1.5.tar.gz) = 96f4ed82706a873bdade99a934a1a66431f146758837ed0f007e3c145649f780
+SIZE (im-ja-1.5.tar.gz) = 905539
diff --git a/japanese/im-ja/pkg-plist b/japanese/im-ja/pkg-plist
index 4c006e9a7549..7ae4c28c5907 100644
--- a/japanese/im-ja/pkg-plist
+++ b/japanese/im-ja/pkg-plist
@@ -2,13 +2,12 @@ bin/im-ja-conf
 bin/im-ja-xim-server
 lib/gtk-2.0/2.4.0/immodules/im-ja.la
 lib/gtk-2.0/2.4.0/immodules/im-ja.so
-lib/im-ja/im-ja-applet
-lib/im-ja/kpengine
-lib/im-ja/im-ja-helper
-@dirrm lib/im-ja
-libdata/bonobo/servers/GNOME_ImJaApplet.server
-share/gnome/control-center-2.0/capplets/im-ja.desktop
-share/gnome/gnome-2.0/ui/GNOME_ImJaApplet.xml
+%%GNOMEPANEL%%libdata/bonobo/servers/GNOME_ImJaApplet.server
+%%GNOMEPANEL%%libexec/im-ja/im-ja-applet
+libexec/im-ja/im-ja-helper
+libexec/im-ja/kpengine
+share/gnome/applications/im-ja.desktop
+%%GNOMEPANEL%%share/gnome/gnome-2.0/ui/GNOME_ImJaApplet.xml
 share/gnome/im-ja/01.unistrok
 share/gnome/im-ja/02.unistrok
 share/gnome/im-ja/03.unistrok
@@ -35,7 +34,7 @@ share/gnome/im-ja/23.unistrok
 share/gnome/im-ja/im-ja-conf.glade
 share/gnome/im-ja/im-ja-doc.html
 share/gnome/im-ja/im-ja-symbols.txt
-@dirrm share/gnome/im-ja
+share/gnome/im-ja/radkfile.utf8
 share/gnome/pixmaps/im-ja-about.jpg
 share/gnome/pixmaps/im-ja-capplet.png
 share/locale/ca/LC_MESSAGES/im-ja.mo
@@ -43,5 +42,7 @@ share/locale/de/LC_MESSAGES/im-ja.mo
 share/locale/es/LC_MESSAGES/im-ja.mo
 share/locale/hu/LC_MESSAGES/im-ja.mo
 share/locale/ja/LC_MESSAGES/im-ja.mo
+@dirrm share/gnome/im-ja
+@dirrm libexec/im-ja
 @exec if [ -f %D/bin/gtk-query-immodules-2.0 ]; then %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules; fi
 @unexec if [ -f %D/bin/gtk-query-immodules-2.0 ]; then %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules; fi