Index: Makefile
===================================================================
RCS file: /misc/ncvs/ports/databases/cyrus-imspd/Makefile,v
retrieving revision 1.10
diff -u -u -r1.10 Makefile
--- Makefile	15 May 2004 00:04:44 -0000	1.10
+++ Makefile	21 Jul 2004 14:04:17 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cyrus-imspd
-PORTVERSION=	1.6a5
+PORTVERSION=	1.7b
 CATEGORIES=	databases mail
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
@@ -15,8 +15,8 @@
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The cyrus IMSP (Internet Message Support Protocol) server
 
-LIB_DEPENDS=	sasl.8:${PORTSDIR}/security/cyrus-sasl
-BUILD_DEPENDS=	${LOCALBASE}/sbin/pwcheck:${PORTSDIR}/security/cyrus-sasl
+LIB_DEPENDS=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+##BUILD_DEPENDS=	${LOCALBASE}/sbin/pwcheck:${PORTSDIR}/security/cyrus-sasl2
 
 USE_REINPLACE=	YES
 GNU_CONFIGURE=	YES
@@ -25,14 +25,14 @@
 		--with-auth=unix
 
 pre-configure:
-		${REINPLACE_CMD} -e "s|<sasl.h>|<sasl1/sasl.h>|" \
+		${REINPLACE_CMD} -e "s|<sasl.h>|<sasl2/sasl.h>|" \
 			${WRKSRC}/configure
 
 post-install:
 		${INSTALL_SCRIPT} ${FILESDIR}/imspd.sh \
 			${PREFIX}/etc/rc.d/imspd.sh
 		${INSTALL_DATA} ${FILESDIR}/imspd.conf \
-			${PREFIX}/lib/sasl/imspd.conf
+			${PREFIX}/lib/sasl2/imspd.conf
 		${MKDIR} /var/imsp
 		${INSTALL_DATA} ${WRKSRC}/imsp/options.sample \
 			/var/imsp/options.dist
Index: distinfo
===================================================================
RCS file: /misc/ncvs/ports/databases/cyrus-imspd/distinfo,v
retrieving revision 1.3
diff -u -u -r1.3 distinfo
--- distinfo	15 May 2004 00:04:44 -0000	1.3
+++ distinfo	21 Jul 2004 14:04:18 -0000
@@ -1,2 +1,2 @@
-MD5 (cyrus-imspd-v1.6a5.tar.gz) = 92c4bd77f32a17ffd6ce16a872a679bc
-SIZE (cyrus-imspd-v1.6a5.tar.gz) = 607857
+MD5 (cyrus-imspd-v1.7b.tar.gz) = 58aed9741f975e29f364e7e604ddc5e9
+SIZE (cyrus-imspd-v1.7b.tar.gz) = 636760
Index: files/patch-aj
===================================================================
RCS file: /misc/ncvs/ports/databases/cyrus-imspd/files/patch-aj,v
retrieving revision 1.1
diff -u -u -r1.1 patch-aj
--- files/patch-aj	30 Mar 2002 10:23:57 -0000	1.1
+++ files/patch-aj	21 Jul 2004 14:04:18 -0000
@@ -1,5 +1,23 @@
---- lib/Makefile.in.orig	Tue Oct  2 20:29:13 2001
-+++ lib/Makefile.in	Tue Oct  2 20:35:28 2001
+--- lib/Makefile.in.orig	Tue Sep 16 06:06:54 2003
++++ lib/Makefile.in	Wed Jul 21 03:48:17 2004
+@@ -70,7 +70,7 @@
+ 
+ HDRS = $(srcdir)/acl.h $(srcdir)/assert.h $(srcdir)/auth.h \
+ 	$(srcdir)/bsearch.h $(srcdir)/charset.h $(srcdir)/glob.h \
+-	$(srcdir)/gmtoff.h $(srcdir)/imclient.h $(srcdir)/imparse.h \
++	$(srcdir)/gmtoff.h $(srcdir)/imparse.h \
+ 	$(srcdir)/lock.h $(srcdir)/map.h $(srcdir)/mkgmtime.h \
+ 	$(srcdir)/nonblock.h $(srcdir)/parseaddr.h $(srcdir)/prot.h \
+ 	$(srcdir)/retry.h $(srcdir)/sysexits.h \
+@@ -87,7 +87,7 @@
+ #	@LIBOBJS@ cyrusdb_db3.o cyrusdb_flat.o
+ 
+ OBJS = acl.o assert.o bsearch.o charset.o glob.o retry.o util.o \
+-	mkgmtime.o prot.o parseaddr.o imclient.o imparse.o xmalloc.o \
++	mkgmtime.o prot.o parseaddr.o imparse.o xmalloc.o \
+ 	chartable.o nonblock_@WITH_NONBLOCK@.o lock_@WITH_LOCK@.o \
+ 	gmtoff_@WITH_GMTOFF@.o hash.o $(ACL) $(AUTH) iptostring.o \
+ 	@LIBOBJS@
 @@ -96,12 +96,12 @@
  
  install:
Index: files/patch-imsp::dispatch.h
===================================================================
RCS file: /misc/ncvs/ports/databases/cyrus-imspd/files/patch-imsp::dispatch.h,v
retrieving revision 1.1
diff -u -u -r1.1 patch-imsp::dispatch.h
--- files/patch-imsp::dispatch.h	7 Sep 2003 15:21:09 -0000	1.1
+++ files/patch-imsp::dispatch.h	21 Jul 2004 14:04:18 -0000
@@ -1,6 +1,3 @@
-
-$FreeBSD: ports/databases/cyrus-imspd/files/patch-imsp::dispatch.h,v 1.1 2003/09/07 15:21:09 sobomax Exp $
-
 --- imsp/dispatch.h	2003/04/03 13:38:05	1.1
 +++ imsp/dispatch.h	2003/04/03 13:38:26
 @@ -42,7 +42,7 @@
@@ -10,5 +7,5 @@
 -#define MAX_BUF 4096
 +#define MAX_BUF (4096 * 1024)
  
- #include <sasl.h>
+ #include <sasl/sasl.h>