Index: Mk/Uses/emacs.mk =================================================================== --- Mk/Uses/emacs.mk +++ Mk/Uses/emacs.mk @@ -106,7 +106,7 @@ EMACS_VER= 27.0.50 EMACS_PORTDIR= editors/emacs-devel .else -EMACS_VER= 26.1 +EMACS_VER= 26.1.91 EMACS_PORTDIR= editors/emacs .endif Index: editors/emacs/Makefile =================================================================== --- editors/emacs/Makefile +++ editors/emacs/Makefile @@ -3,10 +3,9 @@ PORTNAME= emacs DISTVERSION= ${EMACS_VER} -PORTREVISION= 4 PORTEPOCH= 3 CATEGORIES= editors ipv6 -MASTER_SITES= GNU +MASTER_SITES= GNU_ALPHA/emacs/pretest .if ${FLAVOR:U} == canna PATCH_DIST_STRIP= -p1 @@ -43,7 +42,7 @@ CONFIGURE_ARGS= --disable-build-details \ --localstatedir=/var \ - --with-gameuser=games:games + --without-gpm .if ${FLAVOR:U} == canna CONFIGURE_ARGS+= --with-canna .endif @@ -128,26 +127,32 @@ 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 @@ -180,6 +185,7 @@ .if ${FLAVOR:U} == canna SOURCES_PLIST_FILES= ${DATADIR}/${EMACS_VER}/src/canna.c .endif +SVG_USES= gnome SVG_USE= GNOME=cairo,librsvg2 SVG_CONFIGURE_WITH= rsvg SVG_IMPLIES= PNG @@ -195,6 +201,7 @@ XFT_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 XIM_CONFIGURE_WITH= xim +XML_USES= gnome XML_USE= GNOME=libxml2 XML_CONFIGURE_WITH= xml2 XPM_USE= XORG=xpm @@ -205,7 +212,7 @@ libsoup-2.4.so:devel/libsoup XWIDGETS_IMPLIES= GTK3 -EMACS_VER= 26.1 +EMACS_VER= 26.1.91 .include Index: editors/emacs/distinfo =================================================================== --- editors/emacs/distinfo +++ editors/emacs/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1527559243 -SHA256 (emacs-26.1.tar.xz) = 1cf4fc240cd77c25309d15e18593789c8dbfba5c2b44d8f77c886542300fd32c -SIZE (emacs-26.1.tar.xz) = 44258932 +TIMESTAMP = 1547123824 +SHA256 (emacs-26.1.91.tar.xz) = 0ca140136b72cfa0588648d2089f26a603a4be94ce065c0da7a765ce26ffd909 +SIZE (emacs-26.1.91.tar.xz) = 43892592 SHA256 (emacs26.1-canna-20180529.diff.gz) = defe94426449a5d48c1b0b92c0a6051816b78dba25c600d38c06ab903d667ecb SIZE (emacs26.1-canna-20180529.diff.gz) = 30163 Index: editors/emacs/pkg-plist =================================================================== --- editors/emacs/pkg-plist +++ editors/emacs/pkg-plist @@ -4,18 +4,18 @@ bin/emacs-%%EMACS_VER%% bin/emacsclient bin/etags +include/emacs-module.h libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/hexl libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/movemail libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/profile libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/rcs2log -@(games,games,4555) libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/update-game-score man/man1/ctags.1.gz man/man1/ebrowse.1.gz man/man1/emacs.1.gz man/man1/emacsclient.1.gz man/man1/etags.1.gz -share/appdata/emacs.appdata.xml share/applications/emacs.desktop +share/metainfo/emacs.appdata.xml %%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%-buffer.gdb %%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%.appdata.xml %%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%.desktop @@ -797,19 +797,13 @@ %%DATADIR%%/%%EMACS_VER%%/etc/refcards/orgcard.pdf %%DATADIR%%/%%EMACS_VER%%/etc/refcards/orgcard.tex %%DATADIR%%/%%EMACS_VER%%/etc/refcards/pdflayout.sty -%%DATADIR%%/%%EMACS_VER%%/etc/refcards/pl-refcard.pdf %%DATADIR%%/%%EMACS_VER%%/etc/refcards/pl-refcard.tex -%%DATADIR%%/%%EMACS_VER%%/etc/refcards/pt-br-refcard.pdf %%DATADIR%%/%%EMACS_VER%%/etc/refcards/pt-br-refcard.tex %%DATADIR%%/%%EMACS_VER%%/etc/refcards/refcard.pdf %%DATADIR%%/%%EMACS_VER%%/etc/refcards/refcard.tex -%%DATADIR%%/%%EMACS_VER%%/etc/refcards/ru-refcard.pdf %%DATADIR%%/%%EMACS_VER%%/etc/refcards/ru-refcard.tex -%%DATADIR%%/%%EMACS_VER%%/etc/refcards/sk-dired-ref.pdf %%DATADIR%%/%%EMACS_VER%%/etc/refcards/sk-dired-ref.tex -%%DATADIR%%/%%EMACS_VER%%/etc/refcards/sk-refcard.pdf %%DATADIR%%/%%EMACS_VER%%/etc/refcards/sk-refcard.tex -%%DATADIR%%/%%EMACS_VER%%/etc/refcards/sk-survival.pdf %%DATADIR%%/%%EMACS_VER%%/etc/refcards/sk-survival.tex %%DATADIR%%/%%EMACS_VER%%/etc/refcards/survival.pdf %%DATADIR%%/%%EMACS_VER%%/etc/refcards/survival.tex @@ -4122,6 +4116,3 @@ share/icons/hicolor/scalable/apps/emacs.svg share/icons/hicolor/scalable/mimetypes/emacs-document.svg share/icons/hicolor/scalable/mimetypes/emacs-document23.svg -@(games,games,0664) /var/games/emacs/snake-scores -@(games,games,0664) /var/games/emacs/tetris-scores -@dir(games,games,0755) /var/games/emacs