update ess to 5.3.4

4 years worth of bug fixes and enhancements.

5 files changed, 75 insertions, 74 deletions

diff --git a/math/ess/Makefile b/math/ess/Makefile
index 45fa5e65073..0233beed085 100644
--- a/math/ess/Makefile
+++ b/math/ess/Makefile
@@ -1,17 +1,19 @@
-# $NetBSD: Makefile,v 1.13 2006/03/31 04:29:51 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2007/06/11 14:16:25 markd Exp $
 
-DISTNAME=	ess-5.1.24
+DISTNAME=	ess-5.3.4
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	2
 CATEGORIES=	math
-MASTER_SITES=	http://software.biostat.washington.edu/ess/
+MASTER_SITES=	http://ess.r-project.org/downloads/ess/
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	markd@NetBSD.org
-HOMEPAGE=	http://software.biostat.washington.edu/statsoft/ess/
+HOMEPAGE=	http://ess.r-project.org/
 COMMENT=	Emacs Speaks Statistics
 
 USE_TOOLS+=	makeinfo perl
 EMACS_MODULES=	base
+INFO_FILES=	# PLIST
+
 
 MAKE_ENV+=	LISPDIR=${EMACS_LISPPREFIX}/ess
 MAKEFLAGS+=	EMACS=${EMACS_BIN:Q}
@@ -20,7 +22,7 @@ INSTALLATION_DIRS=	${EMACS_INFOPREFIX} ${EMACS_LISPPREFIX}/ess
 
 do-install:
 	cd ${WRKSRC}/lisp && ${INSTALL_DATA} *.el* ${EMACS_LISPPREFIX}/ess
-	cd ${WRKSRC}/doc; for f in ess.info ess.info-[0-9]*; do		\
+	cd ${WRKSRC}/doc/info; for f in ess.info ess.info-[0-9]*; do	\
 		${TEST} ! -f "$$f" ||					\
 		${INSTALL_DATA} "$$f" ${EMACS_INFOPREFIX};		\
         done
diff --git a/math/ess/PLIST b/math/ess/PLIST
index cf0e390f65a..6d26095392b 100644
--- a/math/ess/PLIST
+++ b/math/ess/PLIST
@@ -1,12 +1,12 @@
-@comment $NetBSD: PLIST,v 1.3 2006/03/31 04:29:51 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2007/06/11 14:16:26 markd Exp $
 ${EMACS_INFOPREFIX}/ess.info
-${EMACS_LISPPREFIX}/ess/ess-batch.el
 ${EMACS_LISPPREFIX}/ess/ess-comp.el
 ${EMACS_LISPPREFIX}/ess/ess-comp.elc
 ${EMACS_LISPPREFIX}/ess/ess-cust.el
 ${EMACS_LISPPREFIX}/ess/ess-cust.elc
+${EMACS_LISPPREFIX}/ess/ess-dde.el
+${EMACS_LISPPREFIX}/ess/ess-dde.elc
 ${EMACS_LISPPREFIX}/ess/ess-debug.el
-${EMACS_LISPPREFIX}/ess/ess-dump.el
 ${EMACS_LISPPREFIX}/ess/ess-emcs.el
 ${EMACS_LISPPREFIX}/ess/ess-emcs.elc
 ${EMACS_LISPPREFIX}/ess/ess-font-lock.el
@@ -15,9 +15,7 @@ ${EMACS_LISPPREFIX}/ess/ess-help.el
 ${EMACS_LISPPREFIX}/ess/ess-help.elc
 ${EMACS_LISPPREFIX}/ess/ess-inf.el
 ${EMACS_LISPPREFIX}/ess/ess-inf.elc
-${EMACS_LISPPREFIX}/ess/ess-iw32.el
-${EMACS_LISPPREFIX}/ess/ess-iw32.elc
-${EMACS_LISPPREFIX}/ess/ess-iw32b.el
+${EMACS_LISPPREFIX}/ess/ess-install.el
 ${EMACS_LISPPREFIX}/ess/ess-latex.el
 ${EMACS_LISPPREFIX}/ess/ess-menu.el
 ${EMACS_LISPPREFIX}/ess/ess-menu.elc
