Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 31 Aug 2013 15:08:11 +0000 (UTC)
From:      Raphael Kubo da Costa <rakuco@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r325814 - branches/RELENG_9_2_0/misc/kde4-l10n/files
Message-ID:  <201308311508.r7VF8Bhu036258@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rakuco
Date: Sat Aug 31 15:08:11 2013
New Revision: 325814
URL: http://svnweb.freebsd.org/changeset/ports/325814

Log:
  MFH r325482.
  
    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)

Modified:
  branches/RELENG_9_2_0/misc/kde4-l10n/files/bsd.l10n.mk
Directory Properties:
  branches/RELENG_9_2_0/   (props changed)

Modified: branches/RELENG_9_2_0/misc/kde4-l10n/files/bsd.l10n.mk
==============================================================================
--- branches/RELENG_9_2_0/misc/kde4-l10n/files/bsd.l10n.mk	Sat Aug 31 14:53:55 2013	(r325813)
+++ branches/RELENG_9_2_0/misc/kde4-l10n/files/bsd.l10n.mk	Sat Aug 31 15:08:11 2013	(r325814)
@@ -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}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308311508.r7VF8Bhu036258>