Page MenuHomeFreeBSD
Files F146188842

D18810.id56281.diff
No OneTemporary
Actions

D18810.id56281.diff
View Options

Index: head/Mk/Uses/emacs.mk
===================================================================
--- head/Mk/Uses/emacs.mk
+++ head/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.2
EMACS_PORTDIR= editors/emacs
.endif
Index: head/editors/emacs/Makefile
===================================================================
--- head/editors/emacs/Makefile
+++ head/editors/emacs/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= emacs
-DISTVERSION= ${EMACS_VER}
-PORTREVISION= 6
+DISTVERSION= 26.2
PORTEPOCH= 3
CATEGORIES= editors ipv6
MASTER_SITES= GNU
@@ -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
@@ -75,14 +74,14 @@
INSTALLS_ICONS= yes
.endif
.if ${FLAVOR:U} == canna
-PLIST_FILES+= ${DATADIR}/${EMACS_VER}/lisp/canna.el.gz \
- ${DATADIR}/${EMACS_VER}/lisp/canna.elc \
- ${DATADIR}/${EMACS_VER}/lisp/isearch-ext.el.gz \
- ${DATADIR}/${EMACS_VER}/lisp/isearch-ext.elc
+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.elc
.endif
-PLIST_SUB= EMACS_VER=${EMACS_VER} GNU_HOST=${CONFIGURE_TARGET}
+PLIST_SUB= EMACS_VER=${DISTVERSION} GNU_HOST=${CONFIGURE_TARGET}
SUB_FILES= sources.el
-SUB_LIST= EMACS_VER=${EMACS_VER} # 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
@@ -184,7 +183,7 @@
PNG_CONFIGURE_WITH= png
SCROLLBARS_CONFIGURE_WITH= toolkit-scroll-bars
.if ${FLAVOR:U} == canna
-SOURCES_PLIST_FILES= ${DATADIR}/${EMACS_VER}/src/canna.c
+SOURCES_PLIST_FILES= ${DATADIR}/${DISTVERSION}/src/canna.c
.endif
SVG_USES= gnome
SVG_USE= GNOME=cairo,librsvg2
@@ -213,8 +212,6 @@
libsoup-2.4.so:devel/libsoup
XWIDGETS_IMPLIES= GTK3
-EMACS_VER= 26.1
-
.include <bsd.port.options.mk>
# has graphics/ImageMagick been compiled with OPENMP?
@@ -237,12 +234,12 @@
post-install-MAILUTILS-on:
${LN} -sf ${PREFIX}/bin/movemail \
- ${STAGEDIR}${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET}
+ ${STAGEDIR}${PREFIX}/libexec/emacs/${DISTVERSION}/${CONFIGURE_TARGET}
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
+ @${MKDIR} ${STAGEDIR}${DATADIR}/${DISTVERSION}/src
+ ${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
Index: head/editors/emacs/distinfo
===================================================================
--- head/editors/emacs/distinfo
+++ head/editors/emacs/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1527559243
-SHA256 (emacs-26.1.tar.xz) = 1cf4fc240cd77c25309d15e18593789c8dbfba5c2b44d8f77c886542300fd32c
-SIZE (emacs-26.1.tar.xz) = 44258932
+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
Index: head/editors/emacs/files/patch-lisp_textmodes_ispell.el
===================================================================
--- head/editors/emacs/files/patch-lisp_textmodes_ispell.el
+++ head/editors/emacs/files/patch-lisp_textmodes_ispell.el
@@ -1,16 +0,0 @@
---- lisp/textmodes/ispell.el.orig 2018-05-25 08:53:30 UTC
-+++ lisp/textmodes/ispell.el
-@@ -1111,7 +1111,12 @@ dictionary from that list was found."
- null-device
- t
- nil
-- "-D")
-+ ;; Hunspell 1.7.0 (and later?) won't
-+ ;; show LOADED DICTIONARY unless
-+ ;; there's at least one file argument
-+ ;; on the command line. So we feed
-+ ;; it with the null device.
-+ "-D" null-device)
- (buffer-string))
- "[\n\r]+"
- t))
Index: head/editors/emacs/pkg-plist
===================================================================
--- head/editors/emacs/pkg-plist
+++ head/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
@@ -4122,6 +4122,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

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 1, 2:25 PM (13 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29116616
Default Alt Text
D18810.id56281.diff (5 KB)

Event Timeline