summaryrefslogtreecommitdiff
path: root/editors/emacs
diff options
context:
space:
mode:
authorGiorgos Keramidas <keramida@FreeBSD.org>2010-05-21 19:51:04 +0000
committerGiorgos Keramidas <keramida@FreeBSD.org>2010-05-21 19:51:04 +0000
commit9afa2a9afa26c51914c9ac1c5358a11b65fef924 (patch)
treec0d5c5a902d72b125890c45f8dd4ebfaf71264a3 /editors/emacs
parentWhen dbus is already installed on FreeBSD 6.X emacs-nox11 may (diff)
When dbus is already installed on FreeBSD 6.X and Emacs builds
without X11 support, it may pick dbus up as a dependency and fail to link with the proper threading libraries. Approved by: Ashish SHUKLA <wahjava@gmail.com> (maintainer)
Notes
Notes: svn path=/head/; revision=254746
Diffstat (limited to 'editors/emacs')
-rw-r--r--editors/emacs/Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 68fa15eb01d3..2f4196d8acc9 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= emacs
PORTVERSION= ${EMACS_VER}
-PORTEPOCH= 1
+PORTEPOCH= 2
CATEGORIES= editors ipv6
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -209,7 +209,11 @@ PLIST_SUB+= SOURCES=""
.endif
.if ${ARCH} == "ia64"
-BROKEN= Emacs 22.X does not currently build on ia64
+BROKEN= Emacs 23.X does not currently build on ia64
+.endif
+
+.if ${OSVERSION} < 700000 && defined(WITHOUT_X11) && defined(WITH_DBUS)
+BROKEN= Does not currently build with dbus support but without X11
.endif
post-patch: