From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Oct 7 04:20:21 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B5A8E106564A for ; Sun, 7 Oct 2012 04:20:19 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id C48CE8FC23 for ; Sun, 7 Oct 2012 04:20:18 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q974KI1d064240 for ; Sun, 7 Oct 2012 04:20:18 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q974KImq064239; Sun, 7 Oct 2012 04:20:18 GMT (envelope-from gnats) Resent-Date: Sun, 7 Oct 2012 04:20:18 GMT Resent-Message-Id: <201210070420.q974KImq064239@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Michael Gmelin Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E979C1065676 for ; Sun, 7 Oct 2012 04:15:39 +0000 (UTC) (envelope-from freebsd@grem.de) Received: from mail.grem.de (outcast.grem.de [213.239.217.27]) by mx1.freebsd.org (Postfix) with SMTP id 1ACBC8FC08 for ; Sun, 7 Oct 2012 04:15:38 +0000 (UTC) Received: (qmail 60512 invoked by uid 0); 7 Oct 2012 04:15:38 -0000 Message-Id: <20121007041538.60511.qmail@mail.grem.de> Date: 7 Oct 2012 04:15:38 -0000 From: Michael Gmelin To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/172430: [PATCH] textproc/openvanilla-modules: Converting port to new options framework X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Oct 2012 04:20:21 -0000 >Number: 172430 >Category: ports >Synopsis: [PATCH] textproc/openvanilla-modules: Converting port to new options framework >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Oct 07 04:20:18 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Michael Gmelin >Release: FreeBSD 9.0-RELEASE amd64 >Organization: Grem Equity GmbH >Environment: System: FreeBSD bsd64.grem.de 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan 3 07:46:30 UTC >Description: The patch below converts the port to use the new options framework[1] and converts the Makefile header to the new format[2]. The patch is to be applied using: patch -p0 -E How-To-Repeat: >Fix: --- openvanilla-modules-0.7.2.20070514_4.patch begins here --- diff -ruN --exclude=CVS ../openvanilla-modules.orig/Makefile ./Makefile --- ../openvanilla-modules.orig/Makefile 2012-10-07 05:42:32.465888677 +0200 +++ ./Makefile 2012-10-07 05:50:53.700268186 +0200 @@ -1,98 +1,97 @@ -# New ports collection makefile for: openvanilla-modules -# Date Created: 3 September 2005 -# Whom: Leland Wang -# -# $FreeBSD: ports/textproc/openvanilla-modules/Makefile,v 1.17 2012/06/01 05:24:39 dinoex Exp $ -# - -PORTNAME= openvanilla-modules -PORTVERSION= 0.7.2.20070514 -PORTREVISION= 4 -CATEGORIES= textproc -MASTER_SITES= ${MASTER_SITE_LOCAL} +# Created by: Leland Wang +# $FreeBSD: $ + +PORTNAME= openvanilla-modules +PORTVERSION= 0.7.2.20070514 +PORTREVISION= 4 +CATEGORIES= textproc +MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= rafan -DISTNAME= openvanilla-${PORTVERSION} +DISTNAME= openvanilla-${PORTVERSION} -MAINTAINER= ports@FreeBSD.org -COMMENT= Input method modules for OpenVanilla +MAINTAINER= ports@FreeBSD.org +COMMENT= Input method modules for OpenVanilla -BUILD_DEPENDS= ${LOCALBASE}/include/OpenVanilla/OpenVanilla.h:${PORTSDIR}/textproc/openvanilla-framework -RUN_DEPENDS= ${LOCALBASE}/lib/scim-1.0/1.4.0/IMEngine/OVLoader-SCIM.so:${PORTSDIR}/textproc/scim-openvanilla +BUILD_DEPENDS= ${LOCALBASE}/include/OpenVanilla/OpenVanilla.h:${PORTSDIR}/textproc/openvanilla-framework +RUN_DEPENDS= ${LOCALBASE}/lib/scim-1.0/1.4.0/IMEngine/OVLoader-SCIM.so:${PORTSDIR}/textproc/scim-openvanilla -USE_AUTOTOOLS= libtool:env -USE_GMAKE= yes +USE_AUTOTOOLS= libtool:env +USE_GMAKE= yes USE_PERL5_BUILD= yes -OPTIONS= OVIMArray "Array Input Module" on \ - OVIMBig5 "Big5 Input Module" off \ - OVIMGeneric "Generic Input Module" on \ - OVIMPOJ_Holo "POJ-Holo Input Module" on \ - OVIMPhonetic "Phonetic Input Module" on \ - OVIMRoman "Roman Input Module" off \ - OVIMSpaceChewing "Chewing Input Module" on \ - OVIMTibetan "Tibetan Input Module" off \ - OVIMUnicode "Unicode Input Module" off +OPTIONS_DEFINE= OVIMArray OVIMBig5 OVIMGeneric OVIMPOJ_Holo OVIMPhonetic OVIMRoman \ + OVIMSpaceChewing OVIMTibetan OVIMUnicode +OPTIONS_DEFAULT= OVIMArray OVIMGeneric OVIMPOJ_Holo OVIMPhonetic OVIMSpaceChewing +OVIMArray_DESC= Array Input Module +OVIMBig5_DESC= Big5 Input Module +OVIMGeneric_DESC= Generic Input Module +OVIMPOJ_Holo_DESC= POJ-Holo Input Module +OVIMPhonetic_DESC= Phonetic Input Module +OVIMRoman_DESC= Roman Input Module +OVIMSpaceChewing_DESC= Chewing Input Module +OVIMTibetan_DESC= Tibetan Input Module +OVIMUnicode_DESC= Unicode Input Module -MAKE_ARGS+= INSTALL_PREFIX=${PREFIX} OV_INCLUDE=${LOCALBASE}/include +MAKE_ARGS+= INSTALL_PREFIX=${PREFIX} OV_INCLUDE=${LOCALBASE}/include -.include +.include .if (${OSVERSION} >= 800501) EXTRA_PATCHES+= ${FILESDIR}/extra-patch-Modules-SharedSource-OVCINInfo.cpp .endif -.if !defined(WITHOUT_OVIMArray) +.if ${PORT_OPTIONS:MOVIMArray} PLIST_SUB+= OVIMArray="" .else PLIST_SUB+= OVIMArray="@comment " .endif -.if defined(WITH_OVIMBig5) +.if ${PORT_OPTIONS:MOVIMBig5} PLIST_SUB+= OVIMBig5="" .else PLIST_SUB+= OVIMBig5="@comment " .endif -#.if defined(WITH_OVIMBoshiamy) +#.if ${PORT_OPTIONS:MOVIMBoshiamy} #PLIST_SUB+= OVIMBoshiamy="" #.else #PLIST_SUB+= OVIMBoshiamy="@comment " #.endif -.if !defined(WITHOUT_OVIMGeneric) +.if ${PORT_OPTIONS:MOVIMGeneric} PLIST_SUB+= OVIMGeneric="" .else PLIST_SUB+= OVIMGeneric="@comment " .endif -.if !defined(WITHOUT_OVIMPOJ_Holo) +.if ${PORT_OPTIONS:MOVIMPOJ_Holo} PLIST_SUB+= OVIMPOJ_Holo="" .else PLIST_SUB+= OVIMPOJ_Holo="@comment " .endif -.if !defined(WITHOUT_OVIMPhonetic) +.if ${PORT_OPTIONS:MOVIMPhonetic} PLIST_SUB+= OVIMPhonetic="" .else PLIST_SUB+= OVIMPhonetic="@comment " .endif -.if defined(WITH_OVIMRoman) +.if ${PORT_OPTIONS:MOVIMRoman} PLIST_SUB+= OVIMRoman="" .else PLIST_SUB+= OVIMRoman="@comment " .endif -.if !defined(WITHOUT_OVIMSpaceChewing) +.if ${PORT_OPTIONS:MOVIMSpaceChewing} PLIST_SUB+= OVIMSpaceChewing="" .else PLIST_SUB+= OVIMSpaceChewing="@comment " .endif -.if defined(WITH_OVIMTibetan) +.if ${PORT_OPTIONS:MOVIMTibetan} PLIST_SUB+= OVIMTibetan="" .else PLIST_SUB+= OVIMTibetan="@comment " .endif -.if defined(WITH_OVIMUnicode) +.if ${PORT_OPTIONS:MOVIMUnicode} PLIST_SUB+= OVIMUnicode="" .else PLIST_SUB+= OVIMUnicode="@comment " .endif -#.if defined(WITH_OVIMBoshiamy) +#.if ${PORT_OPTIONS:MOVIMBoshiamy} #DISTFILES+= liu5.cin #NOFETCHFILES= liu5.cin #EXTRACT_ONLY+= openvanilla-${PORTVERSION}${EXTRACT_SUFX} @@ -105,72 +104,72 @@ # @${CP} ${DISTDIR}/liu5.cin ${WRKSRC}/Modules/OVIMBoshiamy #.endif -#.if !defined(WITHOUT_OVIMSpaceChewing) +#.if ${PORT_OPTIONS:MOVIMSpaceChewing} #LIB_DEPENDS+= chewing.3:${PORTSDIR}/chinese/libchewing #.endif do-build: -.if !defined(WITHOUT_OVIMArray) +.if ${PORT_OPTIONS:MOVIMArray} @(cd ${WRKSRC}/Modules/OVIMArray; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} all) .endif -.if defined(WITH_OVIMBig5) +.if ${PORT_OPTIONS:MOVIMBig5} @(cd ${WRKSRC}/Modules/OVIMBig5; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} all) .endif -#.if defined(WITH_OVIMBoshiamy) +#.if ${PORT_OPTIONS:MOVIMBoshiamy} # @(cd ${WRKSRC}/Modules/OVIMBoshiamy; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} all) #.endif -.if !defined(WITHOUT_OVIMGeneric) +.if ${PORT_OPTIONS:MOVIMGeneric} @(cd ${WRKSRC}/Modules/OVIMGeneric; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} all) .endif -.if !defined(WITHOUT_OVIMPOJ_Holo) +.if ${PORT_OPTIONS:MOVIMPOJ_Holo} @(cd ${WRKSRC}/Modules/OVIMPOJ-Holo; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} all) .endif -.if !defined(WITHOUT_OVIMPhonetic) +.if ${PORT_OPTIONS:MOVIMPhonetic} @(cd ${WRKSRC}/Modules/OVIMPhonetic; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} all) .endif -.if !defined(WITHOUT_OVIMSpaceChewing) +.if ${PORT_OPTIONS:MOVIMSpaceChewing} @(cd ${WRKSRC}/Modules/OVIMSpaceChewing0.3; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} data all) .endif -.if defined(WITH_OVIMRoman) +.if ${PORT_OPTIONS:MOVIMRoman} @(cd ${WRKSRC}/Modules/OVIMRoman; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} all) .endif -.if defined(WITH_OVIMTibetan) +.if ${PORT_OPTIONS:MOVIMTibetan} @(cd ${WRKSRC}/Modules/OVIMTibetan; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} all) .endif -.if defined(WITH_OVIMUnicode) +.if ${PORT_OPTIONS:MOVIMUnicode} @(cd ${WRKSRC}/Modules/OVIMUnicode; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} all) .endif do-install: -.if !defined(WITHOUT_OVIMArray) +.if ${PORT_OPTIONS:MOVIMArray} @(cd ${WRKSRC}/Modules/OVIMArray; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install) .endif -.if defined(WITH_OVIMBig5) +.if ${PORT_OPTIONS:MOVIMBig5} @(cd ${WRKSRC}/Modules/OVIMBig5; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install) .endif -#.if defined(WITH_OVIMBoshiamy) +#.if ${PORT_OPTIONS:MOVIMBoshiamy} # @(cd ${WRKSRC}/Modules/OVIMBoshiamy; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install) #.endif -.if !defined(WITHOUT_OVIMGeneric) +.if ${PORT_OPTIONS:MOVIMGeneric} @(cd ${WRKSRC}/Modules/OVIMGeneric; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install) .endif -.if !defined(WITHOUT_OVIMPOJ_Holo) +.if ${PORT_OPTIONS:MOVIMPOJ_Holo} @(cd ${WRKSRC}/Modules/OVIMPOJ-Holo; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install) .endif -.if !defined(WITHOUT_OVIMPhonetic) +.if ${PORT_OPTIONS:MOVIMPhonetic} @(cd ${WRKSRC}/Modules/OVIMPhonetic; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install) .endif -.if defined(WITH_OVIMRoman) +.if ${PORT_OPTIONS:MOVIMRoman} @(cd ${WRKSRC}/Modules/OVIMRoman; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install) .endif -.if !defined(WITHOUT_OVIMSpaceChewing) +.if ${PORT_OPTIONS:MOVIMSpaceChewing} @(cd ${WRKSRC}/Modules/OVIMSpaceChewing0.3; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install) .endif -.if defined(WITH_OVIMTibetan) +.if ${PORT_OPTIONS:MOVIMTibetan} @(cd ${WRKSRC}/Modules/OVIMTibetan; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install) .endif -.if defined(WITH_OVIMUnicode) +.if ${PORT_OPTIONS:MOVIMUnicode} @(cd ${WRKSRC}/Modules/OVIMUnicode; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install) .endif -.include +.include --- openvanilla-modules-0.7.2.20070514_4.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: