From owner-svn-ports-all@FreeBSD.ORG Fri May 3 17:42:13 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 44D98315; Fri, 3 May 2013 17:42:13 +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 1D0BF158F; Fri, 3 May 2013 17:42:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r43HgC11064680; Fri, 3 May 2013 17:42:12 GMT (envelope-from hrs@svn.freebsd.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r43HgCsl064679; Fri, 3 May 2013 17:42:12 GMT (envelope-from hrs@svn.freebsd.org) Message-Id: <201305031742.r43HgCsl064679@svn.freebsd.org> From: Hiroki Sato Date: Fri, 3 May 2013 17:42:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317226 - head/japanese/onew X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 May 2013 17:42:13 -0000 Author: hrs Date: Fri May 3 17:42:12 2013 New Revision: 317226 URL: http://svnweb.freebsd.org/changeset/ports/317226 Log: - Trim old-style header. - Use OPTIONS_DEFINE. Modified: head/japanese/onew/Makefile Modified: head/japanese/onew/Makefile ============================================================================== --- head/japanese/onew/Makefile Fri May 3 17:39:01 2013 (r317225) +++ head/japanese/onew/Makefile Fri May 3 17:42:12 2013 (r317226) @@ -1,9 +1,5 @@ -# New ports collection makefile for: ONEW -# Date created: 5 Sep 1997 -# Whom: Satoshi TAOKA -# +# Created by: Satoshi TAOKA # $FreeBSD$ -# PORTNAME= onew PORTVERSION= 2.2.10 @@ -20,13 +16,15 @@ WRKSRC= ${WRKDIR}/${PORTNAME} ALL_TARGET= PORTDOCS= README.ONEW -OPTIONS= CANNA "Build Canna-backend library" on \ - CANNA_FREEWNN "Build Canna+FreeWnn-backend library" on \ - CANNA_WNN6 "Build Canna+Wnn6-backend library" on \ - CANNA_WNN7 "Build Canna+Wnn7-backend library" on \ - FREEWNN "Build FreeWnn-backend library" on \ - WNN6 "Build Wnn6-backend library" on \ - WNN7 "Build Wnn7-backend library" on +OPTIONS_DEFINE= CANNA CANNA_FREEWNN CANNA_WNN6 CANNA_WNN7 FREEWNN WNN6 WNN7 +OPTIONS_DEFAULT=CANNA CANNA_FREEWNN CANNA_WNN6 CANNA_WNN7 FREEWNN WNN6 WNN7 +CANNA_DESC= Build Canna-backend library +CANNA_FREEWNN_DESC= Build Canna+FreeWnn-backend library +CANNA_WNN6_DESC= Build Canna+Wnn6-backend library +CANNA_WNN7_DESC= Build Canna+Wnn7-backend library +FREEWNN_DESC= Build FreeWnn-backend library +WNN6_DESC= Build Wnn6-backend library +WNN7_DESC= Build Wnn7-backend library LIB_DEPENDS.CANNA= canna.1:${PORTSDIR}/japanese/canna-lib BUILD_DEPENDS.CANNA_FREEWNN= ${BUILD_DEPENDS.FREEWNN} @@ -42,16 +40,16 @@ RK_DIR.WNN6= ${LOCALBASE}/lib/wnn/ja_JP BUILD_DEPENDS.WNN7= ${BUILD_DEPENDS.FREEWNN} RK_DIR.WNN7= ${LOCALBASE}/lib/wnn/ja_JP/rk.wnn7 -.include +.include -.for I in WITH_CANNA WITH_FREEWNN WITH_WNN6 WITH_WNN7 WITH_CANNA_FREEWNN WITH_CANNA_WNN6 WITH_CANNA_WNN7 -.if defined(${I}) -INPUT_METHOD+= ${I:S/^WITH_//:S/_/+/g:L} -SUB_FILES+= ONEW_CONF-for-${I:S/^WITH_//:S/_/+/g:L} -PLIST_FILES+= lib/libonew-${I:S/^WITH_//:S/_/+/g:L}.a -LIB_DEPENDS+= ${LIB_DEPENDS.${I:S/^WITH_//}} -BUILD_DEPENDS+= ${BUILD_DEPENDS.${I:S/^WITH_//}} -RK_DIR+= ${RK_DIR.${I:S/^WITH_//}} +.for I in ${OPTIONS_DEFINE:NDOCS} +.if ${PORT_OPTIONS:M${I}} +INPUT_METHOD+= ${I:S/_/+/g:L} +SUB_FILES+= ONEW_CONF-for-${I:S/_/+/g:L} +PLIST_FILES+= lib/libonew-${I:S/_/+/g:L}.a +LIB_DEPENDS+= ${LIB_DEPENDS.${I}} +BUILD_DEPENDS+= ${BUILD_DEPENDS.${I}} +RK_DIR+= ${RK_DIR.${I}} .endif .endfor @@ -68,9 +66,9 @@ do-install: .for I in ${INPUT_METHOD} ${INSTALL_DATA} ${WRKDIR}/libonew-${I}.a ${PREFIX}/lib/libonew-${I}.a .endfor -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.ONEW ${DOCSDIR} .endif -.include +.include