diff -urN math/ess.orig/Makefile math/ess/Makefile
--- math/ess.orig/Makefile	2019-07-27 07:19:23.773445000 +0200
+++ math/ess/Makefile	2019-08-18 18:12:27.359227000 +0200
@@ -2,8 +2,7 @@
 # $FreeBSD: head/math/ess/Makefile 507372 2019-07-26 20:46:53Z gerald $
 
 PORTNAME=	ess
-DISTVERSION=	17.11
-PORTREVISION=	6
+DISTVERSION=	18.10.2
 CATEGORIES=	math
 MASTER_SITES=	http://ess.r-project.org/downloads/ess/ \
 		http://stat.ethz.ch/ESS/downloads/ess/
@@ -17,11 +16,11 @@
 
 RUN_DEPENDS=	R:math/R
 
-NO_ARCH=	yes
-
 USES=		emacs gmake makeinfo perl5 tar:tgz
 USE_PERL5=	build
 
+NO_ARCH=	yes
+
 INFO=		ess
 
 OPTIONS_DEFINE=	DOCS
@@ -30,9 +29,12 @@
 	@${REINPLACE_CMD} -e \
 		's|^DESTDIR|#DESTDIR| ; \
 		 s|^PREFIX|#PREFIX| ; \
-		 s|=$$(PREFIX)|=$$(DESTDIR)$$(PREFIX)|' \
-		 ${WRKSRC}/Makeconf
+		 s|=$$(PREFIX)|=$$(DESTDIR)$$(PREFIX)| ; \
+		 s|share/info|${INFO_PATH}|' ${WRKSRC}/Makeconf
 	@${REINPLACE_CMD} -e \
 		'/^PDFs/s|=.*|=|' ${WRKSRC}/doc/Makefile
