upgrade to 2.10.1

PR:		40663
Submitted by:	maintainer

2 files changed, 34 insertions, 121 deletions

diff --git a/math/gri/files/patch-aa b/math/gri/files/patch-aa
index 52288ad15d38..c2865bedd0db 100644
--- a/math/gri/files/patch-aa
+++ b/math/gri/files/patch-aa
@@ -1,33 +1,24 @@
-*** Makefile.in.orig	Sun May  7 11:44:07 2000
---- Makefile.in	Sat Sep 23 12:10:29 2000
-***************
-*** 154,167 ****
-  install: all
-  	echo "Installing into '$(prefix)' directory"
-  	cat startup.msg | sed -e s,VSN,${VERSION}, > tmp
-  	$(INSTALL_DATA) tmp $(prefix)/share/gri/startup.msg
-  	rm -f tmp
-  	$(INSTALL_PROGRAM)      gri             $(prefix)/bin/gri
-  	$(INSTALL_DATA)         gri.cmd         $(prefix)/share/gri/gri.cmd
-  	$(INSTALL_DATA)         license.txt     $(prefix)/share/gri/license.txt
-! 	$(INSTALL_PROGRAM)      gri_merge       $(prefix)/bin/gri_merge
-! 	$(INSTALL_PROGRAM)      gri_unpage      $(prefix)/bin/gri_unpage
-! 	cd doc; prefix=$(prefix) make html-install
-  
-  all: force
-  	make gri
---- 154,167 ----
-  install: all
-  	echo "Installing into '$(prefix)' directory"
-  	cat startup.msg | sed -e s,VSN,${VERSION}, > tmp
-+ 	-@mkdir $(prefix)/share/gri
-  	$(INSTALL_DATA) tmp $(prefix)/share/gri/startup.msg
-  	rm -f tmp
-  	$(INSTALL_PROGRAM)      gri             $(prefix)/bin/gri
-  	$(INSTALL_DATA)         gri.cmd         $(prefix)/share/gri/gri.cmd
-  	$(INSTALL_DATA)         license.txt     $(prefix)/share/gri/license.txt
-! 	$(INSTALL_DATA)      gri_merge       $(prefix)/bin/gri_merge
-! 	$(INSTALL_DATA)      gri_unpage      $(prefix)/bin/gri_unpage
-  
-  all: force
-  	make gri
+--- Makefile.in.orig	Sat Jun  1 13:37:59 2002
++++ Makefile.in	Mon Jul 15 15:56:40 2002
+@@ -118,17 +118,17 @@
+ 
+ install-bin:
+ 	cat startup.msg | sed -e s,VSN,${VERSION}, -e s,PREFIX,$(prefix), > tmp
+-	$(INSTALL_PROGRAM) -d $(libdir)
++	-@mkdir -p $(libdir)
+ 	$(INSTALL_DATA) tmp $(libdir)/startup.msg
+ 	rm -f tmp
+ 	$(INSTALL_DATA)         gri.cmd         $(libdir)/gri.cmd
+ 	$(INSTALL_DATA)         logo.dat        $(libdir)/logo.dat
+ 	$(INSTALL_DATA)         license.txt     $(libdir)/license.txt
+-	$(INSTALL_PROGRAM) -d                   $(prefix)/bin
++	-@mkdir -p $(prefix)/bin
+ 	$(INSTALL_PROGRAM)      gri             $(prefix)/bin/gri-$(VERSION)
+ 	(cd $(prefix)/bin/ ; rm -f gri ; ln -sf gri-$(VERSION) gri)
+-	$(INSTALL_PROGRAM)      gri_merge       $(prefix)/bin/gri_merge
+-	$(INSTALL_PROGRAM)      gri_unpage      $(prefix)/bin/gri_unpage
++	$(INSTALL_DATA)      gri_merge       $(prefix)/bin/gri_merge
++	$(INSTALL_DATA)      gri_unpage      $(prefix)/bin/gri_unpage
+ 
+ debian-lib = $(debian)/usr/share/gri/$(VERSION)
+ install_linux_debian: gri
diff --git a/math/gri/files/patch-ab b/math/gri/files/patch-ab
index 8bcb5be93f05..527060d9e9b7 100644
--- a/math/gri/files/patch-ab
+++ b/math/gri/files/patch-ab
@@ -1,88 +1,10 @@
-*** doc/Makefile.orig	Sun May  7 11:44:08 2000
---- doc/Makefile	Sat Sep 23 12:49:29 2000
-***************
-*** 1,6 ****
-  # Makefile for Gri documentation files.
-  
-!             GRI_DIR = /opt/gri
-             DEST_BIN = /doc/info
-                   RM = rm -f
-              REFCARD = refcard
---- 1,6 ----
-  # Makefile for Gri documentation files.
-  
-!             GRI_DIR = $(PREFIX)/share/doc/gri
-             DEST_BIN = /doc/info
-                   RM = rm -f
-              REFCARD = refcard
-***************
-*** 11,22 ****
-  FORCE:
-  
-  all:
-- 	make info
-  	make html
-  
-! install:
-! 	make info-install
-! 	make html-install
-  
-  read:
-  	chmod a+r Makefile
---- 11,27 ----
-  FORCE:
-  
-  all:
-  	make html
-  
-! #	make info
-! #	make html
-! 
-! man-install:
-! 	gzip -nfc -9 gri-manpage.1 > gri.1.gz
-! 	${INSTALL_MAN} gri.1.gz   ${PREFIX}/man/man1
-! 
-! #	make info-install
-! #	make html-install
-  
-  read:
-  	chmod a+r Makefile
-***************
-*** 48,69 ****
-  	perl archive-to-html.pl > Newsgroup.html
-  
-  html-install:
-! 	# GRI_DIR = /opt/gri
-! 	if test ! -d $(GRI_DIR)                    ; then mkdir -m 755 -p $(GRI_DIR)                    ; fi
-! 	if test ! -d $(GRI_DIR)/doc                ; then mkdir -m 755 -p $(GRI_DIR)/doc                ; fi
-! 	if test ! -d $(GRI_DIR)/doc/html           ; then mkdir -m 755 -p $(GRI_DIR)/doc/html           ; fi
-! 	if test ! -d $(GRI_DIR)/doc/html/examples  ; then mkdir -m 755 -p $(GRI_DIR)/doc/html/examples  ; fi
-! 	if test ! -d $(GRI_DIR)/doc/html/resources ; then mkdir -m 755 -p $(GRI_DIR)/doc/html/resources ; fi
-! 	-cp ./resources/*.gif    $(GRI_DIR)/doc/html/resources
-! 	-chmod a+r               $(GRI_DIR)/doc/html/resources/*
-! 	-cp ./examples/*         $(GRI_DIR)/doc/html/examples
-! 	-chmod a+r               $(GRI_DIR)/doc/html/examples/*
-! 	-cp ./*.html             $(GRI_DIR)/doc/html
-! 	-cp ./resources/logo.ps  $(GRI_DIR)/doc/html/resources
-! 	-cp ./resources/logo.gif $(GRI_DIR)/doc/html/resources
-! 	-cp ./resources/logo.gri $(GRI_DIR)/doc/html/resources
-  	-chmod a+r               $(GRI_DIR)/*
-- 	-make html-clean
-  
-  html-clean:
-  	-cp FAQ.html save
---- 53,66 ----
-  	perl archive-to-html.pl > Newsgroup.html
-  
-  html-install:
-! 	-cp ./resources/*.gif    $(GRI_DIR)/html/resources
-! 	-chmod a+r               $(GRI_DIR)/html/resources/*
-! 	-cp ./examples/*         $(GRI_DIR)/html/examples
-! 	-chmod a+r               $(GRI_DIR)/html/examples/*
-! 	-cp ./*.html             $(GRI_DIR)/html
-! 	-cp ./resources/logo.eps $(GRI_DIR)/html/resources
-! 	-cp ./resources/logo.gif $(GRI_DIR)/html/resources
-  	-chmod a+r               $(GRI_DIR)/*
-  
-  html-clean:
-  	-cp FAQ.html save
+--- doc/Makefile.orig	Sat Jun  1 13:37:59 2002
++++ doc/Makefile	Tue Jul 16 11:55:44 2002
+@@ -17,7 +17,6 @@
+ 	make html
+ 
+ install:
+-	make info-install
+ 	make html-install
+ 
+ read: