Update to ess 13.09.1

4 years worth of bugfixes/updates.

5 files changed, 61 insertions, 53 deletions

diff --git a/math/ess/Makefile b/math/ess/Makefile
index 1aee435c5ef..63e8767113d 100644
--- a/math/ess/Makefile
+++ b/math/ess/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2013/05/31 12:41:21 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2014/02/06 09:49:15 markd Exp $
 
-DISTNAME=	ess-5.11
-PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	3
+DISTNAME=	ess-13.09-1
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME:S/-1$/.1/}
 CATEGORIES=	math
 MASTER_SITES=	http://ess.r-project.org/downloads/ess/
 EXTRACT_SUFX=	.tgz
@@ -11,7 +10,7 @@ MAINTAINER=	markd@NetBSD.org
 HOMEPAGE=	http://ess.r-project.org/
 COMMENT=	Emacs Speaks Statistics
 
-USE_TOOLS+=	makeinfo perl
+USE_TOOLS+=	makeinfo perl gmake
 EMACS_MODULES=	base
 INFO_FILES=	yes
 
diff --git a/math/ess/PLIST b/math/ess/PLIST
index 65005d9fccb..d6ffa9740ab 100644
--- a/math/ess/PLIST
+++ b/math/ess/PLIST
@@ -1,19 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2010/09/15 08:46:21 markd Exp $
-${EMACS_ETCPREFIX}/ess/ess-s4.S
-${EMACS_ETCPREFIX}/ess/ess-sas-sh-command
-${EMACS_ETCPREFIX}/ess/ess-sp3.S
-${EMACS_ETCPREFIX}/ess/function-outline.S
-${EMACS_ETCPREFIX}/ess/icons/rbuffer.xpm
-${EMACS_ETCPREFIX}/ess/icons/rfunction.xpm
-${EMACS_ETCPREFIX}/ess/icons/rline.xpm
-${EMACS_ETCPREFIX}/ess/icons/rregion.xpm
-${EMACS_ETCPREFIX}/ess/icons/splus_letter_small.xpm
-${EMACS_ETCPREFIX}/ess/icons/splus_letters_large.xpm
-${EMACS_ETCPREFIX}/ess/icons/spluslogo.xpm
-${EMACS_ETCPREFIX}/ess/icons/startr.xpm
-${EMACS_ETCPREFIX}/ess/icons/switch_ess.xpm
-${EMACS_ETCPREFIX}/ess/icons/switchr.xpm
-${EMACS_ETCPREFIX}/ess/icons/switchs.xpm
+@comment $NetBSD: PLIST,v 1.8 2014/02/06 09:49:15 markd Exp $
 ${EMACS_INFOPREFIX}/ess.info
 ${EMACS_LISPPREFIX}/ess/ess-arc-d.el
 ${EMACS_LISPPREFIX}/ess/ess-arc-d.elc
@@ -30,10 +15,14 @@ ${EMACS_LISPPREFIX}/ess/ess-custom.elc
 ${EMACS_LISPPREFIX}/ess/ess-dde.el
 ${EMACS_LISPPREFIX}/ess/ess-dde.elc
 ${EMACS_LISPPREFIX}/ess/ess-debug.el
+${EMACS_LISPPREFIX}/ess/ess-developer.el
+${EMACS_LISPPREFIX}/ess/ess-developer.elc
 ${EMACS_LISPPREFIX}/ess/ess-eldoc.el
 ${EMACS_LISPPREFIX}/ess/ess-eldoc.elc
 ${EMACS_LISPPREFIX}/ess/ess-font-lock.el
 ${EMACS_LISPPREFIX}/ess/ess-font-lock.elc
+${EMACS_LISPPREFIX}/ess/ess-gretl.el
+${EMACS_LISPPREFIX}/ess/ess-gretl.elc
 ${EMACS_LISPPREFIX}/ess/ess-help.el
 ${EMACS_LISPPREFIX}/ess/ess-help.elc
 ${EMACS_LISPPREFIX}/ess/ess-inf.el
@@ -41,15 +30,20 @@ ${EMACS_LISPPREFIX}/ess/ess-inf.elc
 ${EMACS_LISPPREFIX}/ess/ess-install.el
 ${EMACS_LISPPREFIX}/ess/ess-jags-d.el
 ${EMACS_LISPPREFIX}/ess/ess-jags-d.elc
+${EMACS_LISPPREFIX}/ess/ess-julia.el
+${EMACS_LISPPREFIX}/ess/ess-julia.elc
 ${EMACS_LISPPREFIX}/ess/ess-lsp-l.el
 ${EMACS_LISPPREFIX}/ess/ess-lsp-l.elc
 ${EMACS_LISPPREFIX}/ess/ess-menu.el
 ${EMACS_LISPPREFIX}/ess/ess-menu.elc
 ${EMACS_LISPPREFIX}/ess/ess-mode.el
 ${EMACS_LISPPREFIX}/ess/ess-mode.elc
