- Respect DESTDIR

- Respect NOPORTDOCS
- Bump PORTREVISION
- Eliminate plist

PR:             101788
Submitted by:   gabor

2 files changed, 11 insertions, 10 deletions

diff --git a/archivers/unarj/Makefile b/archivers/unarj/Makefile
index dbea2f03571d..6c73cbad262d 100644
--- a/archivers/unarj/Makefile
+++ b/archivers/unarj/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	unarj
 PORTVERSION=	2.65
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	ache
@@ -16,14 +16,19 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ache@FreeBSD.org
 COMMENT=	Allows files to be extracted from ARJ archives
 
+PLIST_FILES=	bin/unarj
+PORTDOCS=	unarj.txt technote.txt
+
 post-patch:
 	${CP} ${FILESDIR}/sanitize.c ${WRKSRC}
 
 do-install:
-	${INSTALL} -d -m 755 -o ${SHAREOWN} -g ${SHAREGRP} \
-		${PREFIX}/share/doc/unarj
-	cd ${WRKSRC}; ${INSTALL_PROGRAM} unarj ${PREFIX}/bin
-	cd ${WRKSRC}; ${INSTALL_DATA} unarj.txt technote.txt \
-		${PREFIX}/share/doc/unarj
+	${INSTALL_PROGRAM} ${WRKSRC}/unarj ${TARGETDIR}/bin
+.if !defined(NOPORTDOCS)
+	${INSTALL} -d -m 755 -o ${SHAREOWN} -g ${SHAREGRP} ${DOCSDIR}
+.for i in ${PORTDOCS}	
+	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/archivers/unarj/pkg-plist b/archivers/unarj/pkg-plist
deleted file mode 100644
index a17185497705..000000000000
--- a/archivers/unarj/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/unarj
-%%DOCSDIR%%/unarj.txt
-%%DOCSDIR%%/technote.txt
-@dirrm %%DOCSDIR%%