1 files changed, 153 insertions, 132 deletions

diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index d685b14f6ee8..e1b8a0f7bd7c 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -9,9 +9,9 @@ CATEGORIES=	editors
 MASTER_SITES=	GNU
 
 .if ${FLAVOR:U} == canna
+PATCH_SITES=		https://www.gentei.org/~yuuji/software/emacs26canna/
+PATCHFILES=		emacs26.3-canna-20190828.diff.gz
 PATCH_DIST_STRIP=	-p1
-PATCH_SITES=	https://www.gentei.org/~yuuji/software/emacs26canna/
-PATCHFILES=	emacs26.3-canna-20190828.diff.gz
 .endif
 
 MAINTAINER=	emacs@FreeBSD.org
@@ -25,45 +25,62 @@ COMMENT+=	(Canna Japanese input flavor)
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-FLAVORS=		full canna nox
-full_CONFLICTS_INSTALL=	emacs-canna emacs-nox
+FLAVORS=			full canna nox
+canna_PKGNAMESUFFIX=		-canna
+canna_LIB_DEPENDS=		libcanna.so:japanese/canna-lib
 canna_CONFLICTS_INSTALL=	emacs emacs-nox
-canna_PKGNAMESUFFIX=	-canna
-canna_DESCR=		${.CURDIR}/pkg-descr-canna
-canna_LIB_DEPENDS=	libcanna.so:japanese/canna-lib
-nox_CONFLICTS_INSTALL=	emacs emacs-canna
-nox_PKGNAMESUFFIX=	-nox
+canna_DESCR=			${.CURDIR}/pkg-descr-canna
+full_CONFLICTS_INSTALL=		emacs-canna emacs-nox
+nox_PKGNAMESUFFIX=		-nox
+nox_CONFLICTS_INSTALL=		emacs emacs-canna
 
 USES=		cpe gmake localbase:ldflags makeinfo ncurses pkgconfig tar:xz
+CPE_VENDOR=	gnu
 .if ${FLAVOR:U} != nox
 USES+=		desktop-file-utils gnome xorg
 INSTALLS_ICONS=	yes
 USE_XORG=	ice sm x11 xcb xext xfixes xinerama xmu xrandr xt
 .endif
-CPE_VENDOR=	gnu
 
-CONFIGURE_ARGS=	--disable-build-details \
-		--localstatedir=/var \
-		--without-gpm
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS=		--disable-build-details \
+			--localstatedir=/var \
+			--without-gpm
 .if ${FLAVOR:U} == canna
 CONFIGURE_ARGS+=	--with-canna
 .endif
 .if ${FLAVOR:U} == nox
-CONFIGURE_ARGS+=	--with-sound=no --without-cairo --without-dbus \
-			--without-gconf --without-gif --without-gsettings \
-			--with-x-toolkit=no --without-jpeg --without-lcms2 \
-			--without-m17n-flt --without-imagemagick \
-			--without-libotf --without-png \
-			--without-toolkit-scroll-bars --without-rsvg \
-			--without-tiff --without-x --without-xim --without-xpm \
+CONFIGURE_ARGS+=	--with-sound=no \
+			--with-x-toolkit=no \
+			--without-cairo \
+			--without-dbus \
+			--without-gconf \
+			--without-gif \
+			--without-gsettings \
+			--without-imagemagick \
+			--without-jpeg \
+			--without-lcms2 \
+			--without-libotf \
+			--without-m17n-flt \
+			--without-png \
+			--without-rsvg \
+			--without-tiff \
+			--without-toolkit-scroll-bars \
+			--without-x \
+			--without-xim \
+			--without-xpm \
 			--without-xwidgets
 .else
 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
+
 CONFLICTS_INSTALL=	emacs-devel emacs-devel-nox
-GNU_CONFIGURE=		yes
+
+SUB_FILES=	sources.el
+SUB_LIST=	EMACS_VER=${DISTVERSION}
+
 INFO=		ada-mode auth autotype bovine calc ccmode cl dbus dired-x \
 		ebrowse ede ediff edt efaq eieio eintr elisp emacs emacs-gnutls \
 		emacs-mime epa erc ert eshell eudc eww flymake forms gnus \
@@ -75,136 +92,139 @@ INFO_PATH=	${DATADIR_REL}/info
 .if ${FLAVOR:U} == canna
 PLIST_FILES+=	${DATADIR}/${DISTVERSION}/lisp/canna.el.gz \
 		${DATADIR}/${DISTVERSION}/lisp/canna.elc \
-		${DATADIR}/${DISTVERSION}/lisp/isearch-ext.el.gz	\
+		${DATADIR}/${DISTVERSION}/lisp/isearch-ext.el.gz \
 		${DATADIR}/${DISTVERSION}/lisp/isearch-ext.elc
 .endif