-${EMACS_LISPPREFIX}/ess/ess-mous.el
 ${EMACS_LISPPREFIX}/ess/ess-mouse.el
 ${EMACS_LISPPREFIX}/ess/ess-mouse.elc
+${EMACS_LISPPREFIX}/ess/ess-noweb-font-lock-mode.el
+${EMACS_LISPPREFIX}/ess/ess-noweb-font-lock-mode.elc
+${EMACS_LISPPREFIX}/ess/ess-noweb-mode.el
+${EMACS_LISPPREFIX}/ess/ess-noweb-mode.elc
 ${EMACS_LISPPREFIX}/ess/ess-noweb.el
 ${EMACS_LISPPREFIX}/ess/ess-noweb.elc
 ${EMACS_LISPPREFIX}/ess/ess-omg-d.el
@@ -104,6 +98,8 @@ ${EMACS_LISPPREFIX}/ess/ess-swv.el
 ${EMACS_LISPPREFIX}/ess/ess-swv.elc
 ${EMACS_LISPPREFIX}/ess/ess-toolbar.el
 ${EMACS_LISPPREFIX}/ess/ess-toolbar.elc
+${EMACS_LISPPREFIX}/ess/ess-tracebug.el
+${EMACS_LISPPREFIX}/ess/ess-tracebug.elc
 ${EMACS_LISPPREFIX}/ess/ess-trns.el
 ${EMACS_LISPPREFIX}/ess/ess-trns.elc
 ${EMACS_LISPPREFIX}/ess/ess-utils.el
@@ -122,7 +118,18 @@ ${EMACS_LISPPREFIX}/ess/mouseme.el
 ${EMACS_LISPPREFIX}/ess/mouseme.elc
 ${EMACS_LISPPREFIX}/ess/msdos.el
 ${EMACS_LISPPREFIX}/ess/msdos.elc
-${EMACS_LISPPREFIX}/ess/noweb-font-lock-mode.el
-${EMACS_LISPPREFIX}/ess/noweb-font-lock-mode.elc
-${EMACS_LISPPREFIX}/ess/noweb-mode.el
-${EMACS_LISPPREFIX}/ess/noweb-mode.elc
+${EMACS_ETCPREFIX}/ess/ess-s4.S
+${EMACS_ETCPREFIX}/ess/ess-sas-sh-command
+${EMACS_ETCPREFIX}/ess/ess-sp3.S
+${EMACS_ETCPREFIX}/ess/function-outline.S
+${EMACS_ETCPREFIX}/ess/icons/rbuffer.xpm
+${EMACS_ETCPREFIX}/ess/icons/rfunction.xpm
+${EMACS_ETCPREFIX}/ess/icons/rline.xpm
+${EMACS_ETCPREFIX}/ess/icons/rregion.xpm
+${EMACS_ETCPREFIX}/ess/icons/splus_letter_small.xpm
+${EMACS_ETCPREFIX}/ess/icons/splus_letters_large.xpm
+${EMACS_ETCPREFIX}/ess/icons/spluslogo.xpm
+${EMACS_ETCPREFIX}/ess/icons/startr.xpm
+${EMACS_ETCPREFIX}/ess/icons/switch_ess.xpm
+${EMACS_ETCPREFIX}/ess/icons/switchr.xpm
+${EMACS_ETCPREFIX}/ess/icons/switchs.xpm
diff --git a/math/ess/distinfo b/math/ess/distinfo
index 39b0574617d..6188ea5234c 100644
--- a/math/ess/distinfo
+++ b/math/ess/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2010/09/15 08:46:21 markd Exp $
+$NetBSD: distinfo,v 1.5 2014/02/06 09:49:15 markd Exp $
 
-SHA1 (ess-5.11.tgz) = 541af2444a55d8ab3484606314caf64cc5db4688
-RMD160 (ess-5.11.tgz) = adc55eba44133648eb62f1ab0706aa46cde97991
-Size (ess-5.11.tgz) = 2980487 bytes
-SHA1 (patch-aa) = 6f82af22b67869a7fdfd10c596bf8737b8919200
-SHA1 (patch-ab) = d7f02a34512c0d22d38fa240d53dcccc88d14848
+SHA1 (ess-13.09-1.tgz) = e4ee1155d137ae421137c067994bbb866a8aaee5
+RMD160 (ess-13.09-1.tgz) = e86dd26932de00ee2f224dcc1c8eb0de78e7c2be
+Size (ess-13.09-1.tgz) = 3331643 bytes
+SHA1 (patch-aa) = 2e2c39c4c98e37cbbb968d605afd3d98a4199e68
+SHA1 (patch-ab) = 22673b8f70ac9ba952d9e23eb9ca3fcbb18e371b
diff --git a/math/ess/patches/patch-aa b/math/ess/patches/patch-aa
index aa808f99d0f..58328cb4f0d 100644
--- a/math/ess/patches/patch-aa
+++ b/math/ess/patches/patch-aa
@@ -1,38 +1,40 @@
-$NetBSD: patch-aa,v 1.3 2010/09/15 08:46:21 markd Exp $
+$NetBSD: patch-aa,v 1.4 2014/02/06 09:49:15 markd Exp $
 
