Date: Sun, 31 Mar 2013 10:30:04 GMT From: Martin Birgmeier <Martin.Birgmeier@aon.at> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/177519: [patch] fix options handling for calligra-l10n (do not always build all languages) Message-ID: <201303311030.r2VAU4b7002039@red.freebsd.org> Resent-Message-ID: <201303311040.r2VAe1K0078398@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.options.mk>
-.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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303311030.r2VAU4b7002039>