editors/emacs-devel: Fix build on 10.4 and update

Recent changes in upstream's master branch mean a newer makeinfo than is
available in the 10.4 base system is required, so add print/texinfo to
BUILD_DEPENDS.

While here, also update to the tip of upstream's master branch and silence
portlint warnings about USE_GNOME without USES=gnome.

Reported by:	pkg-fallout, antoine

3 files changed, 14 insertions, 20 deletions

diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index 43f0b3266df4..f89043340c96 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -16,6 +16,7 @@ COMMENT+=	(No X flavor)
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+BUILD_DEPENDS=	texinfo>=6.5,1:print/texinfo
 LIB_DEPENDS=	libgmp.so:math/gmp
 
 FLAVORS=		full nox
@@ -23,8 +24,7 @@ full_CONFLICTS_INSTALL=	emacs-devel-nox
 nox_CONFLICTS_INSTALL=	emacs-devel
 nox_PKGNAMESUFFIX=	-devel-nox
 
-USES=		autoreconf:build cpe gmake localbase:ldflags makeinfo ncurses \
-		pkgconfig
+USES=		autoreconf:build cpe gmake localbase:ldflags ncurses pkgconfig
 .if ${FLAVOR:U} != nox
 USES+=		desktop-file-utils
 USE_XORG=	ice sm x11 xcb xext xfixes xinerama xmu xrandr xt
@@ -32,7 +32,7 @@ USE_XORG=	ice sm x11 xcb xext xfixes xinerama xmu xrandr xt
 CPE_VENDOR=	gnu
 USE_GITHUB=	yes
 GH_ACCOUNT=	emacs-mirror
-GH_TAGNAME=	a0605d9
+GH_TAGNAME=	93fe420
 
 CONFIGURE_ARGS=	--disable-build-details \
 		--localstatedir=/var \
@@ -54,7 +54,7 @@ CONFIGURE_ARGS+=	--with-sound=no --without-cairo --without-dbus \
 CONFIGURE_ARGS+=	--with-x
 .endif
 # See r468320 to determine if/when the next line can be removed
-CONFIGURE_ENV=	ac_cv_header_sys_sysinfo_h=no
+CONFIGURE_ENV=	ac_cv_header_sys_sysinfo_h=no MAKEINFO=${LOCALBASE}/bin/makeinfo
 CONFLICTS_INSTALL=	emacs emacs-canna emacs-nox
 GNU_CONFIGURE=	yes
 INFO=		ada-mode auth autotype bovine calc ccmode cl dbus dired-x \
@@ -116,26 +116,32 @@ XWIDGETS_DESC=	Experimental GTK widgets               (requires GTK3)
 ACL_CONFIGURE_ENABLE=	acl
 ALSA_CONFIGURE_ON=	--with-sound=alsa
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
+CAIRO_USES=		gnome
 CAIRO_USE=		GNOME=cairo
 CAIRO_CONFIGURE_WITH=	cairo
 CAIRO_IMPLIES=		PNG XFT
 DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_CONFIGURE_WITH=	dbus
+GCONF_USES=		gnome
 GCONF_USE=		GNOME=gconf2
 GCONF_CONFIGURE_WITH=	gconf
 GFILE_CONFIGURE_ON=	--with-file-notification=gfile
+GFILE_USES=		gnome
 GFILE_USE=		GNOME=glib20
 GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
 GIF_CONFIGURE_WITH=	gif
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_WITH=	gnutls
+GSETTINGS_USES=		gnome
 GSETTINGS_USE=		GNOME=glib20
 GSETTINGS_CONFIGURE_WITH=	gsettings
 GSETTINGS_IMPLIES=	DBUS
+GTK2_USES=		gnome
 GTK2_USE=		GNOME=cairo,gtk20
 GTK2_CONFIGURE_ON=	--with-x-toolkit=gtk2
 GTK2_LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 			libfontconfig.so:x11-fonts/fontconfig
+GTK3_USES=		gnome
 GTK3_USE=		GNOME=cairo,gtk30
 GTK3_CONFIGURE_ON=	--with-x-toolkit=gtk3
 JPEG_USES=		jpeg
@@ -191,7 +197,7 @@ XWIDGETS_LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
 XWIDGETS_IMPLIES=	GTK3
 
 EMACS_VER=	27.0.50
-EMACS_REV=	20181008
+EMACS_REV=	20181011
 
 .include <bsd.port.options.mk>
 
diff --git a/editors/emacs-devel/distinfo b/editors/emacs-devel/distinfo
index 3ccbc15e329e..545c12879c84 100644
--- a/editors/emacs-devel/distinfo
+++ b/editors/emacs-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1539009297
-SHA256 (emacs-mirror-emacs-27.0.50.20181008-a0605d9_GH0.tar.gz) = 24b74b9ee704f34633768967719cfdb8ba2b5a25887fc7c2fa9cb5f99f343e85
-SIZE (emacs-mirror-emacs-27.0.50.20181008-a0605d9_GH0.tar.gz) = 40334018
+TIMESTAMP = 1539224595
+SHA256 (emacs-mirror-emacs-27.0.50.20181011-93fe420_GH0.tar.gz) = eb0ebd7b850b568aa8af4e05b752740d0d7b3e3f18364e0f809b2fd7f4283294
+SIZE (emacs-mirror-emacs-27.0.50.20181011-93fe420_GH0.tar.gz) = 40332761
diff --git a/editors/emacs-devel/files/patch-configure.ac b/editors/emacs-devel/files/patch-configure.ac
deleted file mode 100644
index 2dc44ce5cb0a..000000000000
--- a/editors/emacs-devel/files/patch-configure.ac
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.ac.orig	2017-09-03 12:54:18 UTC
-+++ configure.ac
-@@ -1251,7 +1251,8 @@ AC_SUBST([PAXCTL_notdumped])
- ## Require makeinfo >= 4.13 (last of the 4.x series) to build the manuals.
- if test "${MAKEINFO:=makeinfo}" != "no"; then
-   case `($MAKEINFO --version) 2>/dev/null` in
--    *' (GNU texinfo) '4.1[[3-9]]* | \
-+    *' (GNU texinfo) '4.[[8-9]]* | \  
-+    *' (GNU texinfo) '4.1[[0-9]]* | \
-     *' (GNU texinfo) '[[5-9]]* | \
-     *' (GNU texinfo) '[[1-9][0-9]]* ) ;;
-     *) MAKEINFO=no;;