sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Update to git snapshot 1b492fa

Browse source 
- Add a patch to workaround a configure issue reported upstream
  at http://lists.gnu.org/archive/html/emacs-devel/2017-09/msg00020.html
- Update BROKEN message on AARCH64, as now it does not break on sbrk[1]

PR:		221961[1]
Reported by:	Gergely Czuczy <gergely.czuczy@harmless.hu>
This commit is contained in:
Ashish SHUKLA 2017-09-04 13:42:18 +00:00
parent 161a491b5f
commit 9fa7c2a9cf
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=449247
4 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
editors/emacs-devel/Makefile
View file

@ -15,14 +15,14 @@ LICENSE_FILE= ${WRKSRC}/COPYING
CONFLICTS= emacs25-[0-9]* emacs-nox11-[0-9]*
BROKEN_aarch64= Fails to link: missing sbrk
BROKEN_aarch64= Segfaults during build
USE_GITHUB= yes
GH_ACCOUNT= emacs-mirror
GH_TAGNAME= 01a98e9
GH_TAGNAME= 1b492fa
EMACS_VER= 26.0.50
EMACS_REV= 20170712
EMACS_REV= 20170903
GNU_CONFIGURE= yes
USES= autoreconf:build cpe gmake makeinfo ncurses pkgconfig
INFO_PATH= ${DATADIR_REL}/info

6
editors/emacs-devel/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1499881754
SHA256 (emacs-mirror-emacs-26.0.50.20170712-01a98e9_GH0.tar.gz) = a8dac385243085666eb1838be5e148e7a7a98508405e2fa3a10d2d29b3a4b480
SIZE (emacs-mirror-emacs-26.0.50.20170712-01a98e9_GH0.tar.gz) = 39301316
TIMESTAMP = 1504453415
SHA256 (emacs-mirror-emacs-26.0.50.20170903-1b492fa_GH0.tar.gz) = f409d8d0afecbf35999a4af0bb168969cb84a8f21428bbbdc9c28b498e804da7
SIZE (emacs-mirror-emacs-26.0.50.20170903-1b492fa_GH0.tar.gz) = 39365573

17
editors/emacs-devel/files/patch-configure.ac
View file

@ -1,8 +1,8 @@
--- configure.ac.orig 2017-01-22 02:35:42 UTC
--- configure.ac.orig 2017-09-03 12:54:18 UTC
+++ configure.ac
@@ -1225,7 +1225,8 @@ if test "$MAKEINFO" != "no"; then
MAKEINFO=makeinfo
fi
@@ -1251,7 +1251,8 @@ AC_SUBST([PAXCTL_notdumped])
## Require makeinfo >= 4.13 (last of the 4.x series) to build the manuals.
if test "${MAKEINFO:=makeinfo}" != "no"; then
case `($MAKEINFO --version) 2>/dev/null` in
- *' (GNU texinfo) '4.1[[3-9]]* | \
+ *' (GNU texinfo) '4.[[8-9]]* | \
@ -10,3 +10,12 @@
*' (GNU texinfo) '[[5-9]]* | \
*' (GNU texinfo) '[[1-9][0-9]]* ) ;;
*) MAKEINFO=no;;
@@ -3364,7 +3365,7 @@ if test "${HAVE_X11}" = "yes"; then
AC_CACHE_CHECK([for XpmReturnAllocPixels preprocessor define],
[emacs_cv_cpp_xpm_return_alloc_pixels],
[AC_EGREP_CPP(no_return_alloc_pixels,
- [#include "noX/xpm.h"
+ [#include "X11/xpm.h"
#ifndef XpmReturnAllocPixels
no_return_alloc_pixels
#endif

11
editors/emacs-devel/pkg-plist
View file

@ -765,7 +765,6 @@ share/applications/emacs.desktop
%%DATADIR%%/%%EMACS_VER%%/etc/org/OrgOdtContentTemplate.xml
%%DATADIR%%/%%EMACS_VER%%/etc/org/OrgOdtStyles.xml
%%DATADIR%%/%%EMACS_VER%%/etc/org/README
%%DATADIR%%/%%EMACS_VER%%/etc/org/library-of-babel.org
%%DATADIR%%/%%EMACS_VER%%/etc/package-keyring.gpg
%%DATADIR%%/%%EMACS_VER%%/etc/ps-prin0.ps
%%DATADIR%%/%%EMACS_VER%%/etc/ps-prin1.ps
@ -1451,6 +1450,8 @@ share/applications/emacs.desktop
%%DATADIR%%/%%EMACS_VER%%/lisp/dirtrack.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/disp-table.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/disp-table.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/display-line-numbers.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/display-line-numbers.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/dnd.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/dnd.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/doc-view.el.gz
@ -3342,6 +3343,10 @@ share/applications/emacs.desktop
%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/f90.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/flymake.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/flymake.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/flymake-proc.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/flymake-proc.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/flymake-ui.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/flymake-ui.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/fortran.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/fortran.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/gdb-mi.el.gz
@ -3531,6 +3536,8 @@ share/applications/emacs.desktop
%%DATADIR%%/%%EMACS_VER%%/lisp/term/internal.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/term/iris-ansi.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/term/iris-ansi.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/term/konsole.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/term/konsole.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/term/linux.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/term/linux.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/term/lk201.el.gz
@ -3587,6 +3594,8 @@ share/applications/emacs.desktop
%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/flyspell.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/ispell.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/ispell.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/less-css-mode.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/less-css-mode.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/makeinfo.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/makeinfo.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/mhtml-mode.el.gz