6 files changed, 68 insertions, 50 deletions

diff --git a/math/abs/Makefile b/math/abs/Makefile
index cb43a58a6814..8ba75ebe5585 100644
--- a/math/abs/Makefile
+++ b/math/abs/Makefile
@@ -3,21 +3,32 @@
 # Date created:        20 January 1999
 # Whom:                gmarco
 #
-# $Id: Makefile,v 1.1.1.1 1999/01/26 03:43:37 steve Exp $
+# $Id: Makefile,v 1.2 1999/03/24 17:43:06 steve Exp $
 #
 
-DISTNAME=	abs-src-0.5
-PKGNAME=	abs-0.5
+DISTNAME=	abs-src-0.6a
+PKGNAME=	abs-0.6
 CATEGORIES=	math
-MASTER_SITES=	http://www.ping.be/bertin/
+MASTER_SITES=	http://www.ping.be/bertin/ \
+		http://www.giovannelli.it/~gmarco/files/
 
 MAINTAINER=	freebsd@scotty.masternet.it
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
 USE_XLIB=	yes
+WRKSRC=         ${WRKDIR}/abs-src-0.6a/src
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/abs ${PREFIX}/bin
 
+post-install:
+	@${ECHO} "For the changes from previous version 0.5"
+	@${ECHO} "you can read the NEWS file in ${WRKDIR}/abs-src-0.6a"
+	@${ECHO} ""
+	@${ECHO} "There are also some examples (not installed) in :"
+	@${ECHO} "${WRKDIR}/abs-src-0.6a/Examples"
+	@${ECHO} ""
+	@${ECHO} ""
+
 .include <bsd.port.mk>
diff --git a/math/abs/distinfo b/math/abs/distinfo
index dea66d8ecac2..4c5752bbdf62 100644
--- a/math/abs/distinfo
+++ b/math/abs/distinfo
@@ -1 +1 @@
-MD5 (abs-src-0.5.tar.gz) = ee3f6312009d76bac8fdb73c978511e8
+MD5 (abs-src-0.6a.tar.gz) = 3c391e2ea78ac66e78a5153ca94e7234
diff --git a/math/abs/files/patch-aa b/math/abs/files/patch-aa
index 09890135c6bd..c1afbd7e2417 100644
--- a/math/abs/files/patch-aa
+++ b/math/abs/files/patch-aa
@@ -1,25 +1,32 @@
---- Makefile.orig	Sun Dec 20 11:56:29 1998
-+++ Makefile	Mon Mar 22 20:05:40 1999
-@@ -1,10 +1,11 @@
- CURRENT_DIR = 	.
+--- Makefile.orig	Mon Apr  5 02:43:35 1999
++++ Makefile	Sun Apr 18 16:35:49 1999
+@@ -5,7 +5,7 @@
+ ### C Compiler
+ CC		= cc -c 
+ /*CC		= cc -c -Aa -D_HPUX_SOURCE*/
+-CFLAGS		= -I./pixmaps -I./Xpm -I./TextField-1.0 -I/usr/contrib/X11R6/include
++CFLAGS		= -I./pixmaps -I./TextField-1.0 -I$(X11BASE)/include
  
--SUBDIRS =	Xpm TextField-1.0
-+SUBDIRS =	TextField-1.0
+ ### Fortran Compiler
+ FC		= xlf 
+@@ -199,17 +199,17 @@
+ ### Program Libraries #
+ #######################
  
