At joerg@'s suggestion instead of set MANINSTALL to agree with what gets

installed simple don't install the catpages.

4 files changed, 123 insertions, 68 deletions

diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index 9bddfb3d830..4e641e751d3 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2012/03/09 04:04:47 sbd Exp $
+# $NetBSD: Makefile,v 1.64 2012/03/12 03:53:55 sbd Exp $
 #
 
 DISTNAME=		${PKGNAME_NOREV}
@@ -57,10 +57,8 @@ SETUP_PROGRAMS=		dnsfq dnsip dnsptr hostname install ipmeprint
 SETUP_SCRIPTS=		config config-fast
 
 MANDIRS=		man
-.for i in cat man
-.  for j in 1 5 7 8
-MANDIRS+=		man/${i}${j}
-.  endfor
+.for j in 1 5 7 8
+MANDIRS+=		man/man${j}
 .endfor
 INSTALLATION_DIRS=	bin ${MANDIRS} ${DOCDIR} ${SHAREDIR}
 INSTALLATION_DIRS+=	${EGDIR}/alias ${EGDIR}/boot ${EGDIR}/control
@@ -68,10 +66,6 @@ INSTALLATION_DIRS+=	${EGDIR}/users
 
 .include "../../mk/bsd.prefs.mk"
 
-# XXX qmail always installs the manpages and catpages so MANINSTALL
-# XXX must be set here so thay are not removed from the PLIST. 
-MANINSTALL=		maninstall catinstall
-
 BUILD_DEFS+=		QMAILDIR QMAIL_QUEUE_DIR QMAIL_QUEUE_EXTRA
 
 .if !empty(QMAIL_QUEUE_DIR:M${QMAILDIR}/*)
diff --git a/mail/qmail/PLIST b/mail/qmail/PLIST
index 28abe6efea5..741c041b27d 100644
--- a/mail/qmail/PLIST
+++ b/mail/qmail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2011/09/28 06:36:57 joerg Exp $
+@comment $NetBSD: PLIST,v 1.15 2012/03/12 03:53:55 sbd Exp $
 bin/bouncesaying
 bin/condredirect
 bin/datemail
@@ -44,56 +44,6 @@ bin/sendmail
 bin/splogger
 bin/tcp-env
 ${PLIST.tls}bin/update_tmprsadh
-man/cat1/bouncesaying.0
-man/cat1/condredirect.0
-man/cat1/except.0
-man/cat1/forward.0
-man/cat1/maildir2mbox.0
-man/cat1/maildirmake.0
-man/cat1/maildirwatch.0
-man/cat1/mailsubj.0
-man/cat1/preline.0
-man/cat1/qbiff.0
-man/cat1/qreceipt.0
-man/cat1/tcp-env.0
-man/cat5/addresses.0
-man/cat5/dot-qmail.0
-man/cat5/envelopes.0
-man/cat5/maildir.0
-man/cat5/mbox.0
-man/cat5/qmail-control.0
-man/cat5/qmail-header.0
-man/cat5/qmail-log.0
-man/cat5/qmail-users.0
-man/cat7/forgeries.0
-man/cat7/qmail-limits.0
-man/cat7/qmail.0
-man/cat8/qmail-clean.0
-man/cat8/qmail-command.0
-man/cat8/qmail-getpw.0
-man/cat8/qmail-inject.0
-man/cat8/qmail-local.0
-man/cat8/qmail-lspawn.0
-man/cat8/qmail-newmrh.0
-man/cat8/qmail-newu.0
-man/cat8/qmail-pop3d.0
-man/cat8/qmail-popup.0
-man/cat8/qmail-pw2u.0
-man/cat8/qmail-qmqpc.0
-man/cat8/qmail-qmqpd.0
-man/cat8/qmail-qmtpd.0
-man/cat8/qmail-qread.0
-man/cat8/qmail-qstat.0
-man/cat8/qmail-queue.0
-man/cat8/qmail-remote.0
-man/cat8/qmail-rspawn.0
-man/cat8/qmail-send.0
-man/cat8/qmail-showctl.0
-man/cat8/qmail-smtpd.0
-man/cat8/qmail-start.0
-man/cat8/qmail-tcpok.0
-man/cat8/qmail-tcpto.0
-man/cat8/splogger.0
 man/man1/bouncesaying.1
 man/man1/condredirect.1
 man/man1/except.1
diff --git a/mail/qmail/distinfo b/mail/qmail/distinfo
index bcc4611124f..18c806507be 100644
--- a/mail/qmail/distinfo
+++ b/mail/qmail/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2011/09/28 06:36:57 joerg Exp $
+$NetBSD: distinfo,v 1.21 2012/03/12 03:53:55 sbd Exp $
 
 SHA1 (qmail-1.03.tar.gz) = 18fb960481291a0503e93a94df3f6094edb7f27a
 RMD160 (qmail-1.03.tar.gz) = b851f273f1d365d38efd949b1efcf35768ffa30f
@@ -32,4 +32,4 @@ RMD160 (qmail-smtpd-viruscan-logging.patch) = 79631cb7b5b120f98397011c4fb94726c4
 Size (qmail-smtpd-viruscan-logging.patch) = 2157 bytes
 SHA1 (patch-aa) = 2c8c50889cbc7da8c51bf6d44c0b31f5f0853896
 SHA1 (patch-ab) = 15e6466c655058664cb660e5e12232bf45010814
-SHA1 (patch-hier.c) = e14d89fc346b2e47e264ed2d9798a66e778c990f
+SHA1 (patch-hier.c) = 3c3b6c9404ea2a852b89481dc67bf4ae4d869570
diff --git a/mail/qmail/patches/patch-hier.c b/mail/qmail/patches/patch-hier.c
index 825c36ef4aa..96238672901 100644
--- a/mail/qmail/patches/patch-hier.c
+++ b/mail/qmail/patches/patch-hier.c
@@ -1,13 +1,124 @@
-$NetBSD: patch-hier.c,v 1.1 2011/09/28 06:36:58 joerg Exp $
+$NetBSD: patch-hier.c,v 1.2 2012/03/12 03:53:55 sbd Exp $
 
---- hier.c.orig	2011-09-26 08:54:57.000000000 +0000
+--- hier.c.orig	1998-06-15 10:53:16.000000000 +0000
 +++ hier.c
-@@ -162,8 +162,6 @@ void hier()
-   c(auto_qmail,"man/cat5","qmail-log.0",auto_uido,auto_gidq,0644);
+@@ -37,10 +37,6 @@ void hier()
+   d(auto_qmail,"boot",auto_uido,auto_gidq,0755);
+   d(auto_qmail,"doc",auto_uido,auto_gidq,0755);
+   d(auto_qmail,"man",auto_uido,auto_gidq,0755);
+-  d(auto_qmail,"man/cat1",auto_uido,auto_gidq,0755);
+-  d(auto_qmail,"man/cat5",auto_uido,auto_gidq,0755);
+-  d(auto_qmail,"man/cat7",auto_uido,auto_gidq,0755);
+-  d(auto_qmail,"man/cat8",auto_uido,auto_gidq,0755);
+   d(auto_qmail,"man/man1",auto_uido,auto_gidq,0755);
+   d(auto_qmail,"man/man5",auto_uido,auto_gidq,0755);
+   d(auto_qmail,"man/man7",auto_uido,auto_gidq,0755);
+@@ -145,108 +141,56 @@ void hier()
+   c(auto_qmail,"bin","pinq",auto_uido,auto_gidq,0755);
+ 
+   c(auto_qmail,"man/man5","addresses.5",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat5","addresses.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man5","envelopes.5",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat5","envelopes.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man5","maildir.5",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat5","maildir.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man5","mbox.5",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat5","mbox.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man5","dot-qmail.5",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat5","dot-qmail.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man5","qmail-control.5",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat5","qmail-control.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man5","qmail-header.5",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat5","qmail-header.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man5","qmail-log.5",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat5","qmail-log.0",auto_uido,auto_gidq,0644);
    c(auto_qmail,"man/man5","qmail-users.5",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/cat5","qmail-users.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat5","qmail-users.0",auto_uido,auto_gidq,0644);
 -  c(auto_qmail,"man/man5","tcp-environ.5",auto_uido,auto_gidq,0644);
 -  c(auto_qmail,"man/cat5","tcp-environ.0",auto_uido,auto_gidq,0644);
  
    c(auto_qmail,"man/man7","forgeries.7",auto_uido,auto_gidq,0644);
-   c(auto_qmail,"man/cat7","forgeries.0",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat7","forgeries.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man7","qmail-limits.7",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat7","qmail-limits.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man7","qmail.7",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat7","qmail.0",auto_uido,auto_gidq,0644);
+ 
+   c(auto_qmail,"man/man1","forward.1",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat1","forward.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man1","condredirect.1",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat1","condredirect.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man1","bouncesaying.1",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat1","bouncesaying.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man1","except.1",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat1","except.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man1","maildirmake.1",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat1","maildirmake.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man1","maildir2mbox.1",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat1","maildir2mbox.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man1","maildirwatch.1",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat1","maildirwatch.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man1","mailsubj.1",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat1","mailsubj.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man1","qreceipt.1",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat1","qreceipt.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man1","qbiff.1",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat1","qbiff.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man1","preline.1",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat1","preline.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man1","tcp-env.1",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat1","tcp-env.0",auto_uido,auto_gidq,0644);
+ 
+   c(auto_qmail,"man/man8","qmail-local.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-local.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man8","qmail-lspawn.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-lspawn.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man8","qmail-getpw.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-getpw.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man8","qmail-remote.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-remote.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man8","qmail-rspawn.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-rspawn.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man8","qmail-clean.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-clean.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man8","qmail-send.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-send.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man8","qmail-start.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-start.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man8","splogger.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","splogger.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man8","qmail-queue.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-queue.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man8","qmail-inject.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-inject.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man8","qmail-showctl.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-showctl.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man8","qmail-newmrh.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-newmrh.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man8","qmail-newu.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-newu.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man8","qmail-pw2u.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-pw2u.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man8","qmail-qread.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-qread.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man8","qmail-qstat.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-qstat.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man8","qmail-tcpok.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-tcpok.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man8","qmail-tcpto.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-tcpto.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man8","qmail-pop3d.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-pop3d.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man8","qmail-popup.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-popup.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man8","qmail-qmqpc.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-qmqpc.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man8","qmail-qmqpd.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-qmqpd.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man8","qmail-qmtpd.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-qmtpd.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man8","qmail-smtpd.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-smtpd.0",auto_uido,auto_gidq,0644);
+   c(auto_qmail,"man/man8","qmail-command.8",auto_uido,auto_gidq,0644);
+-  c(auto_qmail,"man/cat8","qmail-command.0",auto_uido,auto_gidq,0644);
+ }