anders assigned me a PR to update pine, so he must have meant me to update

this too. :)

* Mostly a simple version update, although I tweaked a few things
* Make some Makefile variables more... variable
* SSLTYPE update to match new c-client makefile
* Remove a spurious variable from the port Makefile
* Tab'ify a couple places in patches that had to be regenerated anyway

4 files changed, 24 insertions, 22 deletions

diff --git a/mail/cclient/Makefile b/mail/cclient/Makefile
index 074c2bb00a88..2e3eefe400ed 100644
--- a/mail/cclient/Makefile
+++ b/mail/cclient/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	cclient
-PORTVERSION=	2001a
+PORTVERSION=	2002
 PORTEPOCH=	1
 CATEGORIES=	mail devel
 MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/ \
 		http://atreides.freenix.no/~anders/ \
 		ftp://ftp.funet.fi/pub/mirrors/ftp.cac.washington.edu/imap/ \
 		ftp://ftp.nuug.no/pub/anders/distfiles/
-MASTER_SITE_SUBDIR=	. old
-DISTNAME=	imap-2001a
+DISTNAME=	imap-${PORTVERSION}
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	anders@FreeBSD.org
@@ -22,11 +21,11 @@ MAINTAINER=	anders@FreeBSD.org
 INSTALLS_SHLIB=	yes
 ALL_TARGET=	bsf
 .if defined(WITH_SSL)
-MAKE_ARGS+=	SSLTYPE=unix
+MAKE_ARGS+=	SSLTYPE=unix.nopwd
 USE_OPENSSL=	yes
 .endif
 
-WRKSRC=		${WRKDIR}/imap-2001a
+WRKSRC=		${WRKDIR}/${DISTNAME}
 USE_REINPLACE=	yes
 
 SHLIBBASE=	c-client4
@@ -35,9 +34,6 @@ SHLIBNAME=	lib${SHLIBBASE}.so.${SHLIBMAJ}
 MAKE_ENV=	SHLIBNAME=${SHLIBNAME} SHLIBBASE=${SHLIBBASE}
 PLIST_SUB=	SHLIBNAME=${SHLIBNAME} SHLIBBASE=${SHLIBBASE}
 
-PREFIX_FIX_FILES=	Makefile src/osdep/unix/Makefile \
-			src/osdep/unix/Makefile.gss
-
 .include <bsd.port.pre.mk>
 
 .if ${PORTOBJFORMAT} == "aout"
@@ -45,7 +41,7 @@ SHLIBNAME=	lib${SHLIBBASE}.so.${SHLIBMAJ}.0
 .endif
 
 post-patch:
-.for file in ${PREFIX_FIX_FILES}
+.for file in Makefile src/osdep/unix/Makefile src/osdep/unix/Makefile.gss
 	@${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|g" ${WRKSRC}/${file}
 .endfor
 
diff --git a/mail/cclient/distinfo b/mail/cclient/distinfo
index a3035b2a07c6..c864f0bfcb07 100644
--- a/mail/cclient/distinfo
+++ b/mail/cclient/distinfo
@@ -1 +1 @@
-MD5 (imap-2001a.tar.Z) = 42c5c8d049c209b15513a4f6ebba34d2
+MD5 (imap-2002.tar.Z) = ab5a7afb25cbd037b4490c42e0fe235e
diff --git a/mail/cclient/files/patch-ab b/mail/cclient/files/patch-ab
index 8d3f7449372e..6562900dbdd8 100644
--- a/mail/cclient/files/patch-ab
+++ b/mail/cclient/files/patch-ab
@@ -1,12 +1,13 @@
---- src/osdep/unix/Makefile.orig	Tue Jul  3 08:02:10 2001
-+++ src/osdep/unix/Makefile	Mon Oct  1 10:13:43 2001
+--- src/osdep/unix/Makefile.orig	Mon Oct 14 15:45:24 2002
++++ src/osdep/unix/Makefile	Tue Nov 26 01:44:27 2002
 @@ -22,18 +22,18 @@
  
  EXTRAAUTHENTICATORS=
  EXTRADRIVERS=mbox
 -PASSWDTYPE=std
+-SSLTYPE=nopwd
 +PASSWDTYPE=pam
- SSLTYPE=none
++SSLTYPE=nopwd.nopwd
  
  
  # Extended flags needed for SSL.  You may need to modify.
@@ -129,14 +130,19 @@
  	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 flocksim.c nfstest.c flcksafe.c fsync.c gethstid.c \
-@@ -824,7 +841,12 @@
+@@ -824,12 +841,17 @@
  	write.c sslstdio.c \
  	strerror.c strpbrk.c strstr.c strtok.c strtoul.c \
  	OSCFLAGS
--	`$(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
+ 	@echo Building OS-dependent module
+ 	@echo If you get No such file error messages for files x509.h, ssl.h,
+ 	@echo pem.h, buffer.h, bio.h, and crypto.h, that means that OpenSSL
+ 	@echo is not installed on your system.  Either install OpenSSL first
+ 	@echo or build with command: make `$(CAT) OSTYPE` SSLTYPE=none
+-	`$(CAT) CCTYPE` -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c
 +
 +osdep.so: $(OSDEPS)
 +	$(CC) -fpic -DPIC -c $(CFLAGS) `cat OSCFLAGS` osdep.c -o $@
diff --git a/mail/cclient/files/patch-ac b/mail/cclient/files/patch-ac
index 8dd24c954196..ae5ba9170a10 100644
--- a/mail/cclient/files/patch-ac
+++ b/mail/cclient/files/patch-ac
@@ -1,6 +1,6 @@
---- Makefile.orig	Tue Oct 23 06:46:33 2001
-+++ Makefile	Fri Dec  7 00:37:08 2001
-@@ -253,7 +253,7 @@
+--- Makefile.orig	Mon Nov  4 16:19:13 2002
++++ Makefile	Tue Nov 26 01:18:50 2002
+@@ -256,7 +256,7 @@
  
  # Make the IMAP Toolkit
  
@@ -9,8 +9,8 @@
  
  c-client:
  	@echo Not processed yet.  In a first-time build, you must specify
-@@ -374,7 +374,7 @@
- 	$(TOOLS)/$@ "$(LN)" src/imapd imapd
+@@ -434,7 +434,7 @@
+ 	$(TOOLS)/$@ "$(LN)" src/tmail tmail
  	$(LN) $(TOOLS)/$@ .
  
 -build:	OSTYPE rebuild rebuildclean bundled
@@ -18,7 +18,7 @@
  
  OSTYPE:
  	@echo Building c-client for $(BUILDTYPE)...
-@@ -393,8 +393,7 @@
+@@ -453,8 +453,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) SPECIALS