7 files changed, 58 insertions, 49 deletions

diff --git a/mail/cyrus/Makefile b/mail/cyrus/Makefile
index dca65424f2f5..8a67999e0341 100644
--- a/mail/cyrus/Makefile
+++ b/mail/cyrus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cyrus
 PORTVERSION=	1.6.24
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail tcl82
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
@@ -23,7 +23,7 @@ BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend \
 		${LOCALBASE}/sbin/pwcheck:${PORTSDIR}/security/cyrus-sasl
 
 USE_REINPLACE=	yes
-GNU_CONFIGURE=	YES
+USE_AUTOCONF=	yes
 CONFIGURE_ARGS=	--with-cyrus-prefix=${PREFIX}/cyrus \
 		--with-cyrus-group=cyrus \
 		--with-sasldir=${LOCALBASE} \
@@ -38,12 +38,6 @@ MAN8=		arbitron.8 collectnews.8 cyrquota.8 deliver.8 fud.8 \
 		imapd.8 mbpath.8 pop3d.8 reconstruct.8 rmnews.8 syncnews.8 \
 		timsieved.8
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
-
 post-patch:
 	${CP} ${FILESDIR}/600.cyrus ${WRKDIR}
 	${REINPLACE_CMD} -e 's,LOCALBASE,${LOCALBASE},g' ${WRKDIR}/600.cyrus
@@ -110,4 +104,4 @@ post-install:
 		@${ECHO_CMD} "@dirrm spool/imap" >>${TMPPLIST}
 		@PKG_PREFIX=${PREFIX} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/cyrus/files/patch-ac b/mail/cyrus/files/patch-aclocal.m4
index 8e79599cca36..6b91657ff2ec 100644
--- a/mail/cyrus/files/patch-ac
+++ b/mail/cyrus/files/patch-aclocal.m4
@@ -1,11 +1,11 @@
---- configure	Thu Jan  6 22:28:51 2000
-+++ /tmp/configure.new	Sat Apr  8 20:55:29 2000
-@@ -4951,7 +4951,7 @@
+--- aclocal.m4.orig	Tue Oct 28 05:08:17 2003
++++ aclocal.m4	Tue Oct 28 05:08:23 2003
+@@ -84,7 +84,7 @@
      # try the user-specified path --- too lazy to test for it right now
      LIB_SASL="-L$sasldir/lib -lsasl"
-     
+     AC_SUBST(LIB_SASL)
 -    SASLFLAGS="-I$sasldir/include"
 +    SASLFLAGS="-I$sasldir/include/sasl1"
-         
+     AC_SUBST(SASLFLAGS)    
    fi
