From 5894389797b212299e13f2373afdc156e6c914bf Mon Sep 17 00:00:00 2001
From: Florian Wagner <florian@wagner-flo.net>
Date: Fri, 26 Oct 2018 16:15:50 +0200
Subject: [PATCH] emacs-ess: update to 18.10-1

---
 srcpkgs/emacs-ess/template | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/emacs-ess/template b/srcpkgs/emacs-ess/template
index 6a5bdae7da5..317f3b9e9ff 100644
--- a/srcpkgs/emacs-ess/template
+++ b/srcpkgs/emacs-ess/template
@@ -1,21 +1,27 @@
 # Template file for 'emacs-ess'
 pkgname=emacs-ess
-version=17.11
+version=18.10r1
 revision=1
 noarch=yes
 depends="emacs R"
 makedepends="emacs perl"
 short_desc="Emacs Speaks Statistics: A Universal Interface for Statistical Analysis"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://ess.r-project.org"
-_juliarev=2ef6992125a85674532a1e37dacd5c60bee4feeb
+_juliarev=ec01995f60486480cf2240bbd3b9a2ff3fa9e0f0
 _juliafile=julia-mode-${_juliarev}.el.txt
-distfiles="http://ess.r-project.org/downloads/ess/ess-${version}.tgz
+distfiles="http://ess.r-project.org/downloads/ess/ess-${version//r/-}.tgz
  https://raw.githubusercontent.com/JuliaEditorSupport/julia-emacs/${_juliarev}/julia-mode.el>${_juliafile}"
-checksum="484773fcfa2463fbbb9470cbdcf8e628500ca6cf97fb751ac72eed198d5fa715
- d0f7cf7e5ef5ede8a79ac72bffb0618414c2d60853646168532afe1757a21b2c"
-wrksrc=ess-${version}
+checksum="918537a62be6c3f5cef992787286ebbb0bb7cc75dad5124dc52ab1a57eb32b0c
+ 132915c0f04c3ab755e78d7bbc89d58f033a67e1a56e685f14dfeb8078cd69b3"
+wrksrc=ess-${version//r/-}
+
+pre_configure() {
+	sed -e '/^ELS = \$(wildcard \*\.el)$/s@$@ $(wildcard obsolete/*.el)@' -i lisp/Makefile
+	sed -e '/^	cd doc; \$(MAKE) \$@/d' -i Makefile
+	cat Makefile
+}
 
 do_build() {
 	cp -f ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_juliafile} lisp/julia-mode.el