Remove patch-ab and "rm -f auxiliary/MacOSX/Postfix.StartupItem/Postfix"

in post-extract.

I exchanges few mails with Wietse and he refused to fix the "==" lines and
instructed me to simply remove the offending file. Instead of having a patch
for a file which is not used by pkgsrc I think it makes sense to remove it.

6 files changed, 6 insertions, 58 deletions

diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index c1afc9fa2e3..7811b4496d3 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2006/10/16 11:03:07 martti Exp $
+# $NetBSD: Makefile,v 1.73 2006/10/18 09:26:53 martti Exp $
 
 DISTNAME=	postfix-2.4-20061015
 #PKGREVISION=	1
@@ -129,6 +129,7 @@ SUBST_STAGE.paths=	post-patch
 
 post-extract:
 	cp ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf
+	rm -f ${WRKSRC}/auxiliary/MacOSX/Postfix.StartupItem/Postfix
 
 do-configure:
 	cd ${WRKSRC} &&							\
diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo
index acb558d953b..312f0ade2fe 100644
--- a/mail/postfix-current/distinfo
+++ b/mail/postfix-current/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.29 2006/10/18 05:52:26 martti Exp $
+$NetBSD: distinfo,v 1.30 2006/10/18 09:26:53 martti Exp $
 
 SHA1 (postfix/postfix-2.4-20061015.tar.gz) = ef1dfb806025223eaf2c4bac9002a21c917717f4
 RMD160 (postfix/postfix-2.4-20061015.tar.gz) = fb27fa03459ea4c15bea6a8c99126e16ad32c77b
 Size (postfix/postfix-2.4-20061015.tar.gz) = 2816332 bytes
 SHA1 (patch-aa) = 3f45ca9b05bf080bd0f9ef3c9f8c24a1ef992edd
-SHA1 (patch-ab) = 6aef72d5f53694d68e413b7e6962164d019ba1da
 SHA1 (patch-ag) = 8eb496390981c30842f2988c5dfdb17e8aa813ad
 SHA1 (patch-ai) = 7797f14838cf8278684139a287dcbdbb271641f6
diff --git a/mail/postfix-current/patches/patch-ab b/mail/postfix-current/patches/patch-ab
deleted file mode 100644
index 3c463049a9b..00000000000
--- a/mail/postfix-current/patches/patch-ab
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ab,v 1.10 2006/10/18 05:52:26 martti Exp $
-
---- auxiliary/MacOSX/Postfix.StartupItem/Postfix.orig	2006-10-18 08:42:33.000000000 +0000
-+++ auxiliary/MacOSX/Postfix.StartupItem/Postfix	2006-10-18 08:43:13.000000000 +0000
-@@ -20,18 +20,18 @@
- # Start mail server
- ##
- 
--if [ "$1" == "start" ]
-+if [ "$1" = "start" ]
- then
- 	if [ "${POSTFIX:=-NO-}" = "-YES-" ]
- 	then
- 		ConsoleMessage "Starting Postfix mail services"
- 		/usr/sbin/postfix start
- 	fi
--elif [ "$1" == "stop" ]
-+elif [ "$1" = "stop" ]
- then
- 	ConsoleMessage "Stopping Postfix mail services"
- 	/usr/sbin/postfix stop
--elif [ "$1" == "restart" ]
-+elif [ "$1" = "restart" ]
- then
- 	if [ "${POSTFIX:=-NO-}" = "-YES-" ]
- 	then
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index d1b2b1a56c7..0f38e018d28 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.192 2006/10/16 11:03:07 martti Exp $
+# $NetBSD: Makefile,v 1.193 2006/10/18 09:26:53 martti Exp $
 
 DISTNAME=	postfix-2.3.3
 #PKGREVISION=	1
@@ -129,6 +129,7 @@ SUBST_STAGE.paths=	post-patch
 
 post-extract:
 	cp ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf
+	rm -f ${WRKSRC}/auxiliary/MacOSX/Postfix.StartupItem/Postfix
 
 do-configure:
 	cd ${WRKSRC} &&							\
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index 2e5f948eb5b..c97771ec4c6 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.105 2006/10/18 05:50:42 martti Exp $
+$NetBSD: distinfo,v 1.106 2006/10/18 09:26:53 martti Exp $
 
 SHA1 (postfix/postfix-2.3.3.tar.gz) = 8fb8cff36b18468e75d21cf6c668269f941b4a41
 RMD160 (postfix/postfix-2.3.3.tar.gz) = 9e1550b09e98e7802ffcd1eaba65cf4420fd8ea5
 Size (postfix/postfix-2.3.3.tar.gz) = 2777045 bytes
 SHA1 (patch-aa) = e53bc6644c2b7898b73f4604489021cb85514610
-SHA1 (patch-ab) = 6aef72d5f53694d68e413b7e6962164d019ba1da
 SHA1 (patch-ag) = db654a29edb15c52915e98b6a2babbcf13686f0e
 SHA1 (patch-ai) = b4887cea0b4a2b373cb827c28fc20e253497aa02
diff --git a/mail/postfix/patches/patch-ab b/mail/postfix/patches/patch-ab
deleted file mode 100644
index 20379995111..00000000000
--- a/mail/postfix/patches/patch-ab
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ab,v 1.12 2006/10/18 05:50:42 martti Exp $
-
---- auxiliary/MacOSX/Postfix.StartupItem/Postfix.orig	2006-10-18 08:42:33.000000000 +0000
-+++ auxiliary/MacOSX/Postfix.StartupItem/Postfix	2006-10-18 08:43:13.000000000 +0000
-@@ -20,18 +20,18 @@
- # Start mail server
- ##
- 
--if [ "$1" == "start" ]
-+if [ "$1" = "start" ]
- then
- 	if [ "${POSTFIX:=-NO-}" = "-YES-" ]
- 	then
- 		ConsoleMessage "Starting Postfix mail services"
- 		/usr/sbin/postfix start
- 	fi
--elif [ "$1" == "stop" ]
-+elif [ "$1" = "stop" ]
- then
- 	ConsoleMessage "Stopping Postfix mail services"
- 	/usr/sbin/postfix stop
--elif [ "$1" == "restart" ]
-+elif [ "$1" = "restart" ]
- then
- 	if [ "${POSTFIX:=-NO-}" = "-YES-" ]
- 	then