Date: Sun, 25 Dec 2016 04:52:42 +0000 (UTC) From: Joseph Mingrone <jrm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r429394 - in head: Mk editors/emacs-devel Message-ID: <201612250452.uBP4qgBn017421@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jrm Date: Sun Dec 25 04:52:41 2016 New Revision: 429394 URL: https://svnweb.freebsd.org/changeset/ports/429394 Log: editors/emacs-devel: Update to pull in new concurrency features. - Minimize the differences with editors/emacs. - Do not require GCC to work around a clang bug. The OS versions for which this was relevant are no longer supported. - The check for X11 is handled with the X11 option and _IMPLIES, so remove the redundant .if logic. Approved by: swills (mentor) asish (maintainer) Differential Revision: https://reviews.freebsd.org/D8796 Modified: head/Mk/bsd.emacs.mk head/editors/emacs-devel/Makefile head/editors/emacs-devel/distinfo head/editors/emacs-devel/pkg-plist Modified: head/Mk/bsd.emacs.mk ============================================================================== --- head/Mk/bsd.emacs.mk Sun Dec 25 04:23:34 2016 (r429393) +++ head/Mk/bsd.emacs.mk Sun Dec 25 04:52:41 2016 (r429394) @@ -80,11 +80,11 @@ DESCR?= ${PKGDIR}/pkg-descr.${EMACS_PO PLIST?= ${PKGDIR}/pkg-plist.${EMACS_PORT_NAME} .endif -# Emacs-25.x (development version) +# Emacs-26.x (development version) .elif (${EMACS_PORT_NAME} == "emacs-devel") EMACS_NAME= emacs -EMACS_VER= 25.2.50 -EMACS_MAJOR_VER= 25 +EMACS_VER= 26.0.50 +EMACS_MAJOR_VER= 26 EMACS_LIBDIR?= share/${EMACS_NAME} EMACS_LIBDIR_WITH_VER?= share/${EMACS_NAME}/${EMACS_VER} EMACS_PORTDIR= editors/emacs-devel Modified: head/editors/emacs-devel/Makefile ============================================================================== --- head/editors/emacs-devel/Makefile Sun Dec 25 04:23:34 2016 (r429393) +++ head/editors/emacs-devel/Makefile Sun Dec 25 04:52:41 2016 (r429394) @@ -3,7 +3,6 @@ PORTNAME= emacs DISTVERSION= ${EMACS_VER}.${EMACS_REV} -PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= editors ipv6 PKGNAMESUFFIX= -devel @@ -11,25 +10,24 @@ PKGNAMESUFFIX= -devel MAINTAINER= ashish@FreeBSD.org COMMENT= GNU editing macros -LICENSE= GPLv3 +LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING CONFLICTS= emacs25-[0-9]* emacs-nox11-[0-9]* USE_GITHUB= yes GH_ACCOUNT= emacs-mirror -GH_TAGNAME= 25dca60d +GH_TAGNAME= 2dae636 -EMACS_VER= 25.2.50 -EMACS_REV= 20161001 +EMACS_VER= 26.0.50 +EMACS_REV= 20161225 GNU_CONFIGURE= yes USES= autoreconf cpe gmake makeinfo ncurses pkgconfig INFO_PATH= ${DATADIR_REL}/info CPE_VENDOR= gnu -SUB_FILES+= sources.el -SUB_LIST+= ARCHLIBDIR=${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET} -SUB_LIST+= EMACS_VER=${EMACS_VER} +SUB_FILES= sources.el +SUB_LIST= EMACS_VER=${EMACS_VER} CONFIGURE_ARGS= --localstatedir=/var \ --with-gameuser=games:games @@ -45,18 +43,21 @@ INFO= ada-mode auth autotype bovine calc rcirc reftex remember sasl sc semantic ses sieve smtpmail speedbar \ srecode todo-mode tramp url vhdl-mode vip viper widget wisent woman -OPTIONS_DEFINE= ACL DBUS GNUTLS LLDB MODULES SOURCES X11 XML +OPTIONS_DEFINE= ACL DBUS GNUTLS LLDB MODULES SOURCES THREADS X11 XML OPTIONS_RADIO= FILENOTIFY SOUND X11TOOLKIT OPTIONS_RADIO_FILENOTIFY= GFILE KQUEUE OPTIONS_RADIO_SOUND= ALSA OSS OPTIONS_RADIO_X11TOOLKIT= GTK2 GTK3 MOTIF XAW XAW3D - OPTIONS_GROUP= GRAPHICS NEEDX11 OPTIONS_GROUP_GRAPHICS= CAIRO GIF JPEG MAGICK PNG SVG TIFF XPM OPTIONS_GROUP_NEEDX11= GCONF GSETTINGS M17N OTF SCROLLBARS XFT XIM \ XWIDGETS +OPTIONS_DEFAULT= ACL DBUS FREEDESKTOP GCONF GIF GNUTLS GSETTINGS GTK2 \ + JPEG KQUEUE M17N MAGICK MODULES OSS OTF PNG SCROLLBARS \ + SOURCES SVG THREADS TIFF X11 XFT XIM XML XPM + ACL_DESC= Access control list support CAIRO_DESC= Experimental Cairo support (implies PNG, XFT) FILENOTIFY_DESC=File notification support @@ -75,6 +76,7 @@ OTF_DESC= Opentype fonts support SCROLLBARS_DESC=Toolkit scroll-bars SOURCES_DESC= Install sources SVG_DESC= SVG support (implies PNG) +THREADS_DESC= Emacs Lisp threading support X11_DESC= X11 support X11TOOLKIT_DESC=X11 toolkit (each implies X11) XAW3D_DESC= Athena3D widgets @@ -82,179 +84,111 @@ XAW_DESC= Athena widgets XIM_DESC= X Input Method Support XWIDGETS_DESC= GTK widgets in Emacs buffers (requires GTK3) -OPTIONS_DEFAULT=ACL DBUS FREEDESKTOP GCONF GIF GNUTLS GSETTINGS GTK2 JPEG \ - KQUEUE M17N MAGICK MODULES OSS OTF PNG SCROLLBARS SOURCES SVG \ - TIFF X11 XFT XIM XML XPM - OPTIONS_SUB= YES 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 X11 - DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus DBUS_CONFIGURE_WITH= dbus - GCONF_USE= GNOME=gconf2 GCONF_CONFIGURE_WITH= gconf GCONF_IMPLIES= X11 - GFILE_CONFIGURE_ON= --with-file-notification=gfile - GIF_LIB_DEPENDS= libgif.so:graphics/giflib GIF_CONFIGURE_WITH= gif GIF_IMPLIES= X11 - GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GNUTLS_CONFIGURE_WITH= gnutls - GSETTINGS_USE= GNOME=glib20 GSETTINGS_CONFIGURE_WITH=gsettings GSETTINGS_IMPLIES= DBUS X11 - GTK2_USE= GNOME=cairo,gtk20 GTK2_USES= gettext GTK2_CONFIGURE_ON= --with-x-toolkit=gtk2 GTK2_IMPLIES= X11 GTK2_LIB_DEPENDS= libfreetype.so:print/freetype2 \ libfontconfig.so:x11-fonts/fontconfig - GTK3_USE= GNOME=cairo,gtk30 GTK3_USES= gettext GTK3_CONFIGURE_ON= --with-x-toolkit=gtk3 GTK3_IMPLIES= X11 - JPEG_USES= jpeg JPEG_CONFIGURE_WITH= jpeg JPEG_IMPLIES= X11 - KQUEUE_CONFIGURE_ON= --with-file-notification=kqueue - LLDB_EXTRA_PATCHES= ${PATCHDIR}/extrapatch-lldb-gud.el - #LTO_CONFIGURE_ON= --enable-link-time-optimization - M17N_LIB_DEPENDS= libm17n.so:devel/m17n-lib M17N_CONFIGURE_WITH= m17n-flt M17N_IMPLIES= XFT X11 - MAGICK_LIB_DEPENDS= libMagickCore-6.so:graphics/ImageMagick MAGICK_CONFIGURE_WITH= imagemagick MAGICK_IMPLIES= X11 - MODULES_CONFIGURE_WITH= modules - MOTIF_USES= motif MOTIF_CONFIGURE_ON= --with-x-toolkit=motif MOTIF_IMPLIES= X11 MOTIF_LIB_DEPENDS= libXp.so:x11/libXp - OSS_CONFIGURE_ON= --with-sound=oss - OTF_LIB_DEPENDS= libotf.so:print/libotf OTF_CONFIGURE_WITH= libotf OTF_IMPLIES= X11 XFT - PNG_LIB_DEPENDS= libpng.so:graphics/png PNG_CONFIGURE_WITH= png PNG_IMPLIES= X11 - SCROLLBARS_CONFIGURE_WITH=toolkit-scroll-bars SCROLLBARS_IMPLIES= X11 - SVG_USE= GNOME=cairo,librsvg2 SVG_CONFIGURE_WITH= rsvg SVG_IMPLIES= X11 PNG SVG_USES= gettext - +THREADS_CONFIGURE_WITH= threads TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff TIFF_CONFIGURE_WITH= tiff TIFF_IMPLIES= X11 - X11_CONFIGURE_OFF= --without-x --with-x-toolkit=no X11_CONFIGURE_ON= --with-x X11_USE= XORG=ice,sm,x11,xcb,xext,xfixes,xinerama,xmu,xrandr,xt X11_USES= desktop-file-utils X11_VARS= installs_icons=yes X11_VARS_OFF= without_x11=yes - XAW_USE= XORG=xaw XAW_CONFIGURE_ON= --with-x-toolkit=athena --without-xaw3d XAW_IMPLIES= X11 - XAW3D_LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d XAW3D_CONFIGURE_ON= --with-x-toolkit=athena XAW3D_IMPLIES= X11 - XFT_USE= XORG=xft,xrender XFT_CONFIGURE_WITH= xft XFT_IMPLIES= X11 XFT_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 - XIM_CONFIGURE_WITH= xim XIM_IMPLIES= X11 - XML_USE= GNOME=libxml2 XML_CONFIGURE_WITH= xml2 - XPM_USE= XORG=xpm XPM_CONFIGURE_WITH= xpm XPM_IMPLIES= X11 - XWIDGETS_USE= XORG=xcomposite XWIDGETS_CONFIGURE_WITH=xwidgets XWIDGETS_LIB_DEPENDS= libwebkitgtk-3.0.so:www/webkit-gtk3 XWIDGETS_IMPLIES= GTK3 -.include <bsd.port.options.mk> - -# clang is broken on i386 platform in -O2, due to use of alloca, and -# stack realignment and %esi as frame pointer register -# http://llvm.org/bugs/show_bug.cgi?id=18171 fixed in r263312 -# (11-CURRENT), and fixed in r263765 (10-STABLE) -.if ${ARCH} == "i386" -.if (${OSVERSION} < 1000706) || (${OSVERSION} >= 1100000 && \ -${OSVERSION} < 1100015) -USE_GCC=any -.endif -.endif - -.if ! ${PORT_OPTIONS:MGTK2} && ! ${PORT_OPTIONS:MGTK3} && \ -! ${PORT_OPTIONS:MMOTIF} && ! ${PORT_OPTIONS:MXAW} && ! ${PORT_OPTIONS:MXAW3D} -CONFIGURE_ARGS+= --with-x-toolkit=no -.endif - -.include <bsd.port.pre.mk> - -# Building with GCC 4.6+ requires it -.if ${ncurses_ARGS} == "port" -LDFLAGS+=-ltinfo -.endif - -post-patch: - @${RM} ${WRKSRC}/info/* - -## stage-qa will give a warning, but don't pull in desktop-file-utils -## portlint -AC will give a warning about INSTALL_ICONS, but don't pull in those -## dependencies +# With a desktop entry stage-qa will give a warning about requiring +# desktop-file-utils and portlint -C will give a warning about INSTALL_ICONS, +# but don't pull in those dependencies when X11 is off. post-patch-X11-off: @${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' \ ${WRKSRC}/etc/emacs.desktop -pre-configure: - @cd ${WRKSRC} && ./autogen.sh - post-install-SOURCES-on: @${MKDIR} ${STAGEDIR}${DATADIR}/${EMACS_VER}/src - ${INSTALL_DATA} ${WRKSRC}/src/*.[ch] \ - ${STAGEDIR}${DATADIR}/${EMACS_VER}/src - ${INSTALL_DATA} ${WRKDIR}/sources.el \ - ${STAGEDIR}${DATADIR}/${EMACS_VER}/site-lisp/site-start.el + ${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${STAGEDIR}${DATADIR}/${EMACS_VER}/src + ${INSTALL_DATA} ${WRKDIR}/sources.el ${STAGEDIR}${DATADIR}/${EMACS_VER}/site-lisp/site-start.el -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/editors/emacs-devel/distinfo ============================================================================== --- head/editors/emacs-devel/distinfo Sun Dec 25 04:23:34 2016 (r429393) +++ head/editors/emacs-devel/distinfo Sun Dec 25 04:52:41 2016 (r429394) @@ -1,3 +1,3 @@ -TIMESTAMP = 1475279278 -SHA256 (emacs-mirror-emacs-25.2.50.20161001-25dca60d_GH0.tar.gz) = e7dcebce7c33ca6124220301665fcb173bca4f9d0e01f9f5ff0d157c00f7abcb -SIZE (emacs-mirror-emacs-25.2.50.20161001-25dca60d_GH0.tar.gz) = 38532769 +TIMESTAMP = 1482637400 +SHA256 (emacs-mirror-emacs-26.0.50.20161225-2dae636_GH0.tar.gz) = 7c435025f41dafe180de0c40be489b92fec03e0b3ba44c6a2431842b11a97017 +SIZE (emacs-mirror-emacs-26.0.50.20161225-2dae636_GH0.tar.gz) = 38843056 Modified: head/editors/emacs-devel/pkg-plist ============================================================================== --- head/editors/emacs-devel/pkg-plist Sun Dec 25 04:23:34 2016 (r429393) +++ head/editors/emacs-devel/pkg-plist Sun Dec 25 04:52:41 2016 (r429394) @@ -4,6 +4,7 @@ bin/emacs bin/emacs-%%EMACS_VER%% bin/emacsclient bin/etags +%%DBUS%%lib/systemd/user/emacs.service libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/hexl libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/movemail libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/profile @@ -46,6 +47,7 @@ share/applications/emacs.desktop %%DATADIR%%/%%EMACS_VER%%/etc/NEWS.22 %%DATADIR%%/%%EMACS_VER%%/etc/NEWS.23 %%DATADIR%%/%%EMACS_VER%%/etc/NEWS.24 +%%DATADIR%%/%%EMACS_VER%%/etc/NEWS.25 %%DATADIR%%/%%EMACS_VER%%/etc/NEXTSTEP %%DATADIR%%/%%EMACS_VER%%/etc/NXML-NEWS %%DATADIR%%/%%EMACS_VER%%/etc/ORDERS @@ -197,6 +199,7 @@ share/applications/emacs.desktop %%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%.appdata.xml %%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%.desktop %%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%.icon +%%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%.service %%DATADIR%%/%%EMACS_VER%%/etc/enriched.txt %%DATADIR%%/%%EMACS_VER%%/etc/forms/README %%DATADIR%%/%%EMACS_VER%%/etc/forms/forms-d2.dat @@ -775,7 +778,6 @@ share/applications/emacs.desktop %%DATADIR%%/%%EMACS_VER%%/etc/refcards/de-refcard.tex %%DATADIR%%/%%EMACS_VER%%/etc/refcards/dired-ref.tex %%DATADIR%%/%%EMACS_VER%%/etc/refcards/emacsver.tex -%%DATADIR%%/%%EMACS_VER%%/etc/refcards/emacsver.tex.in %%DATADIR%%/%%EMACS_VER%%/etc/refcards/fr-dired-ref.tex %%DATADIR%%/%%EMACS_VER%%/etc/refcards/fr-refcard.tex %%DATADIR%%/%%EMACS_VER%%/etc/refcards/fr-survival.tex @@ -2089,8 +2091,6 @@ share/applications/emacs.desktop %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/spam-wash.elc %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/spam.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/spam.elc -%%DATADIR%%/%%EMACS_VER%%/lisp/gs.el.gz -%%DATADIR%%/%%EMACS_VER%%/lisp/gs.elc %%DATADIR%%/%%EMACS_VER%%/lisp/help-at-pt.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/help-at-pt.elc %%DATADIR%%/%%EMACS_VER%%/lisp/help-fns.el.gz @@ -2296,6 +2296,8 @@ share/applications/emacs.desktop %%DATADIR%%/%%EMACS_VER%%/lisp/language/lao-util.elc %%DATADIR%%/%%EMACS_VER%%/lisp/language/lao.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/language/lao.elc +%%DATADIR%%/%%EMACS_VER%%/lisp/ldefs-boot-auto.el +%%DATADIR%%/%%EMACS_VER%%/lisp/ldefs-boot-manual.el %%DATADIR%%/%%EMACS_VER%%/lisp/language/misc-lang.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/language/misc-lang.elc %%DATADIR%%/%%EMACS_VER%%/lisp/language/romanian.el.gz @@ -2762,8 +2764,6 @@ share/applications/emacs.desktop %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-ftp.elc %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-gvfs.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-gvfs.elc -%%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-gw.el.gz -%%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-gw.elc %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-loaddefs.el %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-sh.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-sh.elc @@ -2853,6 +2853,8 @@ share/applications/emacs.desktop %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/eudcb-ph.elc %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/fast-lock.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/fast-lock.elc +%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/gs.el.gz +%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/gs.elc %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/gulp.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/gulp.elc %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/iswitchb.el.gz @@ -3963,6 +3965,8 @@ share/applications/emacs.desktop %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sysstdio.h %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/systime.h %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/systty.h +%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/systhread.c +%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/systhread.h %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/syswait.h %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/term.c %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/termcap.c @@ -3972,6 +3976,8 @@ share/applications/emacs.desktop %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/terminfo.c %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/termopts.h %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/textprop.c +%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/thread.c +%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/thread.h %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/tparam.c %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/tparam.h %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/undo.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612250452.uBP4qgBn017421>