From owner-svn-ports-head@FreeBSD.ORG Thu May 2 22:13:02 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 093F0DE; Thu, 2 May 2013 22:13:02 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id D653B1827; Thu, 2 May 2013 22:13:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r42MD1kA051449; Thu, 2 May 2013 22:13:01 GMT (envelope-from hrs@svn.freebsd.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r42MD1dJ051448; Thu, 2 May 2013 22:13:01 GMT (envelope-from hrs@svn.freebsd.org) Message-Id: <201305022213.r42MD1dJ051448@svn.freebsd.org> From: Hiroki Sato Date: Thu, 2 May 2013 22:13:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317163 - head/japanese/kinput2 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: Thu, 02 May 2013 22:13:02 -0000 Author: hrs Date: Thu May 2 22:13:01 2013 New Revision: 317163 URL: http://svnweb.freebsd.org/changeset/ports/317163 Log: - Trim old-style header. - Use OPTIONS_DEFINE. Modified: head/japanese/kinput2/Makefile Modified: head/japanese/kinput2/Makefile ============================================================================== --- head/japanese/kinput2/Makefile Thu May 2 22:10:11 2013 (r317162) +++ head/japanese/kinput2/Makefile Thu May 2 22:13:01 2013 (r317163) @@ -1,9 +1,5 @@ -# New ports collection makefile for: kinput2 -# Date created: 19 Dec 1997 -# Whom: Satoshi TAOKA -# +# Created by: Satoshi TAOKA # $FreeBSD$ -# PORTNAME= kinput2 PORTVERSION= 3.1 @@ -22,12 +18,14 @@ PLIST_FILES= ${PLIST_ALL} MAN1= kinput2.1 -OPTIONS= CANNA "Canna support" on \ - FREEWNN "FreeWnn support " on \ - WNN6 "Wnn6 support" off \ - WNN7 "Wnn7 support" off \ - SJ3 "SJ3 support" on \ - TCP "TCP transport support (not needed for most cases)" off +OPTIONS_DEFINE= CANNA FREEWNN WNN6 WNN7 SJ3 TCP +OPTIONS_DEFAULT=CANNA FREEWNN SJ3 +CANNA_DESC= Canna support +FREEWNN_DESC= FreeWnn support +WNN6_DESC= Wnn6 support +WNN7_DESC= Wnn7 support +SJ3_DESC= SJ3 support +TCP_DESC= TCP transport support (not needed for most cases) LIB_DEPENDS.CANNA= canna16.1:${PORTSDIR}/japanese/canna-lib CONF.CANNA= '\#define UseCanna' \ @@ -76,22 +74,24 @@ PLIST.WNN= lib/X11/ccdef/ccdef.kinput2 lib/X11/ccdef/rule.katakana.egg \ lib/X11/ccdef/rule.kigou.egg -.include +.include -.if defined(WITH_FREEWNN) || defined(WITH_WNN6) || defined(WITH_WNN7) +.if ${PORT_OPTIONS:MFREEWNN) || \ + ${PORT_OPTIONS:MWNN6) || \ + ${PORT_OPTIONS:MWNN7) PLIST_ALL+= ${PLIST.WNN} .endif -.for I in WITH_CANNA WITH_FREEWNN WITH_WNN6 WITH_WNN7 WITH_SJ3 -.if defined(${I}) -LIB_DEPENDS+= ${LIB_DEPENDS.${I:S/^WITH_//}} -BUILD_DEPENDS+= ${BUILD_DEPENDS.${I:S/^WITH_//}} -CONF+= ${CONF.${I:S/^WITH_//}} -PLIST_ALL+= ${PLIST.${I:S/^WITH_//}} +.for I in ${OPTIONS_DEFINE:NTCP} +.if ${PORT_OPTIONS:M${I}} +LIB_DEPENDS+= ${LIB_DEPENDS.${I}} +BUILD_DEPENDS+= ${BUILD_DEPENDS.${I}} +CONF+= ${CONF.${I}} +PLIST_ALL+= ${PLIST.${I}} .endif .endfor -.if !defined(WITH_TCP) +.if !${PORT_OPTIONS:MTCP} CONF+= TRANSPORTDEFS="-DNO_TCP_TRANSPORT" .endif @@ -102,4 +102,4 @@ pre-configure: apply-slist post-install: @${CAT} ${PKGMESSAGE} -.include +.include