Don't install cat pages. Bump revision.

16 files changed, 79 insertions, 57 deletions

diff --git a/mail/dot-forward/Makefile b/mail/dot-forward/Makefile
index ab77dd15445..56d6a97a10a 100644
--- a/mail/dot-forward/Makefile
+++ b/mail/dot-forward/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2010/03/15 17:28:10 schmonz Exp $
+# $NetBSD: Makefile,v 1.22 2012/03/12 21:49:49 joerg Exp $
 #
 
 DISTNAME=		dot-forward-0.71
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		mail
 MASTER_SITES=		http://cr.yp.to/software/
 
diff --git a/mail/dot-forward/PLIST b/mail/dot-forward/PLIST
index 2363dd8d2b1..ccb9ad39f6e 100644
--- a/mail/dot-forward/PLIST
+++ b/mail/dot-forward/PLIST
@@ -1,4 +1,3 @@
-@comment $NetBSD: PLIST,v 1.3 2004/07/21 23:06:10 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.4 2012/03/12 21:49:49 joerg Exp $
 bin/dot-forward
 man/man1/dot-forward.1
-man/cat1/dot-forward.0
diff --git a/mail/dot-forward/distinfo b/mail/dot-forward/distinfo
index d30a1ffdef5..10cda48ab29 100644
--- a/mail/dot-forward/distinfo
+++ b/mail/dot-forward/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2010/03/15 17:28:10 schmonz Exp $
+$NetBSD: distinfo,v 1.4 2012/03/12 21:49:49 joerg Exp $
 
 SHA1 (dot-forward-0.71.tar.gz) = 2adacc13bb43fcf7ae13d3fbeaadd2649ff91137
 RMD160 (dot-forward-0.71.tar.gz) = 1e5fd7558296cf213274e6e80944ba26fed74c79
 Size (dot-forward-0.71.tar.gz) = 26352 bytes
 SHA1 (patch-aa) = ae2cd9f340d25f721203c65505e3a5426d295313
+SHA1 (patch-hier.c) = 848dedac7428f8b731361bbd9e272dc0a320a62f
diff --git a/mail/dot-forward/patches/patch-hier.c b/mail/dot-forward/patches/patch-hier.c
new file mode 100644
index 00000000000..8557fcc14fb
--- /dev/null
+++ b/mail/dot-forward/patches/patch-hier.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-hier.c,v 1.1 2012/03/12 21:49:49 joerg Exp $
+
+--- hier.c.orig	2012-03-12 21:06:14.000000000 +0000
++++ hier.c
+@@ -7,10 +7,8 @@ void hier()
+   d(auto_qmail,"bin",-1,-1,0755);
+   d(auto_qmail,"man",-1,-1,0755);
+   d(auto_qmail,"man/man1",-1,-1,0755);
+-  d(auto_qmail,"man/cat1",-1,-1,0755);
+ 
+   c(auto_qmail,"bin","dot-forward",-1,-1,0755);
+ 
+   c(auto_qmail,"man/man1","dot-forward.1",-1,-1,0644);
+-  c(auto_qmail,"man/cat1","dot-forward.0",-1,-1,0644);
+ }
diff --git a/mail/elm-me/Makefile b/mail/elm-me/Makefile
index 3df259c268d..96e09fb1fc7 100644
--- a/mail/elm-me/Makefile
+++ b/mail/elm-me/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2011/04/22 13:44:02 obache Exp $
+# $NetBSD: Makefile,v 1.33 2012/03/12 21:50:32 joerg Exp $
 
 DISTNAME=		elm-2.4ME+93
 PKGNAME=		elm-me-2.4.93
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		mail
 MASTER_SITES=		ftp://ftp.funet.fi/pub/unix/mail/elm/elm-2.4ME+/
 
diff --git a/mail/elm-me/PLIST b/mail/elm-me/PLIST
index 971f2d80976..762f778d8f7 100644
--- a/mail/elm-me/PLIST
+++ b/mail/elm-me/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:04:31 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2012/03/12 21:50:32 joerg Exp $
 bin/answer
 bin/checkalias
 bin/elm
@@ -25,22 +25,6 @@ lib/elmrc-info
 lib/elmterminal
 lib/elmunidata
 lib/prlong
