Don't install cat pages. Bump revision.

8 files changed, 52 insertions, 18 deletions

diff --git a/mail/qmailanalog/Makefile b/mail/qmailanalog/Makefile
index c2f982ec1e7..d2ac649b234 100644
--- a/mail/qmailanalog/Makefile
+++ b/mail/qmailanalog/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2010/03/15 17:30:45 schmonz Exp $
+# $NetBSD: Makefile,v 1.13 2012/03/14 23:15:16 joerg Exp $
 #
 
 DISTNAME=		qmailanalog-0.70
+PKGREVISION=		1
 CATEGORIES=		mail
 MASTER_SITES=		http://cr.yp.to/software/
 
@@ -11,10 +12,9 @@ COMMENT=		Collection of tools to help analyze qmail's activity
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_TOOLS+=		nroff
-
 DJB_RESTRICTED=		YES
 DJB_CONFIG_PREFIX=	${PREFIX}/qmailanalog
+BUILD_TARGETS=		prog install instcheck
 
 .include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/qmailanalog/PLIST b/mail/qmailanalog/PLIST
index f91a77db58d..c33e3979d92 100644
--- a/mail/qmailanalog/PLIST
+++ b/mail/qmailanalog/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:04:41 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/03/14 23:15:16 joerg Exp $
 qmailanalog/bin/matchup
 qmailanalog/bin/columnt
 qmailanalog/bin/zoverall
@@ -31,8 +31,3 @@ qmailanalog/man/man1/xqp.1
 qmailanalog/man/man1/xsender.1
 qmailanalog/man/man1/xrecipient.1
 qmailanalog/man/man1/columnt.1
-qmailanalog/man/cat1/matchup.0
-qmailanalog/man/cat1/xqp.0
-qmailanalog/man/cat1/xsender.0
-qmailanalog/man/cat1/xrecipient.0
-qmailanalog/man/cat1/columnt.0
diff --git a/mail/qmailanalog/distinfo b/mail/qmailanalog/distinfo
index 69b01f44df6..7db272bd850 100644
--- a/mail/qmailanalog/distinfo
+++ b/mail/qmailanalog/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2010/03/15 17:30:45 schmonz Exp $
+$NetBSD: distinfo,v 1.4 2012/03/14 23:15:16 joerg Exp $
 
 SHA1 (qmailanalog-0.70.tar.gz) = d9f47b6c5348759aeba3873b6b7653b823b2f92c
 RMD160 (qmailanalog-0.70.tar.gz) = 2f67793dc46930a4375dc481341d33b3406525d0
 Size (qmailanalog-0.70.tar.gz) = 28416 bytes
 SHA1 (patch-aa) = be5c86804cb3ba9fcbff3bf58997ae7a2d87b84c
+SHA1 (patch-hier.c) = 2e26e4717560e5a38eb662e64cdcd05e0fe355fe
diff --git a/mail/qmailanalog/patches/patch-hier.c b/mail/qmailanalog/patches/patch-hier.c
new file mode 100644
index 00000000000..6aac5ac5af9
--- /dev/null
+++ b/mail/qmailanalog/patches/patch-hier.c
@@ -0,0 +1,26 @@
+$NetBSD: patch-hier.c,v 1.1 2012/03/14 23:15:16 joerg Exp $
+
+--- hier.c.orig	2012-03-13 17:48:44.000000000 +0000
++++ hier.c
+@@ -8,21 +8,15 @@ void hier()
+   d(auto_home,"doc",-1,-1,02755);
+   d(auto_home,"man",-1,-1,02755);
+   d(auto_home,"man/man1",-1,-1,02755);
+-  d(auto_home,"man/cat1",-1,-1,02755);
+ 
+   c(auto_home,"doc","MATCHUP",-1,-1,0644);
+   c(auto_home,"doc","ACCOUNTING",-1,-1,0644);
+ 
+   c(auto_home,"man/man1","matchup.1",-1,-1,0644);
+-  c(auto_home,"man/cat1","matchup.0",-1,-1,0644);
+   c(auto_home,"man/man1","xqp.1",-1,-1,0644);
+-  c(auto_home,"man/cat1","xqp.0",-1,-1,0644);
+   c(auto_home,"man/man1","xsender.1",-1,-1,0644);
+-  c(auto_home,"man/cat1","xsender.0",-1,-1,0644);
+   c(auto_home,"man/man1","xrecipient.1",-1,-1,0644);
+-  c(auto_home,"man/cat1","xrecipient.0",-1,-1,0644);
+   c(auto_home,"man/man1","columnt.1",-1,-1,0644);
+-  c(auto_home,"man/cat1","columnt.0",-1,-1,0644);
+ 
+   c(auto_home,"bin","matchup",-1,-1,0755);
+   c(auto_home,"bin","columnt",-1,-1,0755);
diff --git a/mail/safecat/Makefile b/mail/safecat/Makefile
index 1d1aa42be01..22398b85a91 100644
--- a/mail/safecat/Makefile
+++ b/mail/safecat/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2010/02/26 10:28:32 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2012/03/14 23:16:29 joerg Exp $
 #
 
 DISTNAME=		safecat-1.13
