aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Marino <marino@FreeBSD.org>2016-08-03 23:47:55 +0000
committerJohn Marino <marino@FreeBSD.org>2016-08-03 23:47:55 +0000
commit98bdc51ed144025c2db05593024aeb6976776834 (patch)
treedd8c2a38342efbfa6c376afaa7ac827dd6a620ac
parentcd287333289c27408d335519c9961d2eeaad41ce (diff)
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
Notes
Notes: svn path=/head/; revision=419563
-rw-r--r--misc/elscreen/Makefile13
1 files changed, 4 insertions, 9 deletions
diff --git a/misc/elscreen/Makefile b/misc/elscreen/Makefile
index 6c9b963467a5..45706f2aa93e 100644
--- a/misc/elscreen/Makefile
+++ b/misc/elscreen/Makefile
@@ -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>