svn commit: r419563 - head/misc/elscreen

[John Marino]

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 at 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>