From 110d0019f6d4285674cfc6414a894fed8de4326b Mon Sep 17 00:00:00 2001
From: frueauf <frueauf>
Date: Tue, 22 Dec 1998 18:55:51 +0000
Subject: Update abs to 0.5, provided in pr 6635 by Rene Hexel.

---
 math/abs/Makefile         |  8 +++++---
 math/abs/files/md5        |  4 ++--
 math/abs/patches/patch-aa | 16 ++++++++--------
 math/abs/patches/patch-ab |  6 +++---
 4 files changed, 18 insertions(+), 16 deletions(-)

(limited to 'math')

diff --git a/math/abs/Makefile b/math/abs/Makefile
index 18cf7f5bd03..7794b6ab71c 100644
--- a/math/abs/Makefile
+++ b/math/abs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 1998/12/05 12:33:18 frueauf Exp $
+# $NetBSD: Makefile,v 1.2 1998/12/22 18:55:51 frueauf Exp $
 #
 
-DISTNAME=	abs-src-0.4
-PKGNAME=	abs-0.4
+DISTNAME=	abs-src-0.5
+PKGNAME=	abs-0.5
 CATEGORIES=	math x11
 MASTER_SITES=	http://www.ping.be/bertin/
 
@@ -11,6 +11,8 @@ HOMEPAGE=	http://www.ping.be/bertin/abs.shtml
 
 DEPENDS+=	xpm-3.4k:../../graphics/xpm
 
+CONFLICTS=	abs-0.4
+
 USE_X11=	yes
 
 do-install:
diff --git a/math/abs/files/md5 b/math/abs/files/md5
index bd683a002e9..7d316fb5662 100644
--- a/math/abs/files/md5
+++ b/math/abs/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1998/12/05 12:33:18 frueauf Exp $
+$NetBSD: md5,v 1.2 1998/12/22 18:55:52 frueauf Exp $
 
-MD5 (abs-src-0.4.tar.gz) = bc53b0f5590e39583ccb4ac6fb139c0e
+MD5 (abs-src-0.5.tar.gz) = ee3f6312009d76bac8fdb73c978511e8
diff --git a/math/abs/patches/patch-aa b/math/abs/patches/patch-aa
index a8baa98775f..1d409f3d918 100644
--- a/math/abs/patches/patch-aa
+++ b/math/abs/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 1998/12/05 12:33:18 frueauf Exp $
+$NetBSD: patch-aa,v 1.2 1998/12/22 18:55:52 frueauf Exp $
 
---- Makefile.orig	Thu Dec  3 22:46:08 1998
-+++ Makefile	Sat Dec  5 11:01:36 1998
+--- Makefile.orig	Sun Dec 20 18:56:29 1998
++++ Makefile	Tue Dec 22 18:28:07 1998
 @@ -1,10 +1,11 @@
  CURRENT_DIR = 	.
  
@@ -14,14 +14,14 @@ $NetBSD: patch-aa,v 1.1.1.1 1998/12/05 12:33:18 frueauf Exp $
 +CFLAGS+= -I ${X11BASE}/include -I ${LOCALBASE}/include
 +LIBS = -L ${LOCALBASE}/lib -L ${X11BASE}/lib -lXaw -lX11 -lm -lXt -lXmu -lXext -lXpm
  
- #DEFINE = -O 
- 
-@@ -107,7 +108,7 @@
+ SRCS 	=	\
+ 	applic.c \
+@@ -105,7 +106,7 @@
  	$(MAKE) all); \
  	fi \
  	done
--	cc -o abs ./TextField-1.0/*.o $(OBJS) ./Xpm/libxpm.a $(LIBS) $(DEFINE)
-+	cc -o abs ./TextField-1.0/*.o $(OBJS) $(LIBS) $(DEFINE)
+-	cc -o abs ./TextField-1.0/*.o $(OBJS) ./Xpm/libxpm.a $(LIBS) 
++	cc -o abs ./TextField-1.0/*.o ${OBJS} ${LIBS} 
  
  clean::
  	rm -f *.o */*.o */*.a
diff --git a/math/abs/patches/patch-ab b/math/abs/patches/patch-ab
index a311087743a..e2437241368 100644
--- a/math/abs/patches/patch-ab
+++ b/math/abs/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 1998/12/05 12:33:18 frueauf Exp $
+$NetBSD: patch-ab,v 1.2 1998/12/22 18:55:52 frueauf Exp $
 
---- TextField-1.0/Makefile.orig	Thu Dec  3 22:46:08 1998
-+++ TextField-1.0/Makefile	Sat Dec  5 11:03:14 1998
+--- 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
  
-- 
cgit v1.2.3