o update to 2000c.

o change maintainer.

PR:		24834
Submitted by:	Pete Fritchman <petef@databits.net>

3 files changed, 21 insertions, 21 deletions

diff --git a/mail/cclient/Makefile b/mail/cclient/Makefile
index 55b9b6552713..7492e19e982a 100644
--- a/mail/cclient/Makefile
+++ b/mail/cclient/Makefile
@@ -6,19 +6,16 @@
 #
 
 PORTNAME=	cclient
-PORTVERSION=	4.8
-PORTREVISION=	1
+PORTVERSION=	2000c
 CATEGORIES=	mail devel
 MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/%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-2000b
+DISTNAME=	imap-${PORTVERSION}
 EXTRACT_SUFX=	.tar.Z
 
-MAINTAINER=	ports@FreeBSD.org
-
-WRKSRC=		${WRKDIR}/${DISTNAME}
+MAINTAINER=	petef@databits.net
 
 INSTALLS_SHLIB=	yes
 ALL_TARGET=	bsf
diff --git a/mail/cclient/distinfo b/mail/cclient/distinfo
index 739d437b999e..e43e58226b40 100644
--- a/mail/cclient/distinfo
+++ b/mail/cclient/distinfo
@@ -1 +1 @@
-MD5 (imap-2000b.tar.Z) = bb4f0ce015be8a4a455d62b1f714108f
+MD5 (imap-2000c.tar.Z) = 90bdc0670812234a0589286798575980
diff --git a/mail/cclient/files/patch-ab b/mail/cclient/files/patch-ab
index bb9510bbe527..3091ebfdf519 100644
--- a/mail/cclient/files/patch-ab
+++ b/mail/cclient/files/patch-ab
@@ -1,5 +1,5 @@
---- src/osdep/unix/Makefile.orig	Tue Oct 31 13:55:01 2000
-+++ src/osdep/unix/Makefile	Sun Dec 17 23:19:06 2000
+--- src/osdep/unix/Makefile.orig	Sat Feb  3 15:55:21 2001
++++ src/osdep/unix/Makefile		Sat Feb  3 16:05:02 2001
 @@ -74,7 +74,7 @@
  # Commands possibly overriden by the individual port
  
@@ -13,14 +13,14 @@
   dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
   rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
   unix.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o
--CFLAGS=$(BASECFLAGS) $(EXTRACFLAGS)
+-CFLAGS=-g
 +CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS)
  
  CAT=cat
  MAKE=make
-@@ -109,6 +109,10 @@
+@@ -108,6 +108,10 @@
+  EXTRADRIVERS='$(EXTRADRIVERS)' EXTRAAUTHENTICATORS='$(EXTRAAUTHENTICATORS)'\
   PASSWDTYPE=$(PASSWDTYPE) SPECIALAUTHENTICATORS='$(SPECIALAUTHENTICATORS)'
- BUILD=$(MAKE) build $(BUILDOPTIONS)
  
 +# Need this for the shared library rule to work correctly
 +.SUFFIXES: .o .so
@@ -29,12 +29,12 @@
  # Here if no make argument established
  
  missing: osdep.h
-@@ -189,13 +193,14 @@
+@@ -188,13 +192,14 @@
  	 BASECFLAGS="-g -Dconst="
  
  bsf:	# FreeBSD
--	$(BUILD) `$(CAT) SPECIALS` OS=bsi \
-+	$(BUILD) `$(CAT) SPECIALS` OS=bsi CHECKPW=pam \
+-	$(BUILD) `$(CAT) SPECIALS` OS=$@ \
++	$(BUILD) `$(CAT) SPECIALS` OS=$@ CHECKPW=pam \
  	 SIGTYPE=psx CRXTYPE=nfs \
  	 SPOOLDIR=/var \
  	 ACTIVEFILE=/usr/local/news/lib/active \
@@ -47,7 +47,7 @@
  
  bsi:	# BSD/i386
  	$(BUILD) `$(CAT) SPECIALS` OS=$@ \
-@@ -702,19 +707,31 @@
+@@ -718,15 +723,26 @@
  
  # Build it!
  
@@ -73,7 +73,10 @@
 +.c.so: osdep.h
 +	$(CC) -fpic -DPIC -c $(CFLAGS) ${@:.so=.c} -o $@
 +
- # Cleanup
+ .c.o:
+ 	`$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c
+ 
+@@ -735,6 +751,7 @@
  
  clean:
  	sh -c '$(RM) auths.c crexcl.c flockbsd.c linkage.[ch] siglocal.c osdep*.[ch] *.o ARCHIVE *FLAGS *TYPE $(ARCHIVE) || true'
@@ -81,7 +84,7 @@
  
  
  # Dependencies
-@@ -748,7 +765,7 @@
+@@ -768,7 +785,7 @@
  
  # OS-dependent
  
@@ -90,14 +93,14 @@
  	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 \
-@@ -760,7 +777,12 @@
+@@ -780,7 +797,12 @@
  	write.c \
  	strerror.c strpbrk.c strstr.c strtok.c strtoul.c \
  	OSCFLAGS
--	$(CC) $(CFLAGS) `$(CAT) OSCFLAGS` -c osdep.c
+-	`$(CAT) CCTYPE` -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c
 +
 +osdep.o: $(OSDEPS)
-+	$(CC) $(CFLAGS) `cat OSCFLAGS` -c osdep.c
++	$(CC) $(CFLAGS) `$(CAT) OSCFLAGS` -c osdep.c
 +
 +osdep.so: $(OSDEPS)
 +	$(CC) -fpic -DPIC -c $(CFLAGS) `cat OSCFLAGS` osdep.c -o $@