Skip to content

Commit

Permalink
When dbus is already installed on FreeBSD 6.X and Emacs builds
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
gkeramidas committed May 21, 2010
1 parent f22fa4f commit 9afa2a9
Showing 2 changed files with 12 additions and 4 deletions.
8 changes: 6 additions & 2 deletions editors/emacs/Makefile
Original file line number Diff line number Diff line change
@@ -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:
8 changes: 6 additions & 2 deletions editors/emacs23/Makefile
Original file line number Diff line number Diff line change
@@ -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:

0 comments on commit 9afa2a9

Please sign in to comment.