update to 5.1.10 (PR pkg/18369 by Wolfgang Rupprecht)

notable changes:
-many bugfixes
-allow XYZ sets in polar graphs
-extended x-correlation routines
-use leading zeros in axis year formats
-implemented "safe" mode

5 files changed, 30 insertions, 37 deletions

diff --git a/math/grace/Makefile b/math/grace/Makefile
index 5eb9052d9ac..35a7479c563 100644
--- a/math/grace/Makefile
+++ b/math/grace/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2002/09/23 17:22:54 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2002/09/27 12:01:15 drochner Exp $
 #
 
-DISTNAME=	grace-5.1.4
-PKGREVISION=	1
+DISTNAME=	grace-5.1.10
 CATEGORIES=	math graphics x11
 MASTER_SITES=	ftp://plasma-gate.weizmann.ac.il/pub/grace/src/ \
 		ftp://linux.mathematik.tu-darmstadt.de/pub/linux/mirrors/misc/grace/src/ \
@@ -12,7 +11,7 @@ MASTER_SITES=	ftp://plasma-gate.weizmann.ac.il/pub/grace/src/ \
 		ftp://ftp.u-aizu.ac.jp/pub/SciEng/math/grace/src/ \
 		ftp://ftp2.netmor.com/pub/mirrors/grace/src/
 
-MAINTAINER=	drochner@netbsd.org
+MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://plasma-gate.weizmann.ac.il/Grace/
 COMMENT=	GRaphing, Advanced Computation and Exploration of data
 
@@ -24,7 +23,7 @@ USE_GMAKE=		YES
 USE_FORTRAN=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--enable-grace-home=${PREFIX}/grace
-CONFIGURE_ARGS+=	--with-extra-incpath=${BUILDLINK_DIR}/include
+CONFIGURE_ARGS+=	--without-bundled-xbae
 MAKE_ENV+=		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
 post-install:
diff --git a/math/grace/PLIST b/math/grace/PLIST
index 4ec609ab852..cdcb5bf1e53 100644
--- a/math/grace/PLIST
+++ b/math/grace/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:12:28 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/09/27 12:01:15 drochner Exp $
 bin/xmgrace
 grace/bin/gracebat
 grace/bin/xmgrace
@@ -46,6 +46,7 @@ grace/fonts/enc/WinAnsi.enc
 grace/templates/Default.agr
 grace/doc/CHANGES.html
 grace/doc/GPL.html
+grace/doc/convcal.1
 grace/doc/philosophical-gnu-sm.jpg
 grace/doc/nohelp.html
 grace/doc/FAQ.html
@@ -74,9 +75,11 @@ grace/examples/boxplot.agr
 grace/examples/logit.agr
 grace/examples/logtest.par
 grace/examples/pie.agr
+grace/examples/reciprocal.agr
 grace/examples/times.agr
 grace/examples/txttrans.agr
 grace/examples/vmap.agr
+grace/examples/xycolor.agr
 grace/examples/xysize.agr
 grace/examples/au.agr
 grace/examples/manygraphs.agr
diff --git a/math/grace/distinfo b/math/grace/distinfo
index b25e3e9faef..97b2fea2a5b 100644
--- a/math/grace/distinfo
+++ b/math/grace/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2001/07/29 15:19:15 wiz Exp $
+$NetBSD: distinfo,v 1.4 2002/09/27 12:01:16 drochner Exp $
 
-SHA1 (grace-5.1.4.tar.gz) = 64ec51327bc45c866b61df38e12865ba6e9b61e2
-Size (grace-5.1.4.tar.gz) = 2385006 bytes
-SHA1 (patch-aa) = 542ba023a03fbf102fda1722447a0a53e79415b2
-SHA1 (patch-ab) = b7fb08b589d79960acc038628003b0baabdadf68
+SHA1 (grace-5.1.10.tar.gz) = 074e998a04cd12d68ea70bedce54e0dd48174396
+Size (grace-5.1.10.tar.gz) = 2418504 bytes
+SHA1 (patch-aa) = 9ec6f7d6e6cca7950c8aade4d97511ad8a3ae1c1
+SHA1 (patch-ab) = d73881cd5911abc972591f03dba2afe1a033384e
diff --git a/math/grace/patches/patch-aa b/math/grace/patches/patch-aa
index 65cbafb839b..0c21bd51756 100644
--- a/math/grace/patches/patch-aa
+++ b/math/grace/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/02/03 19:47:41 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2002/09/27 12:01:16 drochner Exp $
 