@@ -27,27 +25,34 @@ ${EMACS_LISPPREFIX}/ess/ess-mous.el
 ${EMACS_LISPPREFIX}/ess/ess-mous.elc
 ${EMACS_LISPPREFIX}/ess/ess-noweb.el
 ${EMACS_LISPPREFIX}/ess/ess-noweb.elc
-${EMACS_LISPPREFIX}/ess/ess-sas-make-regexp.el
+${EMACS_LISPPREFIX}/ess/ess-rdired.el
+${EMACS_LISPPREFIX}/ess/ess-rdired.elc
 ${EMACS_LISPPREFIX}/ess/ess-send.el
 ${EMACS_LISPPREFIX}/ess/ess-send2.el
 ${EMACS_LISPPREFIX}/ess/ess-site.el
 ${EMACS_LISPPREFIX}/ess/ess-site.elc
-${EMACS_LISPPREFIX}/ess/ess-sysdp.el
-${EMACS_LISPPREFIX}/ess/ess-sysdp.elc
+${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-trns.el
 ${EMACS_LISPPREFIX}/ess/ess-trns.elc
 ${EMACS_LISPPREFIX}/ess/ess-utils.el
 ${EMACS_LISPPREFIX}/ess/ess-utils.elc
-${EMACS_LISPPREFIX}/ess/ess-vars.el
 ${EMACS_LISPPREFIX}/ess/ess.el
 ${EMACS_LISPPREFIX}/ess/ess.elc
 ${EMACS_LISPPREFIX}/ess/essa-r.el
 ${EMACS_LISPPREFIX}/ess/essa-r.elc
 ${EMACS_LISPPREFIX}/ess/essa-sas.el
+${EMACS_LISPPREFIX}/ess/essa-sas.elc
 ${EMACS_LISPPREFIX}/ess/essd-arc.el
 ${EMACS_LISPPREFIX}/ess/essd-arc.elc
+${EMACS_LISPPREFIX}/ess/essd-bugs.el
+${EMACS_LISPPREFIX}/ess/essd-bugs.elc
 ${EMACS_LISPPREFIX}/ess/essd-els.el
 ${EMACS_LISPPREFIX}/ess/essd-els.elc
+${EMACS_LISPPREFIX}/ess/essd-jags.el
+${EMACS_LISPPREFIX}/ess/essd-jags.elc
 ${EMACS_LISPPREFIX}/ess/essd-omg.el
 ${EMACS_LISPPREFIX}/ess/essd-omg.elc
 ${EMACS_LISPPREFIX}/ess/essd-r.el
@@ -62,12 +67,11 @@ ${EMACS_LISPPREFIX}/ess/essd-sp3.el
 ${EMACS_LISPPREFIX}/ess/essd-sp3.elc
 ${EMACS_LISPPREFIX}/ess/essd-sp4.el
 ${EMACS_LISPPREFIX}/ess/essd-sp4.elc
-${EMACS_LISPPREFIX}/ess/essd-sp4com.el
-${EMACS_LISPPREFIX}/ess/essd-sp4com.elc
 ${EMACS_LISPPREFIX}/ess/essd-sp5.el
 ${EMACS_LISPPREFIX}/ess/essd-sp5.elc
 ${EMACS_LISPPREFIX}/ess/essd-sp6.el
 ${EMACS_LISPPREFIX}/ess/essd-sp6.elc
+${EMACS_LISPPREFIX}/ess/essd-sp6w.el
 ${EMACS_LISPPREFIX}/ess/essd-sta.el
 ${EMACS_LISPPREFIX}/ess/essd-sta.elc
 ${EMACS_LISPPREFIX}/ess/essd-vst.el
@@ -76,9 +80,9 @@ ${EMACS_LISPPREFIX}/ess/essd-xls.el
 ${EMACS_LISPPREFIX}/ess/essd-xls.elc
 ${EMACS_LISPPREFIX}/ess/essddr.el
 ${EMACS_LISPPREFIX}/ess/essddr.elc
-${EMACS_LISPPREFIX}/ess/essdsp6w.el
 ${EMACS_LISPPREFIX}/ess/essl-bug.el
-${EMACS_LISPPREFIX}/ess/essl-bug.elc
+${EMACS_LISPPREFIX}/ess/essl-bugs.el
+${EMACS_LISPPREFIX}/ess/essl-bugs.elc
 ${EMACS_LISPPREFIX}/ess/essl-lsp.el
 ${EMACS_LISPPREFIX}/ess/essl-lsp.elc
 ${EMACS_LISPPREFIX}/ess/essl-omg.el
@@ -89,8 +93,6 @@ ${EMACS_LISPPREFIX}/ess/essl-sas.el
 ${EMACS_LISPPREFIX}/ess/essl-sas.elc
 ${EMACS_LISPPREFIX}/ess/essl-sta.el
 ${EMACS_LISPPREFIX}/ess/essl-sta.elc
-${EMACS_LISPPREFIX}/ess/essnt204.el
-${EMACS_LISPPREFIX}/ess/essnt204.elc
 ${EMACS_LISPPREFIX}/ess/make-regexp.el
 ${EMACS_LISPPREFIX}/ess/make-regexp.elc
 ${EMACS_LISPPREFIX}/ess/mouseme.el
@@ -100,6 +102,4 @@ ${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_LISPPREFIX}/ess/semantic-r.el
-${EMACS_LISPPREFIX}/ess/semantic-sas.el
 @dirrm ${EMACS_LISPPREFIX}/ess
diff --git a/math/ess/distinfo b/math/ess/distinfo
index 9533e5c5fe4..21cb95d9b5c 100644
--- a/math/ess/distinfo
+++ b/math/ess/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 12:06:54 agc Exp $
+$NetBSD: distinfo,v 1.3 2007/06/11 14:16:26 markd Exp $
 
-SHA1 (ess-5.1.24.tar.gz) = ffa5855a681309691f69ba2a1a023b71d227f444
-RMD160 (ess-5.1.24.tar.gz) = fba89db7992dd006430846fe12c63d5ef9394862
-Size (ess-5.1.24.tar.gz) = 1039537 bytes
-SHA1 (patch-aa) = b7579dc393eae40ca73fd6d60bada6daef316121
-SHA1 (patch-ab) = 6dc37139be5fe23f8c7b6a84eec9610cd4f347b6
+SHA1 (ess-5.3.4.tgz) = 2c090e6673a08debc285f3e19cefde84899b4add
+RMD160 (ess-5.3.4.tgz) = 029d6c6602cde7d809b733434aba221e924f5be0
+Size (ess-5.3.4.tgz) = 2609357 bytes
+SHA1 (patch-aa) = a545d12fd8a7b963c5d0879d447b158b741b5e02
+SHA1 (patch-ab) = 4cfb513257a8b1e496a6741488705bc4e9472b9e
diff --git a/math/ess/patches/patch-aa b/math/ess/patches/patch-aa
index 4b181e9b314..67487ec4b58 100644
--- a/math/ess/patches/patch-aa
+++ b/math/ess/patches/patch-aa
@@ -1,44 +1,43 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/06/05 11:51:11 markd Exp $
+$NetBSD: patch-aa,v 1.2 2007/06/11 14:16:26 markd Exp $
 
---- Makeconf.orig	Thu Aug  8 21:58:21 2002
+--- Makeconf.orig	2007-04-27 05:13:11.000000000 +1200
 +++ Makeconf
-@@ -8,7 +8,7 @@ SHELL = /bin/sh
- ## emacs distribution that you are installing ESS for.
- ##
- ## EMACS 21:  {MM: Keep this as default -- ``has always been''}
+@@ -16,14 +16,14 @@
+ ## ETCDIR          Destination of script and icon files
+ ## PREFIX/DESTDIR  Directory prepended to LISPDIR, INFODIR & ETCDIR
+ ##                 Specify either PREFIX or DESTDIR to over-ride /usr/local
+-DESTDIR=/usr/local
+-PREFIX=$(DESTDIR)
++#DESTDIR=/usr/local
++#PREFIX=$(DESTDIR)
+ #
+ ## GNU Emacs
 -EMACS=emacs
+-LISPDIR=$(PREFIX)/share/emacs/site-lisp
+-INFODIR=$(PREFIX)/info
+-ETCDIR =$(PREFIX)/share/emacs/etc/ess
 +#EMACS=emacs
- ## XEMACS 21:
++#LISPDIR=$(PREFIX)/share/emacs/site-lisp
++#INFODIR=$(PREFIX)/info
++#ETCDIR =$(PREFIX)/share/emacs/etc/ess
+ #
+ ## XEmacs
  #EMACS=xemacs
- 
-@@ -27,14 +27,14 @@ EMACSBATCH = $(EMACS) -batch -no-site-fi
- ## but we want source-file target-directory; we also want to
- ## preserve owner, group and time-stamp; lastly, note that we
- ## are assuming that the target-directory exists
+@@ -48,7 +48,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
+ ##                            ^^^^^^^^^^ today's bandwidth is fast
+ MAKETXT  = $(MAKEINFO) --no-validate --no-headers --no-split -o -
+@@ -56,7 +56,7 @@ MAKETXT  = $(MAKEINFO) --no-validate --n
+ INSTALLDIR = install -d
+ #INSTALLDIR = mkdir -p
+ #
 -INSTALL = cp -p
 +#INSTALL = cp -p
+ #INSTALL = install
  
- # What GZCAT is called on your system (GNU gzip "cat")
- #GZCAT = gzcat
--GZCAT = zcat
-+#GZCAT = zcat
- 
- # program to convert .texi{nfo} to .info
--MAKEINFO = makeinfo
-+#MAKEINFO = makeinfo
- MAKETXT = $(MAKEINFO) --no-validate --no-headers --no-split -o -
- 
- ## Set ESSVERSION to the contents of VERSION
-@@ -46,10 +46,10 @@ ESSVERSION=$(shell cat ./VERSION 2> /dev
- 
- # Destination of your info files relative to the doc directory
- # defaults to the info directory
--INFODIR = ../info
-+#INFODIR = ../info
- 
- # Destination of your byte-compiled elisp (.elc) files
- # relative to the lisp directory (which is the default)
--LISPDIR = .
-+#LISPDIR = .
- 
- .SUFFIXES: .i3 .m3 .nw .tex .dvi .html .c .h .el .elc
+ ## Section 3
diff --git a/math/ess/patches/patch-ab b/math/ess/patches/patch-ab
index 4f1941cc8ff..567454ada33 100644
--- a/math/ess/patches/patch-ab
+++ b/math/ess/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/06/05 11:51:11 markd Exp $
+$NetBSD: patch-ab,v 1.2 2007/06/11 14:16:26 markd Exp $
 
---- doc/Makefile.orig	Tue Apr 15 23:57:46 2003
+--- doc/Makefile.orig	2007-04-27 05:13:00.000000000 +1200
 +++ doc/Makefile
-@@ -24,7 +24,7 @@ TEXISRC = announc.texi authors.texi bugr
- 
- ### Targets --
+@@ -34,7 +34,7 @@ PDFs = ess.pdf readme.pdf refcard/refcar
+ DVIs = ess.dvi readme.dvi
+ TXTs = ../README ../ANNOUNCE
  
 -all  : info text html dvi pdf
 +all  : info text
- install : $(INFODIR)/ess.info
- info : ess.info 
- text : ../README ../ANNOUNCE
+ docs : info text html
+ info : info/ess.info
+ text : $(TXTs)