From owner-svn-ports-all@FreeBSD.ORG  Sat Jan  4 20:12:39 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 25FAB222;
 Sat,  4 Jan 2014 20:12:39 +0000 (UTC)
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 11E1D1DEB;
 Sat,  4 Jan 2014 20:12:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04KCc2O082097;
 Sat, 4 Jan 2014 20:12:38 GMT (envelope-from ashish@svn.freebsd.org)
Received: (from ashish@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04KCcWc082095;
 Sat, 4 Jan 2014 20:12:38 GMT (envelope-from ashish@svn.freebsd.org)
Message-Id: <201401042012.s04KCcWc082095@svn.freebsd.org>
From: Ashish SHUKLA <ashish@FreeBSD.org>
Date: Sat, 4 Jan 2014 20:12:38 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r338676 - in head/editors: emacs emacs-nox11
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.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Jan 2014 20:12:39 -0000

Author: ashish
Date: Sat Jan  4 20:12:38 2014
New Revision: 338676
URL: http://svnweb.freebsd.org/changeset/ports/338676

Log:
  - Fix the logic in updating emacs.desktop file, from the regression introduced
    in r338450
  
  PR:		ports/185468
  Submitted by:	rakuco

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

Modified: head/editors/emacs-nox11/Makefile
==============================================================================
--- head/editors/emacs-nox11/Makefile	Sat Jan  4 19:46:52 2014	(r338675)
+++ head/editors/emacs-nox11/Makefile	Sat Jan  4 20:12:38 2014	(r338676)
@@ -3,7 +3,7 @@
 
 PKGNAMESUFFIX=	-nox11
 
-PORTREVISION=	9
+PORTREVISION=	10
 
 OPTIONS_EXCLUDE=GCONF GIF JPEG OTF M17N PNG SVG TIFF SYNC_INPUT GTK2 GTK3 \
 		SCROLLBARS XFT XIM XPM MAGICK GSETTINGS X11 CANNA \

Modified: head/editors/emacs/Makefile
==============================================================================
--- head/editors/emacs/Makefile	Sat Jan  4 19:46:52 2014	(r338675)
+++ head/editors/emacs/Makefile	Sat Jan  4 20:12:38 2014	(r338676)
@@ -3,7 +3,7 @@
 
 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}
-PORTREVISION?=	1
+PORTREVISION?=	2
 PORTEPOCH=	3
 CATEGORIES=	editors ipv6
 MASTER_SITES=	${MASTER_SITE_GNU}
@@ -214,7 +214,7 @@ BROKEN=	Emacs 24.X does not currently bu
 post-patch:
 	@${RM} -f ${WRKSRC}/info/*
 	@${REINPLACE_CMD} -e "s/%%EMACS_VER%%/${EMACS_VER}/g" -e "s/%%DATADIR%%/${DATADIR:C/\//\\\//g}/g" ${WRKSRC}/sources.el
-.if ${PORT_OPTIONS:MX11}
+.if !${PORT_OPTIONS:MX11}
 	@${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' ${WRKSRC}/etc/emacs.desktop
 .endif