4 files changed, 24 insertions, 21 deletions

diff --git a/mail/cyrus-imapd2/files/imapd.sh b/mail/cyrus-imapd2/files/imapd.sh
index 5230d76473ae..d34317dd5501 100644
--- a/mail/cyrus-imapd2/files/imapd.sh
+++ b/mail/cyrus-imapd2/files/imapd.sh
@@ -8,12 +8,15 @@ start)
 	if [ -x /usr/local/cyrus/bin/master -a \
 	     -f /usr/local/etc/cyrus.conf -a \
 	     -f /usr/local/etc/imapd.conf ]; then
-		/usr/local/cyrus/bin/master &
+		/usr/local/cyrus/bin/master -d
 		echo -n ' imapd'
 	fi
 	;;
 stop)
-	kill `ps -U cyrus | awk '/master/ {print $1}'` && echo -n ' imapd'
+	if [ -r /var/run/cyrus-master.pid ]; then
+		kill `cat /var/run/cyrus-master.pid` && echo -n ' imapd'
+		rm /var/run/cyrus-master.pid
+	fi
 	;;
 *)
 	echo "Usage: `basename $0` {start|stop}" >&2
diff --git a/mail/cyrus-imapd2/files/patch-ac b/mail/cyrus-imapd2/files/patch-ac
index 36d98e3d9312..3ae125eef8b3 100644
--- a/mail/cyrus-imapd2/files/patch-ac
+++ b/mail/cyrus-imapd2/files/patch-ac
@@ -1,22 +1,22 @@
 Index: configure
 diff -u configure.orig configure
---- configure.orig	Thu Jan 30 16:54:20 2003
-+++ configure	Thu Jan 30 17:07:29 2003
-@@ -1988,7 +1988,7 @@
+--- configure.orig	Tue Feb  4 16:05:15 2003
++++ configure	Tue Feb  4 16:08:25 2003
+@@ -2760,7 +2760,7 @@
+ 	    BDB_LIBADD=""
+ 	fi
  
- #Try to detect the name of the DB4/DB3 library
- dbfound="no"
--for dbname in db-4.1 db4.1 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
-+for dbname in db-4.1 db4.1 db-4.0 db4.0 db-4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
-   do
-     echo $ac_n "checking for db_create in -l$dbname""... $ac_c" 1>&6
- echo "configure:1995: checking for db_create in -l$dbname" >&5
-@@ -6171,7 +6171,7 @@
+-        for dbname in db-4.1 db4.1 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
++        for dbname in db-4.1 db4.1 db-4.0 db4.0 db-4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
+           do
+             echo $ac_n "checking for db_create in -l$dbname""... $ac_c" 1>&6
+ echo "configure:2767: checking for db_create in -l$dbname" >&5
+@@ -6757,7 +6757,7 @@
  #define HAVE_UCDSNMP 1
  EOF
  
 -    LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
 +    LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm"
      echo $ac_n "checking for rpmdbOpen in -lrpm""... $ac_c" 1>&6
- echo "configure:6177: checking for rpmdbOpen in -lrpm" >&5
+ echo "configure:6763: checking for rpmdbOpen in -lrpm" >&5
  ac_lib_var=`echo rpm'_'rpmdbOpen | sed 'y%./+-%__p_%'`
diff --git a/mail/cyrus-imapd2/files/patch-bc b/mail/cyrus-imapd2/files/patch-bc
index 232ac2da797e..158b0dda9aad 100644
--- a/mail/cyrus-imapd2/files/patch-bc
+++ b/mail/cyrus-imapd2/files/patch-bc
@@ -1,17 +1,17 @@
 Index: imap/Makefile.in
 diff -u imap/Makefile.in.orig imap/Makefile.in
---- imap/Makefile.in.orig	Fri Jul 26 06:07:05 2002
-+++ imap/Makefile.in	Fri Sep 13 18:49:25 2002
+--- imap/Makefile.in.orig	Tue Dec 10 09:52:43 2002
++++ imap/Makefile.in	Tue Feb  4 20:28:12 2003
 @@ -61,7 +61,7 @@
  CYRUS_USER=@cyrus_user@
  CYRUS_GROUP=@cyrus_group@
  
 -DEFS = @DEFS@ @LOCALDEFS@
 +DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\"
- CPPFLAGS = -I. -I.. -I../sieve -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../acap -I../acap @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
+ CPPFLAGS = -I. -I.. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../sieve -I$(srcdir)/../acap @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
  IMAP_LIBS = @IMAP_LIBS@
  SIEVE_LIBS = @SIEVE_LIBS@
-@@ -244,12 +244,12 @@
+@@ -243,12 +243,12 @@
  mupdate: mupdate.o mupdate-slave.o mupdate-client.o libimap.a $(DEPLIBS)
  	$(CC) $(LDFLAGS) -o mupdate \
  	 $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
diff --git a/mail/cyrus-imapd2/files/patch-dc b/mail/cyrus-imapd2/files/patch-dc
index 4c2865a19c62..10bec3adc883 100644
--- a/mail/cyrus-imapd2/files/patch-dc
+++ b/mail/cyrus-imapd2/files/patch-dc
@@ -1,13 +1,13 @@
 Index: master/Makefile.in
 diff -u master/Makefile.in.orig master/Makefile.in
---- master/Makefile.in.orig	Wed Dec 12 02:03:08 2001
-+++ master/Makefile.in	Wed Dec 12 02:05:57 2001
+--- master/Makefile.in.orig	Tue Feb  4 20:30:08 2003
++++ master/Makefile.in	Tue Feb  4 20:31:00 2003
 @@ -52,7 +52,7 @@
  CYRUS_USER=@cyrus_user@
  CYRUS_GROUP=@cyrus_group@
  
 -DEFS = @DEFS@ @LOCALDEFS@
 +DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/cyrus.conf\"
- CPPFLAGS = -I. -I.. -I../lib -I$(srcdir) @CPPFLAGS@ @COM_ERR_CPPFLAGS@
+ CPPFLAGS = -I. -I.. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @COM_ERR_CPPFLAGS@
  DEPLIBS = ../lib/libcyrus.a @DEPLIBS@