---- Makeconf.orig	2010-07-13 16:42:27.000000000 +0000
+--- Makeconf.orig	2013-11-23 00:40:17.000000000 +0000
 +++ Makeconf
-@@ -15,14 +15,14 @@
+@@ -15,15 +15,15 @@
  ## ETCDIR          Destination of script and icon files
  ## PREFIX(DESTDIR) Directory prepended to LISPDIR, INFODIR, DOCDIR & ETCDIR
  ##                 Specify either PREFIX or DESTDIR to over-ride /usr/local
--DESTDIR=/usr/local
+-DESTDIR=/usr
 -PREFIX=$(DESTDIR)
-+#DESTDIR=/usr/local
++#DESTDIR=/usr
 +#PREFIX=$(DESTDIR)
  #
- ## GNU Emacs
+ ##__ GNU Emacs __
 -EMACS=emacs
--LISPDIR=$(PREFIX)/share/emacs/site-lisp
--INFODIR=$(PREFIX)/info
+-SITELISP=$(PREFIX)/share/emacs/site-lisp
+-LISPDIR=$(SITELISP)/ess
+-INFODIR=$(PREFIX)/share/info
 -ETCDIR =$(PREFIX)/share/emacs/etc/ess
 +#EMACS=emacs
-+#LISPDIR=$(PREFIX)/share/emacs/site-lisp
-+#INFODIR=$(PREFIX)/info
++#SITELISP=$(PREFIX)/share/emacs/site-lisp
++#LISPDIR=$(SITELISP)/ess
++#INFODIR=$(PREFIX)/share/info
 +#ETCDIR =$(PREFIX)/share/emacs/etc/ess
  
- ## XEmacs
- #EMACS=xemacs
-@@ -48,7 +48,7 @@ EMACSBATCH = $(EMACS) -batch -no-site-fi
+ ##__ XEmacs __
+ #EMACS=$(PREFIX)/bin/xemacs
+@@ -67,7 +67,7 @@ EMACSBATCH = $(EMACS) -batch -no-site-fi
  #
  SHELL = /bin/sh
  #
 -MAKEINFO = LC_ALL=C LANG=en makeinfo
 +#MAKEINFO = LC_ALL=C LANG=en makeinfo
- MAKEHTML = $(MAKEINFO) --html --no-split --css-include=atouchofstyle.css -o -
+ # new:  MAKEHTML <output>.html  <input>.texi  {necessary to build 'Index'}
+ MAKEHTML = $(MAKEINFO) --html --no-split --css-include=atouchofstyle.css -o
  ##                            ^^^^^^^^^^ today's bandwidth is fast
- #MAKETXT  = $(MAKEINFO) --no-validate --no-headers --no-split -o -
-@@ -57,7 +57,7 @@ MAKETXT  = $(MAKEINFO) --no-validate --p
+@@ -77,7 +77,7 @@ MAKETXT  = $(MAKEINFO) --no-validate --p
  INSTALLDIR = install -d
  #INSTALLDIR = mkdir -p
  #
@@ -40,4 +42,4 @@ $NetBSD: patch-aa,v 1.3 2010/09/15 08:46:21 markd Exp $
 +#INSTALL = cp -p
  #INSTALL = install
  #
- DOCDIR=$(PREFIX)/share/doc/ess
+ UNINSTALL = rm -f
diff --git a/math/ess/patches/patch-ab b/math/ess/patches/patch-ab
index 218603527b0..d4998b7fcda 100644
--- a/math/ess/patches/patch-ab
+++ b/math/ess/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.3 2010/09/15 08:46:21 markd Exp $
+$NetBSD: patch-ab,v 1.4 2014/02/06 09:49:15 markd Exp $
 
---- doc/Makefile.orig	2010-07-13 16:42:20.000000000 +0000
+--- doc/Makefile.orig	2013-11-28 14:31:07.000000000 +0000
 +++ doc/Makefile
 @@ -35,7 +35,7 @@ PDFs = ess.pdf readme.pdf refcard/refcar
  DVIs = ess.dvi readme.dvi
- TXTs = ../README ../ANNOUNCE
+ TXTs = ../README ../ANNOUNCE ../NEWS ../ONEWS
  
 -all  : info text html dvi pdf
 +all  : info text
  docs : info text html
  info : info/ess.info
- text : $(TXTs) ../NEWS ../ONEWS
+ text : $(TXTs)