aboutsummaryrefslogtreecommitdiff
path: root/misc/kde4-l10n
diff options
context:
space:
mode:
authorRaphael Kubo da Costa <rakuco@FreeBSD.org>2013-07-09 21:49:00 +0000
committerRaphael Kubo da Costa <rakuco@FreeBSD.org>2013-07-09 21:49:00 +0000
commit2c80774ea9e44f876b9af2e57eb6518e34b048e6 (patch)
tree21ade7adf550e362a177b17677167207e23451a5 /misc/kde4-l10n
parentc9f576c5338b08f896d070b9bdc5e754af345373 (diff)
downloadports-2c80774ea9e44f876b9af2e57eb6518e34b048e6.tar.gz
ports-2c80774ea9e44f876b9af2e57eb6518e34b048e6.zip
KDE4 l10n fixes.
- Remove an entry from all plists that slipped under radar and made packaging fail. - Properly save the OPTIONS defined by the user in the l10n ports. [1] Quoting bapt, master of all things ports: That is because misc/kde4-l10n/files/bsd.l10n.mk is totally wrong it does ... .include <bsd.port.pre.mk> ... .include <bsd.port.options.mk> ... .include <bsd.port.post.mk> First the right order in that case should be: ... .include <bsd.port.options.mk> ... .include <bsd.port.pre.mk> ... .include <bsd.port.post.mk> Second in that case (kde) the pre.mk/post.mk can be removed just keeping the options.mk and given that we now have the helpers options.mk can also be removed. The check for variables in OPTIONS_DEFINE is also useless (already done by the framework) defining OPTIONS_DEFINE and OPTIONS_DEFAULT to some empty values is also useless. No PORTREVISION bump because the generated packages do not change regardless of the changes/fixes in behavior here. Reported by: avg [1] Submitted by: bapt [1]
Notes
Notes: svn path=/head/; revision=322586
Diffstat (limited to 'misc/kde4-l10n')
-rw-r--r--misc/kde4-l10n/files/bsd.l10n.mk16
1 files changed, 2 insertions, 14 deletions
diff --git a/misc/kde4-l10n/files/bsd.l10n.mk b/misc/kde4-l10n/files/bsd.l10n.mk
index 6bbcbdde8596..95ece110c6a6 100644
--- a/misc/kde4-l10n/files/bsd.l10n.mk
+++ b/misc/kde4-l10n/files/bsd.l10n.mk
@@ -51,11 +51,6 @@ ${KDE4_L10N}_${i}_PORT_SUFFIX?= #
${KDE4_L10N}_${i}_PORT?= ${${KDE4_L10N}_CATEGORY}/${${KDE4_L10N}_${i}_PORT_PREFIX}${i}${${KDE4_L10N}_${i}_PORT_SUFFIX}
.endfor
-.include <bsd.port.pre.mk>
-
-OPTIONS_DEFINE= #
-OPTIONS_DEFAULT= ${OPTIONS_DEFINE}
-
.if exists(${PORTSDIR}/${${KDE4_L10N}_aspell_PORT}/Makefile)
OPTIONS_DEFINE+= ASPELL
ASPELL_DESC= Install aspell dictionary
@@ -66,12 +61,5 @@ OPTIONS_DEFINE+= HUNSPELL
HUNSPELL_DESC= Install hunspell dictionary
.endif
-.include <bsd.port.options.mk>
-
-.if ${OPTIONS_DEFINE:MASPELL} && ${PORT_OPTIONS:MASPELL}
-RUN_DEPENDS+= ${${KDE4_L10N}_aspell_DETECT}:${PORTSDIR}/${${KDE4_L10N}_aspell_PORT}
-.endif
-
-.if ${OPTIONS_DEFINE:MHUNSPELL} && ${PORT_OPTIONS:MHUNSPELL}
-RUN_DEPENDS+= ${${KDE4_L10N}_hunspell_DETECT}:${PORTSDIR}/${${KDE4_L10N}_hunspell_PORT}
-.endif
+ASPELL_RUN_DEPENDS+= ${${KDE4_L10N}_aspell_DETECT}:${PORTSDIR}/${${KDE4_L10N}_aspell_PORT}
+HUNSPELL_RUN_DEPENDS+= ${${KDE4_L10N}_hunspell_DETECT}:${PORTSDIR}/${${KDE4_L10N}_hunspell_PORT}