* 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.

4 files changed, 4 insertions, 4 deletions

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