-PLIST_SUB=	EMACS_VER=${DISTVERSION} GNU_HOST=${CONFIGURE_TARGET}
-SUB_FILES=	sources.el
-SUB_LIST=	EMACS_VER=${DISTVERSION} # sources.el
-
-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
+PLIST_SUB=	EMACS_VER=${DISTVERSION} \
+		GNU_HOST=${CONFIGURE_TARGET}
+
+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
 OPTIONS_RADIO_FILENOTIFY=	GFILE KQUEUE
-OPTIONS_RADIO_SOUND=	ALSA OSS
+OPTIONS_RADIO_SOUND=		ALSA OSS
 OPTIONS_RADIO_X11TOOLKIT=	GTK2 GTK3 MOTIF XAW XAW3D
-
 .if ${FLAVOR:U} == nox
-OPTIONS_EXCLUDE=	ALSA CAIRO DBUS GCONF GFILE GIF GSETTINGS GTK2 GTK3 \
-			JPEG LCMS2 M17N MAGICK MOTIF OSS OTF PNG SCROLLBARS SVG \
-			TIFF XAW XAW3D XFT XIM XPM XWIDGETS
+OPTIONS_EXCLUDE=		ALSA CAIRO DBUS GCONF GFILE GIF GSETTINGS GTK2 \
+				GTK3 JPEG LCMS2 M17N MAGICK MOTIF OSS OTF PNG \
+				SCROLLBARS SVG TIFF XAW XAW3D XFT XIM XPM \
+				XWIDGETS
 .endif
-OPTIONS_SUB=	YES
+OPTIONS_SUB=			YES
 
-ACL_DESC=	Access control list support
-CAIRO_DESC=	Experimental Cairo library support  [implies PNG, XFT]
+ACL_DESC=		Access control list support
+CAIRO_DESC=		Experimental Cairo library support [implies PNG, XFT]
 FILENOTIFY_DESC=	File notification support
-GFILE_DESC=	File notification via gfile
-GRAPHICS_DESC=	Graphics support
-GSETTINGS_DESC=	GSettings API for application settings
-KQUEUE_DESC=	File notification via kqueue
-#LTO_DESC=	Enable link-time optimization
-M17N_DESC=	M17N support for text-shaping       [implies XFT]
-MAILUTILS_DESC=	Mail framework via GNU Mailutils
-MODULES_DESC=	Dynamic modules support
-OTF_DESC=	Opentype fonts                      [implies XFT]
+GFILE_DESC=		File notification via gfile
+GRAPHICS_DESC=		Graphics support
+GSETTINGS_DESC=		GSettings API for application settings
+KQUEUE_DESC=		File notification via kqueue
+#LTO_DESC=		Enable link-time optimization
+M17N_DESC=		M17N support for text-shaping [implies XFT]
+MAILUTILS_DESC=		Mail framework via GNU Mailutils
+MODULES_DESC=		Dynamic modules support
+OTF_DESC=		Opentype fonts [implies XFT]
 SCROLLBARS_DESC=	Toolkit scroll-bars
-SOURCES_DESC=	Install sources
-SVG_DESC=	Scalable vector graphics support    [implies PNG]
+SOURCES_DESC=		Install sources
+SVG_DESC=		Scalable vector graphics support [implies PNG]
 X11TOOLKIT_DESC=	X11 toolkit
-XAW3D_DESC=	Athena3D widgets
-XAW_DESC=	Athena widgets
-XIM_DESC=	X Input Method
-XWIDGETS_DESC=	Experimental GTK widgets            [implies GTK3]
-
-ACL_CONFIGURE_ENABLE=	acl
-ALSA_CONFIGURE_ON=	--with-sound=alsa
-ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
-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_USE=		GNOME=gconf2
-GCONF_CONFIGURE_WITH=	gconf
-GFILE_CONFIGURE_ON=	--with-file-notification=gfile
-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_USE=		GNOME=glib20
+XAW3D_DESC=		Athena3D widgets
+XAW_DESC=		Athena widgets
+XIM_DESC=		X Input Method
+XWIDGETS_DESC=		Experimental GTK widgets [implies GTK3]
+
+ACL_CONFIGURE_ENABLE=		acl
+ALSA_LIB_DEPENDS=		libasound.so:audio/alsa-lib
+ALSA_CONFIGURE_ON=		--with-sound=alsa
+CAIRO_IMPLIES=			PNG XFT
+CAIRO_USE=			GNOME=cairo
+CAIRO_CONFIGURE_WITH=		cairo
+DBUS_LIB_DEPENDS=		libdbus-1.so:devel/dbus
+DBUS_CONFIGURE_WITH=		dbus
+GCONF_USE=			GNOME=gconf2
+GCONF_CONFIGURE_WITH=		gconf
+GFILE_USE=			GNOME=glib20
+GFILE_CONFIGURE_ON=		--with-file-notification=gfile
+GIF_LIB_DEPENDS=		libgif.so:graphics/giflib
+GIF_CONFIGURE_WITH=		gif
+GNUTLS_LIB_DEPENDS=		libgnutls.so:security/gnutls
+GNUTLS_CONFIGURE_WITH=		gnutls
+GSETTINGS_IMPLIES=		DBUS
+GSETTINGS_USE=			GNOME=glib20
 GSETTINGS_CONFIGURE_WITH=	gsettings
