- Update to 1.5.19

- Don't overwrite pre-existing imapd.conf
- Fix installation of doc files
- Clean up pkg/COMMENT

7 files changed, 81 insertions, 57 deletions

diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index 52117d933842..4fbbeab2580e 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:		cyrus
-# Version required:				1.5.14
+# Version required:				1.5.19
 # Date created:					May 4th 1997
 # Whom:						jfitz@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.16 1999/04/20 22:54:02 stb Exp $
+# $Id: Makefile,v 1.17 1999/04/21 00:29:36 stb Exp $
 #
 
-DISTNAME=	cyrus-imapd-v1.5.14
-PKGNAME=	cyrus-1.5.14
+DISTNAME=	cyrus-imapd-v1.5.19
+PKGNAME=	cyrus-1.5.19
 CATEGORIES=	mail tcl80
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		http://www.freebsd.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
@@ -41,16 +41,31 @@ pre-install:
 		@ ${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
 		@${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
 
+DOCS=	README acl-extension anoncvs bugs changes copyrights install \
+	mailing-list overview quota-extension server-design
+HTDOCS=	anoncvs bugs changes index install mailing-list overview \
+	readme unpack
 post-install:
 		@ ${MV} ${PREFIX}/cyrus/bin/quota ${PREFIX}/cyrus/bin/cyrquota
 .if !defined(NOPORTDOCS)
 		${MKDIR} ${PREFIX}/share/doc/cyrus/html
-.for file in acl-extension bugs changes copyrights install overview quota-extension server-design
-		${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/share/doc/cyrus
+.for file in ${DOCS}
+		${INSTALL_DATA} ${WRKSRC}/doc/${file} \
+			${PREFIX}/share/doc/cyrus
+		@${ECHO} share/doc/cyrus/${file} >>${TMPPLIST}
 .endfor
-		${INSTALL_DATA} ${WRKSRC}/doc/html/* ${PREFIX}/share/doc/cyrus/html
+.for file in ${HTDOCS}
+		${INSTALL_DATA} ${WRKSRC}/doc/html/${file}.html \
+			${PREFIX}/share/doc/cyrus/html
+		@${ECHO} share/doc/cyrus/html/${file}.html >>${TMPPLIST}
+.endfor
+		@${ECHO} "@dirrm share/doc/cyrus/html"
+		@${ECHO} "@dirrm share/doc/cyrus"
 .endif
-		${INSTALL_DATA} ${FILESDIR}/imapd.conf ${PREFIX}/etc
+		${INSTALL_DATA} ${FILESDIR}/imapd.conf \
+			${PREFIX}/etc/imapd.conf.dist
+		${INSTALL_DATA} ${FILESDIR}/inetd.conf.cyrus \
+			${PREFIX}/etc/
 		${INSTALL} -d -m 750 -o cyrus -g cyrus /var/spool/imap \
 			${PREFIX}/etc/imap \
 			${PREFIX}/etc/imap/user \
@@ -64,5 +79,6 @@ post-install:
 		@sed -e "/%%PREFIX%%/s##${PREFIX}#g" ${FILESDIR}/cyrus.sh \
 			>${PREFIX}/etc/rc.d/cyrus.sh
 		@chmod 0755 ${PREFIX}/etc/rc.d/cyrus.sh
+		@PKG_PREFIX=${PREFIX} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/mail/cyrus-imapd22/distinfo b/mail/cyrus-imapd22/distinfo
index a77cb42e4e43..ac94f46b85b9 100644
--- a/mail/cyrus-imapd22/distinfo
+++ b/mail/cyrus-imapd22/distinfo
@@ -1 +1 @@
-MD5 (cyrus-imapd-v1.5.14.tar.gz) = e90555be60ec3a647f1661e10cc16458
+MD5 (cyrus-imapd-v1.5.19.tar.gz) = d56b318c0d89c40c759a89da61a6df40
diff --git a/mail/cyrus-imapd22/files/patch-aa b/mail/cyrus-imapd22/files/patch-aa
index d798ab224d1b..3b39dfb1440f 100644
--- a/mail/cyrus-imapd22/files/patch-aa
+++ b/mail/cyrus-imapd22/files/patch-aa
@@ -1,11 +1,11 @@
---- man/Makefile.in.orig	Sun May  4 22:14:52 1997
-+++ man/Makefile.in	Sun May  4 22:15:02 1997
+--- man/Makefile.in.orig	Tue Sep  1 03:49:14 1998
++++ man/Makefile.in	Mon May 10 02:27:39 1999
 @@ -52,7 +52,7 @@
  MAN3 = $(srcdir)/imclient.3
  MAN5 = $(srcdir)/imapd.conf.5 $(srcdir)/krb.equiv.5
  MAN8 = $(srcdir)/arbitron.8 $(srcdir)/collectnews.8 $(srcdir)/deliver.8 \
--	$(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/quota.8 \
-+	$(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/cyrquota.8 \
+-	$(srcdir)/fud.8 $(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/quota.8 \
++	$(srcdir)/fud.8 $(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/cyrquota.8 \
  	$(srcdir)/reconstruct.8 $(srcdir)/rmnews.8 $(srcdir)/syncnews.8 
  
  
diff --git a/mail/cyrus-imapd22/files/patch-bb b/mail/cyrus-imapd22/files/patch-bb
index b4ec10180d1f..10f844cadc37 100644
--- a/mail/cyrus-imapd22/files/patch-bb
+++ b/mail/cyrus-imapd22/files/patch-bb
@@ -1,22 +1,13 @@
-*** 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@
+--- cyradm/Makefile.in.orig	Fri Aug  7 08:48:26 1998
++++ cyradm/Makefile.in	Mon May 10 02:40:06 1999
+@@ -33,8 +33,8 @@
+ RANLIB = @RANLIB@
+ 
+ DEFS = @DEFS@ @TCL_DEFS@
+-CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ @TCL_CPPFLAGS@
+-LIBS =  @TCL_LIBS@ @LIBS@
++CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ -I$(prefix)/include/tcl8.0
++LIBS =  -L$(prefix)/lib -ltcl80 -lm @LIBS@
+ DEPLIBS = ../lib/libcyrus.a @DEPLIBS@ 
+ 
+ CFLAGS = @CFLAGS@
diff --git a/mail/cyrus-imapd22/pkg-comment b/mail/cyrus-imapd22/pkg-comment
index 74916d2c2df1..b26e555b2c72 100644
--- a/mail/cyrus-imapd22/pkg-comment
+++ b/mail/cyrus-imapd22/pkg-comment
@@ -1 +1 @@
-the cyrus mail server, supporting POP3, KPOP, and IMAP4 protocols.
+The cyrus mail server, supporting POP3, KPOP, and IMAP4 protocols
diff --git a/mail/cyrus-imapd22/pkg-install b/mail/cyrus-imapd22/pkg-install
index 1b0ea1ddecc8..93e91ebc4dae 100644
--- a/mail/cyrus-imapd22/pkg-install
+++ b/mail/cyrus-imapd22/pkg-install
@@ -27,13 +27,18 @@ create() {
 		gid=`pw show group cyrus 2>/dev/null | cut -d: -f3`
 	fi
 
+	if [ -x /sbin/nologin ]; then
+		shell=/sbin/nologin
+	else
+		shell=/nonexistent
+	fi
 	if ! pw show user cyrus -q >/dev/null; then
 		uid=60
 		while pw show user -u ${uid} -q >/dev/null; do
 			uid=`expr ${uid} + 1`
 		done
 		if ! pw add user cyrus -u ${uid} -g ${gid} -d "/nonexistent" \
-				-c "the cyrus mail server" -s "/nonexistent" -p "*" \
+				-c "the cyrus mail server" -s "${shell}" -p "*" \
 				; then
 			e=$?
 			echo "*** Failed to add user \`cyrus'. Please add it manually."
@@ -42,7 +47,7 @@ create() {
 		echo "*** Added user \`cyrus' (id ${uid})"
 	else
 		if ! pw mod user cyrus -g ${gid} -d "/nonexistent" \
-				-c "the cyrus mail server" -s "/nonexistent" -p "*" \
+				-c "the cyrus mail server" -s "${shell}" -p "*" \
 				; then
 			e=$?
 			echo "*** Failed to update user \`cyrus'."
@@ -55,8 +60,37 @@ create() {
 	fi
 }
 
+
+checkfile() {
+	diff -bBqw $1 $1.dist >/dev/null 2>&1
+	case $? in
+		0)	# config file exists, but is the same
+			;;
+		1)	# config file exists and differs
+			echo "** Make sure $1 is in sync with this version"; 
+			echo "   of the port.  See $1.dist for details."; 
+			;;
+		*)	# no config file exists, copy it
+			install -c -m 644 $1.dist $1
+			;;
+	esac
+}
+
+
 case $2 in
 	PRE-INSTALL)
 		create
 		;;
+
+	POST-INSTALL)
+		cd ${PKG_PREFIX}
+		checkfile ${PKG_PREFIX}/etc/imapd.conf
+		if grep '^imap4' /etc/inetd.conf; then
+			echo "** Please check that your /etc/inetd.conf entry for \`imap4'"
+			echo "   is suitable for the Cyrus IMAP server."
+		else
+			echo "** Please add an entry for the imap4 protocol to /etc/inetd.conf."
+		fi
+		echo "   An example can be found in ${PKG_PREFIX}/etc/inetd.conf.cyrus."
+		;;
 esac
diff --git a/mail/cyrus-imapd22/pkg-plist b/mail/cyrus-imapd22/pkg-plist
index 2b61100e7692..c021cf4f07d6 100644
--- a/mail/cyrus-imapd22/pkg-plist
+++ b/mail/cyrus-imapd22/pkg-plist
@@ -13,7 +13,8 @@ cyrus/bin/pop3d
 cyrus/bin/reconstruct
 cyrus/bin/syncnews
 cyrus/bin/updateimsp
-etc/imapd.conf
+etc/imapd.conf.dist
+etc/inetd.conf.cyrus
 etc/rc.d/cyrus.sh
 include/cyrus/acl.h
 include/cyrus/assert.h
@@ -36,24 +37,6 @@ include/cyrus/sysexits.h
 include/cyrus/util.h
 include/cyrus/xmalloc.h
 lib/libcyrus.a
-share/doc/cyrus/html/bugs.html
-share/doc/cyrus/html/changes.html
-share/doc/cyrus/html/htmlstrip.c
-share/doc/cyrus/html/index.html
-share/doc/cyrus/html/install.html
-share/doc/cyrus/html/overview.html
-share/doc/cyrus/html/readme.html
-share/doc/cyrus/html/unpack.html
-share/doc/cyrus/acl-extension
-share/doc/cyrus/bugs
-share/doc/cyrus/changes
-share/doc/cyrus/copyrights
-share/doc/cyrus/install
-share/doc/cyrus/overview
-share/doc/cyrus/quota-extension
-share/doc/cyrus/server-design
 @dirrm include/cyrus
 @dirrm cyrus/bin
 @dirrm cyrus
-@dirrm share/doc/cyrus/html
-@dirrm share/doc/cyrus