Only install manual pages for "cfgmaker" as "mrtgcfgmaker.1" and for

"indexmaker" as "mrtgindexmaker.1" to avoid name conflicts. All manual
pages are installed to "share/doc/mrtg" again.

2 files changed, 31 insertions, 27 deletions

diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile
index b154a470cd6..57c636c5fae 100644
--- a/net/mrtg/Makefile
+++ b/net/mrtg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2001/02/25 13:30:41 tron Exp $
+# $NetBSD: Makefile,v 1.24 2001/02/25 13:42:13 tron Exp $
 # FreeBSD Id: Makefile,v 1.7 1997/12/16 19:42:17 vanilla Exp
 #
 
@@ -46,19 +46,21 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/etc/mrtg
 	${INSTALL_DATA_DIR} ${PREFIX}/share/mrtg
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mrtg
-	for file in ${WRKSRC}/doc/*; do \
-	  ${INSTALL_DATA} $$file ${PREFIX}/share/doc/mrtg; \
+	for FILE in ${WRKSRC}/doc/*; do \
+	  ${INSTALL_DATA} $$FILE ${PREFIX}/share/doc/mrtg; \
 	done
-	${MV} ${PREFIX}/share/doc/mrtg/*.1 ${PREFIX}/man/man1
-	for file in ANNOUNCE CHANGES COPYING COPYRIGHT README; do \
-	  ${INSTALL_DATA} ${WRKSRC}/$$file ${PREFIX}/share/doc/mrtg; \
+	for FILE in cfgmaker.1 indexmaker.1; do \
+	  ${INSTALL_DATA} ${WRKSRC}/doc/$$FILE ${PREFIX}/man/man1/mrtg$$FILE; \
 	done
-	for file in ${WRKSRC}/images/*.png; do \
-	  ${INSTALL_DATA} $$file ${PREFIX}/share/mrtg; \
+	for FILE in ANNOUNCE CHANGES COPYING COPYRIGHT README; do \
+	  ${INSTALL_DATA} ${WRKSRC}/$$FILE ${PREFIX}/share/doc/mrtg; \
+	done
+	for FILE in ${WRKSRC}/images/*.png; do \
+	  ${INSTALL_DATA} $$FILE ${PREFIX}/share/mrtg; \
 	done
 	${INSTALL_DATA} ${WRKDIR}/mrtg.conf.example ${PREFIX}/etc/mrtg
-	for file in netstat2mrtg sys2mrtg; do \
-	  ${INSTALL_SCRIPT} ${WRKDIR}/$$file ${PREFIX}/libexec; \
+	for FILE in netstat2mrtg sys2mrtg; do \
+	  ${INSTALL_SCRIPT} ${WRKDIR}/$$FILE ${PREFIX}/libexec; \
 	done
 	${INSTALL_DATA_DIR} ${PERL5_SITELIB}
 	${INSTALL_SCRIPT} ${WRKSRC}/lib/mrtg2/BER.pm \
@@ -69,8 +71,8 @@ do-install:
 	  ${PERL5_SITELIB}
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/rateup ${PREFIX}/libexec/
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/mrtg ${PREFIX}/bin/
-	for file in cfgmaker indexmaker; do \
-	  ${INSTALL_SCRIPT} ${WRKSRC}/bin/$$file ${PREFIX}/bin/mrtg$$file; \
+	for FILE in cfgmaker indexmaker; do \
+	  ${INSTALL_SCRIPT} ${WRKSRC}/bin/$$FILE ${PREFIX}/bin/mrtg$$FILE; \
 	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/mrtg/pkg/PLIST b/net/mrtg/pkg/PLIST
index e717037fe5c..046eb6d6c27 100644
--- a/net/mrtg/pkg/PLIST
+++ b/net/mrtg/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2001/02/25 13:30:41 tron Exp $
+@comment $NetBSD: PLIST,v 1.11 2001/02/25 13:42:13 tron Exp $
 bin/mrtg
 bin/mrtgcfgmaker
 bin/mrtgindexmaker
@@ -11,71 +11,73 @@ ${PERL5_SITELIB}/locales_mrtg.pm
 libexec/netstat2mrtg
 libexec/rateup
 libexec/sys2mrtg
-man/man1/cfgmaker.1
-man/man1/contrib.1
-man/man1/faq.1
-man/man1/forum.1
-man/man1/indexmaker.1
-man/man1/mibhelp.1
-man/man1/mrtg-rrd.1
-man/man1/mrtg.1
-man/man1/nt-guide.1
-man/man1/logfile.1
-man/man1/reference.1
-man/man1/squid.1
-man/man1/unix-guide.1
-man/man1/webserver.1
+man/man1/mrtgcfgmaker.1
+man/man1/mrtgindexmaker.1
 share/doc/mrtg/ANNOUNCE
 share/doc/mrtg/CHANGES
 share/doc/mrtg/COPYING
 share/doc/mrtg/COPYRIGHT
 share/doc/mrtg/README
+share/doc/mrtg/cfgmaker.1
 share/doc/mrtg/cfgmaker.html
 share/doc/mrtg/cfgmaker.pod
 share/doc/mrtg/cfgmaker.txt
+share/doc/mrtg/contrib.1
 share/doc/mrtg/contrib.html
 share/doc/mrtg/contrib.pod
 share/doc/mrtg/contrib.txt
+share/doc/mrtg/faq.1
 share/doc/mrtg/faq.html
 share/doc/mrtg/faq.pod
 share/doc/mrtg/faq.txt
+share/doc/mrtg/forum.1
 share/doc/mrtg/forum.html
 share/doc/mrtg/forum.pod
 share/doc/mrtg/forum.txt
 share/doc/mrtg/index.html
 share/doc/mrtg/index.txt
 share/doc/mrtg/index.wml
+share/doc/mrtg/indexmaker.1
 share/doc/mrtg/indexmaker.html
 share/doc/mrtg/indexmaker.pod
 share/doc/mrtg/indexmaker.txt
+share/doc/mrtg/logfile.1
 share/doc/mrtg/logfile.html
 share/doc/mrtg/logfile.pod
 share/doc/mrtg/logfile.txt
+share/doc/mrtg/mibhelp.1
 share/doc/mrtg/mibhelp.html
 share/doc/mrtg/mibhelp.pod
 share/doc/mrtg/mibhelp.txt
 share/doc/mrtg/mrtg-l.png
 share/doc/mrtg/mrtg-m.png
 share/doc/mrtg/mrtg-r.png
+share/doc/mrtg/mrtg-rrd.1
 share/doc/mrtg/mrtg-rrd.html
 share/doc/mrtg/mrtg-rrd.pod
 share/doc/mrtg/mrtg-rrd.txt
 share/doc/mrtg/mrtg-ti.png
+share/doc/mrtg/mrtg.1
 share/doc/mrtg/mrtg.html
 share/doc/mrtg/mrtg.pod
 share/doc/mrtg/mrtg.txt
+share/doc/mrtg/nt-guide.1
 share/doc/mrtg/nt-guide.html
 share/doc/mrtg/nt-guide.pod
 share/doc/mrtg/nt-guide.txt
+share/doc/mrtg/reference.1
 share/doc/mrtg/reference.html
 share/doc/mrtg/reference.pod
 share/doc/mrtg/reference.txt
+share/doc/mrtg/squid.1
 share/doc/mrtg/squid.html
 share/doc/mrtg/squid.pod
 share/doc/mrtg/squid.txt
+share/doc/mrtg/unix-guide.1
 share/doc/mrtg/unix-guide.html
 share/doc/mrtg/unix-guide.pod
 share/doc/mrtg/unix-guide.txt
+share/doc/mrtg/webserver.1
 share/doc/mrtg/webserver.html
 share/doc/mrtg/webserver.pod
 share/doc/mrtg/webserver.txt