diff options
| author | Joseph Mingrone <jrm@FreeBSD.org> | 2017-01-24 15:27:06 +0000 |
|---|---|---|
| committer | Joseph Mingrone <jrm@FreeBSD.org> | 2017-01-24 15:27:06 +0000 |
| commit | 8a7d93bd4401514ff885d215d5cb1a7dc6b5b82f (patch) | |
| tree | 4e988074e67c3c566252249eb5f9ad69a1e684d8 /editors/emacs-devel | |
| parent | 1dddebbcbb096fa33ab613b745bfaaae16304f52 (diff) | |
| download | ports-8a7d93bd4401514ff885d215d5cb1a7dc6b5b82f.tar.gz ports-8a7d93bd4401514ff885d215d5cb1a7dc6b5b82f.zip | |
editors/emacs-devel: Update to latest commit on master branch.
- Switch to using the supplied autoconf.sh, because it is required on 10.3 to
create nt/gnulib.mk.
- Patch to accept makeinfo versions as far back as 4.8, which is the version in
10.3 base.
Approved by: ashish (maintainer) swills (mentor)
Differential Revision: https://reviews.freebsd.org/D9287
Notes
Notes:
svn path=/head/; revision=432348
Diffstat (limited to 'editors/emacs-devel')
| -rw-r--r-- | editors/emacs-devel/Makefile | 11 | ||||
| -rw-r--r-- | editors/emacs-devel/distinfo | 6 | ||||
| -rw-r--r-- | editors/emacs-devel/files/patch-configure.ac | 12 | ||||
| -rw-r--r-- | editors/emacs-devel/pkg-plist | 7 |
4 files changed, 27 insertions, 9 deletions
diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile index 680f31e85a27..a4bee11058a5 100644 --- a/editors/emacs-devel/Makefile +++ b/editors/emacs-devel/Makefile @@ -17,12 +17,12 @@ CONFLICTS= emacs25-[0-9]* emacs-nox11-[0-9]* USE_GITHUB= yes GH_ACCOUNT= emacs-mirror -GH_TAGNAME= 2dae636 +GH_TAGNAME= ad29e14 EMACS_VER= 26.0.50 -EMACS_REV= 20161225 +EMACS_REV= 20170121 GNU_CONFIGURE= yes -USES= autoreconf cpe gmake makeinfo ncurses pkgconfig +USES= autoreconf:build cpe gmake makeinfo ncurses pkgconfig INFO_PATH= ${DATADIR_REL}/info CPE_VENDOR= gnu @@ -173,9 +173,14 @@ XPM_CONFIGURE_WITH= xpm XPM_IMPLIES= X11 XWIDGETS_USE= XORG=xcomposite XWIDGETS_CONFIGURE_WITH=xwidgets +XWIDGETS_IGNORE= Cannot build with XWIDGETS, because the version of \ +WebKit GTK3 in the ports tree is too old XWIDGETS_LIB_DEPENDS= libwebkitgtk-3.0.so:www/webkit-gtk3 XWIDGETS_IMPLIES= GTK3 +pre-configure: + @(cd ${WRKSRC} && ./autogen.sh all) + # 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. diff --git a/editors/emacs-devel/distinfo b/editors/emacs-devel/distinfo index 6bea5312c2be..f8f2ae602ddd 100644 --- a/editors/emacs-devel/distinfo +++ b/editors/emacs-devel/distinfo @@ -1,3 +1,3 @@ -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 +TIMESTAMP = 1485052021 +SHA256 (emacs-mirror-emacs-26.0.50.20170121-ad29e14_GH0.tar.gz) = 227831b4fe09e124d4854ac7b750d84e4d53107b3e50345598d7e8debfcc4101 +SIZE (emacs-mirror-emacs-26.0.50.20170121-ad29e14_GH0.tar.gz) = 38521604 diff --git a/editors/emacs-devel/files/patch-configure.ac b/editors/emacs-devel/files/patch-configure.ac new file mode 100644 index 000000000000..82865a1c0fd2 --- /dev/null +++ b/editors/emacs-devel/files/patch-configure.ac @@ -0,0 +1,12 @@ +--- configure.ac.orig 2017-01-22 02:35:42 UTC ++++ configure.ac +@@ -1225,7 +1225,8 @@ if test "$MAKEINFO" != "no"; then + MAKEINFO=makeinfo + fi + case `($MAKEINFO --version) 2>/dev/null` in +- *' (GNU texinfo) '4.1[[3-9]]* | \ ++ *' (GNU texinfo) '4.[[8-9]]* | \ ++ *' (GNU texinfo) '4.1[[0-9]]* | \ + *' (GNU texinfo) '[[5-9]]* | \ + *' (GNU texinfo) '[[1-9][0-9]]* ) ;; + *) MAKEINFO=no;; diff --git a/editors/emacs-devel/pkg-plist b/editors/emacs-devel/pkg-plist index 89db6fa5670b..d71a7d7f54ac 100644 --- a/editors/emacs-devel/pkg-plist +++ b/editors/emacs-devel/pkg-plist @@ -2296,8 +2296,6 @@ 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 @@ -2326,7 +2324,8 @@ share/applications/emacs.desktop %%DATADIR%%/%%EMACS_VER%%/lisp/language/viet-util.elc %%DATADIR%%/%%EMACS_VER%%/lisp/language/vietnamese.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/language/vietnamese.elc -%%DATADIR%%/%%EMACS_VER%%/lisp/ldefs-boot.el +%%DATADIR%%/%%EMACS_VER%%/lisp/ldefs-boot-auto.el +%%DATADIR%%/%%EMACS_VER%%/lisp/ldefs-boot-manual.el %%DATADIR%%/%%EMACS_VER%%/lisp/leim/ja-dic/ja-dic.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/leim/ja-dic/ja-dic.elc %%DATADIR%%/%%EMACS_VER%%/lisp/leim/leim-list.el @@ -3631,6 +3630,8 @@ share/applications/emacs.desktop %%DATADIR%%/%%EMACS_VER%%/lisp/timezone.elc %%DATADIR%%/%%EMACS_VER%%/lisp/tmm.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/tmm.elc +%%DATADIR%%/%%EMACS_VER%%/lisp/term/tmux.el.gz +%%DATADIR%%/%%EMACS_VER%%/lisp/term/tmux.elc %%DATADIR%%/%%EMACS_VER%%/lisp/tool-bar.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/tool-bar.elc %%DATADIR%%/%%EMACS_VER%%/lisp/tooltip.el.gz |