svn commit: r344955 - head/japanese/im-ja

[Koop Mast]

Author: kwm
Date: Tue Feb 18 20:33:12 2014
New Revision: 344955
URL: http://svnweb.freebsd.org/changeset/ports/344955
QAT: https://qat.redports.org/buildarchive/r344955/

Log:
  Remove gnomepanel option, old gnome-panel 2.x will go away.

Modified:
  head/japanese/im-ja/Makefile
  head/japanese/im-ja/pkg-plist

Modified: head/japanese/im-ja/Makefile
==============================================================================
--- head/japanese/im-ja/Makefile	Tue Feb 18 20:17:19 2014	(r344954)
+++ head/japanese/im-ja/Makefile	Tue Feb 18 20:33:12 2014	(r344955)
@@ -10,18 +10,18 @@ MASTER_SITES=	http://im-ja.sourceforge.n
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Japanese input module for GTK2
 
-OPTIONS_DEFINE=	ANTHY CANNA WNN GNOMEPANEL
+OPTIONS_DEFINE=	ANTHY CANNA WNN
 OPTIONS_DEFAULT=	ANTHY CANNA WNN
 ANTHY_DESC=		Use Anthy
 CANNA_DESC=		Use Canna
 WNN_DESC=		Use FreeWnn
-GNOMEPANEL_DESC=	Build GNOME Panel Applet
 
 USES=		gmake pathfix perl5 pkgconfig
 USE_GNOME=	gconf2 gnomeprefix intlhack libglade2
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-schemas-install # Avoid stage violation
+CONFIGURE_ARGS+=	--disable-gnome
 
 GCONF_SCHEMAS=	im-ja.schemas
 
@@ -48,14 +48,6 @@ LIB_DEPENDS+=	libwnn.so:${PORTSDIR}/japa
 CONFIGURE_ARGS+=	--disable-wnn
 .endif
 
-.if ${PORT_OPTIONS:MGNOMEPANEL}
-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}

Modified: head/japanese/im-ja/pkg-plist
==============================================================================
--- head/japanese/im-ja/pkg-plist	Tue Feb 18 20:17:19 2014	(r344954)
+++ head/japanese/im-ja/pkg-plist	Tue Feb 18 20:33:12 2014	(r344955)
@@ -2,14 +2,11 @@ bin/im-ja-conf
 bin/im-ja-xim-server
 lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ja.la
 lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ja.so
-%%GNOMEPANEL%%libdata/bonobo/servers/GNOME_ImJaApplet.server
-%%GNOMEPANEL%%libexec/im-ja/im-ja-applet
 libexec/im-ja/im-ja-helper
 libexec/im-ja/kpengine
 man/man1/im-ja-conf.1.gz
 man/man1/im-ja-xim-server.1.gz
 share/applications/im-ja.desktop
-%%GNOMEPANEL%%share/gnome-2.0/ui/GNOME_ImJaApplet.xml
 share/im-ja/01.unistrok
 share/im-ja/02.unistrok
 share/im-ja/03.unistrok