- 
+ ])
diff --git a/mail/cyrus/files/patch-ad b/mail/cyrus/files/patch-ad
deleted file mode 100644
index bcd310e991d3..000000000000
--- a/mail/cyrus/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	Sun Apr  9 01:13:23 2000
-+++ configure.in	Sun Apr  9 01:13:43 2000
-@@ -528,7 +528,7 @@
-       # filename, it should be safe to add it (to the front of the line --
-       # somef vendors have older, badly installed tclshs that we want to avoid
-       # if we can)
--      AC_PATH_PROGS(TCLSH, [tclsh8.1 tclsh8.0 tclsh], "unknown")
-+      AC_PATH_PROGS(TCLSH, [tclsh8.2 tclsh8.1 tclsh8.0 tclsh], "unknown")
-     fi
- 
-     # Do we know where to get a tclsh?
diff --git a/mail/cyrus/files/patch-bf b/mail/cyrus/files/patch-bf
deleted file mode 100644
index 0252ec589130..000000000000
--- a/mail/cyrus/files/patch-bf
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	Fri Dec  4 11:34:53 1998
-+++ configure.in	Sun Apr  9 12:16:24 2000
-@@ -698,6 +698,8 @@
- 
-     dnl Kerberos wants this so we might as well check on it first
-     AC_CHECK_FUNC(res_search,,AC_CHECK_LIB(resolv,res_search))
-+    dnl Kerberos IV on FreeBSD depends on libcom_err, so check for it
-+    AC_CHECK_LIB(com_err, init_error_table)
- 
-     dnl gotta do this: crypt is used by sasl_krb_server.c
-     AC_CHECK_FUNC(crypt,,AC_CHECK_LIB(crypt, crypt))
diff --git a/mail/cyrus/files/patch-bg b/mail/cyrus/files/patch-bg
deleted file mode 100644
index 964814930475..000000000000
--- a/mail/cyrus/files/patch-bg
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.orig	Fri Dec  4 12:03:58 1998
-+++ configure	Sat Apr 15 11:44:42 2000
-@@ -3348,6 +3348,9 @@
- 
- fi
- 
-+# Kerberos IV on FreeBSD depends on libcom_err.
-+LIBS="-lcom_err $LIBS" 
-+echo '#define HAVE_LIBCOM_ERR 1' >> confdefs.h
- 
-         echo $ac_n "checking for crypt""... $ac_c" 1>&6
- echo "configure:3354: checking for crypt" >&5
diff --git a/mail/cyrus/files/patch-configure.in b/mail/cyrus/files/patch-configure.in
new file mode 100644
index 000000000000..f7de62ce4401
--- /dev/null
+++ b/mail/cyrus/files/patch-configure.in
@@ -0,0 +1,29 @@
+--- configure.in.orig	Tue Oct 28 05:01:07 2003
++++ configure.in	Tue Oct 28 04:58:27 2003
+@@ -51,7 +51,7 @@
+ dnl if db_185.h is present, we're using db2.0 and should include db_185.h
+ dnl instead of db.h; otherwise, include db.h.  this is handled in the code
+ dnl itself.
+-AC_CHECK_HEADERS(unistd.h sys/select.h db_185.h sys/param.h)
++AC_CHECK_HEADERS(stdarg.h unistd.h sys/select.h db_185.h sys/param.h)
+ AC_REPLACE_FUNCS(memmove strcasecmp ftruncate strerror)
+ AC_HEADER_DIRENT
+ 
+@@ -531,7 +531,7 @@
+       # filename, it should be safe to add it (to the front of the line --
+       # somef vendors have older, badly installed tclshs that we want to avoid
+       # if we can)
+-      AC_PATH_PROGS(TCLSH, [tclsh8.1 tclsh8.0 tclsh], "unknown")
++      AC_PATH_PROGS(TCLSH, [tclsh8.2 tclsh8.1 tclsh8.0 tclsh], "unknown")
+     fi
+ 
+     # Do we know where to get a tclsh?
+@@ -779,6 +779,8 @@
+ 
+     dnl Kerberos wants this so we might as well check on it first
+     AC_CHECK_FUNC(res_search,,AC_CHECK_LIB(resolv,res_search))
++    dnl Kerberos IV on FreeBSD depends on libcom_err, so check for it
++    AC_CHECK_LIB(com_err, init_error_table)
+ 
+     dnl gotta do this: crypt is used by sasl_krb_server.c
+     AC_CHECK_FUNC(crypt,,AC_CHECK_LIB(crypt, crypt))
diff --git a/mail/cyrus/files/patch-imap-toimsp.c b/mail/cyrus/files/patch-imap-toimsp.c
new file mode 100644
index 000000000000..e78d083977aa
--- /dev/null
+++ b/mail/cyrus/files/patch-imap-toimsp.c
@@ -0,0 +1,20 @@
+--- imap/toimsp.c.orig	Tue Oct 28 05:27:12 2003
++++ imap/toimsp.c	Tue Oct 28 05:27:25 2003
+@@ -129,7 +129,7 @@
+ 		break;
+ 
+ 	    default:
+-		abort("Internal error: unrecognized toimsp type", EC_SOFTWARE);
++		abort();
+ 	    }
+ 	}
+     }
+@@ -141,7 +141,7 @@
+     iov[num_iov++].iov_len = 1;
+ 
+     if (num_iov > VECSIZE) {
+-	abort("Internal error: toimsp arg list overflow", EC_SOFTWARE);
++	abort();
+     }
+ 
+     (void) retry_writev(fd, iov, num_iov);