Update to version 0.9.13.

PR:		9326
Submitted by:	maintainer

3 files changed, 25 insertions, 36 deletions

diff --git a/deskutils/abacus/files/patch-aa b/deskutils/abacus/files/patch-aa
index a010ce80b4d6..3870fec3f190 100644
--- a/deskutils/abacus/files/patch-aa
+++ b/deskutils/abacus/files/patch-aa
@@ -1,20 +1,20 @@
---- Makefile	Thu Aug  6 21:15:12 1998
-+++ /home/andy/tmp/wrk/Makefile	Tue Aug 18 15:24:56 1998
-@@ -8,7 +8,7 @@
- # explicit permission of the copyright holder.
- #
+--- Makefile.options	Tue Oct 20 20:19:08 1998
++++ /home/andy/tmp/wrk/Makefile.options	Tue Jan  5 17:08:02 1999
+@@ -18,7 +18,7 @@
+ LEX = flex
  
--CCFLAGS= -g 
-+CCFLAGS= $(CFLAGS) -I$(X11BASE)/include -I$(LOCALBASE)/include/tcl8.0 -I$(LOCALBASE)/include/tk8.0
- TARGET = tcl_interf/nxlc
- DIRS = display calc  io     graphics include runlib lib canvas tcl_interf
- TARDIRS = $(DIRS) lib  RCS  tests regressive doc
-@@ -32,7 +32,7 @@
- 	rm -f *~ gmon.out tests/* regressive/*.bck
+ # Favourite flags for favourite compiler
+-CCFLAGS = -g
++CCFLAGS = $(CFLAGS)
  
- dep : version
--	for i in $(DIRS); do $(MAKE) dep -C $$i; done
-+	for i in $(DIRS); do $(MAKE) dep -C $$i CCFLAGS="$(CCFLAGS)"; done
- 	rm -f *~
+ # Please don't change the next three lines unless you know what you are doing..
+ AROPTIONS = rc
+@@ -26,7 +26,7 @@
+ LIBDIR = ../lib
  
+ # Add extra include dirs here
+-IFLAGS = -I$(IDIR)
++IFLAGS = -I$(IDIR) -I$(X11BASE)/include -I$(LOCALBASE)/include/tcl8.0 -I$(LOCALBASE)/include/tk8.0
  
+ # Add extra directories where you want the abacus to search for libraries here
+ LFLAGS = -L/usr/local/lib -L/usr/X11R6/lib -L$(LIBDIR) -L.
diff --git a/deskutils/abacus/files/patch-ac b/deskutils/abacus/files/patch-ac
index a02c27fd29eb..a76c42935f46 100644
--- a/deskutils/abacus/files/patch-ac
+++ b/deskutils/abacus/files/patch-ac
@@ -1,11 +1,11 @@
---- calc/Makefile	Thu Nov  6 00:30:09 1997
-+++ /home/andy/tmp/wrk/calc/Makefile	Tue Aug 18 15:32:43 1998
-@@ -58,7 +58,7 @@
- 	$(LEX) -i -t scan.l > scan.c
+--- tcl_interf/Makefile	Sun Oct 25 23:39:45 1998
++++ /home/andy/tmp/wrk/tcl_interf/Makefile	Tue Jan  5 17:05:51 1999
+@@ -14,7 +14,7 @@
+ OTHERSOURCES = 
+ SOURCES = $(CSOURCES) $(OTHERSOURCES)
+ XXL_LIBS = $(LIBDIR)/libcalc.a $(LIBDIR)/libio.a $(LIBDIR)/libcanvas.a
+-LIBS =  -ltk8.0 -ltcl8.0 -lX11 -ldl -lm 
++LIBS =  -ltk80 -ltcl80 -lX11 -lm 
  
- gram.o: gram.cc
--	$(CCC) $(IFLAGS) -g gram.cc -o gram.o -c
-+	$(CCC) $(CCFLAGS) $(IFLAGS) -g gram.cc -o gram.o -c
+ include ../Makefile.options
  
- gram.cc: gram.y scan.c
- 	$(YACC) -d gram.y 
diff --git a/deskutils/abacus/files/patch-ad b/deskutils/abacus/files/patch-ad
deleted file mode 100644
index 7d2cc019c2da..000000000000
--- a/deskutils/abacus/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- tcl_interf/Makefile	Thu Aug  6 21:08:39 1998
-+++ /home/andy/tmp/wrk/tcl_interf/Makefile	Tue Aug 18 15:37:43 1998
-@@ -23,7 +23,7 @@
- LIBDIR = ../lib
- 
- XXL_LIBS = $(LIBDIR)/libcalc.a $(LIBDIR)/libio.a $(LIBDIR)/libcanvas.a
--LIBS =  -ltk8.0 -ltcl8.0 -lX11 -ldl -lm 
-+LIBS =  -ltk80 -ltcl80 -lX11 -lm 
- 
- CC = gcc
- CCC = g++