From owner-svn-ports-head@freebsd.org  Fri Jul 22 03:29:48 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 91617BA1EC2;
 Fri, 22 Jul 2016 03:29:48 +0000 (UTC)
 (envelope-from ashish@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5E32718D5;
 Fri, 22 Jul 2016 03:29:48 +0000 (UTC)
 (envelope-from ashish@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6M3TlEY082517;
 Fri, 22 Jul 2016 03:29:47 GMT (envelope-from ashish@FreeBSD.org)
Received: (from ashish@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6M3TlL7082516;
 Fri, 22 Jul 2016 03:29:47 GMT (envelope-from ashish@FreeBSD.org)
Message-Id: <201607220329.u6M3TlL7082516@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ashish set sender to
 ashish@FreeBSD.org using -f
From: Ashish SHUKLA <ashish@FreeBSD.org>
Date: Fri, 22 Jul 2016 03:29:47 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r418909 - head/Mk
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.22
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 22 Jul 2016 03:29:48 -0000

Author: ashish
Date: Fri Jul 22 03:29:47 2016
New Revision: 418909
URL: https://svnweb.freebsd.org/changeset/ports/418909

Log:
  - Update EMACS_PORTSDIR to match new convention of specifying dependency
    ports, and rename it to EMACS_PORTDIR
  
  PR:		210960
  Submitted by:	rakuco

Modified:
  head/Mk/bsd.emacs.mk

Modified: head/Mk/bsd.emacs.mk
==============================================================================
--- head/Mk/bsd.emacs.mk	Fri Jul 22 03:06:49 2016	(r418908)
+++ head/Mk/bsd.emacs.mk	Fri Jul 22 03:29:47 2016	(r418909)
@@ -70,7 +70,7 @@ EMACS_VER=		24.5
 EMACS_MAJOR_VER=	24
 EMACS_LIBDIR?=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER?=	share/${EMACS_NAME}/${EMACS_VER}
-EMACS_PORTSDIR=		${PORTSDIR}/editors/emacs
+EMACS_PORTDIR=		editors/emacs
 EMACS_COMMON_PORT=	NO
 EMACS_HAS_MULE=		YES
 EMACS_NO_SUBDIRSEL=	NO
@@ -87,7 +87,7 @@ EMACS_VER=		25.0.95
 EMACS_MAJOR_VER=	25
 EMACS_LIBDIR?=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER?=	share/${EMACS_NAME}/${EMACS_VER}
-EMACS_PORTSDIR=		${PORTSDIR}/editors/emacs-devel
+EMACS_PORTDIR=		editors/emacs-devel
 EMACS_COMMON_PORT=	NO
 EMACS_HAS_MULE=		YES
 EMACS_NO_SUBDIRSEL=	NO
@@ -130,13 +130,13 @@ EMACS_VERSION_SITE_LISPDIR?=	${EMACS_LIB
 EMACS_NO_BUILD_DEPENDS?=	NO
 EMACS_NO_RUN_DEPENDS?=		NO
 .if (${EMACS_NO_BUILD_DEPENDS} == "NO")
-BUILD_DEPENDS+=		${EMACS_CMD}:${EMACS_PORTSDIR}
+BUILD_DEPENDS+=		${EMACS_CMD}:${EMACS_PORTDIR}
 .endif
 .if (${EMACS_NO_RUN_DEPENDS} == "NO")
 .if defined(EMACS_COMMON_PORT) && (${EMACS_COMMON_PORT} == "YES")
-RUN_DEPENDS+=	${EMACS_COREEL}:${EMACS_PORTSDIR}-common
+RUN_DEPENDS+=	${EMACS_COREEL}:${EMACS_PORTDIR}-common
 .else
-RUN_DEPENDS+=	${EMACS_CMD}:${EMACS_PORTSDIR}
+RUN_DEPENDS+=	${EMACS_CMD}:${EMACS_PORTDIR}
 .endif
 .endif