Update abs to 0.8. Changes are improved stability and a better GUI.

5 files changed, 58 insertions, 39 deletions

diff --git a/math/abs/Makefile b/math/abs/Makefile
index 70c3c6e3366..3e4ff28e3ba 100644
--- a/math/abs/Makefile
+++ b/math/abs/Makefile
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.5 2000/08/23 23:14:29 tron Exp $
+# $NetBSD: Makefile,v 1.6 2000/11/17 07:36:33 rh Exp $
 #
 
-DISTNAME=	abs-src-0.5
-PKGNAME=	abs-0.5
+DISTNAME=	abs-src-0.8
+PKGNAME=	abs-0.8
 CATEGORIES=	math x11
 MASTER_SITES=	http://www.ping.be/bertin/
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.ping.be/bertin/abs.shtml
 
-USE_X11BASE=	YES
 USE_XPM=	YES
+USE_X11BASE=	YES
+MAKEFILE=	Makefile.netBSD
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/abs ${PREFIX}/bin
diff --git a/math/abs/files/md5 b/math/abs/files/md5
index 7d316fb5662..64181609076 100644
--- a/math/abs/files/md5
+++ b/math/abs/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/12/22 18:55:52 frueauf Exp $
+$NetBSD: md5,v 1.3 2000/11/17 07:36:34 rh Exp $
 
-MD5 (abs-src-0.5.tar.gz) = ee3f6312009d76bac8fdb73c978511e8
+MD5 (abs-src-0.8.tar.gz) = 421faf4cc2f3a82907cfe012e35e3d37
diff --git a/math/abs/files/patch-sum b/math/abs/files/patch-sum
index 1b0caccbe8e..76fa7055583 100644
--- a/math/abs/files/patch-sum
+++ b/math/abs/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.2 1999/10/04 23:10:02 simonb Exp $
+$NetBSD: patch-sum,v 1.3 2000/11/17 07:36:34 rh Exp $
 
-MD5 (patch-aa) = dd3dd7b548396619876e8bbce2970787
-MD5 (patch-ab) = 799239bf379cb92dfd37b723c3f6e988
+MD5 (patch-aa) = 995f9739432e71c7ff6af4b63e84995b
+MD5 (patch-ab) = 5c953d622327c4d5ca1d888cd336c42a
diff --git a/math/abs/patches/patch-aa b/math/abs/patches/patch-aa
index 466b5e254be..b9ccebd9913 100644
--- a/math/abs/patches/patch-aa
+++ b/math/abs/patches/patch-aa
@@ -1,27 +1,45 @@
-$NetBSD: patch-aa,v 1.3 1999/10/04 23:08:00 simonb Exp $
+$NetBSD: patch-aa,v 1.4 2000/11/17 07:36:34 rh Exp $
 
---- Makefile.orig	Mon Dec 21 04:56:29 1998
-+++ Makefile	Sun Oct  3 14:13:44 1999
-@@ -1,10 +1,11 @@
+--- Makefile.netBSD.orig	Wed Nov 15 20:59:20 2000
++++ Makefile.netBSD
+@@ -1,24 +1,24 @@
  CURRENT_DIR = 	.
  
--SUBDIRS =	Xpm TextField-1.0
-+SUBDIRS =	TextField-1.0
  
- MAKE =	make
+-SUBDIRS =	Xpm ABV X11 Kernel Plot Database Fig Interface X11/xedit SAMCEF 
++SUBDIRS =	ABV X11 Kernel Plot Database Fig Interface X11/xedit SAMCEF 
  
--LIBS = -L /lib/X11 -L /usr/X11R6/lib -lXaw -lX11 -lm -lXt -lXmu -lXext 
-+CFLAGS+= -I${X11BASE}/include -I ${LOCALBASE}/include
-+LIBS = -lXaw -lX11 -lm -lXt -lXmu -lXext -lXpm
+ SUBDIRS2 =	ABV X11 Kernel Plot Database Fig Interface
+-MAKE =	make
++#MAKE?=	make
  
- SRCS 	=	\
- 	applic.c \
-@@ -105,7 +106,7 @@
- 	$(MAKE) all); \
- 	fi \
+ #for linux and aix LIBS = -L /lib/X11 -L /usr/X11R6/lib -lXaw -lX11 -lm -lXt -lXmu -lXext
+ #for silicon: LIBS = -lXaw -lX11 -lm -lXt -lXmu -lXext
+ #for hp LIBS = -L /lib/X11 -L /usr/X11R6/lib -L /usr/contrib/X11R6/lib -lXaw -lX11 -lm -lXt -lXmu -lXext
+-LIBS = -L /usr/lib -L /usr/X11R6/lib -lXaw -lX11 -lm -lXt -lXmu -lXext
++LIBS = -lXaw -lXpm -lX11 -lm -lXt -lXmu -lXext
+ #LIBS = -L /lib/X11 -L /usr/X11R6/lib -L /usr/contrib/X11R6/lib -lXaw -lX11 -lm -lXt -lXmu -lXext
+ 
+ #for hp DEFINE = -D_HPUX_SOURCE
+ DEFINE = 
+ 
+-CFLAGS = 
++#CFLAGS = 
+ 
+ #for hp IncludeDir = /usr/contrib/X11R6/include
+-IncludeDir = /usr/X11R6/include
++IncludeDir = ${X11BASE}/include
+ 
+ #for hp Ccompiler = c89
+ Ccompiler = cc
+@@ -35,8 +35,8 @@
  	done
--	cc -o abs ./TextField-1.0/*.o $(OBJS) ./Xpm/libxpm.a $(LIBS) 
-+	cc -o abs ./TextField-1.0/*.o ${OBJS} ${LDFLAGS} ${LIBS} 
+ 	cc -o abs  ./Plot/*.o ./ABV/*.o \
+         Fig/*.o Interface/*.o X11/xedit/*.o \
+-        ./Kernel/*.o ./X11/*.o ./Database/*.o ./Xpm/libxpm.a\
+-        $(LIBS) $(DEFINE)
++        ./Kernel/*.o ./X11/*.o ./Database/*.o \
++        ${LDFLAGS} ${LIBS} ${DEFINE}
+ 
+ 
  
- clean::
- 	rm -f *.o */*.o */*.a
diff --git a/math/abs/patches/patch-ab b/math/abs/patches/patch-ab
index e2437241368..0a44114333a 100644
--- a/math/abs/patches/patch-ab
+++ b/math/abs/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.2 1998/12/22 18:55:52 frueauf Exp $
+$NetBSD: patch-ab,v 1.3 2000/11/17 07:36:34 rh Exp $
 
---- TextField-1.0/Makefile.orig	Sun Dec 20 00:16:05 1998
-+++ TextField-1.0/Makefile	Tue Dec 22 18:29:38 1998
-@@ -1,7 +1,7 @@
- # Makefile for widget demo programs
+--- X11/xedit/xedit.h.orig	Fri Nov 17 08:27:10 2000
++++ X11/xedit/xedit.h
+@@ -37,6 +37,8 @@
+ #include <X11/Xaw/Viewport.h>
+ #include <X11/Xaw/Cardinals.h>
  
- ATHENALIBS = -lXaw -lXmu -lXt -lX11 -lm
--CFLAGS = $(DEFINES) $(CDEBUGFLAGS)
-+CFLAGS = ${DEFINES} ${CDEBUGFLAGS} -I ${X11BASE}/include -I ${LOCALBASE}/include
- CDEBUGFLAGS =
- DEFINES =
- RM = rm -f
++#include <stdio.h>
++
+ #ifndef BUFSIZ
+ #define BUFSIZ 2048
+ #endif