* Install maildirmake as imapd.maildirmake and depend on

  mail/courier-maildirmake.
* There was an inverted test in the rc.d scripts that was causing them to
  fail on newer NetBSD systems.
* Install the rc.d scripts under ${PREFIX}/etc/rc.d, not in ${PREFIX}/etc.

8 files changed, 56 insertions, 21 deletions

diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 093a2b5c2fd..50cae1b58f8 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/08/15 19:40:04 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/08/16 06:23:21 jlam Exp $
 
 DISTNAME=	courier-imap-1.3.8.2
 CATEGORIES=	mail
@@ -8,6 +8,8 @@ MAINTAINER=	jlam@netbsd.org
 HOMEPAGE=	http://www.inter7.com/courierimap/
 COMMENT=	IMAP server for access to Maildir-style mailboxes
 
+DEPENDS+=	courier-maildirmake-[0-9]*:../../mail/courier-maildirmake
+
 USE_BUILDLINK_ONLY=	# defined
 USE_GMAKE=		# defined
 USE_PERL5=		# defined
@@ -82,10 +84,14 @@ pre-install:
 	${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE}
 
 post-install:
-	${INSTALL_SCRIPT} ${FILESDIR}/courierimap.sh ${PREFIX}/etc/courierimap
-	${INSTALL_SCRIPT} ${FILESDIR}/courierimaps.sh ${PREFIX}/etc/courierimaps
-	${INSTALL_SCRIPT} ${FILESDIR}/courierpop.sh ${PREFIX}/etc/courierpop
-	${INSTALL_SCRIPT} ${FILESDIR}/courierpops.sh ${PREFIX}/etc/courierpops
+	for file in							\
+		courierimap.sh courierimaps.sh				\
+		courierpop.sh courierpops.sh;				\
+	do								\
+		src=${FILESDIR}/$${file};				\
+		dest=${PREFIX}/etc/rc.d/$${file%.sh};			\
+		${INSTALL_SCRIPT} $${src} $${dest};			\
+	done
 	${INSTALL_SCRIPT} ${WRKSRC}/sysconftool ${PREFIX}/sbin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/courier
 	${INSTALL_DATA} ${WRKSRC}/imap/README				\
diff --git a/mail/courier-imap/distinfo b/mail/courier-imap/distinfo
index 106ef473df5..db487693677 100644
--- a/mail/courier-imap/distinfo
+++ b/mail/courier-imap/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/08/15 19:40:05 jlam Exp $
+$NetBSD: distinfo,v 1.3 2001/08/16 06:23:21 jlam Exp $
 
 SHA1 (courier-imap-1.3.8.2.tar.gz) = 7e199dee58eb125df2b897f0621ffa5eb6d7fbde
 Size (courier-imap-1.3.8.2.tar.gz) = 1131541 bytes
-SHA1 (patch-aa) = caa86582c8b0915acb126969cbd69f88714f0f3a
+SHA1 (patch-aa) = 5a2934b729970de7faa84414555885dc2641c3ae
 SHA1 (patch-ab) = da50612c40a7882353eec09abeebb4ad89720d94
diff --git a/mail/courier-imap/files/courierimap.sh b/mail/courier-imap/files/courierimap.sh
index 31f9da5eaa5..090482a03f5 100755
--- a/mail/courier-imap/files/courierimap.sh
+++ b/mail/courier-imap/files/courierimap.sh
@@ -5,7 +5,7 @@
 # PROVIDE: courierimap
 # REQUIRE: DAEMON
 
-if [ ! -d /etc/rc.d -a -f /etc/rc.subr ]
+if [ -d /etc/rc.d -a -f /etc/rc.subr ]
 then
 	. /etc/rc.subr
 fi
diff --git a/mail/courier-imap/files/courierimaps.sh b/mail/courier-imap/files/courierimaps.sh
index eeec7a72ea5..ca0c25c9ada 100755
--- a/mail/courier-imap/files/courierimaps.sh
+++ b/mail/courier-imap/files/courierimaps.sh
@@ -5,7 +5,7 @@
 # PROVIDE: courierimaps
 # REQUIRE: DAEMON
 
-if [ ! -d /etc/rc.d -a -f /etc/rc.subr ]
+if [ -d /etc/rc.d -a -f /etc/rc.subr ]
 then
 	. /etc/rc.subr
 fi
diff --git a/mail/courier-imap/files/courierpop.sh b/mail/courier-imap/files/courierpop.sh
index 8cb371a891a..9f963ed4297 100755
--- a/mail/courier-imap/files/courierpop.sh
+++ b/mail/courier-imap/files/courierpop.sh
@@ -5,7 +5,7 @@
 # PROVIDE: courierpop
 # REQUIRE: DAEMON
 
-if [ ! -d /etc/rc.d -a -f /etc/rc.subr ]
+if [ -d /etc/rc.d -a -f /etc/rc.subr ]
 then
 	. /etc/rc.subr
 fi
