- Update to bzr snapshot revision 116732

- Add OPTIONs for building with GnuTLS 3.x[1] (default), and GnuTLS 2.x
  support
- Remove OPTION for SYNC_INPUT (not supported)
- Add a fix when building with ncurses port being installed
- Fix CONFLICTS to pass portlint checks

PR:		ports/187346[1]

3 files changed, 65 insertions, 13 deletions

diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index ee2248ab9496..18e8e8bd25b3 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -16,13 +16,13 @@ COMMENT=	GNU editing macros
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-CONFLICTS=	emacs-19.* emacs21-* emacs22-* emacs23-* \
-		emacs24-* xemacs-[0-9]* xemacs-devel-[0-9]* \
+CONFLICTS=	emacs-19.* emacs21-[0-9]* emacs22-[0-9]* emacs23-[0-9]* \
+		emacs24-[0-9]* xemacs-[0-9]* xemacs-devel-[0-9]* \
 		xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* \
 		emacs-nox11-[0-9]*
 
 EMACS_VER=	24.3.50
-EMACS_REV=	116446
+EMACS_REV=	116732
 GNU_CONFIGURE=	yes
 USES=		ncurses pkgconfig
 USE_GMAKE=	yes
@@ -51,17 +51,16 @@ INFO=		ada-mode auth autotype bovine calc ccmode cl dbus dired-x \
 		org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve \
 		smtpmail speedbar srecode todo-mode tramp url vip viper widget wisent woman
 
-OPTIONS_DEFINE=	X11 ACL DBUS GCONF GIF JPEG M17N OTF PNG SOUND SOURCES SVG TIFF SYNC_INPUT SCROLLBARS \
+OPTIONS_DEFINE=	X11 ACL DBUS GCONF GIF JPEG M17N OTF PNG SOUND SOURCES SVG TIFF SCROLLBARS \
 		XFT XIM XML XPM MAGICK GNUTLS GSETTINGS LTO FILENOTIFY
 
-OPTIONS_SINGLE=	X11 SOUND
+OPTIONS_SINGLE=	X11 SOUND GNUTLS
 
 ACL_DESC=		ACL support
 GSETTINGS_DESC=		GSettings support
 SCROLLBARS_DESC=	Toolkit scroll-bars
 SOUND_DESC=		Sound support
 SOURCES_DESC=		Install sources
-SYNC_INPUT_DESC=	Synchronously process asynchronous input
 XAW_DESC=		Athena widgets
 XAW3D_DESC=		Athena3D widgets
 XIM_DESC=		X Input Method Support
@@ -69,12 +68,15 @@ M17N_DESC=		M17N support for text-shaping
 OTF_DESC=		Opentype fonts suport
 FILENOTIFY_DESC=	File notification support
 LTO_DESC=		Enable link-time optimization (requires GCC 4.6+)
+GNUTLS2_DESC=		GnuTLS 2.x
+GNUTLS3_DESC=		GnuTLS 3.x
 
 OPTIONS_SINGLE_X11=	GTK2 GTK3 XAW XAW3D MOTIF
 OPTIONS_SINGLE_SOUND=		ALSA OSS
+OPTIONS_SINGLE_GNUTLS=		GNUTLS2 GNUTLS3
 
-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 FILENOTIFY OSS X11
+OPTIONS_DEFAULT=ACL DBUS GCONF GIF GTK2 JPEG M17N OTF PNG SOUND SOURCES SVG TIFF \
+		SCROLLBARS XFT XIM XML XPM MAGICK GNUTLS GSETTINGS FILENOTIFY OSS X11 GNUTLS3
 
 OPTIONS_SUB=		SOURCES
 
@@ -85,9 +87,11 @@ OSS_CONFIGURE_ON=		--with-sound=oss
 DBUS_LIB_DEPENDS=		dbus-1:${PORTSDIR}/devel/dbus
 DBUS_CONFIGURE_WITH=		dbus
 
-GNUTLS_LIB_DEPENDS=	gnutls:${PORTSDIR}/security/gnutls
 GNUTLS_CONFIGURE_WITH=	gnutls
 
+GNUTLS3_LIB_DEPENDS=	gnutls:${PORTSDIR}/security/gnutls3
+GNUTLS2_LIB_DEPENDS=	gnutls:${PORTSDIR}/security/gnutls
+
 XML_USE=		GNOME=libxml2
 XML_CONFIGURE_WITH=	xml2
 
@@ -155,7 +159,7 @@ XIM_CONFIGURE_WITH=		xim
 LTO_CONFIGURE_ON=		--enable-link-time-optimization
 LTO_USE=			GCC=4.6+
 
-ACL_CONFIGURE_WITH=		acl
+ACL_CONFIGURE_OFF=		--disable-acl
 
 FILENOTIFY_CONFIGURE_ON=	--with-file-notification=gfile
 FILENOTIFY_CONFIGURE_OFF=	--without-file-notification
