- Upgrade to imap-2001.FINAL

- Install additional cclient header files
- Move SSL dependency generation for cclient to post-build
- Bump PORTEPOCH
- Removed -drac PKGNAMESUFFIX,more confusion than extra info
- Remove futile build of imapd/ipop3d/ipop2d in cclient, and libc-client4.a
  in the imap-uw port.
- Respect CFLAGS and CC

PR:		30954
Submitted by:	maintainer

5 files changed, 66 insertions, 19 deletions

diff --git a/mail/cclient/Makefile b/mail/cclient/Makefile
index 59449c478125..b2690ed3daf8 100644
--- a/mail/cclient/Makefile
+++ b/mail/cclient/Makefile
@@ -6,7 +6,8 @@
 #
 
 PORTNAME=	cclient
-PORTVERSION=	0106191041
+PORTVERSION=	2001
+PORTEPOCH=	1
 CATEGORIES=	mail devel
 MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/ \
 		http://www.freenix.no/~anders/ \
@@ -14,7 +15,7 @@ MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/ \
 		http://mirror.nucba.ac.jp/mirror/ \
 		ftp://ftp.nuug.no/pub/anders/distfiles/
 MASTER_SITE_SUBDIR=	. old
-DISTNAME=	imap-2001.BETA.SNAP-${PORTVERSION}
+DISTNAME=	imap-2001.FINAL
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	anders@fix.no
@@ -26,6 +27,8 @@ MAKE_ARGS+=	SSLTYPE=unix
 USE_OPENSSL=	yes
 .endif
 
+WRKSRC=		${WRKDIR}/imap-2001.RELEASE-CANDIDATE.1
+
 SHLIBBASE=	c-client4
 SHLIBMAJ=	8
 SHLIBNAME=	lib${SHLIBBASE}.so.${SHLIBMAJ}
@@ -49,10 +52,20 @@ post-patch:
 post-configure:
 	@${ECHO_MSG} ">> The c-client shared library will be named ${SHLIBNAME}"
 
-HEADERS=	dummy.h env.h env_unix.h fdstring.h flstring.h fs.h ftl.h \
-		imap4r1.h linkage.c linkage.h mail.h misc.h nl.h nntp.h \
-		osdep.h pop3.h rfc822.h smtp.h tcp.h utf8.h c-client.h
-PORTREV_H=	${PREFIX}/include/c-client/portrevision.h
+HEADERS=	c-client.h dummy.h env.h env_unix.h fdstring.h flocksim.h \
+		flstring.h fs.h ftl.h imap4r1.h linkage.c linkage.h mail.h \
+		mbox.h mbx.h mh.h misc.h mmdf.h mtx.h mx.h netmsg.h news.h \
+		newsrc.h nl.h nntp.h osdep.h phile.h pop3.h pseudo.h rfc822.h \
+		smtp.h sslio.h tcp.h tcp_unix.h tenex.h unix.h utf8.h
+PORTREV_H=	${WRKDIR}/portrevision.h
+
+post-build:
+	@${ECHO} "#define CCLIENT_PORTVERSION \"${PORTVERSION}\"" >${PORTREV_H}
+.if defined(WITH_SSL)
+	@${ECHO} "#define CCLIENT_SSLENABLED \"yes\"" >>${PORTREV_H}
+.else
+	@${ECHO} "#define CCLIENT_SSLENABLED \"no\"" >>${PORTREV_H}
+.endif
 
 do-install:
 	${MKDIR} ${PREFIX}/include/c-client
@@ -66,16 +79,13 @@ do-install:
 		${PREFIX}/lib/lib${SHLIBBASE}.a
 
 post-install:
-	@${ECHO} "#define CCLIENT_PORTVERSION \"${PORTVERSION}\"" >${PORTREV_H}
+	${INSTALL_DATA} ${PORTREV_H} ${PREFIX}/include/c-client
 .if defined(WITH_SSL)
 	@${ECHO} "================================================================================"
 	@${ECHO} "Warning: You have chosen to include SSL support. Applications/ports that use"
 	@${ECHO} "the cclient library but do not support SSL may stop working or have problems
 	@${ECHO} "linking. Linking explicitly with ssl (-lssl -lcrypto) may or may not help."
 	@${ECHO} "================================================================================"
-	@${ECHO} "#define CCLIENT_SSLENABLED \"yes\"" >>${PORTREV_H}
-.else
-	@${ECHO} "#define CCLIENT_SSLENABLED \"no\"" >>${PORTREV_H}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/mail/cclient/distinfo b/mail/cclient/distinfo
index 767843702246..e72b231cc8ca 100644
--- a/mail/cclient/distinfo
+++ b/mail/cclient/distinfo
@@ -1 +1 @@
-MD5 (imap-2001.BETA.SNAP-0106191041.tar.Z) = 119117c9ba437b6de64c68326fe5ddc8
+MD5 (imap-2001.FINAL.tar.Z) = b26456af47ba63c5624d0ed434690e4d
diff --git a/mail/cclient/files/patch-ab b/mail/cclient/files/patch-ab
index b7a9432425db..8d3f7449372e 100644
--- a/mail/cclient/files/patch-ab
+++ b/mail/cclient/files/patch-ab
@@ -1,5 +1,5 @@
---- src/osdep/unix/Makefile.orig	Wed Apr 11 00:02:06 2001
-+++ src/osdep/unix/Makefile	Sat Apr 14 02:59:26 2001
+--- src/osdep/unix/Makefile.orig	Tue Jul  3 08:02:10 2001
++++ src/osdep/unix/Makefile	Mon Oct  1 10:13:43 2001
 @@ -22,18 +22,18 @@
  
  EXTRAAUTHENTICATORS=
