summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaphael Kubo da Costa <rakuco@FreeBSD.org>2013-08-31 15:08:11 +0000
committerRaphael Kubo da Costa <rakuco@FreeBSD.org>2013-08-31 15:08:11 +0000
commit7aa7b253bac58b43228bc4c1e1561525d8daadcd (patch)
treeb12a26ad760416603c7c6210d71a112e446c30bd
parentMFH: 325617 (diff)
MFH r325482.release/9.2.0
Fix auto-detection of dictionaries for kde4-l10n ports. With the removal of '.include <bsd.port.options.mk>' and '.include <bsd.port.pre.mk>' PORTSDIR is no longer defined. Since Ports is (almost) never based at the root system the checks will always fail to find a port. Fix this by using relative searches for the dictionary ports. Giving PORTSDIR a conditional assignment of /usr/ports was rejected due to lack of precedent. While here teach kde4-l10n about en_GB. Original commit by dbn. Approved by: portmgr (bapt)
Notes
Notes: svn path=/branches/RELENG_9_2_0/; revision=325814 svn path=/tags/RELEASE_9_2_0/; revision=328999; tag=release/9.2.0
-rw-r--r--misc/kde4-l10n/files/bsd.l10n.mk11
1 files changed, 7 insertions, 4 deletions
diff --git a/misc/kde4-l10n/files/bsd.l10n.mk b/misc/kde4-l10n/files/bsd.l10n.mk
index 95ece110c6a6..bc49a4227a0b 100644
--- a/misc/kde4-l10n/files/bsd.l10n.mk
+++ b/misc/kde4-l10n/files/bsd.l10n.mk
@@ -27,6 +27,9 @@ ru_CATEGORY= russian
uk_CATEGORY= ukrainian
vi_CATEGORY= vietnamese
+en_GB_aspell_PORT_PREFIX= en-
+en_GB_hunspell_PORT_PREFIX= en-
+
ca@valencia_aspell_PORT_PREFIX= ca-
ca@valencia_aspell_DETECT_PREFIX= ca-
@@ -51,15 +54,15 @@ ${KDE4_L10N}_${i}_PORT_SUFFIX?= #
${KDE4_L10N}_${i}_PORT?= ${${KDE4_L10N}_CATEGORY}/${${KDE4_L10N}_${i}_PORT_PREFIX}${i}${${KDE4_L10N}_${i}_PORT_SUFFIX}
.endfor
-.if exists(${PORTSDIR}/${${KDE4_L10N}_aspell_PORT}/Makefile)
+.if exists(${.CURDIR}/../../${${KDE4_L10N}_aspell_PORT}/Makefile)
OPTIONS_DEFINE+= ASPELL
ASPELL_DESC= Install aspell dictionary
.endif
-.if exists(${PORTSDIR}/${${KDE4_L10N}_hunspell_PORT}/Makefile)
+.if exists(${.CURDIR}/../../${${KDE4_L10N}_hunspell_PORT}/Makefile)
OPTIONS_DEFINE+= HUNSPELL
HUNSPELL_DESC= Install hunspell dictionary
.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}
+ASPELL_RUN_DEPENDS+= ${${KDE4_L10N}_aspell_DETECT}:${.CURDIR}/../../${${KDE4_L10N}_aspell_PORT}
+HUNSPELL_RUN_DEPENDS+= ${${KDE4_L10N}_hunspell_DETECT}:${.CURDIR}/../../${${KDE4_L10N}_hunspell_PORT}