- 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

2 files changed, 29 insertions, 8 deletions

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'