12 files changed, 28 insertions, 91 deletions

diff --git a/databases/cyrus-imspd/Makefile b/databases/cyrus-imspd/Makefile
index 13ee3d2c6ca8..12a86f971765 100644
--- a/databases/cyrus-imspd/Makefile
+++ b/databases/cyrus-imspd/Makefile
@@ -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,7 @@ DISTNAME=	${PORTNAME}-v${PORTVERSION}
 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
 
 USE_REINPLACE=	YES
 GNU_CONFIGURE=	YES
@@ -25,14 +24,14 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--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
diff --git a/databases/cyrus-imspd/distinfo b/databases/cyrus-imspd/distinfo
index 9065b486946b..fcfad975bb1a 100644
--- a/databases/cyrus-imspd/distinfo
+++ b/databases/cyrus-imspd/distinfo
@@ -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
diff --git a/databases/cyrus-imspd/files/patch-aa b/databases/cyrus-imspd/files/patch-aa
deleted file mode 100644
index 3fab656d9fde..000000000000
--- a/databases/cyrus-imspd/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- imsp/dispatch.c.orig	Mon Oct  1 22:49:47 2001
-+++ imsp/dispatch.c	Mon Oct  1 22:40:20 2001
-@@ -57,7 +57,7 @@
- #endif
- #include "dispatch.h"
- 
--#include <sasl.h>
-+#include <sasl1/sasl.h>
- 
- #ifndef HAVE_GETDTABLESIZE
- #define getdtablesize() 32
diff --git a/databases/cyrus-imspd/files/patch-ab b/databases/cyrus-imspd/files/patch-ab
deleted file mode 100644
index 06384ea5745f..000000000000
--- a/databases/cyrus-imspd/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- imsp/dispatch.h.orig	Mon Oct  1 22:54:38 2001
-+++ imsp/dispatch.h	Mon Oct  1 22:40:31 2001
-@@ -44,7 +44,7 @@
- 
- #define MAX_BUF 4096
- 
--#include <sasl.h>
-+#include <sasl1/sasl.h>
- 
- /* a file buffer structure
-  */
diff --git a/databases/cyrus-imspd/files/patch-ac b/databases/cyrus-imspd/files/patch-ac
deleted file mode 100644
index fd0212524328..000000000000
--- a/databases/cyrus-imspd/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- imsp/imsp_server.c.orig	Mon Oct  1 22:56:14 2001
-+++ imsp/imsp_server.c	Mon Oct  1 22:41:13 2001
-@@ -53,7 +53,7 @@
- #include <netinet/in.h>
- #include <syslog.h>
- #include <fcntl.h>
--#include <sasl.h>
-+#include <sasl1/sasl.h>
- #include <netdb.h>
- #include "version.h"
- #include "dispatch.h"
diff --git a/databases/cyrus-imspd/files/patch-ad b/databases/cyrus-imspd/files/patch-ad
deleted file mode 100644
index f7779d5e3f05..000000000000
--- a/databases/cyrus-imspd/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- imsp/sasl_support.c.orig	Mon Oct  1 22:57:49 2001
-+++ imsp/sasl_support.c	Mon Oct  1 22:41:39 2001
-@@ -47,7 +47,7 @@
- #include <strings.h>
- #include <syslog.h>
- #include "xmalloc.h"
--#include <sasl.h>
-+#include <sasl1/sasl.h>
- 
- #include "util.h"
- #include "syncdb.h"
diff --git a/databases/cyrus-imspd/files/patch-ae b/databases/cyrus-imspd/files/patch-ae
deleted file mode 100644
index 83a945df2094..000000000000
--- a/databases/cyrus-imspd/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/imclient.c.orig	Mon Oct  1 23:00:28 2001
-+++ lib/imclient.c	Mon Oct  1 22:43:05 2001
-@@ -64,7 +64,7 @@
- #include <sys/select.h>
- #endif
- 
--#include <sasl.h>
-+#include <sasl1/sasl.h>
- 
- #ifdef HAVE_SSL
- #include <openssl/lhash.h>
diff --git a/databases/cyrus-imspd/files/patch-af b/databases/cyrus-imspd/files/patch-af
deleted file mode 100644
index 531cd660a558..000000000000
--- a/databases/cyrus-imspd/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/imclient.h.orig	Mon Oct  1 23:01:49 2001
-+++ lib/imclient.h	Mon Oct  1 22:43:26 2001
-@@ -45,7 +45,7 @@
- #ifndef INCLUDED_IMCLIENT_H
- #define INCLUDED_IMCLIENT_H
- 
--#include <sasl.h>
-+#include <sasl1/sasl.h>
- 
- struct imclient;
- struct sasl_client; /* to avoid having to include sasl sometimes */
diff --git a/databases/cyrus-imspd/files/patch-ag b/databases/cyrus-imspd/files/patch-ag
deleted file mode 100644
index 7ca5e997e188..000000000000
--- a/databases/cyrus-imspd/files/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/prot.h.orig	Mon Oct  1 23:02:44 2001
-+++ lib/prot.h	Mon Oct  1 22:43:41 2001
-@@ -48,7 +48,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- 
--#include <sasl.h>
-+#include <sasl1/sasl.h>
- 
- #ifdef HAVE_SSL
- #include <openssl/ssl.h>
diff --git a/databases/cyrus-imspd/files/patch-aj b/databases/cyrus-imspd/files/patch-aj
index b4d01fd30349..ce3e51e7d940 100644
--- a/databases/cyrus-imspd/files/patch-aj
+++ b/databases/cyrus-imspd/files/patch-aj
@@ -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:
diff --git a/databases/cyrus-imspd/files/patch-imsp::dispatch.h b/databases/cyrus-imspd/files/patch-imsp::dispatch.h
index 69884c2f5674..887c9a03870d 100644
--- a/databases/cyrus-imspd/files/patch-imsp::dispatch.h
+++ b/databases/cyrus-imspd/files/patch-imsp::dispatch.h
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
 --- 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 @@ $FreeBSD$
 -#define MAX_BUF 4096
 +#define MAX_BUF (4096 * 1024)
  
- #include <sasl.h>
+ #include <sasl/sasl.h>
  
diff --git a/databases/cyrus-imspd/pkg-plist b/databases/cyrus-imspd/pkg-plist
index a26f69832023..ece51692d884 100644
--- a/databases/cyrus-imspd/pkg-plist
+++ b/databases/cyrus-imspd/pkg-plist
@@ -1,5 +1,5 @@
 etc/rc.d/imspd.sh
-lib/sasl/imspd.conf
+lib/sasl2/imspd.conf
 sbin/imspd
 %%PORTDOCS%%share/doc/imspd/Setup-instructions
 %%PORTDOCS%%share/doc/imspd/option.registry