Index: head/editors/aee/Makefile
===================================================================
--- head/editors/aee/Makefile	(revision 426538)
+++ head/editors/aee/Makefile	(revision 426539)
@@ -1,58 +1,51 @@
 # Created by: Kelly Yancey <kbyanc@posi.net>
 # $FreeBSD$
 
 PORTNAME=	aee
 PORTVERSION=	2.2.21
 PORTREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	http://www.users.uswest.net/~hmahon/sources/
 
 MAINTAINER=	portmaster@BSDforge.com
 COMMENT=	Easy editor with both curses and X11 interfaces
 
 LICENSE=	ART10
 
 USES=		ncurses
+PLIST_FILES=	bin/aee bin/rae man/man1/aee.1.gz %%DATADIR%%/help.ae
+ALL_TARGET=	main
 
-OPTIONS_DEFINE=	XAE
-XAE_DESC=	Build X11 version 'xae'
-
 MAKE_JOBS_UNSAFE=	yes
 
-PLIST_FILES=	bin/aee bin/rae man/man1/aee.1.gz %%DATADIR%%/help.ae
+OPTIONS_DEFINE=	XAE
 
-.include <bsd.port.options.mk>
+XAE_DESC=		Build X11 version 'xae'
+XAE_USE=		XORG=x11
+XAE_PLIST_FILES=	bin/xae bin/rxae
+XAE_ALL_TARGET=		xae
+XAE_DESKTOP_ENTRIES=	"Xae" "" "" "xae" "" false
 
-.if ${PORT_OPTIONS:MXAE}
-USE_XORG=	x11
-ALL_TARGET=	both
-PLIST_FILES+=	bin/xae bin/rxae
-DESKTOP_ENTRIES="Xae" "" "" "xae" "" false
-.else
-ALL_TARGET=	main
-.endif
-
 post-patch:
-.for i in create.mk.aee create.mk.xae
 	@${REINPLACE_CMD} -e \
 		's|cc|${CC}|g ; \
 		 s|"-s"|""|g ; \
-		 s|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/${i}
-.endfor
-.for i in aee.1 localize.c
-	@${REINPLACE_CMD} -e \
-		's|/usr/local/lib|${DATADIR}|g' ${WRKSRC}/${i}
-.endfor
+		 s|/usr/X11R6|${LOCALBASE}|g' \
+		 ${WRKSRC}/create.mk.aee \
+		 ${WRKSRC}/create.mk.xae
+	@${REINPLACE_CMD} -e 's|/usr/local/lib|${DATADIR}|g' \
+		${WRKSRC}/aee.1  \
+		${WRKSRC}/localize.c
 
 do-install:
-	(cd ${WRKSRC} && ${INSTALL_PROGRAM} aee ${STAGEDIR}${PREFIX}/bin)
-	(cd ${STAGEDIR}${PREFIX}/bin && ${LN} aee rae)
-	(cd ${WRKSRC} && ${INSTALL_MAN} aee.1 ${STAGEDIR}${MANPREFIX}/man/man1)
 	@${MKDIR} ${STAGEDIR}${DATADIR}
-	(cd ${WRKSRC} && ${INSTALL_DATA} help.ae ${STAGEDIR}${DATADIR})
-.if ${PORT_OPTIONS:MXAE}
-	(cd ${WRKSRC} && ${INSTALL_PROGRAM} xae ${STAGEDIR}${PREFIX}/bin)
+	${INSTALL_PROGRAM} ${WRKSRC}/aee ${STAGEDIR}${PREFIX}/bin
+	(cd ${STAGEDIR}${PREFIX}/bin && ${LN} aee rae)
+	${INSTALL_MAN} ${WRKSRC}/aee.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_DATA} ${WRKSRC}/help.ae ${STAGEDIR}${DATADIR}
+
+do-install-XAE-on:
+	${INSTALL_PROGRAM} ${WRKSRC}/xae ${STAGEDIR}${PREFIX}/bin
 	(cd ${STAGEDIR}${PREFIX}/bin && ${LN} xae rxae)
-.endif
 
 .include <bsd.port.mk>
Index: head/editors/aee/files/patch-create.mk.aee
===================================================================
--- head/editors/aee/files/patch-create.mk.aee	(revision 426538)
+++ head/editors/aee/files/patch-create.mk.aee	(revision 426539)
@@ -1,20 +1,20 @@
 --- create.mk.aee.orig	2010-07-18 00:58:19 UTC
 +++ create.mk.aee
 @@ -184,7 +184,7 @@ fi
  # make decisions about use of new_curse.c (use of new_curse is recommended 
  # rather than local curses)
  
 -if [ -n "$terminfo_exists" -a -z "$termcap_exists" ]
-+if true
++if false
  then
  	echo "Neither terminfo or termcap are on this system!  "
  	if [ -f /usr/include/curses.h ]
 @@ -291,7 +291,7 @@ OBJS = aee.o control.o format.o localize
  	\$(CC) \$(DEFINES) -c \$*.c \$(CFLAGS)
  
  curses :	\$(OBJS)
 -	\$(CC) -o aee \$(OBJS) \$(CFLAGS) -lcurses 
 +	\$(CC) -o aee \$(OBJS) \$(CFLAGS) \$(LDFLAGS) -lncurses 
  
  aee :	\$(OBJS) new_curse.o
  	\$(CC) -o aee \$(OBJS) new_curse.o \$(CFLAGS)