From 960c90423cf73a9057fb4541c4c4d87bd7c6ea4c Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Tue, 4 Sep 2007 20:40:43 +0000
Subject: Fix build after recent changes to the RCD handling.

---
 mail/jchkmail/Makefile         |  3 ++-
 mail/jchkmail/distinfo         |  5 +++--
 mail/jchkmail/patches/patch-aa | 13 +++++++------
 mail/jchkmail/patches/patch-ad | 13 +++++++++++++
 4 files changed, 25 insertions(+), 9 deletions(-)
 create mode 100644 mail/jchkmail/patches/patch-ad

(limited to 'mail/jchkmail')

diff --git a/mail/jchkmail/Makefile b/mail/jchkmail/Makefile
index db280701f09..016bf0947c4 100644
--- a/mail/jchkmail/Makefile
+++ b/mail/jchkmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/03/24 19:21:27 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2007/09/04 20:40:43 joerg Exp $
 #
 
 DISTNAME=		jchkmail-1.3.1a
@@ -26,6 +26,7 @@ CONF_FILES+=		${EGDIR}/j-host-access ${PKG_SYSCONFDIR}/j-host-access
 CONF_FILES+=		${EGDIR}/j-user-access ${PKG_SYSCONFDIR}/j-user-access
 CONF_FILES+=		${EGDIR}/j-regex ${PKG_SYSCONFDIR}/j-regex
 RCD_SCRIPTS=		jchkmail
+RCD_SCRIPT_SRC.jchkmail=	${WRKSRC}/bin/jchkmail.init
 
 PTHREAD_AUTO_VARS=	yes
 
diff --git a/mail/jchkmail/distinfo b/mail/jchkmail/distinfo
index 7a19fc93ee1..503e1c1af92 100644
--- a/mail/jchkmail/distinfo
+++ b/mail/jchkmail/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.4 2006/04/11 11:12:21 manu Exp $
+$NetBSD: distinfo,v 1.5 2007/09/04 20:40:43 joerg Exp $
 
 SHA1 (jchkmail-1.3.1a.tar.gz) = 6cade163151a2c08d42082b971b55a11c33f47c6
 RMD160 (jchkmail-1.3.1a.tar.gz) = b707514f3a04d871f32db660be8b975577e1dbf3
 Size (jchkmail-1.3.1a.tar.gz) = 420432 bytes
-SHA1 (patch-aa) = b0c8c3483c2b65570547d79c59c0974b685d57bb
+SHA1 (patch-aa) = 19acb161de38b297d000ae4cc9a96106ff7b3a20
 SHA1 (patch-ab) = c629836b5dbab9282104a3c2731e379c56c5ea81
 SHA1 (patch-ac) = 8be29408b4fb665d3374fb6232b596d028d69e28
+SHA1 (patch-ad) = 2702900d14582a926370b31e88a05e0cbd3d4105
diff --git a/mail/jchkmail/patches/patch-aa b/mail/jchkmail/patches/patch-aa
index 5b8a01fb045..c13d84949ce 100644
--- a/mail/jchkmail/patches/patch-aa
+++ b/mail/jchkmail/patches/patch-aa
@@ -1,8 +1,10 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/09/22 14:33:35 manu Exp $
---- bin/jchkmail.init.in.orig	Tue Mar 11 11:38:43 2003
-+++ bin/jchkmail.init.in	Mon Sep 22 14:49:05 2003
-@@ -1,20 +1,9 @@
- #!/bin/sh
+$NetBSD: patch-aa,v 1.2 2007/09/04 20:40:43 joerg Exp $
+
+--- bin/jchkmail.init.in.orig	2007-09-04 19:50:09.000000000 +0000
++++ bin/jchkmail.init.in
+@@ -1,19 +1,8 @@
+-#!/bin/sh
++#!@RCD_SCRIPTS_SHELL@
  #
 -# chkconfig: 2345 80 30
 -# description: j-chkmail - Joe's j-chkmail
@@ -24,4 +26,3 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/09/22 14:33:35 manu Exp $
  
  JCHKMAIL_HOME=@prefix@/sbin
  
- JCHKMAIL_BIN=j-chkmail
diff --git a/mail/jchkmail/patches/patch-ad b/mail/jchkmail/patches/patch-ad
new file mode 100644
index 00000000000..7a8762200a6
--- /dev/null
+++ b/mail/jchkmail/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2007/09/04 20:40:43 joerg Exp $
+
+--- Makefile.in.orig	2003-07-03 11:54:07.000000000 +0000
++++ Makefile.in
+@@ -449,8 +449,6 @@ install-data-hook:
+ 	chmod 755 @WORKDIR@ 
+ 	chown @USER@ @WORKDIR@ 
+ 	chgrp @GROUP@ @WORKDIR@ 
+-	cp bin/jchkmail.init @RCDIR@/@RCSCRIPT@
+-	chmod 755 @RCDIR@/@RCSCRIPT@
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
-- 
cgit v1.2.3