diff --git a/mail/courier-imap/files/courierpops.sh b/mail/courier-imap/files/courierpops.sh
index 73320dec8b8..4f070f4a66b 100755
--- a/mail/courier-imap/files/courierpops.sh
+++ b/mail/courier-imap/files/courierpops.sh
@@ -5,7 +5,7 @@
 # PROVIDE: courierpops
 # REQUIRE: DAEMON
 
-if [ ! -d /etc/rc.d -a -f /etc/rc.subr ]
+if [ -d /etc/rc.d -a -f /etc/rc.subr ]
 then
 	. /etc/rc.subr
 fi
diff --git a/mail/courier-imap/patches/patch-aa b/mail/courier-imap/patches/patch-aa
index 04984621564..7b36bc0e813 100644
--- a/mail/courier-imap/patches/patch-aa
+++ b/mail/courier-imap/patches/patch-aa
@@ -1,21 +1,50 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/07/31 22:48:50 jlam Exp $
-
 --- Makefile.in.orig	Wed Jun 13 18:37:56 2001
-+++ Makefile.in
-@@ -30,3 +30,3 @@
++++ Makefile.in	Thu Aug 16 01:46:51 2001
+@@ -28,7 +28,7 @@
+ sbindir = @sbindir@
+ libexecdir = @libexecdir@
  datadir = @datadir@
 -sysconfdir = @sysconfdir@
 +sysconfdir = ${prefix}/share/examples/courier
  sharedstatedir = @sharedstatedir@
-@@ -93,3 +93,3 @@
+ localstatedir = @localstatedir@
+ libdir = @libdir@
+@@ -89,9 +89,9 @@
+ databindir = $(datadir)
+ databin_SCRIPTS = mkimapdcert mkpop3dcert vchkpw2userdb makeuserdb pw2userdb
+ 
+-bin_PROGRAMS = imapd pop3d maildirmake
++bin_PROGRAMS = imapd pop3d imapd.maildirmake
  sbin_PROGRAMS = imaplogin pop3login userdbpw
 -man_MANS = makeuserdb.8 userdb.8 userdbpw.8 couriertcpd.8 deliverquota.8 maildirmake.1 imapd.8 mkimapdcert.8 mkpop3dcert.8
-+man_MANS = makeuserdb.8 userdb.8 userdbpw.8 couriertcpd.8 deliverquota.8 maildirmake.1 courier-imapd.8 mkimapdcert.8 mkpop3dcert.8
++man_MANS = makeuserdb.8 userdb.8 userdbpw.8 couriertcpd.8 deliverquota.8 imapd.maildirmake.1 courier-imapd.8 mkimapdcert.8 mkpop3dcert.8
+ 
+ # Added by sysconftoolize: $Id: patch-aa,v 1.2 2001/08/16 06:23:23 jlam Exp $
+ 
+@@ -751,8 +751,8 @@
+ deliverquota: maildir/deliverquota
+ 	cp maildir/deliverquota .
+ 
+-maildirmake: maildir/maildirmake
+-	cp maildir/maildirmake .
++imapd.maildirmake: maildir/maildirmake
++	cp maildir/maildirmake ./imapd.maildirmake
+ 
+ pop3d.dist: imap/pop3d.dist
+ 	cp imap/pop3d.dist .
+@@ -781,11 +781,11 @@
+ deliverquota.8: maildir/deliverquota.8
+ 	cp maildir/deliverquota.8 .
  
-@@ -786,4 +786,4 @@
+-maildirmake.1: maildir/maildirmake.1
+-	cp maildir/maildirmake.1 .
++imapd.maildirmake.1: maildir/maildirmake.1
++	cp maildir/maildirmake.1 ./imapd.maildirmake.1
  
 -imapd.8: imap/imapd.8
 -	cp imap/imapd.8 .
 +courier-imapd.8: imap/imapd.8
 +	cp imap/imapd.8 courier-imapd.8
  
+ mkimapdcert: imap/mkimapdcert
+ 	cp imap/mkimapdcert .
diff --git a/mail/courier-imap/pkg/PLIST b/mail/courier-imap/pkg/PLIST
index cccd2675250..cb7acb1aa6f 100644
--- a/mail/courier-imap/pkg/PLIST
+++ b/mail/courier-imap/pkg/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2001/08/14 21:42:16 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/08/16 06:23:23 jlam Exp $
 bin/couriertls
 bin/imapd
-bin/maildirmake
+bin/imapd.maildirmake
 bin/pop3d
 etc/rc.d/courierimap
 etc/rc.d/courierimaps
@@ -19,7 +19,7 @@ libexec/courier/logger
 libexec/courier/makedatprog
 libexec/courier/pop3d-ssl.rc
 libexec/courier/pop3d.rc
-man/man1/maildirmake.1
+man/man1/imapd.maildirmake.1
 man/man8/authcram.8
 man/man8/authdaemon.8
 man/man8/authdaemond.8