Page MenuHomeFreeBSD
Files F143092377

D8796.id23181.diff
No OneTemporary
Actions

D8796.id23181.diff
View Options

Index: Mk/bsd.emacs.mk
===================================================================
--- Mk/bsd.emacs.mk
+++ Mk/bsd.emacs.mk
@@ -80,11 +80,11 @@
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
Index: editors/emacs-devel/Makefile
===================================================================
--- editors/emacs-devel/Makefile
+++ editors/emacs-devel/Makefile
@@ -3,7 +3,6 @@
PORTNAME= emacs
DISTVERSION= ${EMACS_VER}.${EMACS_REV}
-PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= editors ipv6
PKGNAMESUFFIX= -devel
@@ -11,25 +10,24 @@
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= 8661313
-EMACS_VER= 25.2.50
-EMACS_REV= 20161001
+EMACS_VER= 26.0.50
+EMACS_REV= 20161221
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,7 +43,7 @@
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
@@ -75,6 +73,7 @@
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
@@ -84,7 +83,7 @@
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
+ THREADS TIFF X11 XFT XIM XML XPM
OPTIONS_SUB= YES
@@ -172,6 +171,8 @@
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
@@ -212,34 +213,6 @@
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
@@ -247,9 +220,6 @@
@${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] \
@@ -257,4 +227,4 @@
${INSTALL_DATA} ${WRKDIR}/sources.el \
${STAGEDIR}${DATADIR}/${EMACS_VER}/site-lisp/site-start.el
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: editors/emacs-devel/distinfo
===================================================================
--- editors/emacs-devel/distinfo
+++ editors/emacs-devel/distinfo
@@ -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 = 1482323090
+SHA256 (emacs-mirror-emacs-26.0.50.20161221-8661313_GH0.tar.gz) = 980c3166c629986b2eecbb45aeb0380fa2252f6b7c3c9b427bdc95e24a95073e
+SIZE (emacs-mirror-emacs-26.0.50.20161221-8661313_GH0.tar.gz) = 38846184
Index: editors/emacs-devel/pkg-plist
===================================================================
--- editors/emacs-devel/pkg-plist
+++ editors/emacs-devel/pkg-plist
@@ -4,6 +4,7 @@
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 @@
%%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 @@
%%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 @@
%%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 @@
%%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 @@
%%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 @@
%%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 @@
%%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 @@
%%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 @@
%%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

File Metadata

Mime Type
text/plain
Expires
Mon, Jan 26, 9:46 PM (12 h, 1 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28044751
Default Alt Text
D8796.id23181.diff (8 KB)

Event Timeline