8 files changed, 125 insertions, 73 deletions

diff --git a/mail/cyrus/Makefile b/mail/cyrus/Makefile
index f702a9435eff..d2218617eb49 100644
--- a/mail/cyrus/Makefile
+++ b/mail/cyrus/Makefile
@@ -3,25 +3,26 @@
 # Date created:					May 4th 1997
 # Whom:						jfitz@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.6 1998/02/24 21:43:06 jseger Exp $
+# $Id: Makefile,v 1.7 1998/02/25 09:41:30 asami Exp $
 #
 
-DISTNAME=	cyrus-imapd-v1.5.2
-PKGNAME=	cyrus-1.5.2
-CATEGORIES=	mail tcl81
+DISTNAME=	cyrus-imapd-v1.5.14
+PKGNAME=	cyrus-1.5.14
+CATEGORIES=	mail tcl80
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/
 
-MAINTAINER=	jfitz@FreeBSD.ORG
+MAINTAINER=	stb@FreeBSD.ORG
 
-LIB_DEPENDS=	tcl81\\.1\\.:${PORTSDIR}/lang/tcl81
+LIB_DEPENDS=	tcl80\\.1\\.:${PORTSDIR}/lang/tcl80
 BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend
 
 HAS_CONFIGURE=	YES
 CONFIGURE_ARGS=	--with-cyrus-prefix=${PREFIX}/cyrus \
 		--with-cyrus-group=cyrus \
-		--with-tcl=${PREFIX} \
 		--with-login=unix_pwcheck \
-		--with-auth=unix
+		--with-tclsh=${PREFIX}/bin/tclsh8.0 \
+		--with-auth=unix \
+		--with-com-err
 
 MAN1=		cyradm.1
 MAN3=		imclient.3
@@ -30,11 +31,11 @@ MAN8=		arbitron.8 collectnews.8 cyrquota.8 deliver.8 imapd.8 \
 		pop3d.8 reconstruct.8 rmnews.8 syncnews.8
 
 post-configure:
-		@ ${SETENV} ${MAKE_ENV} /usr/bin/perl -pi -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/imap/config.c ${WRKSRC}/imap/krbck.c
+		@ ${SETENV} ${MAKE_ENV} perl -pi -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/imap/config.c ${WRKSRC}/imap/krbck.c
 
 pre-install:
