Wed Sep 28 06:36:58 2011 UTC ()
Fix PLIST overlap with dependency


(joerg)
diff -r1.60 -r1.61 pkgsrc/mail/qmail/Makefile
diff -r1.13 -r1.14 pkgsrc/mail/qmail/PLIST
diff -r1.19 -r1.20 pkgsrc/mail/qmail/distinfo
diff -r0 -r1.1 pkgsrc/mail/qmail/patches/patch-hier.c
cvs diff -r1.60 -r1.61 pkgsrc/mail/qmail/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/qmail/Makefile 2011/06/07 02:53:42 1.60
+++ pkgsrc/mail/qmail/Makefile 2011/09/28 06:36:57 1.61
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.60 2011/06/07 02:53:42 schmonz Exp $ 1# $NetBSD: Makefile,v 1.61 2011/09/28 06:36:57 joerg Exp $
2# 2#
3 3
4DISTNAME= ${PKGNAME_NOREV} 4DISTNAME= ${PKGNAME_NOREV}
5PKGNAME= qmail-1.03 5PKGNAME= qmail-1.03
6PKGREVISION= 13 6PKGREVISION= 14
7CATEGORIES= mail 7CATEGORIES= mail
8MASTER_SITES= http://qmail.org/ 8MASTER_SITES= http://qmail.org/
9 9
10MAINTAINER= schmonz@NetBSD.org 10MAINTAINER= schmonz@NetBSD.org
11HOMEPAGE= http://cr.yp.to/qmail.html 11HOMEPAGE= http://cr.yp.to/qmail.html
12COMMENT= Secure, reliable, efficient, simple, and fast MTA 12COMMENT= Secure, reliable, efficient, simple, and fast MTA
13LICENSE= public-domain 13LICENSE= public-domain
14 14
15DEPENDS+= checkpassword-[0-9]*:../../sysutils/checkpassword 15DEPENDS+= checkpassword-[0-9]*:../../sysutils/checkpassword
16DEPENDS+= daemontools-[0-9]*:../../sysutils/daemontools 16DEPENDS+= daemontools-[0-9]*:../../sysutils/daemontools
17DEPENDS+= ucspi-tcp-[0-9]*:../../net/ucspi-tcp 17DEPENDS+= ucspi-tcp-[0-9]*:../../net/ucspi-tcp
18 18
19CONFLICTS+= courier-maildirmake-[0-9]* 19CONFLICTS+= courier-maildirmake-[0-9]*
cvs diff -r1.13 -r1.14 pkgsrc/mail/qmail/PLIST (expand / switch to unified diff)

