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

[Baptiste Daroussin]

Author: bapt
Date: Thu Jun  6 16:05:55 2013
New Revision: 320113
URL: http://svnweb.freebsd.org/changeset/ports/320113

Log:
  Convert to new options framework

Modified:
  head/japanese/im-ja/Makefile

Modified: head/japanese/im-ja/Makefile
==============================================================================
--- head/japanese/im-ja/Makefile	Thu Jun  6 16:02:06 2013	(r320112)
+++ head/japanese/im-ja/Makefile	Thu Jun  6 16:05:55 2013	(r320113)
@@ -10,10 +10,12 @@ MASTER_SITES=	http://im-ja.sourceforge.n
 MAINTAINER=	ports 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
-OPTIONS+=	GNOMEPANEL	"Build GNOME Panel Applet" off
+OPTIONS_DEFINE=	ANTHY CANNA WNN GNOMEPANEL
+OPTIONS_DEFAULT=	ANTHY CANNA WNN
+ANTHY_DESC=		Use Anthy
+CANNA_DESC=		Use Canna
+WNN_DESC=		Use FreeWnn
+GNOMEPANEL_DESC=	Build GNOME Panel Applet
 
 USES=        pathfix
 USE_GNOME=	gconf2 gnomeprefix intlhack libglade2
@@ -27,27 +29,27 @@ GCONF_SCHEMAS=	im-ja.schemas
 CPPFLAGS+=	-I${LOCALBASE}/include -DNO_MALLOC_H
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITHOUT_ANTHY)
-CONFIGURE_ARGS+=	--disable-anthy
-.else
+.if ${PORT_OPTIONS:MANTHY}
 LIB_DEPENDS+=	anthy.1:${PORTSDIR}/japanese/anthy
+.else
+CONFIGURE_ARGS+=	--disable-anthy
 .endif
 
-.if defined(WITHOUT_CANNA)
-CONFIGURE_ARGS+=	--disable-canna
-.else
+.if ${PORT_OPTIONS:MCANNA}
 LIB_DEPENDS+=	RKC.1:${PORTSDIR}/japanese/canna-lib
+.else
+CONFIGURE_ARGS+=	--disable-canna
 .endif
 
-.if defined(WITHOUT_WNN)
-CONFIGURE_ARGS+=	--disable-wnn
-.else
+.if ${PORT_OPTIONS:MWNN}
 LIB_DEPENDS+=	wnn.0:${PORTSDIR}/japanese/FreeWnn-lib
+.else
+CONFIGURE_ARGS+=	--disable-wnn
 .endif
 
-.if defined(WITH_GNOMEPANEL)
+.if ${PORT_OPTIONS:MGNOMEPANEL}
 USE_GNOME+=	gnomepanel
 PLIST_SUB+=	GNOMEPANEL=""
 .else
@@ -69,4 +71,4 @@ post-install:
 	${LOCALBASE}/bin/gtk-query-immodules-2.0 > \
 	    ${LOCALBASE}/etc/gtk-2.0/gtk.immodules
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>