-		@ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/createuser
 		@ ${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
+		@${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
 
 post-install:
 		@ ${MV} ${PREFIX}/cyrus/bin/quota ${PREFIX}/cyrus/bin/cyrquota
@@ -46,25 +47,18 @@ post-install:
 		${INSTALL_DATA} ${WRKSRC}/doc/html/* ${PREFIX}/share/doc/cyrus/html
 .endif
 		${INSTALL_DATA} ${FILESDIR}/imapd.conf ${PREFIX}/etc
-		${MKDIR} -m 750 /var/spool/imap
-		/usr/sbin/chown cyrus.cyrus /var/spool/imap
-		${MKDIR} -m 700 /var/pwcheck
-		/usr/sbin/chown cyrus.cyrus /var/pwcheck
-		${MKDIR} -m 750 ${PREFIX}/etc/imap
-		/usr/sbin/chown cyrus.cyrus ${PREFIX}/etc/imap
-		/usr/bin/touch ${PREFIX}/etc/imap/mailboxes
-		/bin/chmod 640 ${PREFIX}/etc/imap/mailboxes
-		${MKDIR} -m 750 \
+		${INSTALL} -d -m 750 -o cyrus -g cyrus /var/spool/imapd \
+			${PREFIX}/etc/imap \
 			${PREFIX}/etc/imap/user \
 			${PREFIX}/etc/imap/quota \
 			${PREFIX}/etc/imap/proc \
 			${PREFIX}/etc/imap/log \
 			${PREFIX}/etc/imap/msg
-		/usr/sbin/chown cyrus.cyrus ${PREFIX}/etc/imap/*
-		echo "Installing ${PREFIX}/etc/rc.d/cyrus.sh startup file."; \
-		cat ${FILESDIR}/cyrus.sh.pt1 > ${PREFIX}/etc/rc.d/cyrus.sh
-		echo PREFIX=${PREFIX} >> ${PREFIX}/etc/rc.d/cyrus.sh
-		cat ${FILESDIR}/cyrus.sh.pt2 >> ${PREFIX}/etc/rc.d/cyrus.sh
-		/bin/chmod 751 ${PREFIX}/etc/rc.d/cyrus.sh
+		${INSTALL} -d -m 700 -o cyrus -g cyrus /var/pwcheck
+		${TOUCH} ${PREFIX}/etc/imap/mailboxes
+		chmod 640 ${PREFIX}/etc/imap/mailboxes
+		@sed -e "/%%PREFIX%%/s##${PREFIX}#g" ${FILESDIR}/cyrus.sh \
+			>${PREFIX}/etc/rc.d/cyrus.sh
+		@chmod 0755 ${PREFIX}/etc/rc.d/cyrus.sh
 
 .include <bsd.port.mk>
diff --git a/mail/cyrus/distinfo b/mail/cyrus/distinfo
index 5b77e7070db2..a77cb42e4e43 100644
--- a/mail/cyrus/distinfo
+++ b/mail/cyrus/distinfo
@@ -1 +1 @@
-MD5 (cyrus-imapd-v1.5.2.tar.gz) = d9e1471469320c7bc43837ce1b781945
+MD5 (cyrus-imapd-v1.5.14.tar.gz) = e90555be60ec3a647f1661e10cc16458
diff --git a/mail/cyrus/files/cyrus.sh b/mail/cyrus/files/cyrus.sh
new file mode 100644
index 000000000000..9248623a8fe2
--- /dev/null
+++ b/mail/cyrus/files/cyrus.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+PREFIX=%%PREFIX%%
+
+case "$1" in
+
+start)
+	if [ -x ${PREFIX}/cyrus/bin/pwcheck ]
+	then
+		${PREFIX}/cyrus/bin/pwcheck & && echo -n " pwcheck"
+	fi
+	;;
+
+stop)
+	if [ -r /var/run/pwcheck.pid ]
+	then
+		kill `cat /var/run/pwcheck.pid` && echo -n " pwcheck"
+	fi
+	;;
+
+*)
+	echo "usage: $0 {start|stop}" 1>&2
+	exit 64
+	;;
+
+esac
+
diff --git a/mail/cyrus/files/patch-bb b/mail/cyrus/files/patch-bb
index 34ee5682c95b..b4ec10180d1f 100644
--- a/mail/cyrus/files/patch-bb
+++ b/mail/cyrus/files/patch-bb
@@ -1,13 +1,22 @@
---- cyradm/Makefile.in.orig	Sat Dec 21 02:07:57 1996
-+++ cyradm/Makefile.in	Wed Oct  8 13:56:57 1997
-@@ -21,8 +21,8 @@
- RANLIB = @RANLIB@
- 
- DEFS = @DEFS@
--CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ 
--LIBS = @LIBS@ @TCLLIBS@
-+CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et -I$(prefix)/include/tcl8.1 @CPPFLAGS@ 
-+LIBS = @LIBS@ -L/usr/local/lib -ltcl81 -lm
- DEPLIBS = ../lib/libcyrus.a @DEPLIBS@ 
- 
- CFLAGS = @CFLAGS@
+*** cyradm/Makefile.in.orig	Tue Jun  9 06:30:40 1998
+--- cyradm/Makefile.in	Wed Aug 26 11:35:46 1998
+***************
+*** 33,41 ****
+  RANLIB = @RANLIB@
+  
+  DEFS = @DEFS@ @TCL_DEFS@
+! CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ @TCL_CPPFLAGS@
+! # lazy approach to linking: just do it a lot
+! LIBS =  @TCL_LIBS@ @LIBS@ @TCL_LIBS@ @LIBS@
+  DEPLIBS = ../lib/libcyrus.a @DEPLIBS@ 
+  
+  CFLAGS = @CFLAGS@
+--- 33,40 ----
+  RANLIB = @RANLIB@
+  
+  DEFS = @DEFS@ @TCL_DEFS@
+! CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et -I$(prefix)/include/tcl8.0 @CPPFLAGS@ 
+! LIBS = @LIBS@ -L/usr/local/lib -ltcl80 -lm
+  DEPLIBS = ../lib/libcyrus.a @DEPLIBS@ 
+  
+  CFLAGS = @CFLAGS@
diff --git a/mail/cyrus/files/patch-bc b/mail/cyrus/files/patch-bc
index 8c548bfb290d..35f9f254c36a 100644
--- a/mail/cyrus/files/patch-bc
+++ b/mail/cyrus/files/patch-bc
@@ -1,11 +1,19 @@
---- imap/Makefile.in.orig	Thu Mar 13 10:23:01 1997
-+++ imap/Makefile.in	Wed Oct  8 13:56:57 1997
-@@ -34,7 +34,7 @@
- CYRUS_USER=@cyrus_user@
- CYRUS_GROUP=@cyrus_group@
- 
--DEFS = @DEFS@
-+DEFS = @DEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\"
- CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ 
- LIBS = @LIBS@ 
- DEPLIBS = ../et/libcom_err.a ../lib/libcyrus.a @DEPLIBS@
+*** imap/Makefile.in	Wed Aug 26 11:40:10 1998
+--- imap/Makefile.in.orig	Wed Aug 26 11:37:56 1998
+***************
+*** 47,53 ****
+  CYRUS_USER=@cyrus_user@
+  CYRUS_GROUP=@cyrus_group@
+  
+! DEFS = @DEFS@ @LOCALDEFS@
+  CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@
+  LIBS = @LIBS@ @COM_ERR_LIBS@
+  DEPLIBS = ../lib/libcyrus.a @DEPLIBS@
+--- 47,53 ----
+  CYRUS_USER=@cyrus_user@
+  CYRUS_GROUP=@cyrus_group@
+  
+! DEFS = @DEFS@ @LOCALDEFS@  -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\"
+  CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@
+  LIBS = @LIBS@ @COM_ERR_LIBS@
+  DEPLIBS = ../lib/libcyrus.a @DEPLIBS@
diff --git a/mail/cyrus/files/patch-bd b/mail/cyrus/files/patch-bd
index 3268e64bb08a..66480bf2bc2f 100644
--- a/mail/cyrus/files/patch-bd
+++ b/mail/cyrus/files/patch-bd
@@ -1,13 +1,22 @@
---- imap/config.c.orig	Sat Dec 21 02:08:11 1996
-+++ imap/config.c	Wed Oct  8 13:56:58 1997
-@@ -23,7 +23,9 @@
- 
- extern int errno;
- 
--#define CONFIG_FILENAME "/etc/imapd.conf"
-+#if !defined(CONFIG_FILENAME)
-+	#define CONFIG_FILENAME "/etc/imapd.conf"
-+#endif
- 
- struct configlist {
-     char *key;
+*** imap/config.c.orig	Fri May 15 23:48:14 1998
+--- imap/config.c	Wed Aug 26 11:44:18 1998
+***************
+*** 37,43 ****
+  
+  extern int errno;
+  
+! #define CONFIG_FILENAME "/etc/imapd.conf"
+  /* You'd think this'd be EX_CONFIG, but you'd be wrong.
+     If it's EX_CONFIG then sendmail's result is to fatally reject the
+     message; this isn't desireable, we just want to fail the message in a
+--- 37,46 ----
+  
+  extern int errno;
+  
+! #if !defined(CONFIG_FILENAME)
+! # define CONFIG_FILENAME "/etc/imapd.conf"
+! #endif
+! 
+  /* You'd think this'd be EX_CONFIG, but you'd be wrong.
+     If it's EX_CONFIG then sendmail's result is to fatally reject the
+     message; this isn't desireable, we just want to fail the message in a
diff --git a/mail/cyrus/pkg-descr b/mail/cyrus/pkg-descr
index d1b0ff780fc2..a95783d5953f 100644
--- a/mail/cyrus/pkg-descr
+++ b/mail/cyrus/pkg-descr
@@ -1,18 +1,21 @@
 The Cyrus IMAP (Internet Message Access Protocol) server provides access to
-personal mail and system-wide bulletin boards through the IMAP protocol. The
-Cyrus IMAP server is a scaleable enterprise mail system designed for use
+personal mail and system-wide bulletin boards through the IMAP protocol. 
+The Cyrus IMAP server is a scaleable enterprise mail system designed for use
 from small to large enterprise environments using standards-based
 technologies.
 
 A full Cyrus IMAP implementation allows a seamless mail and bulletin board
-environment to be set up across multiple servers. It differs from other IMAP
-server implementations in that it is run on "sealed" servers, where users
-are not normally permitted to log in. The mailbox database is stored in
-parts of the filesystem that are private to the Cyrus IMAP system. All user
-access to mail is through software using the IMAP, POP3, or KPOP protocols.
+environment to be set up across multiple servers.  It differs from other
+IMAP server implementations in that it is run on "sealed" servers, where
+users are not normally permitted to log in.  The mailbox database is stored
+in parts of the filesystem that are private to the Cyrus IMAP system.  All
+user access to mail is through software using the IMAP, POP3, or KPOP
+protocols.
 
 The private mailbox database design gives the server large advantages in
-efficiency, scalability, and administratability. Multiple concurrent
-read/write connections to the same mailbox are permitted. The server
+efficiency, scalability, and administratability.  Multiple concurrent
+read/write connections to the same mailbox are permitted.  The server
 supports access control lists on mailboxes and storage quotas on mailbox
-hierarchies
+hierarchies.
+
+See http://andrew2.andrew.cmu.edu/cyrus/imapd/ for further details.
diff --git a/mail/cyrus/pkg-plist b/mail/cyrus/pkg-plist
index 71fec5cdb5f3..2b61100e7692 100644
--- a/mail/cyrus/pkg-plist
+++ b/mail/cyrus/pkg-plist
@@ -5,7 +5,9 @@ cyrus/bin/arbitron
 cyrus/bin/collectnews
 cyrus/bin/cyrquota
 cyrus/bin/deliver
+cyrus/bin/dump_deliverdb
 cyrus/bin/feedcyrus
+cyrus/bin/fud
 cyrus/bin/imapd
 cyrus/bin/pop3d
 cyrus/bin/reconstruct