From owner-svn-ports-head@freebsd.org  Wed Aug  3 23:47:57 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 0822ABAE354;
 Wed,  3 Aug 2016 23:47:57 +0000 (UTC)
 (envelope-from marino@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 C8EF31E49;
 Wed,  3 Aug 2016 23:47:56 +0000 (UTC)
 (envelope-from marino@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u73NltSf030012;
 Wed, 3 Aug 2016 23:47:55 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u73Nltkn030011;
 Wed, 3 Aug 2016 23:47:55 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201608032347.u73Nltkn030011@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: marino set sender to
 marino@FreeBSD.org using -f
From: John Marino <marino@FreeBSD.org>
Date: Wed, 3 Aug 2016 23:47:55 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r419563 - head/misc/elscreen
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: Wed, 03 Aug 2016 23:47:57 -0000

Author: marino
Date: Wed Aug  3 23:47:55 2016
New Revision: 419563
URL: https://svnweb.freebsd.org/changeset/ports/419563

Log:
  misc/elscreen: Fix options definition / remove obsolete emacs logic
  
  The OPTIONS_DEFINE clause was positioned incorrectly after bsd.port.pre.mk
  include, breaking SELECTED_OPTIONS.  However, the <pre>/<post> inclusions
  were in place to handle emacs20, a port that's long since been removed
  from the tree.  Remove the obsolete logic which fixes the DOCS option.
  
  Approved by:	just-fix-it

Modified:
  head/misc/elscreen/Makefile

Modified: head/misc/elscreen/Makefile
==============================================================================
--- head/misc/elscreen/Makefile	Wed Aug  3 22:55:19 2016	(r419562)
+++ head/misc/elscreen/Makefile	Wed Aug  3 23:47:55 2016	(r419563)
@@ -11,15 +11,9 @@ MASTER_SITE_SUBDIR=	. old
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	GNU screen like utility on Emacsen
 
-USE_EMACS=	yes
-.include <bsd.port.pre.mk>
-.if (${EMACS_PORT_NAME} == "emacs20")
-DEPPORT_SUFFIX=	-${EMACS_PORT_NAME}
-.else
-DEPPORT_SUFFIX=
-.endif
+RUN_DEPENDS=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/emu/emu.el:editors/apel
 
-RUN_DEPENDS=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/emu/emu.el:editors/apel${DEPPORT_SUFFIX}
+USE_EMACS=	yes
 
 EMACS_NO_BUILD_DEPENDS=	YES
 NO_BUILD=	YES
@@ -32,4 +26,5 @@ do-install:
 .for i in ChangeLog README
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
-.include <bsd.port.post.mk>
+
+.include <bsd.port.mk>