1 files changed, 9 insertions, 21 deletions

diff --git a/astro/aa/Makefile b/astro/aa/Makefile
index 45a0387a368c..422d32e62203 100644
--- a/astro/aa/Makefile
+++ b/astro/aa/Makefile
@@ -6,50 +6,38 @@ PORTVERSION=	56
 PORTREVISION=	2
 CATEGORIES=	astro
 MASTER_SITES=	http://moshier.net/
+EXTRACT_SUFX=	.zip
 
 MAINTAINER=	frank@dynamical-systems.org
 COMMENT=	Self-contained ephemeris calculator
 
-EXTRACT_BEFORE_ARGS=	-aqo
-
-NO_STAGE=	yes
-USE_ZIP=	yes
 MAKEFILE=	makefile
+USES=		dos2unix
 ALL_TARGET=	aa
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} -Wall"
 NO_WRKSUBDIR=	yes
 
 SUB_FILES=	pkg-message
 
-PORTDOCS=	read.me readme.404 Readme.FreeBSD
+PORTDOCS=	read.me readme.404
 PORTDATA=	messier.cat orbit.cat star.cat
 PLIST_FILES=	bin/aa etc/aa.ini.default
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} \
 		's|%%PREFIX%%|${PREFIX}|g ; s|%%DATADIR%%|${DATADIR}|g' \
 		${WRKSRC}/kfiles.c
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/aa ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/aa.ini ${PREFIX}/etc/aa.ini.default
-.if !defined(NOPORTDATA)
-	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${PORTDATA:S|^|${WRKSRC}/|} ${DATADIR}
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/aa ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/aa.ini ${STAGEDIR}${PREFIX}/etc/aa.ini.default
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${PORTDATA:S|^|${WRKSRC}/|} ${STAGEDIR}${DATADIR}
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${CAT} ${PKGMESSAGE} > ${WRKSRC}/Readme.FreeBSD
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-.endif
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>