-man/cat1/answer.0
-man/cat1/checkalias.0
-man/cat1/elm.0
-man/cat1/elmalias.0
-man/cat1/elmcharset.0
-man/cat1/elmterminal.0
-man/cat1/elmunidata.0
-man/cat1/fastmail.0
-man/cat1/frm.0
-man/cat1/listalias.0
-man/cat1/messages.0
-man/cat1/newalias.0
-man/cat1/newmail.0
-man/cat1/printmail.0
-man/cat1/readmsg.0
-man/cat1/wnewmail.0
 man/man1/answer.1
 man/man1/checkalias.1
 man/man1/elm.1
diff --git a/mail/elm-me/files/config.sh b/mail/elm-me/files/config.sh
index dc2e90174e2..a2ca3279141 100644
--- a/mail/elm-me/files/config.sh
+++ b/mail/elm-me/files/config.sh
@@ -272,7 +272,7 @@ maildir='/var/mail'
 mailer='/usr/sbin/sendmail'
 mailgrp='wheel'
 mansrc="${PREFIX}/man/man1"
-catmansrc="${PREFIX}/man/cat1"
+catmansrc="none"
 manext='.1'
 manext_choice='.1'
 catmanext='.0'
diff --git a/mail/ezmlm/Makefile b/mail/ezmlm/Makefile
index 41ab5c07edf..bd448091c08 100644
--- a/mail/ezmlm/Makefile
+++ b/mail/ezmlm/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.22 2010/03/15 17:28:46 schmonz Exp $
+# $NetBSD: Makefile,v 1.23 2012/03/12 21:52:07 joerg Exp $
 #
 
 .include "../../mail/ezmlm/Makefile.common"
 
 DISTNAME=		${EZMLM_VERS}
-PKGREVISION=		1
+PKGREVISION=		2
 
 MAINTAINER=		schmonz@NetBSD.org
 HOMEPAGE=		http://cr.yp.to/ezmlm.html
diff --git a/mail/ezmlm/Makefile.common b/mail/ezmlm/Makefile.common
index 37960dc476d..48e68075b79 100644
--- a/mail/ezmlm/Makefile.common
+++ b/mail/ezmlm/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2010/03/15 17:28:46 schmonz Exp $
+# $NetBSD: Makefile.common,v 1.11 2012/03/12 21:52:07 joerg Exp $
 #
 # used by mail/ezmlm/Makefile
 # used by mail/ezmlm-idx/Makefile
@@ -11,9 +11,7 @@ DISTFILES=		${DISTNAME}.tar.gz
 
 DEPENDS+=		qmail>=1.03:../../mail/qmail
 
-USE_TOOLS+=		nroff
-
 PLIST_SRC=		../../mail/ezmlm/PLIST.common
 
-DJB_BUILD_TARGETS=	man install
+BUILD_TARGETS=	install
 INSTALL_TARGET=		setup
diff --git a/mail/ezmlm/PLIST.common b/mail/ezmlm/PLIST.common
index a09157b98c6..088dd0e7955 100644
--- a/mail/ezmlm/PLIST.common
+++ b/mail/ezmlm/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.1 2002/07/23 08:42:37 schmonz Exp $
+@comment $NetBSD: PLIST.common,v 1.2 2012/03/12 21:52:07 joerg Exp $
 bin/ezmlm-list
 bin/ezmlm-make
 bin/ezmlm-manage
@@ -9,17 +9,6 @@ bin/ezmlm-sub
 bin/ezmlm-unsub
 bin/ezmlm-warn
 bin/ezmlm-weed
-man/cat1/ezmlm-list.0
-man/cat1/ezmlm-make.0
-man/cat1/ezmlm-manage.0
-man/cat1/ezmlm-reject.0
-man/cat1/ezmlm-return.0
-man/cat1/ezmlm-send.0
-man/cat1/ezmlm-sub.0
-man/cat1/ezmlm-unsub.0
-man/cat1/ezmlm-warn.0
-man/cat1/ezmlm-weed.0
-man/cat5/ezmlm.0
 man/man1/ezmlm-list.1
 man/man1/ezmlm-make.1
 man/man1/ezmlm-manage.1