@@ -81,7 +81,7 @@
  
  bsi:	# BSD/i386
  	$(BUILD) `$(CAT) SPECIALS` OS=$@ \
-@@ -762,15 +767,26 @@
+@@ -762,23 +767,35 @@
  
  # Build it!
  
@@ -108,9 +108,11 @@
 +	$(CC) -fpic -DPIC -c $(CFLAGS) ${@:.so=.c} -o $@
 +
  .c.o:
- 	`$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c
+-	`$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c
++	$(CC) -c $(CFLAGS) $*.c
  
-@@ -779,6 +795,7 @@
+ 
+ # Cleanup
  
  clean:
  	sh -c '$(RM) auths.c crexcl.c nfstest.c linkage.[ch] siglocal.c osdep*.[ch] *.o ARCHIVE *FLAGS *TYPE $(ARCHIVE) || true'
diff --git a/mail/cclient/files/patch-ac b/mail/cclient/files/patch-ac
index b748b8679ca8..2d86ff57e1c9 100644
--- a/mail/cclient/files/patch-ac
+++ b/mail/cclient/files/patch-ac
@@ -1,6 +1,6 @@
---- Makefile.orig	Sun Dec 17 23:09:44 2000
-+++ Makefile	Sun Dec 17 23:08:58 2000
-@@ -314,7 +314,7 @@
+--- Makefile.orig	Tue Jul  3 08:00:09 2001
++++ Makefile	Mon Oct  1 09:52:24 2001
+@@ -256,7 +256,7 @@
  
  # Make the IMAP Toolkit
  
@@ -9,3 +9,22 @@
  
  c-client:
  	@echo Not processed yet.  In a first-time build, you must specify
+@@ -367,7 +367,7 @@
+ 	$(TOOLS)/$@ "$(LN)" src/imapd imapd
+ 	$(LN) $(TOOLS)/$@ .
+ 
+-build:	OSTYPE rebuild rebuildclean bundled
++build:	OSTYPE rebuild rebuildclean
+ 
+ OSTYPE:
+ 	@echo Building c-client for $(BUILDTYPE)...
+@@ -385,8 +385,7 @@
+ 	@sh -c '(test $(BUILDTYPE) = rebuild -o $(BUILDTYPE) = `$(CAT) OSTYPE`) || (echo Already built for `$(CAT) OSTYPE` -- you must do \"make clean\" first && exit 1)'
+ 	@echo Rebuilding c-client for `$(CAT) OSTYPE`...
+ 	$(TOUCH) c-client/SPECIALS
+-	$(CD) c-client;$(MAKE) all CC=`$(CAT) CCTYPE` \
+-	 CFLAGS="`$(CAT) CFLAGS`" `$(CAT) SPECIALS`
++	$(CD) c-client;$(MAKE) all CFLAGS="`$(CAT) CFLAGS`" `$(CAT) SPECIALS`
+ 
+ rebuildclean:
+ 	sh -c '$(RM) rebuild || true'
diff --git a/mail/cclient/pkg-plist b/mail/cclient/pkg-plist
index 5f55754befde..cdb3a2917a82 100644
--- a/mail/cclient/pkg-plist
+++ b/mail/cclient/pkg-plist
@@ -3,6 +3,7 @@ include/c-client/dummy.h
 include/c-client/env.h
 include/c-client/env_unix.h
 include/c-client/fdstring.h
+include/c-client/flocksim.h
 include/c-client/flstring.h
 include/c-client/fs.h
 include/c-client/ftl.h
@@ -10,14 +11,29 @@ include/c-client/imap4r1.h
 include/c-client/linkage.c
 include/c-client/linkage.h
 include/c-client/mail.h
+include/c-client/mbox.h
+include/c-client/mbx.h
+include/c-client/mh.h
 include/c-client/misc.h
+include/c-client/mmdf.h
+include/c-client/mtx.h
+include/c-client/mx.h
+include/c-client/netmsg.h
+include/c-client/news.h
+include/c-client/newsrc.h
 include/c-client/nl.h
 include/c-client/nntp.h
 include/c-client/osdep.h
+include/c-client/phile.h
 include/c-client/pop3.h
+include/c-client/pseudo.h
 include/c-client/rfc822.h
 include/c-client/smtp.h
+include/c-client/sslio.h
 include/c-client/tcp.h
+include/c-client/tcp_unix.h
+include/c-client/tenex.h
+include/c-client/unix.h
 include/c-client/utf8.h
 include/c-client/portrevision.h
 lib/%%SHLIBNAME%%