From owner-svn-ports-head@FreeBSD.ORG Sat Oct 12 20:10:43 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 2466EC5A; Sat, 12 Oct 2013 20:10:43 +0000 (UTC) (envelope-from ume@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EC37C2EEA; Sat, 12 Oct 2013 20:10:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9CKAgaO035336; Sat, 12 Oct 2013 20:10:42 GMT (envelope-from ume@svn.freebsd.org) Received: (from ume@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9CKAgLU035335; Sat, 12 Oct 2013 20:10:42 GMT (envelope-from ume@svn.freebsd.org) Message-Id: <201310122010.r9CKAgLU035335@svn.freebsd.org> From: Hajimu UMEMOTO Date: Sat, 12 Oct 2013 20:10:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330183 - head/japanese/tomoe X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Oct 2013 20:10:43 -0000 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 -.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;;} \