svn commit: r312553 - head/editors/emacs-devel

[Ashish SHUKLA]

Author: ashish
Date: Tue Feb 19 10:09:45 2013
New Revision: 312553
URL: http://svnweb.freebsd.org/changeset/ports/312553

Log:
  - Update to bzr snapshot 111818
  - Add OPTION for ACL support
  - Make GSETTINGS option depend on DBUS option, as GSettings requires
    DBus to be functional

Modified:
  head/editors/emacs-devel/Makefile
  head/editors/emacs-devel/distinfo

Modified: head/editors/emacs-devel/Makefile
==============================================================================
--- head/editors/emacs-devel/Makefile	Tue Feb 19 09:49:30 2013	(r312552)
+++ head/editors/emacs-devel/Makefile	Tue Feb 19 10:09:45 2013	(r312553)
@@ -7,7 +7,6 @@
 
 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}.${EMACS_REV}
-PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	editors ipv6
 MASTER_SITES=	http://distfiles.pirateparty.in/%SUBDIR%/ \
@@ -28,7 +27,7 @@ CONFLICTS=	emacs-19.* emacs-21.* emacs-2
 		emacs-nox11-[0-9]*
 
 EMACS_VER=	24.3.50
-EMACS_REV=	111312
+EMACS_REV=	111818
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_NCURSES=	yes
@@ -49,19 +48,20 @@ PLIST_SUB=	EMACS_VER=${EMACS_VER}
 
 MAKE_ENV=	LC_ALL=C
 
-INFO=		ada-mode auth autotype calc ccmode cl dbus dired-x \
+INFO=		ada-mode auth autotype bovine calc ccmode cl dbus dired-x \
 		ebrowse ede ediff edt efaq eieio eintr elisp emacs-mime emacs-gnutls emacs epa \
-		erc ert eshell eudc flymake forms gnus idlwave info \
+		erc ert eshell eudc flymake forms gnus htmlfontify idlwave info \
 		mairix-el message mh-e newsticker nxml-mode \
 		org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve \
-		smtpmail speedbar tramp url vip viper widget woman
+		smtpmail speedbar srecode tramp url vip viper widget wisent woman
 
 LATEST_LINK=	emacs-devel
-OPTIONS_DEFINE=	DBUS GCONF GIF JPEG M17N OTF PNG SOUND SOURCES SVG TIFF SYNC_INPUT SCROLLBARS XFT \
-		XIM XML XPM MAGICK GNUTLS GSETTINGS LTO
+OPTIONS_DEFINE=	ACL DBUS GCONF GIF JPEG M17N OTF PNG SOUND SOURCES SVG TIFF SYNC_INPUT SCROLLBARS \
+		XFT XIM XML XPM MAGICK GNUTLS GSETTINGS LTO
 
 OPTIONS_SINGLE=	X11TOOLKIT
 
+ACL_DESC=		ACL support
 GSETTINGS_DESC=		GSettings support
 SCROLLBARS_DESC=	Toolkit scroll-bars
 SOUND_DESC=		Sound support
@@ -76,7 +76,7 @@ LTO_DESC=		Enable link-time optimization
 
 OPTIONS_SINGLE_X11TOOLKIT=	GTK2 GTK3 XAW XAW3D MOTIF
 
-OPTIONS_DEFAULT=DBUS GCONF GIF GTK2 JPEG M17N OTF PNG SOUND SOURCES SVG TIFF SYNC_INPUT \
+OPTIONS_DEFAULT=ACL DBUS GCONF GIF GTK2 JPEG M17N OTF PNG SOUND SOURCES SVG TIFF SYNC_INPUT \
 		SCROLLBARS XFT XIM XML XPM MAGICK GNUTLS GSETTINGS
 
 .include <bsd.port.options.mk>
@@ -216,6 +216,9 @@ LIB_DEPENDS+=	dbus-1:${PORTSDIR}/devel/d
 CONFIGURE_ARGS+=	--with-dbus
 .else
 CONFIGURE_ARGS+=	--without-dbus
+.if ${PORT_OPTIONS:MGSETTINGS}
+IGNORE=	GSettings support requires DBUS. Please run 'make config'
+.endif
 .endif
 
 .if ${PORT_OPTIONS:MXML}
@@ -237,6 +240,12 @@ USE_GCC=	4.6+
 CONFIGURE_ARGS+=	--enable-link-time-optimization
 .endif
 
+.if ${PORT_OPTIONS:MACL}
+CONFIGURE_ARGS+=	--with-acl
+.else
+CONFIGURE_ARGS+=	--without-acl
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "ia64"

Modified: head/editors/emacs-devel/distinfo
==============================================================================
--- head/editors/emacs-devel/distinfo	Tue Feb 19 09:49:30 2013	(r312552)
+++ head/editors/emacs-devel/distinfo	Tue Feb 19 10:09:45 2013	(r312553)
@@ -1,2 +1,2 @@
-SHA256 (emacs-24.3.50.111312.tar.xz) = 1fa8d78640de16c4f14f84ae8baffaf47cf6ec305e4e07ab13e96c823717a757
-SIZE (emacs-24.3.50.111312.tar.xz) = 31610424
+SHA256 (emacs-24.3.50.111818.tar.xz) = 81078efd9313414c86bcd4352d11b0ee309d17f413eaf0a4643e09669febac73
+SIZE (emacs-24.3.50.111818.tar.xz) = 31767196