From 7aa7b253bac58b43228bc4c1e1561525d8daadcd Mon Sep 17 00:00:00 2001 From: Raphael Kubo da Costa Date: Sat, 31 Aug 2013 15:08:11 +0000 Subject: MFH r325482. Fix auto-detection of dictionaries for kde4-l10n ports. With the removal of '.include ' and '.include ' 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) --- misc/kde4-l10n/files/bsd.l10n.mk | 11 +++++++---- 1 file 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} -- cgit v1.2.3