From owner-svn-ports-all@freebsd.org  Sun Oct  2 13:33:54 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 5D3CBADC512;
 Sun,  2 Oct 2016 13:33:54 +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 2D8D1A16;
 Sun,  2 Oct 2016 13:33:54 +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 u92DXrsp084062;
 Sun, 2 Oct 2016 13:33:53 GMT (envelope-from ashish@FreeBSD.org)
Received: (from ashish@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u92DXraI084060;
 Sun, 2 Oct 2016 13:33:53 GMT (envelope-from ashish@FreeBSD.org)
Message-Id: <201610021333.u92DXraI084060@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: Sun, 2 Oct 2016 13:33:53 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r423120 - in head/editors: emacs emacs-devel
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 02 Oct 2016 13:33:54 -0000

Author: ashish
Date: Sun Oct  2 13:33:53 2016
New Revision: 423120
URL: https://svnweb.freebsd.org/changeset/ports/423120

Log:
  - Fix typo, happened in r423103
  
  PR:		212807

Modified:
  head/editors/emacs-devel/Makefile
  head/editors/emacs/Makefile

Modified: head/editors/emacs-devel/Makefile
==============================================================================
--- head/editors/emacs-devel/Makefile	Sun Oct  2 13:28:38 2016	(r423119)
+++ head/editors/emacs-devel/Makefile	Sun Oct  2 13:33:53 2016	(r423120)
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BROKEN_sparc64=	Emacs does not currently build on sparc64
 BROKEN_ia64=	Emacs does not currently build on ia64
 
-CONFLICTS=	emacs-[0-9]* emacs-nox11-[0-9]*
+CONFLICTS=	emacs25-[0-9]* emacs-nox11-[0-9]*
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	emacs-mirror

Modified: head/editors/emacs/Makefile
==============================================================================
--- head/editors/emacs/Makefile	Sun Oct  2 13:28:38 2016	(r423119)
+++ head/editors/emacs/Makefile	Sun Oct  2 13:33:53 2016	(r423120)
@@ -6,7 +6,7 @@ PORTVERSION=	${EMACS_VER}
 PORTEPOCH=	3
 CATEGORIES=	editors ipv6
 MASTER_SITES=	GNU
-1PKGNAMESUFFIX?=	25
+PKGNAMESUFFIX?=	25
 
 PATCH_DIST_STRIP=	-p1