+PKGREVISION=		1
 CATEGORIES=		mail
 MASTER_SITES=		http://jeenyus.net/~budney/linux/software/safecat/
 
@@ -13,10 +14,8 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 MAKE_JOBS_SAFE=		no
 
-USE_TOOLS+=		nroff
-
 DJB_RESTRICTED=		NO
-DJB_BUILD_TARGETS=	install instcheck
+BUILD_TARGETS=		install instcheck
 DJB_CONFIG_HOME=	conf-root
 
 MAKE_FLAGS+=		DESTDIR=${DESTDIR:Q}
diff --git a/mail/safecat/PLIST b/mail/safecat/PLIST
index dadb87d4a75..f6a781eb5f6 100644
--- a/mail/safecat/PLIST
+++ b/mail/safecat/PLIST
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/08/15 09:50:03 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/03/14 23:16:29 joerg Exp $
 bin/maildir
 bin/safecat
-man/cat1/maildir.0
-man/cat1/safecat.0
 man/man1/maildir.1
 man/man1/safecat.1
diff --git a/mail/safecat/distinfo b/mail/safecat/distinfo
index 66d8647e81c..e928c5acfc5 100644
--- a/mail/safecat/distinfo
+++ b/mail/safecat/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.6 2008/02/16 15:21:40 heinz Exp $
+$NetBSD: distinfo,v 1.7 2012/03/14 23:16:29 joerg Exp $
 
 SHA1 (safecat-1.13.tar.gz) = 07b42cb06490abeacefce9429a1dbf96caa1629b
 RMD160 (safecat-1.13.tar.gz) = 614df1d43d13a638ab30a2921b66d78f3fafc4c6
 Size (safecat-1.13.tar.gz) = 33953 bytes
 SHA1 (patch-aa) = 2e06a02df248b91e2b1fda9f783c53a10081b196
 SHA1 (patch-ab) = 59b4876e127ebffdbd3cad83a37e3971d9736e8f
+SHA1 (patch-hier.c) = c6825043a97e94d1748852a867bd0f87f2175297
diff --git a/mail/safecat/patches/patch-hier.c b/mail/safecat/patches/patch-hier.c
new file mode 100644
index 00000000000..f54c3586fc0
--- /dev/null
+++ b/mail/safecat/patches/patch-hier.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-hier.c,v 1.1 2012/03/14 23:16:29 joerg Exp $
+
+--- hier.c.orig	2012-03-13 17:44:57.000000000 +0000
++++ hier.c
+@@ -9,9 +9,6 @@ void hier()
+ 
+   d(auto_home,"man",-1,-1,02755);
+   d(auto_home,"man/man1",-1,-1,02755);
+-  d(auto_home,"man/cat1",-1,-1,02755);
+   c(auto_home,"man/man1","safecat.1",-1,-1,0644);
+-  c(auto_home,"man/cat1","safecat.0",-1,-1,0644);
+   c(auto_home,"man/man1","maildir.1",-1,-1,0644);
+-  c(auto_home,"man/cat1","maildir.0",-1,-1,0644);
+ }