-GSETTINGS_IMPLIES=	DBUS
-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_USE=		GNOME=cairo,gtk30
-GTK3_CONFIGURE_ON=	--with-x-toolkit=gtk3
-JPEG_USES=		jpeg
-JPEG_CONFIGURE_WITH=	jpeg
-KQUEUE_CONFIGURE_ON=	--with-file-notification=kqueue
-LCMS2_CONFIGURE_WITH=	lcms2
-LCMS2_LIB_DEPENDS=	liblcms2.so:graphics/lcms2
-#LTO_CONFIGURE_ON=	--enable-link-time-optimization
-M17N_LIB_DEPENDS=	libm17n.so:devel/m17n-lib
-M17N_CONFIGURE_WITH=	m17n-flt
-M17N_IMPLIES=		XFT
-MAGICK_LIB_DEPENDS=	libMagickCore-6.so:graphics/ImageMagick6
-MAGICK_CONFIGURE_WITH=	imagemagick
+GTK2_LIB_DEPENDS=		libfontconfig.so:x11-fonts/fontconfig \
+				libfreetype.so:print/freetype2
+GTK2_USE=			GNOME=cairo,gtk20
+GTK2_CONFIGURE_ON=		--with-x-toolkit=gtk2
+GTK3_USE=			GNOME=cairo,gtk30
+GTK3_CONFIGURE_ON=		--with-x-toolkit=gtk3
+JPEG_USES=			jpeg
+JPEG_CONFIGURE_WITH=		jpeg
+KQUEUE_CONFIGURE_ON=		--with-file-notification=kqueue
+LCMS2_LIB_DEPENDS=		liblcms2.so:graphics/lcms2
+LCMS2_CONFIGURE_WITH=		lcms2
+#LTO_CONFIGURE_ON=		--enable-link-time-optimization
+M17N_IMPLIES=			XFT
+M17N_LIB_DEPENDS=		libm17n.so:devel/m17n-lib
+M17N_CONFIGURE_WITH=		m17n-flt
+MAGICK_LIB_DEPENDS=		libMagickCore-6.so:graphics/ImageMagick6
+MAGICK_CONFIGURE_WITH=		imagemagick
+MAILUTILS_LIB_DEPENDS=		libmailutils.so:mail/mailutils
 MAILUTILS_CONFIGURE_WITH=	mailutils
-MAILUTILS_CONFIGURE_ENV_OFF=	ac_cv_prog_liblockfile=no ac_cv_lib_lockfile_maillock=no
-MAILUTILS_LIB_DEPENDS=	libmailutils.so:mail/mailutils
-MODULES_CONFIGURE_WITH=	modules
-MOTIF_USES=		motif
-MOTIF_CONFIGURE_ON=	--with-x-toolkit=motif
-OSS_CONFIGURE_ON=	--with-sound=oss
-OTF_LIB_DEPENDS=	libotf.so:print/libotf
-OTF_CONFIGURE_WITH=	libotf
-OTF_IMPLIES=		XFT
-PNG_LIB_DEPENDS=	libpng.so:graphics/png
-PNG_CONFIGURE_WITH=	png
+MAILUTILS_CONFIGURE_ENV_OFF=	ac_cv_lib_lockfile_maillock=no \
+				ac_cv_prog_liblockfile=no
+MODULES_CONFIGURE_WITH=		modules
+MOTIF_USES=			motif
+MOTIF_CONFIGURE_ON=		--with-x-toolkit=motif
+OSS_CONFIGURE_ON=		--with-sound=oss
+OTF_IMPLIES=			XFT
+OTF_LIB_DEPENDS=		libotf.so:print/libotf
+OTF_CONFIGURE_WITH=		libotf
+PNG_LIB_DEPENDS=		libpng.so:graphics/png
+PNG_CONFIGURE_WITH=		png
 SCROLLBARS_CONFIGURE_WITH=	toolkit-scroll-bars
 .if ${FLAVOR:U} == canna