--- pkgsrc/mail/qmail/PLIST 2009/06/14 18:04:41 1.13
+++ pkgsrc/mail/qmail/PLIST 2011/09/28 06:36:57 1.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.13 2009/06/14 18:04:41 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.14 2011/09/28 06:36:57 joerg Exp $
2bin/bouncesaying 2bin/bouncesaying
3bin/condredirect 3bin/condredirect
4bin/datemail 4bin/datemail
5bin/elq 5bin/elq
6bin/except 6bin/except
7bin/forward 7bin/forward
8bin/maildir2mbox 8bin/maildir2mbox
9bin/maildirmake 9bin/maildirmake
10bin/maildirwatch 10bin/maildirwatch
11bin/mailsubj 11bin/mailsubj
12bin/pinq 12bin/pinq
13bin/predate 13bin/predate
14bin/preline 14bin/preline
@@ -55,27 +55,26 @@ man/cat1/mailsubj.0 @@ -55,27 +55,26 @@ man/cat1/mailsubj.0
55man/cat1/preline.0 55man/cat1/preline.0
56man/cat1/qbiff.0 56man/cat1/qbiff.0
57man/cat1/qreceipt.0 57man/cat1/qreceipt.0
58man/cat1/tcp-env.0 58man/cat1/tcp-env.0
59man/cat5/addresses.0 59man/cat5/addresses.0
60man/cat5/dot-qmail.0 60man/cat5/dot-qmail.0
61man/cat5/envelopes.0 61man/cat5/envelopes.0
62man/cat5/maildir.0 62man/cat5/maildir.0
63man/cat5/mbox.0 63man/cat5/mbox.0
64man/cat5/qmail-control.0 64man/cat5/qmail-control.0
65man/cat5/qmail-header.0 65man/cat5/qmail-header.0
66man/cat5/qmail-log.0 66man/cat5/qmail-log.0
67man/cat5/qmail-users.0 67man/cat5/qmail-users.0
68man/cat5/tcp-environ.0 
69man/cat7/forgeries.0 68man/cat7/forgeries.0
70man/cat7/qmail-limits.0 69man/cat7/qmail-limits.0
71man/cat7/qmail.0 70man/cat7/qmail.0
72man/cat8/qmail-clean.0 71man/cat8/qmail-clean.0
73man/cat8/qmail-command.0 72man/cat8/qmail-command.0
74man/cat8/qmail-getpw.0 73man/cat8/qmail-getpw.0
75man/cat8/qmail-inject.0 74man/cat8/qmail-inject.0
76man/cat8/qmail-local.0 75man/cat8/qmail-local.0
77man/cat8/qmail-lspawn.0 76man/cat8/qmail-lspawn.0
78man/cat8/qmail-newmrh.0 77man/cat8/qmail-newmrh.0
79man/cat8/qmail-newu.0 78man/cat8/qmail-newu.0
80man/cat8/qmail-pop3d.0 79man/cat8/qmail-pop3d.0
81man/cat8/qmail-popup.0 80man/cat8/qmail-popup.0
@@ -106,27 +105,26 @@ man/man1/mailsubj.1 @@ -106,27 +105,26 @@ man/man1/mailsubj.1
106man/man1/preline.1 105man/man1/preline.1
107man/man1/qbiff.1 106man/man1/qbiff.1
108man/man1/qreceipt.1 107man/man1/qreceipt.1
109man/man1/tcp-env.1 108man/man1/tcp-env.1
110man/man5/addresses.5 109man/man5/addresses.5
111man/man5/dot-qmail.5 110man/man5/dot-qmail.5
112man/man5/envelopes.5 111man/man5/envelopes.5
113man/man5/maildir.5 112man/man5/maildir.5
114man/man5/mbox.5 113man/man5/mbox.5
115man/man5/qmail-control.5 114man/man5/qmail-control.5
116man/man5/qmail-header.5 115man/man5/qmail-header.5
117man/man5/qmail-log.5 116man/man5/qmail-log.5
118man/man5/qmail-users.5 117man/man5/qmail-users.5
119man/man5/tcp-environ.5 
120man/man7/forgeries.7 118man/man7/forgeries.7
121man/man7/qmail-limits.7 119man/man7/qmail-limits.7
122man/man7/qmail.7 120man/man7/qmail.7
123man/man8/qmail-clean.8 121man/man8/qmail-clean.8
124man/man8/qmail-command.8 122man/man8/qmail-command.8
125man/man8/qmail-getpw.8 123man/man8/qmail-getpw.8
126man/man8/qmail-inject.8 124man/man8/qmail-inject.8
127man/man8/qmail-local.8 125man/man8/qmail-local.8
128man/man8/qmail-lspawn.8 126man/man8/qmail-lspawn.8
129man/man8/qmail-newmrh.8 127man/man8/qmail-newmrh.8
130man/man8/qmail-newu.8 128man/man8/qmail-newu.8
131man/man8/qmail-pop3d.8 129man/man8/qmail-pop3d.8
132man/man8/qmail-popup.8 130man/man8/qmail-popup.8
cvs diff -r1.19 -r1.20 pkgsrc/mail/qmail/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/qmail/distinfo 2011/06/07 02:53:42 1.19
+++ pkgsrc/mail/qmail/distinfo 2011/09/28 06:36:57 1.20
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.19 2011/06/07 02:53:42 schmonz Exp $ 1$NetBSD: distinfo,v 1.20 2011/09/28 06:36:57 joerg Exp $
2 2
3SHA1 (qmail-1.03.tar.gz) = 18fb960481291a0503e93a94df3f6094edb7f27a 3SHA1 (qmail-1.03.tar.gz) = 18fb960481291a0503e93a94df3f6094edb7f27a
4RMD160 (qmail-1.03.tar.gz) = b851f273f1d365d38efd949b1efcf35768ffa30f 4RMD160 (qmail-1.03.tar.gz) = b851f273f1d365d38efd949b1efcf35768ffa30f
5Size (qmail-1.03.tar.gz) = 220668 bytes 5Size (qmail-1.03.tar.gz) = 220668 bytes
6SHA1 (netqmail-1.06.tar.gz) = 9ee9a603e2ad3d8e1d34b900e19b7a5d275f538b 6SHA1 (netqmail-1.06.tar.gz) = 9ee9a603e2ad3d8e1d34b900e19b7a5d275f538b
7RMD160 (netqmail-1.06.tar.gz) = d31598afa862abb35bc1feb8d038ab619b5a17a2 7RMD160 (netqmail-1.06.tar.gz) = d31598afa862abb35bc1feb8d038ab619b5a17a2
8Size (netqmail-1.06.tar.gz) = 260941 bytes 8Size (netqmail-1.06.tar.gz) = 260941 bytes
9SHA1 (badrcptto.patch) = 713875ab08239416b6d22ba0d846b14a6aa6912f 9SHA1 (badrcptto.patch) = 713875ab08239416b6d22ba0d846b14a6aa6912f
10RMD160 (badrcptto.patch) = 88e29eeb203f30ec9c9d01cc42f1b849ea08d509 10RMD160 (badrcptto.patch) = 88e29eeb203f30ec9c9d01cc42f1b849ea08d509
11Size (badrcptto.patch) = 3033 bytes 11Size (badrcptto.patch) = 3033 bytes
12SHA1 (qmail-103.patch) = dfb9cdabe91449dad2117115177b0a6a356baa9f 12SHA1 (qmail-103.patch) = dfb9cdabe91449dad2117115177b0a6a356baa9f
13RMD160 (qmail-103.patch) = 437f8b3063438bbd82c59557333b3566214afa9c 13RMD160 (qmail-103.patch) = 437f8b3063438bbd82c59557333b3566214afa9c
14Size (qmail-103.patch) = 2104 bytes 14Size (qmail-103.patch) = 2104 bytes
@@ -22,13 +22,14 @@ SHA1 (qmail-1.03-realrcptto-2006.12.10.p @@ -22,13 +22,14 @@ SHA1 (qmail-1.03-realrcptto-2006.12.10.p
22RMD160 (qmail-1.03-realrcptto-2006.12.10.patch) = 0f6ad12dd24accab324097350a90f7717747eb56 22RMD160 (qmail-1.03-realrcptto-2006.12.10.patch) = 0f6ad12dd24accab324097350a90f7717747eb56
23Size (qmail-1.03-realrcptto-2006.12.10.patch) = 17718 bytes 23Size (qmail-1.03-realrcptto-2006.12.10.patch) = 17718 bytes
24SHA1 (netqmail-1.05-tls-smtpauth-20070321.patch) = cab82b1edde2ea342275eb67354431d0b78f06a9 24SHA1 (netqmail-1.05-tls-smtpauth-20070321.patch) = cab82b1edde2ea342275eb67354431d0b78f06a9
25RMD160 (netqmail-1.05-tls-smtpauth-20070321.patch) = 7ec6ee04046217c1c2158df36ca6bd4d82b6eab7 25RMD160 (netqmail-1.05-tls-smtpauth-20070321.patch) = 7ec6ee04046217c1c2158df36ca6bd4d82b6eab7
26Size (netqmail-1.05-tls-smtpauth-20070321.patch) = 67641 bytes 26Size (netqmail-1.05-tls-smtpauth-20070321.patch) = 67641 bytes
27SHA1 (qmail-smtpd-viruscan-1.3.patch) = 3a8f4e38df1c3f483f72b1a24ebc36664d075dd9 27SHA1 (qmail-smtpd-viruscan-1.3.patch) = 3a8f4e38df1c3f483f72b1a24ebc36664d075dd9
28RMD160 (qmail-smtpd-viruscan-1.3.patch) = ad6c5ef7894177fd5a7f131765eff22d092ecf54 28RMD160 (qmail-smtpd-viruscan-1.3.patch) = ad6c5ef7894177fd5a7f131765eff22d092ecf54
29Size (qmail-smtpd-viruscan-1.3.patch) = 8891 bytes 29Size (qmail-smtpd-viruscan-1.3.patch) = 8891 bytes
30SHA1 (qmail-smtpd-viruscan-logging.patch) = ca7105b5561cf280e9e3a465d2d68a16673ff56c 30SHA1 (qmail-smtpd-viruscan-logging.patch) = ca7105b5561cf280e9e3a465d2d68a16673ff56c
31RMD160 (qmail-smtpd-viruscan-logging.patch) = 79631cb7b5b120f98397011c4fb94726c48b83e4 31RMD160 (qmail-smtpd-viruscan-logging.patch) = 79631cb7b5b120f98397011c4fb94726c48b83e4
32Size (qmail-smtpd-viruscan-logging.patch) = 2157 bytes 32Size (qmail-smtpd-viruscan-logging.patch) = 2157 bytes
33SHA1 (patch-aa) = 2c8c50889cbc7da8c51bf6d44c0b31f5f0853896 33SHA1 (patch-aa) = 2c8c50889cbc7da8c51bf6d44c0b31f5f0853896
34SHA1 (patch-ab) = 15e6466c655058664cb660e5e12232bf45010814 34SHA1 (patch-ab) = 15e6466c655058664cb660e5e12232bf45010814
 35SHA1 (patch-hier.c) = e14d89fc346b2e47e264ed2d9798a66e778c990f
File Added: pkgsrc/mail/qmail/patches/Attic/patch-hier.c
$NetBSD: patch-hier.c,v 1.1 2011/09/28 06:36:58 joerg Exp $

--- hier.c.orig	2011-09-26 08:54:57.000000000 +0000
+++ hier.c
@@ -162,8 +162,6 @@ void hier()
   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/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);