diff --git a/mail/ezmlm/distinfo b/mail/ezmlm/distinfo
index 718c530665d..e9f2e9fb5a9 100644
--- a/mail/ezmlm/distinfo
+++ b/mail/ezmlm/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2010/03/15 17:28:46 schmonz Exp $
+$NetBSD: distinfo,v 1.4 2012/03/12 21:52:07 joerg Exp $
 
 SHA1 (ezmlm-0.53.tar.gz) = 3a7b618737fed8b774bec69c272d70f4142c1e30
 RMD160 (ezmlm-0.53.tar.gz) = 6d366de2d7028a984ba454f1bec9d2d9f495c88b
 Size (ezmlm-0.53.tar.gz) = 62693 bytes
-SHA1 (patch-aa) = a6ca78b9862d2c87b8ff0ea4bb3efbba891715a9
+SHA1 (patch-MAN) = 4becf683f615bacf236abedee3ab6574bdcc0e10
+SHA1 (patch-aa) = c10560c71a137b138af325c6382e498ec466ec06
diff --git a/mail/ezmlm/patches/patch-MAN b/mail/ezmlm/patches/patch-MAN
new file mode 100644
index 00000000000..3793f2c0659
--- /dev/null
+++ b/mail/ezmlm/patches/patch-MAN
@@ -0,0 +1,21 @@
+$NetBSD: patch-MAN,v 1.1 2012/03/12 21:52:07 joerg Exp $
+
+--- MAN.orig	1997-06-30 03:11:54.000000000 +0000
++++ MAN
+@@ -12,16 +12,3 @@ c:::644:/man1/:ezmlm-sub.1:
+ c:::644:/man1/:ezmlm-unsub.1:
+ c:::644:/man1/:ezmlm-warn.1:
+ c:::644:/man1/:ezmlm-weed.1:
+-d:::755:/cat1::
+-d:::755:/cat5::
+-c:::644:/cat5/:ezmlm.0:
+-c:::644:/cat1/:ezmlm-list.0:
+-c:::644:/cat1/:ezmlm-make.0:
+-c:::644:/cat1/:ezmlm-manage.0:
+-c:::644:/cat1/:ezmlm-reject.0:
+-c:::644:/cat1/:ezmlm-return.0:
+-c:::644:/cat1/:ezmlm-send.0:
+-c:::644:/cat1/:ezmlm-sub.0:
+-c:::644:/cat1/:ezmlm-unsub.0:
+-c:::644:/cat1/:ezmlm-warn.0:
+-c:::644:/cat1/:ezmlm-weed.0:
diff --git a/mail/ezmlm/patches/patch-aa b/mail/ezmlm/patches/patch-aa
index b1f89b9d31f..45cd72f7056 100644
--- a/mail/ezmlm/patches/patch-aa
+++ b/mail/ezmlm/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1 2010/03/15 17:28:46 schmonz Exp $
+$NetBSD: patch-aa,v 1.2 2012/03/12 21:52:07 joerg Exp $
 
 --- Makefile.orig	1997-06-30 03:11:54.000000000 +0000
 +++ Makefile
@@ -9,7 +9,7 @@ $NetBSD: patch-aa,v 1.1 2010/03/15 17:28:46 schmonz Exp $
 -it man install conf-bin conf-man
 -	./install "`head -1 conf-bin`" < BIN
 -	./install "`head -1 conf-man`" < MAN
-+it man install conf-bin conf-man conf-destdir
++it install conf-bin conf-man conf-destdir
 +	./install "`head -1 conf-destdir``head -1 conf-bin`" < BIN
 +	./install "`head -1 conf-destdir``head -1 conf-man`" < MAN
  
diff --git a/mail/fastforward/Makefile b/mail/fastforward/Makefile
index 0204fb8df6d..66886df4a6b 100644
--- a/mail/fastforward/Makefile
+++ b/mail/fastforward/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2010/03/15 17:29:43 schmonz Exp $
+# $NetBSD: Makefile,v 1.21 2012/03/12 21:53:09 joerg Exp $
 #
 
 DISTNAME=		fastforward-0.51
@@ -17,9 +17,7 @@ DEPENDS+=		qmail>=1.03nb7:../../mail/qmail
 
 CONFLICTS+=		esmtp>=1.2 postfix-[0-9]* sendmail-[0-9]*
 
