diff --git a/math/abs/Makefile b/math/abs/Makefile
index 97c37921e3e7..0406a261145c 100644
--- a/math/abs/Makefile
+++ b/math/abs/Makefile
@@ -6,27 +6,27 @@
 #
 
 PORTNAME=	abs
-PORTVERSION=	0.6
+PORTVERSION=	0.6a
 CATEGORIES=	math
 MASTER_SITES=	http://www.ping.be/bertin/ \
 		http://www.giovannelli.it/~gmarco/files/
-DISTNAME=	abs-src-0.6a
+DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 
 MAINTAINER=	gmarco@giovannelli.it
 
 USE_XLIB=	yes
 USE_XPM=	yes
-WRKSRC=         ${WRKDIR}/abs-src-0.6a/src
+WRKSRC=         ${WRKDIR}/${DISTNAME}/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} "you can read the NEWS file in ${WRKDIR}"
 	@${ECHO} ""
 	@${ECHO} "There are also some examples (not installed) in :"
-	@${ECHO} "${WRKDIR}/abs-src-0.6a/Examples"
+	@${ECHO} "${WRKDIR}/Examples"
 	@${ECHO} ""
 	@${ECHO} ""
 
diff --git a/math/abs/files/patch-aa b/math/abs/files/patch-aa
index c1afbd7e2417..a604e7d742e1 100644
--- a/math/abs/files/patch-aa
+++ b/math/abs/files/patch-aa
@@ -1,24 +1,35 @@
---- Makefile.orig	Mon Apr  5 02:43:35 1999
-+++ Makefile	Sun Apr 18 16:35:49 1999
-@@ -5,7 +5,7 @@
+--- Makefile.orig	Mon Apr  5 16:43:35 1999
++++ Makefile	Fri Aug 11 07:31:39 2000
+@@ -3,16 +3,16 @@
+ ### Compilers, Programs and Flags
+ #################################
  ### C Compiler
- CC		= cc -c 
+-CC		= cc -c 
++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
++CFLAGS		+= -I./pixmaps -I./TextField-1.0 -I$(X11BASE)/include
  
  ### Fortran Compiler
  FC		= xlf 
+ FFLAGS		= -qlanglvl=90ext
+ 
+ ### Linker/Loader
+-LD		= cc 
++LD		= $(CC)
+ LDFLAGS		= 
+ 
+ ### Shell Command
 @@ -199,17 +199,17 @@
  ### Program Libraries #
  #######################
  
 -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$(X11BASE)/lib -lXaw -lX11 -lm -lXt -lXmu -lXext -lXpm ./TextField-1.0/*.o
  
  
 -SUBDIRS		= 	cd Xpm; make; cd ../TextField-1.0; make; cd ..
-+SUBDIRS		= 	cd ./TextField-1.0; make; cd ..
++SUBDIRS		= 	cd ./TextField-1.0; $(MAKE); cd ..
  
  ########################
  ### Additional Targets #
@@ -26,7 +37,7 @@
  
  all:		$(OBJS) 
 -		cd Xpm; make; cd ../TextField-1.0; make; cd ..
-+		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 b066a96b04aa..b017110723ca 100644
--- a/math/abs/files/patch-ab
+++ b/math/abs/files/patch-ab
@@ -5,7 +5,7 @@
  
  ATHENALIBS = -lXaw -lXmu -lXt -lX11 -lm
 -CFLAGS = $(DEFINES) $(CDEBUGFLAGS) -I/usr/contrib/X11R6/include 
-+CFLAGS = $(DEFINES) $(CDEBUGFLAGS) -I/usr/X11R6/include 
++CFLAGS += $(DEFINES) $(CDEBUGFLAGS) -I$(X11BASE)/include 
  CDEBUGFLAGS =
  DEFINES =
  RM = rm -f