On Sat, 22 May 2010 14:15:20 +0900, Hajimu UMEMOTO <u...@freebsd.org> wrote: >>>>>> On Fri, 21 May 2010 19:51:04 +0000 (UTC) >>>>>> Giorgos Keramidas <keram...@freebsd.org> said: > > keramida> keramida 2010-05-21 19:51:04 UTC > > keramida> FreeBSD ports repository (doc committer) > > keramida> Modified files: > keramida> editors/emacs Makefile > keramida> Log: > keramida> When dbus is already installed on FreeBSD 6.X and Emacs builds > keramida> without X11 support, it may pick dbus up as a dependency and fail > keramida> to link with the proper threading libraries. > keramida> > keramida> Approved by: Ashish SHUKLA <wahj...@gmail.com> (maintainer) > keramida> > keramida> Revision Changes Path > keramida> 1.95 +6 -2 ports/editors/emacs/Makefile > >> -PORTEPOCH= 1 >> +PORTEPOCH= 2 > > It seems that bumping PORTREVISION is appropriate here, next time.
Thank you UMEMOTO-san!
Does this patch look ok?
%%%
Index: emacs/Makefile
===================================================================
RCS file: /home/pcvs/ports/editors/emacs/Makefile,v
retrieving revision 1.95
diff -u -r1.95 Makefile
--- emacs/Makefile 21 May 2010 19:51:04 -0000 1.95
+++ emacs/Makefile 22 May 2010 05:51:21 -0000
@@ -7,7 +7,7 @@
PORTNAME= emacs
PORTVERSION= ${EMACS_VER}
-PORTEPOCH= 2
+PORTREVISION= 1
CATEGORIES= editors ipv6
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ${PORTNAME}
Index: emacs-nox11/Makefile
===================================================================
RCS file: /home/pcvs/ports/editors/emacs-nox11/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- emacs-nox11/Makefile 21 May 2010 19:49:46 -0000 1.3
+++ emacs-nox11/Makefile 22 May 2010 05:51:21 -0000
@@ -11,6 +11,8 @@
MASTERDIR= ${.CURDIR}/../emacs
LATEST_LINK= emacs-nox11
+.include <bsd.port.pre.mk>
+
.if ${OSVERSION} < 700000 && defined(WITH_DBUS)
BROKEN= Does not currently build with dbus support
.endif
%%%
pgpxyz3QUa4Tl.pgp
Description: PGP signature
