diff -ruN --exclude=CVS /usr/ports/math/aamath/Makefile /usr/ports/math/aamath.enable-readline/Makefile
--- /usr/ports/math/aamath/Makefile	Tue Sep  6 10:55:44 2005
+++ /usr/ports/math/aamath.enable-readline/Makefile	Tue Sep  6 13:58:43 2005
@@ -7,6 +7,7 @@
 
 PORTNAME=	aamath
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	math textproc
 MASTER_SITES=	http://fuse.superglue.se/aamath/
 
@@ -18,8 +19,18 @@
 PLIST_FILES+=	bin/${PORTNAME}
 MAN1=		aamath.1
 
+MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
+LDFLAGS=	-lreadline
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
+LIB_DEPENDS+=	readline.5:${PORTSDIR}/devel/readline
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS=	${LOCALBASE}/lib/libreadline.so
+.endif
+
 do-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/aamath ${PREFIX}/bin
 	@${INSTALL_DATA} ${WRKSRC}/${MAN1} ${MAN1PREFIX}/man/man1
-
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/math/aamath/files/patch-Makefile /usr/ports/math/aamath.enable-readline/files/patch-Makefile
--- /usr/ports/math/aamath/files/patch-Makefile	Thu Jun 23 13:53:28 2005
+++ /usr/ports/math/aamath.enable-readline/files/patch-Makefile	Tue Sep  6 13:40:59 2005
@@ -1,14 +1,17 @@
---- Makefile.orig	Thu Jun 23 00:12:18 2005
-+++ Makefile	Thu Jun 23 15:08:04 2005
-@@ -3,7 +3,7 @@
+--- Makefile	Wed Jun 22 22:12:18 2005
++++ Makefile.port	Tue Sep  6 13:29:09 2005
+@@ -3,9 +3,9 @@
  CXXFILES	= parser.cc lexer.cc expr.cc canvas.cc aamath.cc
  OBJS		= $(CXXFILES:.cc=.o) 
  TARGET		= aamath
 -CFLAGS		= -Wall -O2 -g -DUSE_READLINE
-+CFLAGS		?= -Wall -O2 -g -DUSE_READLINE
++CFLAGS		+= -Wall -g -DUSE_READLINE
  LFLAGS		= -g
- LIBS		= -lreadline -ltermcap
+-LIBS		= -lreadline -ltermcap
++LIBS		= $(LDFLAGS) -ltermcap
  
+ $(TARGET): $(OBJS)
+ 	$(LD) $(LFLAGS) $(OBJS) -o $@ $(LIBS)
 @@ -21,3 +21,5 @@
  
  clean: