summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorAdam Weinberger <adamw@FreeBSD.org>2014-07-21 17:47:52 +0000
committerAdam Weinberger <adamw@FreeBSD.org>2014-07-21 17:47:52 +0000
commite081d9b9ede78a2c05aaae34df25f8bb5ebd936f (patch)
tree319127a7ac77536c193069aa90ed4b279facdd72 /editors
parentUpdate to 5.1.0. (diff)
Remove some instances of WITHOUT_X11 and use an X11 OPTION
instead.
Notes
Notes: svn path=/head/; revision=362457
Diffstat (limited to 'editors')
-rw-r--r--editors/emacs-devel/Makefile2
-rw-r--r--editors/emacs23/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index 2f1ae5efb13f..e315673ae388 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -225,7 +225,7 @@ GNUTLS3_RPATH=
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 defined(WITHOUT_X11)
+.if empty(PORT_OPTIONS:MX11)
@${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' ${WRKSRC}/etc/emacs.desktop
.endif
.if ${PORT_OPTIONS:MGNUTLS3}
diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile
index b3155667eaba..c0798b1d2410 100644
--- a/editors/emacs23/Makefile
+++ b/editors/emacs23/Makefile
@@ -177,7 +177,7 @@ BROKEN= Emacs 23.X does not currently build on ia64
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 defined(WITHOUT_X11)
+.if empty(PORT_OPTIONS:MX11)
@${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' ${WRKSRC}/etc/emacs.desktop
.endif