- MAKE =	make
+-LIBS		= -L /usr/lib  -L /lib/X11 -L /usr/X11R6/lib -lXaw -lX11 -lm -lXt -lXmu -lXext -L./Xpm -lxpm ./TextField-1.0/*.o
++LIBS		= -L /usr/lib -L /usr/X11R6/lib -lXaw -lX11 -lm -lXt -lXmu -lXext -lXpm ./TextField-1.0/*.o
  
--LIBS = -L /lib/X11 -L /usr/X11R6/lib -lXaw -lX11 -lm -lXt -lXmu -lXext 
-+CFLAGS+=-I$(X11BASE)/include
-+LIBS = -L /lib/X11 -L /usr/X11R6/lib -lXaw -lX11 -lm -lXt -lXmu -lXext -lXpm
  
- SRCS 	=	\
- 	applic.c \
-@@ -105,7 +106,7 @@
- 	$(MAKE) all); \
- 	fi \
- 	done
--	cc -o abs ./TextField-1.0/*.o $(OBJS) ./Xpm/libxpm.a $(LIBS) 
-+	$(CC) $(CFLAGS) -o abs ./TextField-1.0/*.o $(OBJS) $(LIBS) 
+-SUBDIRS		= 	cd Xpm; make; cd ../TextField-1.0; make; cd ..
++SUBDIRS		= 	cd ./TextField-1.0; make; cd ..
  
- clean::
- 	rm -f *.o */*.o */*.a
+ ########################
+ ### Additional Targets #
+ ########################
+ 
+ all:		$(OBJS) 
+-		cd Xpm; make; cd ../TextField-1.0; make; cd ..
++		cd ./TextField-1.0; make; cd ..
+ 		@echo "Linking $(PROGRAM) ..."
+ 		@$(LD) $(LDFLAGS) $(OBJS) $(LIBS) -o $(PROGRAM)
+ 		@echo "done"
diff --git a/math/abs/files/patch-ab b/math/abs/files/patch-ab
index e90d9b44f968..b066a96b04aa 100644
--- a/math/abs/files/patch-ab
+++ b/math/abs/files/patch-ab
@@ -1,11 +1,11 @@
---- Xpm/Makefile.orig	Mon Jan 25 00:38:13 1999
-+++ Xpm/Makefile	Mon Jan 25 00:38:43 1999
-@@ -16,7 +16,7 @@
- #################################
- ### C Compiler
- CC		= cc 
--CFLAGS		=  -O
-+CFLAGS		+=  -O -I$(X11BASE)/include
+--- TextField-1.0/Makefile.orig	Sun Apr 11 09:23:53 1999
++++ TextField-1.0/Makefile	Sun Apr 11 09:24:09 1999
+@@ -1,7 +1,7 @@
+ # Makefile for widget demo programs
  
- ### C++ Compiler
- CCC		= xlC 
+ ATHENALIBS = -lXaw -lXmu -lXt -lX11 -lm
+-CFLAGS = $(DEFINES) $(CDEBUGFLAGS) -I/usr/contrib/X11R6/include 
++CFLAGS = $(DEFINES) $(CDEBUGFLAGS) -I/usr/X11R6/include 
+ CDEBUGFLAGS =
+ DEFINES =
+ RM = rm -f
diff --git a/math/abs/files/patch-ac b/math/abs/files/patch-ac
index ca7393bb33a8..df2cd06bce34 100644
--- a/math/abs/files/patch-ac
+++ b/math/abs/files/patch-ac
@@ -1,14 +1,11 @@
---- TextField-1.0/Makefile.orig	Mon Jan 25 00:39:18 1999
-+++ TextField-1.0/Makefile	Mon Jan 25 00:40:01 1999
-@@ -1,9 +1,9 @@
- # Makefile for widget demo programs
+--- widget_makerX11.h.orig	Sun Apr 18 16:50:18 1999
++++ widget_makerX11.h	Sun Apr 18 16:51:08 1999
+@@ -28,7 +28,7 @@
  
- ATHENALIBS = -lXaw -lXmu -lXt -lX11 -lm
--CFLAGS = $(DEFINES) $(CDEBUGFLAGS)
-+CFLAGS += $(DEFINES) $(CDEBUGFLAGS)
- CDEBUGFLAGS =
--DEFINES =
-+DEFINES = -I$(X11BASE)/include
- RM = rm -f
+ #include <stdio.h>
+ #include "param.h"
+-#include "xpm.h"
++#include <X11/xpm.h>
  
- WIDGET = TextField
+ extern void mpst();
+ extern void mcut();
diff --git a/math/abs/pkg-descr b/math/abs/pkg-descr
index 68ee155fd70e..2b52d327d185 100644
--- a/math/abs/pkg-descr
+++ b/math/abs/pkg-descr
@@ -2,7 +2,10 @@ Abs is a free spreadsheet with graphical user interface.
 It has a programming language with the same 
 syntax as Microsoft Visual Basic. 
 
-http://www.ping.be/bertin/abs.shtml
 
-- Gianmarco
-gmarco@giovannelli.it
+Author : Andre.Bertin@ping.be
+Home Page: http://www.ping.be/bertin/abs.shtml
+Distfile:  abs-src-0.6a.tar.gz (270 kb)	
+
+Ported to FreeBSD by:
+- Gianmarco Giovannelli (gmarco@giovannelli.it)