---- examples/Makefile.orig	Sat Oct 23 00:36:31 1999
-+++ examples/Makefile	Thu Feb  3 11:52:37 2000
-@@ -32,7 +32,7 @@
+--- examples/Makefile.orig	Sat Jun 22 13:40:21 2002
++++ examples/Makefile	Thu Sep 26 21:01:32 2002
+@@ -33,7 +33,7 @@
  install : $(EXAMPLES) $(DOTEST)
- 	$(MKINSTALLDIRS) $(GRACE_HOME)/examples
- 	for i in $(EXAMPLES); do $(INSTALL_DATA) $$i $(GRACE_HOME)/examples; done
--	$(INSTALL_PROGRAM) $(DOTEST) $(GRACE_HOME)/examples/$(DOTEST)
-+	$(INSTALL_SCRIPT) $(DOTEST) $(GRACE_HOME)/examples/$(DOTEST)
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/examples
+ 	for i in $(EXAMPLES); do $(INSTALL_DATA) $$i $(DESTDIR)$(GRACE_HOME)/examples; done
+-	$(INSTALL_PROGRAM) $(DOTEST) $(DESTDIR)$(GRACE_HOME)/examples/$(DOTEST)
++	$(INSTALL_SCRIPT) $(DOTEST) $(DESTDIR)$(GRACE_HOME)/examples/$(DOTEST)
  
  links : dummy
  
diff --git a/math/grace/patches/patch-ab b/math/grace/patches/patch-ab
index c397b703c03..d533ba05f2b 100644
--- a/math/grace/patches/patch-ab
+++ b/math/grace/patches/patch-ab
@@ -1,22 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/02/03 19:47:41 drochner Exp $
+$NetBSD: patch-ab,v 1.2 2002/09/27 12:01:17 drochner Exp $
 
---- auxiliary/Makefile.orig	Fri Sep 24 23:23:51 1999
-+++ auxiliary/Makefile	Thu Feb  3 12:00:25 2000
-@@ -9,7 +9,8 @@
- include $(TOP)/Make.conf
- 
- AUXILIARIES = README convcal.c magic.grace
--PROGRAMS = fdf2fit convcal$(EXE)
-+PROGRAMS = convcal$(EXE)
-+SCRIPTS = fdf2fit
- 
- all : convcal$(EXE)
- 
-@@ -26,6 +27,7 @@
- 	$(MKINSTALLDIRS) $(GRACE_HOME)/auxiliary
- 	for i in $(AUXILIARIES); do $(INSTALL_DATA) $$i $(GRACE_HOME)/auxiliary; done
- 	for i in $(PROGRAMS); do $(INSTALL_PROGRAM) $$i $(GRACE_HOME)/bin; done
-+	for i in $(SCRIPTS); do $(INSTALL_SCRIPT) $$i $(GRACE_HOME)/bin; done
+--- auxiliary/Makefile.orig	Fri Sep 27 10:20:55 2002
++++ auxiliary/Makefile	Fri Sep 27 10:21:14 2002
+@@ -28,7 +28,7 @@
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/auxiliary
+ 	for i in $(AUXILIARIES); do $(INSTALL_DATA) $$i $(DESTDIR)$(GRACE_HOME)/auxiliary; done
+ 	for i in $(PROGRAMS); do $(INSTALL_PROGRAM) -s $$i $(DESTDIR)$(GRACE_HOME)/bin; done
+-	for i in $(SCRIPTS); do $(INSTALL_PROGRAM) $$i $(DESTDIR)$(GRACE_HOME)/bin; done
++	for i in $(SCRIPTS); do $(INSTALL_SCRIPT) $$i $(DESTDIR)$(GRACE_HOME)/bin; done
  
  tests : dummy