-USE_TOOLS+=		nroff
-
-DJB_BUILD_TARGETS=	install instcheck
+BUILD_TARGETS=	install instcheck
 
 DJB_RESTRICTED=		no
 
diff --git a/mail/fastforward/distinfo b/mail/fastforward/distinfo
index b8f8b4ca464..8b62bd8a6c0 100644
--- a/mail/fastforward/distinfo
+++ b/mail/fastforward/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2010/03/15 17:29:43 schmonz Exp $
+$NetBSD: distinfo,v 1.4 2012/03/12 21:53:09 joerg Exp $
 
 SHA1 (fastforward-0.51.tar.gz) = 5a20d2a60d2de791d9a7fbbe6ddb1fdca567053e
 RMD160 (fastforward-0.51.tar.gz) = 84518647b43f0d32dd4fde198dd4712896e8ed25
 Size (fastforward-0.51.tar.gz) = 40659 bytes
 SHA1 (patch-aa) = 6b0dfb2cf364fbc9eb86830585210c303a68ae5f
-SHA1 (patch-ab) = 8ec7eff525bbd1b216c47020adaa5af3daf72580
+SHA1 (patch-ab) = c64c375f29b403f0122cf18a1ec3df36dd8bfa1f
diff --git a/mail/fastforward/patches/patch-ab b/mail/fastforward/patches/patch-ab
index 0297f505fe0..864d41037a9 100644
--- a/mail/fastforward/patches/patch-ab
+++ b/mail/fastforward/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2010/03/15 17:29:43 schmonz Exp $
+$NetBSD: patch-ab,v 1.2 2012/03/12 21:53:09 joerg Exp $
 
 --- hier.c.orig	1998-05-19 16:25:42.000000000 +0000
 +++ hier.c
-@@ -5,8 +5,10 @@ void hier()
+@@ -5,11 +5,12 @@ void hier()
    h(auto_qmail,-1,-1,0755);
  
    d(auto_qmail,"bin",-1,-1,0755);
@@ -14,8 +14,11 @@ $NetBSD: patch-ab,v 1.1 2010/03/15 17:29:43 schmonz Exp $
 +  d(auto_qmail,"share/doc/qmail/fastforward",-1,-1,0755);
    d(auto_qmail,"man",-1,-1,0755);
    d(auto_qmail,"man/man1",-1,-1,0755);
-   d(auto_qmail,"man/cat1",-1,-1,0755);
-@@ -19,7 +21,7 @@ void hier()
+-  d(auto_qmail,"man/cat1",-1,-1,0755);
+ 
+   c(auto_qmail,"bin","fastforward",-1,-1,0755);
+   c(auto_qmail,"bin","printforward",-1,-1,0755);
+@@ -19,7 +20,7 @@ void hier()
    c(auto_qmail,"bin","setmaillist",-1,-1,0755);
    c(auto_qmail,"bin","newinclude",-1,-1,0755);
  
@@ -24,3 +27,16 @@ $NetBSD: patch-ab,v 1.1 2010/03/15 17:29:43 schmonz Exp $
  
    c(auto_qmail,"man/man1","fastforward.1",-1,-1,0644);
    c(auto_qmail,"man/man1","printforward.1",-1,-1,0644);
+@@ -28,12 +29,4 @@ void hier()
+   c(auto_qmail,"man/man1","printmaillist.1",-1,-1,0644);
+   c(auto_qmail,"man/man1","setmaillist.1",-1,-1,0644);
+   c(auto_qmail,"man/man1","newinclude.1",-1,-1,0644);
+-
+-  c(auto_qmail,"man/cat1","fastforward.0",-1,-1,0644);
+-  c(auto_qmail,"man/cat1","printforward.0",-1,-1,0644);
+-  c(auto_qmail,"man/cat1","setforward.0",-1,-1,0644);
+-  c(auto_qmail,"man/cat1","newaliases.0",-1,-1,0644);
+-  c(auto_qmail,"man/cat1","printmaillist.0",-1,-1,0644);
+-  c(auto_qmail,"man/cat1","setmaillist.0",-1,-1,0644);
+-  c(auto_qmail,"man/cat1","newinclude.0",-1,-1,0644);
+ }