From owner-svn-ports-head@FreeBSD.ORG Tue Aug 27 18:42:38 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 4574B8C0; Tue, 27 Aug 2013 18:42:38 +0000 (UTC) (envelope-from dbn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1954E2B01; Tue, 27 Aug 2013 18:42:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7RIgblL076453; Tue, 27 Aug 2013 18:42:37 GMT (envelope-from dbn@svn.freebsd.org) Received: (from dbn@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7RIgbK6076452; Tue, 27 Aug 2013 18:42:37 GMT (envelope-from dbn@svn.freebsd.org) Message-Id: <201308271842.r7RIgbK6076452@svn.freebsd.org> From: David Naylor Date: Tue, 27 Aug 2013 18:42:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r325482 - head/misc/kde4-l10n/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Aug 2013 18:42:38 -0000 Author: dbn Date: Tue Aug 27 18:42:37 2013 New Revision: 325482 URL: http://svnweb.freebsd.org/changeset/ports/325482 Log: 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. Modified: head/misc/kde4-l10n/files/bsd.l10n.mk Modified: head/misc/kde4-l10n/files/bsd.l10n.mk ============================================================================== --- head/misc/kde4-l10n/files/bsd.l10n.mk Tue Aug 27 18:11:13 2013 (r325481) +++ head/misc/kde4-l10n/files/bsd.l10n.mk Tue Aug 27 18:42:37 2013 (r325482) @@ -26,6 +26,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- @@ -50,15 +53,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}