[On Fri, Apr 19, 2019 at 09:31:04PM +0200, Jeremie Courreges-Anglas wrote:
>
> Here's a diff to update to the latest emacs release.
>
> Announcement mail:
> https://lists.gnu.org/archive/html/info-gnu/2019-04/msg00003.html
>
> Tested since a few days with the no_x11 FLAVOR on amd64 and sparc64.
> Test reports on other architectures or with a graphical FLAVOR would be
> welcome.
>
> The diff also switches to .tar.xz tarballs since that saves a bit of
> space:
> $ du -h /usr/ports/distfiles/emacs-26.2*
> 62.2M /usr/ports/distfiles/emacs-26.2.tar.gz
> 42.4M /usr/ports/distfiles/emacs-26.2.tar.xz
>
After some struggles with some (other) port (mu? isync?) deciding it
wanted jdk and thus delaying everything by a day or so, and then
a bit of hand to hand combat with the verdammt installurl file
that keeps trying to suck the wrong packages from the wrong place no
matter how many time I remove, empty or modify it, ... where was I?
Oh, right -- 26.2 gtk+3 flavour seems to work fine for me on amd64.
.... Ken
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/editors/emacs/Makefile,v
> retrieving revision 1.84
> diff -u -p -r1.84 Makefile
> --- Makefile 27 Mar 2019 13:36:00 -0000 1.84
> +++ Makefile 19 Apr 2019 18:54:47 -0000
> @@ -2,9 +2,8 @@
>
> COMMENT= GNU editor: extensible, customizable, self-documenting
>
> -VERSION= 26.1
> +VERSION= 26.2
> DISTNAME= emacs-${VERSION}
> -REVISION= 5
>
> CATEGORIES= editors
>
> @@ -18,6 +17,7 @@ PERMIT_PACKAGE_CDROM= Yes
> WANTLIB= c m curses pthread gnutls xml2 z
>
> MASTER_SITES= ${MASTER_SITE_GNU:=emacs/}
> +EXTRACT_SUFX= .tar.xz
>
> USE_GMAKE= Yes
>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/editors/emacs/distinfo,v
> retrieving revision 1.11
> diff -u -p -r1.11 distinfo
> --- distinfo 8 Jun 2018 22:19:20 -0000 1.11
> +++ distinfo 19 Apr 2019 18:54:47 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (emacs-26.1.tar.gz) = dgOC1ejNxdDQeej3VLzhE2++FHO+JLuIVmmw44/FaqM=
> -SIZE (emacs-26.1.tar.gz) = 65007481
> +SHA256 (emacs-26.2.tar.xz) = FRzmnb5bgJ1Ekv+uSksVOyd4RZ3m3rJvNWkeEoGpxY4=
> +SIZE (emacs-26.2.tar.xz) = 44406808
> Index: patches/patch-Makefile_in
> ===================================================================
> RCS file: /cvs/ports/editors/emacs/patches/patch-Makefile_in,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-Makefile_in
> --- patches/patch-Makefile_in 8 Jun 2018 22:19:20 -0000 1.4
> +++ patches/patch-Makefile_in 19 Apr 2019 18:54:47 -0000
> @@ -5,7 +5,7 @@ $OpenBSD: patch-Makefile_in,v 1.4 2018/0
> Index: Makefile.in
> --- Makefile.in.orig
> +++ Makefile.in
> -@@ -658,7 +658,7 @@ install-info: info
> +@@ -663,7 +663,7 @@ install-info: info
> for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
> (cd "$${thisdir}"; \
> ${INSTALL_DATA} ${srcdir}/info/$$f "$(DESTDIR)${infodir}/$$f");
> \
> @@ -14,7 +14,7 @@ Index: Makefile.in
> rm -f "$(DESTDIR)${infodir}/$$f.gz"; \
> ${GZIP_PROG} -9n "$(DESTDIR)${infodir}/$$f"; \
> done; \
> -@@ -682,7 +682,7 @@ install-man:
> +@@ -687,7 +687,7 @@ install-man:
> dest=`echo "$${page}" | sed -e 's/\.1$$//' -e '$(TRANSFORM)'`.1; \
> (cd "$${thisdir}"; \
> ${INSTALL_DATA} ${mansrcdir}/$${page}
> "$(DESTDIR)${man1dir}/$${dest}"); \
> Index: patches/patch-configure
> ===================================================================
> RCS file: /cvs/ports/editors/emacs/patches/patch-configure,v
> retrieving revision 1.15
> diff -u -p -r1.15 patch-configure
> --- patches/patch-configure 27 Nov 2018 13:53:29 -0000 1.15
> +++ patches/patch-configure 19 Apr 2019 18:54:47 -0000
> @@ -2,7 +2,7 @@ $OpenBSD: patch-configure,v 1.15 2018/11
> Index: configure
> --- configure.orig
> +++ configure
> -@@ -9226,9 +9226,7 @@ case "$opsys" in
> +@@ -9258,9 +9258,7 @@ case "$opsys" in
> ;;
>
> openbsd)
> Index: patches/patch-lisp_files_el
> ===================================================================
> RCS file: /cvs/ports/editors/emacs/patches/patch-lisp_files_el,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-lisp_files_el
> --- patches/patch-lisp_files_el 8 Jun 2018 22:19:20 -0000 1.3
> +++ patches/patch-lisp_files_el 19 Apr 2019 18:54:47 -0000
> @@ -5,7 +5,7 @@ $OpenBSD: patch-lisp_files_el,v 1.3 2018
> Index: lisp/files.el
> --- lisp/files.el.orig
> +++ lisp/files.el
> -@@ -2660,6 +2660,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|CB
> +@@ -2674,6 +2674,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|CB
> ("\\.\\(as\\|mi\\|sm\\)2\\'" . snmpv2-mode)
> ("\\.\\(diffs?\\|patch\\|rej\\)\\'" . diff-mode)
> ("\\.\\(dif\\|pat\\)\\'" . diff-mode) ; for MS-DOS
> Index: patches/patch-lisp_vc_vc_el
> ===================================================================
> RCS file: /cvs/ports/editors/emacs/patches/patch-lisp_vc_vc_el,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-lisp_vc_vc_el
> --- patches/patch-lisp_vc_vc_el 8 Jun 2018 22:19:20 -0000 1.3
> +++ patches/patch-lisp_vc_vc_el 19 Apr 2019 18:54:47 -0000
> @@ -5,7 +5,7 @@ Drop messages that slow down VC with big
> Index: lisp/vc/vc.el
> --- lisp/vc/vc.el.orig
> +++ lisp/vc/vc.el
> -@@ -2925,13 +2925,11 @@ to provide the `find-revision' operation instead."
> +@@ -2940,13 +2940,11 @@ to provide the `find-revision' operation instead."
> (defun vc-file-tree-walk (dirname func &rest args)
> "Walk recursively through DIRNAME.
> Invoke FUNC f ARGS on each VC-managed file f underneath it."
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/editors/emacs/pkg/PLIST,v
> retrieving revision 1.23
> diff -u -p -r1.23 PLIST
> --- pkg/PLIST 2 Nov 2018 12:56:52 -0000 1.23
> +++ pkg/PLIST 19 Apr 2019 18:54:47 -0000
> @@ -17,6 +17,7 @@ bin/emacs
> @bin bin/emacs-${VERSION}
> @bin bin/emacsclient
> @bin bin/etags
> +include/emacs-module.h
> @info info/ada-mode.info
> @info info/auth.info
> @info info/autotype.info
> @@ -94,8 +95,6 @@ libexec/emacs/${VERSION}/${GCCARCH}/rcs2
> @man man/man1/emacs.1
> @man man/man1/emacsclient.1
> @man man/man1/etags.1
> -share/appdata/
> -share/appdata/emacs.appdata.xml
> share/doc/pkg-readmes/${PKGSTEM}
> share/emacs/
> share/emacs/${VERSION}/
> @@ -4073,3 +4072,5 @@ share/emacs/${VERSION}/site-lisp/
> share/emacs/${VERSION}/site-lisp/subdirs.el
> share/emacs/site-lisp/
> share/emacs/site-lisp/subdirs.el
> +share/metainfo/
> +share/metainfo/emacs.appdata.xml
>
>
> --
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
>
