svn commit: r330183 - head/japanese/tomoe

[Hajimu UMEMOTO]

Author: ume
Date: Sat Oct 12 20:10:42 2013
New Revision: 330183
URL: http://svnweb.freebsd.org/changeset/ports/330183

Log:
  - enable stage.
  - use modern OPTIONS helper.

Modified:
  head/japanese/tomoe/Makefile

Modified: head/japanese/tomoe/Makefile
==============================================================================
--- head/japanese/tomoe/Makefile	Sat Oct 12 19:44:42 2013	(r330182)
+++ head/japanese/tomoe/Makefile	Sat Oct 12 20:10:42 2013	(r330183)
@@ -43,45 +43,28 @@ OPTIONS_DEFAULT=	PYTHON
 .if ${ARCH} != "sparc64" && ${OSVERSION} < 700042
 OPTIONS_DEFAULT+=	UNIHAN
 .endif
+OPTIONS_SUB=		yes
 DICT_RUBY_DESC=		Enable Ruby based dictionary module
+DICT_RUBY_CONFIGURE_ENABLE=	dict-ruby
 EST_DESC=		Enable Hyper Estraier dictionary module
+EST_CONFIGURE_WITH=	est
 MYSQL_DESC=		Enable MySQL dictionary module
+MYSQL_CONFIGURE_WITH=	mysql
 PYTHON_DESC=		Enable Python module
+PYTHON_CONFIGURE_OFF=	--with-python=no
 UNIHAN_DESC=		Enable Unihan database dictionary module
+UNIHAN_CONFIGURE_ENABLE=	unihan
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
-.if ${PORT_OPTIONS:MDICT_RUBY}
-CONFIGURE_ARGS+=--enable-dict-ruby
-PLIST_SUB+=	DICT_RUBY=""
-.else
-PLIST_SUB+=	DICT_RUBY="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MEST}
-CONFIGURE_ARGS+=--with-est
-PLIST_SUB+=	EST=""
-.else
-PLIST_SUB+=	EST="@comment "
-.endif
-
 .if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
-CONFIGURE_ARGS+=--with-mysql
-PLIST_SUB+=	MYSQL=""
-.else
-PLIST_SUB+=	MYSQL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON}
 USE_PYTHON=	yes
 .include "${PORTSDIR}/Mk/bsd.python.mk"
 USE_GNOME+=	pygtk2
-PLIST_SUB+=	PYTHON=""
-.else
-CONFIGURE_ARGS+=--with-python=no
-PLIST_SUB+=	PYTHON="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MUNIHAN}
@@ -97,10 +80,6 @@ EXTRACT_DEPENDS+=	${UNZIP_CMD}:${PORTSDI
 BUILD_DEPENDS+=	\
 	${RUBY_SITEARCHLIBDIR}/uconv.so:${PORTSDIR}/japanese/ruby-uconv \
 	${RUBY_SITELIBDIR}/suikyo/suikyo.rb:${PORTSDIR}/japanese/suikyo
-PLIST_SUB+=	UNIHAN=""
-.else
-CONFIGURE_ARGS+=--disable-unihan
-PLIST_SUB+=	UNIHAN="@comment "
 .endif
 
 CONFIGURE_ENV+=	PYTHON_VERSION=${PYTHON_VERSION:S;python;;} \