@@ -202,19 +206,35 @@ IGNORE=	GSettings support requires DBUS. Please run 'make config'
 
 .include <bsd.port.pre.mk>
 
+# Building with GCC 4.6+ requires it
+.if ${ncurses_ARGS} == "port"
+LDFLAGS+=	-ltinfo
+.endif
+
 .if ${ARCH} == "ia64"
 BROKEN=	Emacs 24.X does not currently build on ia64
 .endif
 
+.if ${PORT_OPTIONS:MGNUTLS3}
+GNUTLS3_RPATH=	-Wl,-rpath,${LOCALBASE}/lib/gnutls3
+.else
+GNUTLS3_RPATH=
+.endif
+
 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)
 	@${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' ${WRKSRC}/etc/emacs.desktop
 .endif
+.if ${PORT_OPTIONS:MGNUTLS3}
+	@${REINPLACE_CMD} -e '/HAVE_GNUTLS3=yes/s/gnutls >=/gnutls3 >=/' ${WRKSRC}/configure.ac
+.endif
 
 post-configure:
-	@${REINPLACE_CMD} -e "s/^\(DBUS_LIBS.*\)-pthread\(.*\)$$/\1$$(${DBUS_PTHREAD_LIBS})\2/" ${WRKSRC}/src/Makefile
+	@${REINPLACE_CMD} -e "s/^\(DBUS_LIBS.*\)-pthread\(.*\)$$/\1$$(${DBUS_PTHREAD_LIBS})\2/" \
+			  -e 's|%%GNUTLS3_RPATH%%|${GNUTLS3_RPATH}|g' \
+			  ${WRKSRC}/src/Makefile
 
 add-plist-data:
 .for i in ${EMACS_DIRS}
diff --git a/editors/emacs-devel/distinfo b/editors/emacs-devel/distinfo
index 7fb72dba8cef..710a80f49d2a 100644
--- a/editors/emacs-devel/distinfo
+++ b/editors/emacs-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (emacs-24.3.50.116446.tar.xz) = 3b68c3bea5208002ff94126ad2e6162914eabebe2fe61e7f3edb03f7c88d4104
-SIZE (emacs-24.3.50.116446.tar.xz) = 30678320
+SHA256 (emacs-24.3.50.116732.tar.xz) = b04fa64cd7a2cee8dd28f73c4e886c7963e095142a4b712bb8fbf619b307d000
+SIZE (emacs-24.3.50.116732.tar.xz) = 30661920
diff --git a/editors/emacs-devel/files/patch-src_Makefile.in b/editors/emacs-devel/files/patch-src_Makefile.in
new file mode 100644
index 000000000000..6cea350f16ee
--- /dev/null
+++ b/editors/emacs-devel/files/patch-src_Makefile.in
@@ -0,0 +1,32 @@
+
+$FreeBSD$
+
+--- src/Makefile.in.orig
++++ src/Makefile.in
+@@ -283,7 +283,7 @@
+ 
+ LIBSELINUX_LIBS = @LIBSELINUX_LIBS@
+ 
+-LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
++LIBGNUTLS_LIBS = %%GNUTLS3_RPATH%% @LIBGNUTLS_LIBS@
+ LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
+ 
+ LIB_PTHREAD_SIGMASK = @LIB_PTHREAD_SIGMASK@
+@@ -409,7 +409,7 @@
+    $(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \
+    $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(SETTINGS_LIBS) $(LIBSELINUX_LIBS) \
+    $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(LIBOTF_LIBS) $(M17N_FLT_LIBS) \
+-   $(LIBGNUTLS_LIBS) $(LIB_PTHREAD) $(LIB_PTHREAD_SIGMASK) \
++   $(LIB_PTHREAD) $(LIB_PTHREAD_SIGMASK) \
+    $(GFILENOTIFY_LIBS) $(LIB_MATH) $(LIBZ)
+ 
+ all: emacs$(EXEEXT) $(OTHER_FILES)
+@@ -489,7 +489,7 @@
+ ## to start if Vinstallation_directory has the wrong value.
+ temacs$(EXEEXT): $(LIBXMENU) $(ALLOBJS) \
+ 	         $(lib)/libgnu.a $(EMACSRES)
+-	$(CC) $(ALL_CFLAGS) $(TEMACS_LDFLAGS) $(LDFLAGS) \
++	$(CC) $(ALL_CFLAGS) $(TEMACS_LDFLAGS) $(LIBGNUTLS_LIBS) $(LDFLAGS) \
+ 	  -o temacs $(ALLOBJS) $(lib)/libgnu.a $(W32_RES_LINK) $(LIBES)
+ 	$(MKDIR_P) $(etc)
+ 	$(TEMACS_POST_LINK)