svn commit: r510281 - head/editors/emacs

[Joseph Mingrone]

Author: jrm
Date: Fri Aug 30 17:43:53 2019
New Revision: 510281
URL: https://svnweb.freebsd.org/changeset/ports/510281

Log:
  editors/emacs: Update to version 26.3
  
  Port changes:
  
  - Remove JSON knob, because Emacs has no configurable json option in
    versions prior to and including 26.3.  The knob should not have been
    added in r472261.
  
  - Add USES+=gnome unless flavor is nox.  Do this because defining
    INSTALLS_ICONS adds USE_GNOME+=gtk-update-icon-cache.
  
  Upstream changes:
  https://www.gnu.org/software/emacs/news/NEWS.26.3
  
  Submitted by:	HIROSE Yuuji <yuuji at gentei.org> [canna patch updates]
  Differential Revision:	https://reviews.freebsd.org/D21193

Modified:
  head/editors/emacs/Makefile   (contents, props changed)
  head/editors/emacs/distinfo   (contents, props changed)

Modified: head/editors/emacs/Makefile
==============================================================================
--- head/editors/emacs/Makefile	Fri Aug 30 17:42:54 2019	(r510280)
+++ head/editors/emacs/Makefile	Fri Aug 30 17:43:53 2019	(r510281)
@@ -2,16 +2,15 @@
 # $FreeBSD$
 
 PORTNAME=	emacs
-DISTVERSION=	26.2
-PORTREVISION=	1
+DISTVERSION=	26.3
 PORTEPOCH=	3
 CATEGORIES=	editors ipv6
 MASTER_SITES=	GNU
 
 .if ${FLAVOR:U} == canna
 PATCH_DIST_STRIP=	-p1
-PATCH_SITES=	http://www.gentei.org/~yuuji/software/emacs26canna/
-PATCHFILES=	emacs26.1-canna-20180529.diff.gz
+PATCH_SITES=	https://www.gentei.org/~yuuji/software/emacs26canna/
+PATCHFILES=	emacs26.3-canna-20190828.diff.gz
 .endif
 
 MAINTAINER=	emacs at FreeBSD.org
@@ -36,7 +35,7 @@ nox_PKGNAMESUFFIX=	-nox
 
 USES=		cpe gmake localbase:ldflags makeinfo ncurses pkgconfig tar:xz
 .if ${FLAVOR:U} != nox
-USES+=		desktop-file-utils
+USES+=		desktop-file-utils xorg
 USE_XORG=	ice sm x11 xcb xext xfixes xinerama xmu xrandr xt
 .endif
 CPE_VENDOR=	gnu
@@ -73,6 +72,7 @@ INFO=		ada-mode auth autotype bovine calc ccmode cl db
 INFO_PATH=	${DATADIR_REL}/info
 .if ${FLAVOR:U} != nox
 INSTALLS_ICONS=	yes
+USES+=		gnome
 .endif
 .if ${FLAVOR:U} == canna
 PLIST_FILES+=	${DATADIR}/${DISTVERSION}/lisp/canna.el.gz \
@@ -84,11 +84,11 @@ PLIST_SUB=	EMACS_VER=${DISTVERSION} GNU_HOST=${CONFIGU
 SUB_FILES=	sources.el
 SUB_LIST=	EMACS_VER=${DISTVERSION} # sources.el
 
-OPTIONS_DEFINE=	ACL DBUS GCONF GNUTLS GSETTINGS JSON LCMS2 M17N MAILUTILS \
-		MODULES OTF SCROLLBARS SOURCES THREADS XFT XIM XML XWIDGETS
-OPTIONS_DEFAULT=	ACL DBUS GCONF GIF GNUTLS GSETTINGS GTK3 JPEG JSON \
-		KQUEUE LCMS2 M17N MAGICK MAILUTILS MODULES OSS OTF PNG \
-		SCROLLBARS SOURCES SVG THREADS TIFF XFT XIM XML XPM
+OPTIONS_DEFINE=	ACL DBUS GCONF GNUTLS GSETTINGS LCMS2 M17N MAILUTILS MODULES \
+		OTF SCROLLBARS SOURCES THREADS XFT XIM XML XWIDGETS
+OPTIONS_DEFAULT=	ACL DBUS GCONF GIF GNUTLS GSETTINGS GTK3 JPEG KQUEUE \
+		LCMS2 M17N MAGICK MAILUTILS MODULES OSS OTF PNG SCROLLBARS \
+		SOURCES SVG THREADS TIFF XFT XIM XML XPM
 OPTIONS_GROUP=	GRAPHICS
 OPTIONS_GROUP_GRAPHICS=	CAIRO GIF JPEG MAGICK PNG SVG TIFF XPM
 OPTIONS_RADIO=	FILENOTIFY SOUND X11TOOLKIT
@@ -128,38 +128,30 @@ XWIDGETS_DESC=	Experimental GTK widgets               
 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
 JPEG_CONFIGURE_WITH=	jpeg
-JSON_CONFIGURE_WITH=	json
-JSON_LIB_DEPENDS=	libjansson.so:devel/jansson
 KQUEUE_CONFIGURE_ON=	--with-file-notification=kqueue
 LCMS2_CONFIGURE_WITH=	lcms2
 LCMS2_LIB_DEPENDS=	liblcms2.so:graphics/lcms2
@@ -186,7 +178,6 @@ SCROLLBARS_CONFIGURE_WITH=	toolkit-scroll-bars
 .if ${FLAVOR:U} == canna
 SOURCES_PLIST_FILES=	${DATADIR}/${DISTVERSION}/src/canna.c
 .endif
-SVG_USES=		gnome
 SVG_USE=		GNOME=cairo,librsvg2
 SVG_CONFIGURE_WITH=	rsvg
 SVG_IMPLIES=		PNG

Modified: head/editors/emacs/distinfo
==============================================================================
--- head/editors/emacs/distinfo	Fri Aug 30 17:42:54 2019	(r510280)
+++ head/editors/emacs/distinfo	Fri Aug 30 17:43:53 2019	(r510281)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1555126448
-SHA256 (emacs-26.2.tar.xz) = 151ce69dbe5b809d4492ffae4a4b153b2778459de6deb26f35691e1281a9c58e
-SIZE (emacs-26.2.tar.xz) = 44406808
-SHA256 (emacs26.1-canna-20180529.diff.gz) = defe94426449a5d48c1b0b92c0a6051816b78dba25c600d38c06ab903d667ecb
-SIZE (emacs26.1-canna-20180529.diff.gz) = 30163
+TIMESTAMP = 1567160662
+SHA256 (emacs-26.3.tar.xz) = 4d90e6751ad8967822c6e092db07466b9d383ef1653feb2f95c93e7de66d3485
+SIZE (emacs-26.3.tar.xz) = 44415140
+SHA256 (emacs26.3-canna-20190828.diff.gz) = e320383f2a3e634633aae662c2d398d7c6ce5e66be356de32164cbea2f431e61
+SIZE (emacs26.3-canna-20190828.diff.gz) = 30163