summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2011-09-28 06:36:57 +0000
committerjoerg <joerg@pkgsrc.org>2011-09-28 06:36:57 +0000
commitec74a8024aa286f7d8cc78c6dcdca5c7e7f9cecd (patch)
treee75b928f5502ac7d721132bd276fd869913681a6 /mail
parent7f6bd2c7c61e48f5c0ed6a1e08e9a31a95eec3bd (diff)
downloadpkgsrc-ec74a8024aa286f7d8cc78c6dcdca5c7e7f9cecd.tar.gz
Fix PLIST overlap with dependency
Diffstat (limited to 'mail')
-rw-r--r--mail/qmail/Makefile4
-rw-r--r--mail/qmail/PLIST4
-rw-r--r--mail/qmail/distinfo3
-rw-r--r--mail/qmail/patches/patch-hier.c13
4 files changed, 18 insertions, 6 deletions
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index f10dc7503ae..432bfd99175 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.60 2011/06/07 02:53:42 schmonz Exp $
+# $NetBSD: Makefile,v 1.61 2011/09/28 06:36:57 joerg Exp $
#
DISTNAME= ${PKGNAME_NOREV}
PKGNAME= qmail-1.03
-PKGREVISION= 13
+PKGREVISION= 14
CATEGORIES= mail
MASTER_SITES= http://qmail.org/
diff --git a/mail/qmail/PLIST b/mail/qmail/PLIST
index db5bf1785b7..28abe6efea5 100644
--- a/mail/qmail/PLIST
+++ b/mail/qmail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2009/06/14 18:04:41 joerg Exp $
+@comment $NetBSD: PLIST,v 1.14 2011/09/28 06:36:57 joerg Exp $
bin/bouncesaying
bin/condredirect
bin/datemail
@@ -65,7 +65,6 @@ man/cat5/qmail-control.0
man/cat5/qmail-header.0
man/cat5/qmail-log.0
man/cat5/qmail-users.0
-man/cat5/tcp-environ.0
man/cat7/forgeries.0
man/cat7/qmail-limits.0
man/cat7/qmail.0
@@ -116,7 +115,6 @@ man/man5/qmail-control.5
man/man5/qmail-header.5
man/man5/qmail-log.5
man/man5/qmail-users.5
-man/man5/tcp-environ.5
man/man7/forgeries.7
man/man7/qmail-limits.7
man/man7/qmail.7
diff --git a/mail/qmail/distinfo b/mail/qmail/distinfo
index 7642a52a1a7..bcc4611124f 100644
--- a/mail/qmail/distinfo
+++ b/mail/qmail/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2011/06/07 02:53:42 schmonz Exp $
+$NetBSD: distinfo,v 1.20 2011/09/28 06:36:57 joerg Exp $
SHA1 (qmail-1.03.tar.gz) = 18fb960481291a0503e93a94df3f6094edb7f27a
RMD160 (qmail-1.03.tar.gz) = b851f273f1d365d38efd949b1efcf35768ffa30f
@@ -32,3 +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
diff --git a/mail/qmail/patches/patch-hier.c b/mail/qmail/patches/patch-hier.c
new file mode 100644
index 00000000000..825c36ef4aa
--- /dev/null
+++ b/mail/qmail/patches/patch-hier.c
@@ -0,0 +1,13 @@
+$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);