From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Mar 31 10:40:01 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 670D5D10 for ; Sun, 31 Mar 2013 10:40:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 4D34B6C7 for ; Sun, 31 Mar 2013 10:40:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r2VAe1IE078399 for ; Sun, 31 Mar 2013 10:40:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r2VAe1K0078398; Sun, 31 Mar 2013 10:40:01 GMT (envelope-from gnats) Resent-Date: Sun, 31 Mar 2013 10:40:01 GMT Resent-Message-Id: <201303311040.r2VAe1K0078398@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, Martin Birgmeier Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 3E2CCA7F for ; Sun, 31 Mar 2013 10:30:06 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 2F86D652 for ; Sun, 31 Mar 2013 10:30:06 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id r2VAU4oi002040 for ; Sun, 31 Mar 2013 10:30:04 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id r2VAU4b7002039; Sun, 31 Mar 2013 10:30:04 GMT (envelope-from nobody) Message-Id: <201303311030.r2VAU4b7002039@red.freebsd.org> Date: Sun, 31 Mar 2013 10:30:04 GMT From: Martin Birgmeier To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/177519: [patch] fix options handling for calligra-l10n (do not always build all languages) X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Mar 2013 10:40:01 -0000 >Number: 177519 >Category: ports >Synopsis: [patch] fix options handling for calligra-l10n (do not always build all languages) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sun Mar 31 10:40:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Martin Birgmeier >Release: 9.1 >Organization: MBi at home >Environment: FreeBSD hal.xyzzy 9.1-RELEASE FreeBSD 9.1-RELEASE #1: Fri Jan 4 12:37:44 CET 2013 root@v904.xyzzy:/usr/obj/.../hal/z/SRC/FreeBSD/release/9.1.0/sys/XYZZY_SMP amd64 >Description: editors/calligra-l10n always includes localizations for all languages. Fix this in the same manner misc/kde4-l10n does. >How-To-Repeat: Try to build editors/calligra-l10n with only a few languages selected and observe that despite the selection, all of them are built. >Fix: Patch attached with submission follows: --- ./editors/calligra-l10n/Makefile.ORIG 2013-03-30 21:18:36.479381451 +0100 +++ ./editors/calligra-l10n/Makefile 2013-03-30 21:31:09.890379694 +0100 @@ -33,8 +33,8 @@ .include "${.CURDIR}/../../misc/kde4-l10n/files/kde4-lang-names" nb_NAME= Norwegian Bokmal -OPTIONS_DEFINE= ALL -OPTIONS_DEFAULT=ALL +OPTIONS_DEFINE= ALL ${LANG_OPT_ALL} +OPTIONS_DEFAULT= ALL ALL_DESC= All localizations @@ -42,18 +42,20 @@ ${lang}_DETECT?= ${KDE4_PREFIX}/share/locale/${lang}/LC_MESSAGES/calligra.mo ${lang}_PORT?= editors/calligra-l10n-${lang} ${lang}_NAME?= ${lang} -${lang}_OPTION= ${lang:S/@/_/} -OPTIONS_DEFINE+= ${${lang}_OPTION} -${${lang}_OPTION}_DESC= ${${lang}_NAME} localization + +${lang}_OPT= ${lang:S/@/_/} +LANG_OPT_ALL+= ${${lang}_OPT} +${${lang}_OPT}_DESC= ${${lang}_NAME} localization + +${${lang}_OPT}_DEP= ${${lang}_DETECT}:${PORTSDIR}/${${lang}_PORT} .endfor .include -.for lang in ${CALLIGRA_LANG_ALL} -# .if ${PORT_OPTIONS:MALL} || ${PORT_OPTIONS:M${${lang}_OPTION}} -.if ${PORT_OPTIONS:M${${lang}_OPTION}} -RUN_DEPENDS+= ${${lang}_DETECT}:${PORTSDIR}/${${lang}_PORT} -.endif +.for opt in ${LANG_OPT_ALL} +. if ${PORT_OPTIONS:M${opt}} || ${PORT_OPTIONS:MALL} +RUN_DEPENDS+= ${${opt}_DEP} +. endif .endfor do-install: >Release-Note: >Audit-Trail: >Unformatted: