Fix the SunOS do-install target to be DESTDIR compatible.

Fix the patch files to contain proper RCS keywords.

6 files changed, 16 insertions, 8 deletions

diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile
index 015e5baa2ca..d31183d9822 100644
--- a/mail/procmail/Makefile
+++ b/mail/procmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2011/10/31 22:58:45 sbd Exp $
+# $NetBSD: Makefile,v 1.47 2012/03/12 13:22:16 fhajny Exp $
 #
 
 DISTNAME=	procmail-3.22
@@ -30,7 +30,7 @@ PROCMAIL_TRUSTED_IDS?=\
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
 
-### Inlining functions (implied by -O3 or higher) cause the strstr() test 
+### Inlining functions (implied by -O3 or higher) cause the strstr() test
 ### to enter an infinite loop so disable it.  This fixes PR pkg/30999.
 CFLAGS+=        -fno-inline-functions
 
@@ -61,7 +61,7 @@ do-install:
 	for f in procmailex.5 procmailrc.5 procmailsc.5; do		\
 		${INSTALL_MAN} $$f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/$$f; \
 	done
-	${SH} ${WRKSRC}/suid.sh
+	DESTDIR=${DESTDIR:Q} ${SH} ${WRKSRC}/suid.sh
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/procmail/distinfo b/mail/procmail/distinfo
index cbc30062f72..a226656b42a 100644
--- a/mail/procmail/distinfo
+++ b/mail/procmail/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2010/01/27 18:14:05 joerg Exp $
+$NetBSD: distinfo,v 1.14 2012/03/12 13:22:17 fhajny Exp $
 
 SHA1 (procmail-3.22.tar.gz) = cd4e44c15559816453fd60349e5a32289f6f2965
 RMD160 (procmail-3.22.tar.gz) = e609ec94ea9ab3b93629c62b3e29add497806483
@@ -10,7 +10,7 @@ SHA1 (patch-ad) = b35d6d508a15b8e70734ac7ccd58c19db31717ab
 SHA1 (patch-ae) = b5ac027b337c8d9cf9c6096a48ef534315e18250
 SHA1 (patch-af) = 889f937f50561308c644d5a4bd836eccabbb2938
 SHA1 (patch-ag) = 66ae907f1b7ccfa10b5278443a9d9b0277923e61
-SHA1 (patch-ba) = 5b0d2513e5320de26696cfaad9475f462579dae3
-SHA1 (patch-bb) = fd96d7c5adf02d0c264dfa080268c1f27e9f0f10
-SHA1 (patch-bc) = 663b92c51f875fb5b55eba6aa056c91aa0fb5a97
-SHA1 (patch-bd) = cba78a1551d850f5ab8507949265f4c4d1215545
+SHA1 (patch-ba) = dfe9a74ed4fece98850780bebedd162fd0e5b275
+SHA1 (patch-bb) = 0ba6c7a62ea49e8afc2e443fa84b4de692897af4
+SHA1 (patch-bc) = 3f37d5d4ba427407230aae58e4a08a7c87ccad4e
+SHA1 (patch-bd) = 7fe12e0b626c9c7a045cb4a6ccbed20614d5c8d6
diff --git a/mail/procmail/patches/patch-ba b/mail/procmail/patches/patch-ba
index 51556387da0..75e62bf2957 100644
--- a/mail/procmail/patches/patch-ba
+++ b/mail/procmail/patches/patch-ba
@@ -1,3 +1,5 @@
+$NetBSD: patch-ba,v 1.2 2012/03/12 13:22:17 fhajny Exp $
+
 --- src/formail.c.orig	2009-07-17 23:04:16.000000000 -0400
 +++ src/formail.c	2009-07-17 23:04:16.000000000 -0400
 @@ -819,7 +819,7 @@
diff --git a/mail/procmail/patches/patch-bb b/mail/procmail/patches/patch-bb
index db79d4721fd..ecd7a0e1caa 100644
--- a/mail/procmail/patches/patch-bb
+++ b/mail/procmail/patches/patch-bb
@@ -1,3 +1,5 @@
+$NetBSD: patch-bb,v 1.2 2012/03/12 13:22:17 fhajny Exp $
+
 --- src/fields.c.orig	2009-07-17 23:04:16.000000000 -0400
 +++ src/fields.c	2009-07-17 23:04:16.000000000 -0400
 @@ -110,16 +110,16 @@
diff --git a/mail/procmail/patches/patch-bc b/mail/procmail/patches/patch-bc
index a7da9051a56..656ddfd69b5 100644
--- a/mail/procmail/patches/patch-bc
+++ b/mail/procmail/patches/patch-bc
@@ -1,3 +1,5 @@
+$NetBSD: patch-bc,v 1.2 2012/03/12 13:22:17 fhajny Exp $
+
 --- src/formisc.h.orig	2009-07-17 23:04:16.000000000 -0400
 +++ src/formisc.h	2009-07-17 23:04:16.000000000 -0400
 @@ -17,4 +17,4 @@
diff --git a/mail/procmail/patches/patch-bd b/mail/procmail/patches/patch-bd
index 6978eec82a0..b2f1a1f2d56 100644
--- a/mail/procmail/patches/patch-bd
+++ b/mail/procmail/patches/patch-bd
@@ -1,3 +1,5 @@
+$NetBSD: patch-bd,v 1.2 2012/03/12 13:22:17 fhajny Exp $
+
 --- src/formisc.c.orig	2009-07-17 23:04:16.000000000 -0400
 +++ src/formisc.c	2009-07-17 23:04:16.000000000 -0400
 @@ -115,7 +115,7 @@