- Use OPTIONS

- Only need one plist-file with PLIST_SUB

3 files changed, 11 insertions, 16 deletions

diff --git a/editors/aee/Makefile b/editors/aee/Makefile
index 4b9e0494b872..954a3f8f8a89 100644
--- a/editors/aee/Makefile
+++ b/editors/aee/Makefile
@@ -13,18 +13,17 @@ MASTER_SITES=	http://mahon.cwx.net/sources/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An easy editor with both curses and X11 interfaces
 
-.if !defined(BUILD_XAE)
+OPTIONS=	XAE "Build X11 version 'xae'" off
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITH_XAE)
 ALL_TARGET=	main
-pre-fetch:
-	@${ECHO}
-	@${ECHO} "If you would like to also install the X11 version of aee (xae)"
-	@${ECHO} "use 'make install BUILD_XAE=yes'. However, the X11 interface looks"
-	@${ECHO} "almost exactly like the text-based curses version."
-	@${ECHO}
+PLIST_SUB=	XAE="@comment "
 .else
 USE_XLIB=	yes
 ALL_TARGET=	both
-PLIST=		${PKGDIR}/pkg-plist.xae
+PLIST_SUB=	XAE=""
 .endif
 
 MAN1=		aee.1
@@ -34,9 +33,9 @@ do-install:
 	${LN} ${PREFIX}/bin/aee ${PREFIX}/bin/rae
 	${INSTALL_MAN} ${WRKSRC}/aee.1 ${PREFIX}/man/man1
 	${INSTALL_DATA} ${WRKSRC}/help.ae ${PREFIX}/lib
-.if defined(BUILD_XAE)
+.if defined(WITH_XAE)
 	${INSTALL_PROGRAM} ${WRKSRC}/xae ${PREFIX}/bin
 	${LN} ${PREFIX}/bin/xae ${PREFIX}/bin/rxae
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/editors/aee/pkg-plist b/editors/aee/pkg-plist
index 1333a9be04d0..7ebb2b32d9f7 100644
--- a/editors/aee/pkg-plist
+++ b/editors/aee/pkg-plist
@@ -1,3 +1,5 @@
 bin/aee
 bin/rae
 lib/help.ae
+%%XAE%%bin/xae
+%%XAE%%bin/rxae
diff --git a/editors/aee/pkg-plist.xae b/editors/aee/pkg-plist.xae
deleted file mode 100644
index 6ffc13df372c..000000000000
--- a/editors/aee/pkg-plist.xae
+++ /dev/null
@@ -1,6 +0,0 @@
-bin/aee
-bin/rae
-bin/xae
-bin/rxae
-lib/help.ae
-