+
+post-install:
+	@${CP} ${WRKSRC}/lisp/*.el ${STAGEDIR}${PREFIX}/share/emacs/site-lisp/ess/
 
 .include <bsd.port.mk>
diff -urN math/ess.orig/distinfo math/ess/distinfo
--- math/ess.orig/distinfo	2018-02-01 14:48:14.000000000 +0100
+++ math/ess/distinfo	2018-11-12 17:55:27.000000000 +0100
@@ -1,3 +1,3 @@
-TIMESTAMP = 1516644885
-SHA256 (ess-17.11.tgz) = 484773fcfa2463fbbb9470cbdcf8e628500ca6cf97fb751ac72eed198d5fa715
-SIZE (ess-17.11.tgz) = 3275703
+TIMESTAMP = 1542041727
+SHA256 (ess-18.10.2.tgz) = f77b42283c698da091aabca9ccd14a648c3240f00898b93128490feefa04e9d6
+SIZE (ess-18.10.2.tgz) = 2939425
diff -urN math/ess.orig/pkg-plist math/ess/pkg-plist
--- math/ess.orig/pkg-plist	2018-02-01 14:48:14.000000000 +0100
+++ math/ess/pkg-plist	2019-08-18 18:10:01.048558000 +0200
@@ -16,10 +16,7 @@
 %%EMACS_LIBDIR%%/%%ETCDIR%%/ESSR/R/pkg.R
 %%EMACS_LIBDIR%%/%%ETCDIR%%/ESSR/VERSION
 %%EMACS_LIBDIR%%/%%ETCDIR%%/ess-julia.jl
-%%EMACS_LIBDIR%%/%%ETCDIR%%/ess-s4.S
 %%EMACS_LIBDIR%%/%%ETCDIR%%/ess-sas-sh-command
-%%EMACS_LIBDIR%%/%%ETCDIR%%/ess-sp3.S
-%%EMACS_LIBDIR%%/%%ETCDIR%%/function-outline.S
 %%EMACS_LIBDIR%%/%%ETCDIR%%/git-ref
 %%EMACS_LIBDIR%%/%%ETCDIR%%/icons/rbuffer.xpm
 %%EMACS_LIBDIR%%/%%ETCDIR%%/icons/rfunction.xpm
@@ -32,25 +29,17 @@
 %%EMACS_LIBDIR%%/%%ETCDIR%%/icons/switch_ess.xpm
 %%EMACS_LIBDIR%%/%%ETCDIR%%/icons/switchr.xpm
 %%EMACS_LIBDIR%%/%%ETCDIR%%/icons/switchs.xpm
-%%EMACS_LIBDIR%%/%%ETCDIR%%/sas-keys.doc
-%%EMACS_LIBDIR%%/%%ETCDIR%%/sas-keys.ps
-%%EMACS_LIBDIR%%/%%ETCDIR%%/sas-keys.rtf
-%%EMACS_SITE_LISPDIR%%/ess/ChangeLog
 %%EMACS_SITE_LISPDIR%%/ess/ess-arc-d.el
 %%EMACS_SITE_LISPDIR%%/ess/ess-arc-d.elc
+%%EMACS_SITE_LISPDIR%%/ess/ess-autoloads.el
 %%EMACS_SITE_LISPDIR%%/ess/ess-bugs-d.el
 %%EMACS_SITE_LISPDIR%%/ess/ess-bugs-d.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess-bugs-l.el
 %%EMACS_SITE_LISPDIR%%/ess/ess-bugs-l.elc
-%%EMACS_SITE_LISPDIR%%/ess/ess-comp.el
-%%EMACS_SITE_LISPDIR%%/ess/ess-comp.elc
-%%EMACS_SITE_LISPDIR%%/ess/ess-compat.el
-%%EMACS_SITE_LISPDIR%%/ess/ess-compat.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess-custom.el
 %%EMACS_SITE_LISPDIR%%/ess/ess-custom.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess-dde.el
 %%EMACS_SITE_LISPDIR%%/ess/ess-dde.elc
-%%EMACS_SITE_LISPDIR%%/ess/ess-eldoc.el
 %%EMACS_SITE_LISPDIR%%/ess/ess-eldoc.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess-font-lock.el
 %%EMACS_SITE_LISPDIR%%/ess/ess-font-lock.elc
@@ -82,10 +71,13 @@
 %%EMACS_SITE_LISPDIR%%/ess/ess-omg-d.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess-omg-l.el
 %%EMACS_SITE_LISPDIR%%/ess/ess-omg-l.elc
-%%EMACS_SITE_LISPDIR%%/ess/ess-r-args.el
+%%EMACS_SITE_LISPDIR%%/ess/ess-r-a.el
+%%EMACS_SITE_LISPDIR%%/ess/ess-r-a.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess-r-args.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess-r-completion.el
 %%EMACS_SITE_LISPDIR%%/ess/ess-r-completion.elc
+%%EMACS_SITE_LISPDIR%%/ess/ess-r-flymake.el
+%%EMACS_SITE_LISPDIR%%/ess/ess-r-flymake.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess-r-gui.el
 %%EMACS_SITE_LISPDIR%%/ess/ess-r-gui.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess-r-mode.el
@@ -94,6 +86,8 @@
 %%EMACS_SITE_LISPDIR%%/ess/ess-r-package.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess-r-syntax.el
 %%EMACS_SITE_LISPDIR%%/ess/ess-r-syntax.elc
+%%EMACS_SITE_LISPDIR%%/ess/ess-r-xref.el
+%%EMACS_SITE_LISPDIR%%/ess/ess-r-xref.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess-rd.el
 %%EMACS_SITE_LISPDIR%%/ess/ess-rd.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess-rdired.el
@@ -154,5 +148,4 @@
 %%EMACS_SITE_LISPDIR%%/ess/make-regexp.elc
 %%EMACS_SITE_LISPDIR%%/ess/mouseme.el
 %%EMACS_SITE_LISPDIR%%/ess/mouseme.elc
-%%EMACS_SITE_LISPDIR%%/ess/msdos.el
 %%EMACS_SITE_LISPDIR%%/ess/msdos.elc