Move man pages from cfengine2-doc to cfengine package.

Addresses one of the issues in PR#26614.

4 files changed, 14 insertions, 14 deletions

diff --git a/sysutils/cfengine2-doc/Makefile b/sysutils/cfengine2-doc/Makefile
index b091505dcef..f19e5c40c9c 100644
--- a/sysutils/cfengine2-doc/Makefile
+++ b/sysutils/cfengine2-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/09/13 21:12:19 salo Exp $
+# $NetBSD: Makefile,v 1.6 2004/09/23 22:50:59 ben Exp $
 #
 
 PKGNAME=	cfengine-doc-${CFENGINE_VERSION}
@@ -14,8 +14,6 @@ INFO_FILES=	cfengine-Reference.info cfengine-Tutorial.info
 INFO_FILES+=	cfengine-Anomalies.info
 
 do-install:
-	${INSTALL_MAN_DIR} ${PREFIX}/man/man8
-	${INSTALL_MAN} ${WRKSRC}/doc/*.8 ${PREFIX}/man/man8
 	${INSTALL_DATA} ${WRKSRC}/doc/cfengine-*.info* ${PREFIX}/info
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/cfengine
 	${INSTALL_DATA} ${WRKSRC}/doc/cfengine-*.html ${PREFIX}/share/doc/html/cfengine
diff --git a/sysutils/cfengine2-doc/PLIST b/sysutils/cfengine2-doc/PLIST
index 2da2285146b..3e14978a119 100644
--- a/sysutils/cfengine2-doc/PLIST
+++ b/sysutils/cfengine2-doc/PLIST
@@ -1,12 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2004/09/13 21:12:19 salo Exp $
-man/man8/cfagent.8
-man/man8/cfengine.8
-man/man8/cfenvd.8
-man/man8/cfenvgraph.8
-man/man8/cfexecd.8
-man/man8/cfkey.8
-man/man8/cfrun.8
-man/man8/cfservd.8
+@comment $NetBSD: PLIST,v 1.6 2004/09/23 22:50:59 ben Exp $
 share/doc/html/cfengine/cfengine-Anomalies.html
 share/doc/html/cfengine/cfengine-Reference.html
 share/doc/html/cfengine/cfengine-Tutorial.html
diff --git a/sysutils/cfengine2/Makefile b/sysutils/cfengine2/Makefile
index cc086c1a03e..7caac19b812 100644
--- a/sysutils/cfengine2/Makefile
+++ b/sysutils/cfengine2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/08/18 23:03:44 ben Exp $
+# $NetBSD: Makefile,v 1.9 2004/09/23 22:50:59 ben Exp $
 #
 
 .include "../../sysutils/cfengine2/Makefile.common"
@@ -23,6 +23,8 @@ pre-configure:
 		${WRKSRC}/contrib/vicf.in.orig > ${WRKSRC}/contrib/vicf.in
 
 post-install:
+	${INSTALL_MAN_DIR} ${PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/doc/*.8 ${PREFIX}/man/man8
 	${INSTALL_DATA} ${WRKSRC}/inputs/*.example \
 		${PREFIX}/share/examples/cfengine
 	${INSTALL_DATA_DIR} /var/cfengine/inputs
diff --git a/sysutils/cfengine2/PLIST b/sysutils/cfengine2/PLIST
index 2908670c30e..11d2166e467 100644
--- a/sysutils/cfengine2/PLIST
+++ b/sysutils/cfengine2/PLIST
@@ -1,4 +1,12 @@
-@comment $NetBSD: PLIST,v 1.3 2004/08/18 23:03:44 ben Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/09/23 22:50:59 ben Exp $
+man/man8/cfagent.8
+man/man8/cfengine.8
+man/man8/cfenvd.8
+man/man8/cfenvgraph.8
+man/man8/cfexecd.8
+man/man8/cfkey.8
+man/man8/cfrun.8
+man/man8/cfservd.8
 sbin/cfagent
 sbin/cfdoc
 sbin/cfenvd