3 files changed, 15 insertions, 13 deletions

diff --git a/news/atp/Makefile b/news/atp/Makefile
index 4099193d924b..6bd770e833a2 100644
--- a/news/atp/Makefile
+++ b/news/atp/Makefile
@@ -15,16 +15,14 @@ COMMENT=	A QWK message packet reader and composer for FreeBSD
 RUN_DEPENDS=		zip:${PORTSDIR}/archivers/zip \
 			unzip:${PORTSDIR}/archivers/unzip
 
-USE_GMAKE=		YES
+USES=	gmake
 GNU_CONFIGURE=		YES
+SUB_FILES=	pkg-message
 
-MAN1=			atp.1 \
-			atpdiag.1 \
-			rot13.1
-MAN3=			editline.3
-
-NO_STAGE=	yes
-post-install:
-	@${CAT} ${PKGMESSAGE}
+post-patch:
+.for i in atphome bindir mandir
+	${REINPLACE_CMD} -e 's,$$($i),$$(DESTDIR)&,g' \
+		${WRKSRC}/Makefile.in
+.endfor
 
 .include <bsd.port.mk>
diff --git a/news/atp/pkg-message b/news/atp/files/pkg-message.in
index 2806c4cfdf77..7fd504095318 100644
--- a/news/atp/pkg-message
+++ b/news/atp/files/pkg-message.in
@@ -5,7 +5,7 @@ Each user who wishes to use ATP must do the following:
 
 2.  create the directory named above
 
-3.  copy the files in ${PREFIX}/share/atp into it
+3.  copy the files in %%PREFIX%%/share/atp into it
 
 4.  edit the atprc and taglines.atp file to contain whatever
     data you want.
diff --git a/news/atp/pkg-plist b/news/atp/pkg-plist
index cc9a29766a06..a8a5be807a34 100644
--- a/news/atp/pkg-plist
+++ b/news/atp/pkg-plist
@@ -1,6 +1,10 @@
 bin/atp
 bin/atpdiag
 bin/rot13
-share/atp/atprc
-share/atp/taglines.atp
-@dirrm share/atp
+%%DATADIR%%/atprc
+%%DATADIR%%/taglines.atp
+man/man1/atp.1.gz
+man/man1/atpdiag.1.gz
+man/man1/rot13.1.gz
+man/man3/editline.3.gz
+@dirrm %%DATADIR%%