* Set maintainership to Anders Nordby <anders@fix.no>.

* Add two more master sites that I control myself, to bring some much
  needed stability there too (UW has been removing snapshots without
  putting them in the old dir).
* Use PAM by default.
* Remove some unnecessary linking parameters.

Submitted by:	Anders Nordby <anders@fix.no>

5 files changed, 36 insertions, 16 deletions

diff --git a/mail/cclient/Makefile b/mail/cclient/Makefile
index 291169bd0590..9ac32056f616 100644
--- a/mail/cclient/Makefile
+++ b/mail/cclient/Makefile
@@ -6,16 +6,18 @@
 #
 
 PORTNAME=	cclient
-PORTVERSION=	0104051333
+PORTVERSION=	0104101757
 CATEGORIES=	mail devel
 MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/%SUBDIR%/ \
+		ftp://ftp.nuug.no/pub/anders/distfiles/%SUBDIR%/ \
+		http://www.freenix.no/~anders/%SUBDIR%/ \
 		ftp://ftp.funet.fi/pub/mirrors/ftp.cac.washington.edu/imap/%SUBDIR%/ \
 		http://mirror.nucba.ac.jp/mirror/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. old
 DISTNAME=	imap-2001.BETA.SNAP-${PORTVERSION}
 EXTRACT_SUFX=	.tar.Z
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	anders@fix.no
 
 INSTALLS_SHLIB=	yes
 ALL_TARGET=	bsf
diff --git a/mail/cclient/distinfo b/mail/cclient/distinfo
index ceaeb343e3bb..cfdb86a5dae9 100644
--- a/mail/cclient/distinfo
+++ b/mail/cclient/distinfo
@@ -1 +1 @@
-MD5 (imap-2001.BETA.SNAP-0104051333.tar.Z) = 81453371c29ce2c6b5aaca3a2f35dbc1
+MD5 (imap-2001.BETA.SNAP-0104101757.tar.Z) = 11c0611d1d7b4190f78b8daddd61c3d9
diff --git a/mail/cclient/files/patch-aa b/mail/cclient/files/patch-aa
index 4615f235b3fb..ade4d1289237 100644
--- a/mail/cclient/files/patch-aa
+++ b/mail/cclient/files/patch-aa
@@ -1,6 +1,6 @@
---- src/osdep/unix/os_bsi.h.orig	Sat Oct 19 20:30:04 1996
-+++ src/osdep/unix/os_bsi.h	Sun May 24 10:46:33 1998
-@@ -37,7 +37,18 @@
+--- src/osdep/unix/os_bsi.h.orig	Wed Apr 11 10:53:03 2001
++++ src/osdep/unix/os_bsi.h	Wed Apr 11 10:55:32 2001
+@@ -22,7 +22,18 @@
  #include <unistd.h>
  #include <string.h>
  #include <sys/types.h>
@@ -9,7 +9,7 @@
 + * FreeBSD v3.x and onward whines about <sys/dir.h> being obsolete, so switch
 + * to POSIX semantics.
 + */
-+#if	__FreeBSD__ >= 3
++#if    __FreeBSD__ >= 3
 +#include <dirent.h>
 +#define direct dirent
 +#else
diff --git a/mail/cclient/files/patch-ab b/mail/cclient/files/patch-ab
index 1d29cb4bbf2e..b7a9432425db 100644
--- a/mail/cclient/files/patch-ab
+++ b/mail/cclient/files/patch-ab
@@ -1,6 +1,13 @@
---- src/osdep/unix/Makefile.orig	Thu Apr  5 00:45:53 2001
-+++ src/osdep/unix/Makefile	Tue Apr 10 00:48:00 2001
-@@ -28,10 +28,10 @@
+--- src/osdep/unix/Makefile.orig	Wed Apr 11 00:02:06 2001
++++ src/osdep/unix/Makefile	Sat Apr 14 02:59:26 2001
+@@ -22,18 +22,18 @@
+ 
+ EXTRAAUTHENTICATORS=
+ EXTRADRIVERS=mbox
+-PASSWDTYPE=std
++PASSWDTYPE=pam
+ SSLTYPE=none
+ 
  
  # Extended flags needed for SSL.  You may need to modify.
  
@@ -13,8 +20,20 @@
 +SSLINCLUDE=$(OPENSSLINC)
 +SSLLIB=$(OPENSSLLIB)
  
- SSLCRYPTO=-lcrypto
+-SSLCRYPTO=-lcrypto
++SSLCRYPTO=-lcrypto -lcrypt
+ 
+ # Older versions of MIT Kerberos also have a libcrypto.  If so, you may need
+ # to use this instead
+@@ -60,7 +60,7 @@
+ # AFSLDFLAGS may also need -L/usr/ucblib -lucb
+ DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\"
+ DCELDFLAGS= -ldce
+-PAMLDFLAGS= -lpam -ldl
++PAMLDFLAGS= # -lpam -lcrypt
+ 
  
+ # Build parameters normally set by the individual port
 @@ -97,7 +97,7 @@
  # Commands possibly overriden by the individual port
  
@@ -58,7 +77,7 @@
 -	 BASELDFLAGS="-lcrypt"
 +	 LOCKPGM=$(PREFIX)/libexec/mlock \
 +	 BASECFLAGS="-DNFSKLUDGE" \
-+	 BASELDFLAGS="-lpam -lcrypt"
++	 BASELDFLAGS="-lpam"
  
  bsi:	# BSD/i386
  	$(BUILD) `$(CAT) SPECIALS` OS=$@ \
@@ -94,7 +113,7 @@
 @@ -779,6 +795,7 @@
  
  clean:
- 	sh -c '$(RM) auths.c crexcl.c flockbsd.c linkage.[ch] siglocal.c osdep*.[ch] *.o ARCHIVE *FLAGS *TYPE $(ARCHIVE) || true'
+ 	sh -c '$(RM) auths.c crexcl.c nfstest.c linkage.[ch] siglocal.c osdep*.[ch] *.o ARCHIVE *FLAGS *TYPE $(ARCHIVE) || true'
 +	sh -c '$(RM) *.so $(SHLIBNAME)'
  
  
@@ -107,7 +126,7 @@
 +OSDEPS= mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
  	osdep.h env_unix.h tcp_unix.h \
  	osdep.c env_unix.c fs_unix.c ftl_unix.c nl_unix.c tcp_unix.c \
- 	auths.c crexcl.c flock.c flockbsd.c flcksafe.c fsync.c gethstid.c \
+ 	auths.c crexcl.c flocksim.c nfstest.c flcksafe.c fsync.c gethstid.c \
 @@ -824,7 +841,12 @@
  	write.c sslstdio.c \
  	strerror.c strpbrk.c strstr.c strtok.c strtoul.c \
diff --git a/mail/cclient/pkg-descr b/mail/cclient/pkg-descr
index d10824e9e688..b6b9d0913ee4 100644
--- a/mail/cclient/pkg-descr
+++ b/mail/cclient/pkg-descr
@@ -6,5 +6,4 @@ For more information, please see the UW IMAP homepage:
 
 WWW: http://www.washington.edu/imap/
 
-- Pete
-petef@databits.net
+- Anders Nordby <anders@fix.no>