- Fix plist when NOPORTDOCS=1

- Use DOCSDIR, PLIST_FILES

Reported by:	QAT

6 files changed, 16 insertions, 26 deletions

diff --git a/mbone/rqm/Makefile b/mbone/rqm/Makefile
index 0a01ace16c24..bdf424e8ee5d 100644
--- a/mbone/rqm/Makefile
+++ b/mbone/rqm/Makefile
@@ -23,12 +23,14 @@ HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	PREFIX=${PREFIX} X11BASE=${LOCALBASE}
 
 ALL_TARGET=	rqm
+PLIST_FILES=	bin/rqm
+PORTDOCS=	README
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/rqm ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/rqm
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/rqm
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/mbone/rqm/pkg-plist b/mbone/rqm/pkg-plist
deleted file mode 100644
index bdf2098794d3..000000000000
--- a/mbone/rqm/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/rqm
-share/doc/rqm/README
-@dirrm share/doc/rqm
diff --git a/mbone/rtptools/Makefile b/mbone/rtptools/Makefile
index c757f4d4b6b3..31151d8492f6 100644
--- a/mbone/rtptools/Makefile
+++ b/mbone/rtptools/Makefile
@@ -15,13 +15,15 @@ COMMENT=	A set of tools to record, playback and monitor RTPv2 data streams
 
 GNU_CONFIGURE=	yes
 
+PLIST_FILES=	bin/rtpdump bin/rtpplay bin/rtpsend bin/rtptrans
 DOCFILES=	README ChangeLog.html rtptools.html
+PORTDOCS=	${DOCSFILES}
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/rtptools
+	${MKDIR} ${DOCSDIR}
 .for i in ${DOCFILES}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/rtptools
+	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/
 .endfor
 .endif
 
diff --git a/mbone/rtptools/pkg-plist b/mbone/rtptools/pkg-plist
deleted file mode 100644
index 8283c955a1fe..000000000000
--- a/mbone/rtptools/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/rtpdump
-bin/rtpplay
-bin/rtpsend
-bin/rtptrans
-share/doc/rtptools/README
-share/doc/rtptools/ChangeLog.html
-share/doc/rtptools/rtptools.html
-@dirrm share/doc/rtptools
diff --git a/mbone/wb/Makefile b/mbone/wb/Makefile
index 7076fb770950..e8ec0ee2e711 100644
--- a/mbone/wb/Makefile
+++ b/mbone/wb/Makefile
@@ -22,14 +22,17 @@ STRIP=
 # ghostscript, ghostscript3, ghostscript4 or ghostscript5 will all do.
 USE_GHOSTSCRIPT_RUN=	yes
 
+PLIST_FILES=	bin/wb
+PORTDOCS=	README CHANGES NOTES lblwb.ps
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/wb ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/wb
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/wb
-	${INSTALL_DATA} ${WRKSRC}/CHANGES ${PREFIX}/share/doc/wb
-	${INSTALL_DATA} ${WRKSRC}/NOTES ${PREFIX}/share/doc/wb
-	${INSTALL_DATA} ${WRKSRC}/lblwb.ps ${PREFIX}/share/doc/wb
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/CHANGES ${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/NOTES ${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/lblwb.ps ${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/mbone/wb/pkg-plist b/mbone/wb/pkg-plist
deleted file mode 100644
index 084fc240b5dd..000000000000
--- a/mbone/wb/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-bin/wb
-share/doc/wb/README
-share/doc/wb/CHANGES
-share/doc/wb/NOTES
-share/doc/wb/lblwb.ps
-@dirrm share/doc/wb