-SOURCES_PLIST_FILES=	${DATADIR}/${DISTVERSION}/src/canna.c
+SOURCES_PLIST_FILES=		${DATADIR}/${DISTVERSION}/src/canna.c
 .endif
-SVG_USE=		GNOME=cairo,librsvg2
-SVG_CONFIGURE_WITH=	rsvg
-SVG_IMPLIES=		PNG
-THREADS_CONFIGURE_WITH=	threads
-TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
-TIFF_CONFIGURE_WITH=	tiff
-XAW_USE=		XORG=xaw
-XAW_CONFIGURE_ON=	--with-x-toolkit=athena --without-xaw3d
-XAW3D_LIB_DEPENDS=	libXaw3d.so:x11-toolkits/Xaw3d
-XAW3D_CONFIGURE_ON=	--with-x-toolkit=athena
-XFT_USE=		XORG=xft,xrender
-XFT_CONFIGURE_WITH=	xft
-XFT_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
-			libfreetype.so:print/freetype2
-XIM_CONFIGURE_WITH=	xim
-XML_USES=		gnome # portlint complains, but necessary for nox flavor
-XML_USE=		GNOME=libxml2
-XML_CONFIGURE_WITH=	xml2
-XPM_USE=		XORG=xpm
-XPM_CONFIGURE_WITH=	xpm
-XWIDGETS_USE=		XORG=xcomposite
+SVG_IMPLIES=			PNG
+SVG_USE=			GNOME=cairo,librsvg2
+SVG_CONFIGURE_WITH=		rsvg
+THREADS_CONFIGURE_WITH=		threads
+TIFF_LIB_DEPENDS=		libtiff.so:graphics/tiff
+TIFF_CONFIGURE_WITH=		tiff
+XAW3D_LIB_DEPENDS=		libXaw3d.so:x11-toolkits/Xaw3d
+XAW3D_CONFIGURE_ON=		--with-x-toolkit=athena
+XAW_USE=			XORG=xaw
+XAW_CONFIGURE_ON=		--with-x-toolkit=athena \
+				--without-xaw3d
+XFT_LIB_DEPENDS=		libfontconfig.so:x11-fonts/fontconfig \
+				libfreetype.so:print/freetype2
+XFT_USE=			XORG=xft,xrender
+XFT_CONFIGURE_WITH=		xft
+XIM_CONFIGURE_WITH=		xim
+XML_USES=			gnome # portlint complains, but use for nox
+XML_USE=			GNOME=libxml2
+XML_CONFIGURE_WITH=		xml2
+XPM_USE=			XORG=xpm
+XPM_CONFIGURE_WITH=		xpm
+XWIDGETS_IMPLIES=		GTK3
+XWIDGETS_LIB_DEPENDS=		libsoup-2.4.so:devel/libsoup \
+				libwebkit2gtk-4.0.so:www/webkit2-gtk3
+XWIDGETS_USE=			XORG=xcomposite
 XWIDGETS_CONFIGURE_WITH=	xwidgets
-XWIDGETS_LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
-			libsoup-2.4.so:devel/libsoup
-XWIDGETS_IMPLIES=	GTK3
 
 .include <bsd.port.options.mk>
 
 # has graphics/ImageMagick been compiled with OPENMP?
 .if ${PORT_OPTIONS:MMAGICK} && ${:!${GREP} -sc " \-fopenmp " ${LOCALBASE}/libdata/pkgconfig/ImageMagick.pc || true!} == "1"
-USES+=	compiler:openmp
+USES+=		compiler:openmp
 .endif
 
 .if !${PORT_OPTIONS:MGTK2} && !${PORT_OPTIONS:MGTK3} && !${PORT_OPTIONS:MMOTIF} \
@@ -220,6 +240,9 @@ post-patch:
 	@${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' ${WRKSRC}/etc/emacs.desktop
 .endif
 
+post-install:
+	@${RM} -r ${STAGEDIR}${PREFIX}/lib/systemd
+
 post-install-MAILUTILS-on:
 	${LN} -sf ${PREFIX}/bin/movemail \
 		${STAGEDIR}${PREFIX}/libexec/emacs/${DISTVERSION}/${CONFIGURE_TARGET}
@@ -229,7 +252,5 @@ post-install-SOURCES-on:
 	${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${STAGEDIR}${DATADIR}/${DISTVERSION}/src
 	${INSTALL_DATA} ${WRKDIR}/sources.el ${STAGEDIR}${DATADIR}/${DISTVERSION}/site-lisp/site-start.el
 
-post-install:
-	@${RM} -r ${STAGEDIR}${PREFIX}/lib/systemd
 
 .include <bsd.port.mk>