Unbreak: set USE_OPENSSL properly.

Tidy.
Add WITH_SSL_AND_PLAINTEXT knob, if you want to use plaintext passwords.

Pointy hat to:	dougb

3 files changed, 42 insertions, 14 deletions

diff --git a/mail/cclient/Makefile b/mail/cclient/Makefile
index 2e3eefe400ed..3022e0e7aa04 100644
--- a/mail/cclient/Makefile
+++ b/mail/cclient/Makefile
@@ -20,9 +20,15 @@ MAINTAINER=	anders@FreeBSD.org
 
 INSTALLS_SHLIB=	yes
 ALL_TARGET=	bsf
-.if defined(WITH_SSL)
-MAKE_ARGS+=	SSLTYPE=unix.nopwd
+.if defined(WITHOUT_SSL)
+MAKE_ARGS+=	SSLTYPE=none
+.else
 USE_OPENSSL=	yes
+.if defined(WITH_SSL_AND_PLAINTEXT)
+MAKE_ARGS+=	SSLTYPE=unix
+.else
+MAKE_ARGS+=	SSLTYPE=unix.nopwd
+.endif
 .endif
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
@@ -57,7 +63,7 @@ PORTREV_H=	${WRKDIR}/portrevision.h
 
 post-build:
 	@${ECHO_CMD} "#define CCLIENT_PORTVERSION \"${PORTVERSION}\"" >${PORTREV_H}
-.if defined(WITH_SSL)
+.if !defined(WITHOUT_SSL)
 	@${ECHO_CMD} "#define CCLIENT_SSLENABLED \"yes\"" >>${PORTREV_H}
 .else
 	@${ECHO_CMD} "#define CCLIENT_SSLENABLED \"no\"" >>${PORTREV_H}
@@ -76,11 +82,11 @@ do-install:
 
 post-install:
 	${INSTALL_DATA} ${PORTREV_H} ${PREFIX}/include/c-client
-.if defined(WITH_SSL)
+.if !defined(WITHOUT_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} "linking. Linking them explicitly with ssl (-lssl -lcrypto) may or may not help."
 	@${ECHO} "================================================================================"
 .endif
 
diff --git a/mail/cclient/files/patch-ab b/mail/cclient/files/patch-ab
index 6562900dbdd8..9e7f5acb2d19 100644
--- a/mail/cclient/files/patch-ab
+++ b/mail/cclient/files/patch-ab
@@ -1,5 +1,5 @@
---- src/osdep/unix/Makefile.orig	Mon Oct 14 15:45:24 2002
-+++ src/osdep/unix/Makefile	Tue Nov 26 01:44:27 2002
+--- src/osdep/unix/Makefile.orig	Tue Oct 15 00:45:24 2002
++++ src/osdep/unix/Makefile	Wed Nov 27 01:58:27 2002
 @@ -22,18 +22,18 @@
  
  EXTRAAUTHENTICATORS=
@@ -7,7 +7,7 @@
 -PASSWDTYPE=std
 -SSLTYPE=nopwd
 +PASSWDTYPE=pam
-+SSLTYPE=nopwd.nopwd
++SSLTYPE=unix.nopwd
  
  
  # Extended flags needed for SSL.  You may need to modify.
@@ -130,19 +130,21 @@
  	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,12 +841,17 @@
+@@ -824,12 +841,19 @@
  	write.c sslstdio.c \
  	strerror.c strpbrk.c strstr.c strtok.c strtoul.c \
  	OSCFLAGS
 +
 +osdep.o: $(OSDEPS)
-+	 $(CC) $(CFLAGS) `$(CAT) OSCFLAGS` -c osdep.c
++	$(CC) $(CFLAGS) `$(CAT) OSCFLAGS` -c osdep.c
++	@echo ========================================================================
  	@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
++	@echo ========================================================================
 +
 +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 ae5ba9170a10..e8b0ceecf3f1 100644
--- a/mail/cclient/files/patch-ac
+++ b/mail/cclient/files/patch-ac
@@ -1,5 +1,5 @@
---- Makefile.orig	Mon Nov  4 16:19:13 2002
-+++ Makefile	Tue Nov 26 01:18:50 2002
+--- Makefile.orig	Tue Nov  5 01:19:13 2002
++++ Makefile	Wed Nov 27 00:59:07 2002
 @@ -256,7 +256,7 @@
  
  # Make the IMAP Toolkit
@@ -9,7 +9,27 @@
  
  c-client:
  	@echo Not processed yet.  In a first-time build, you must specify
-@@ -434,7 +434,7 @@
+@@ -396,9 +396,6 @@
+ 	@echo + In order to rectify this problem, you MUST build with:
+ 	@echo ++ SSLTYPE=$(SSLTYPE).nopwd
+ 	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+-	@echo
+-	@echo Do you want to continue this build anyway?  Type y or n please:
+-	@$(SH) -c 'read x; case "$$x" in y) exit 0;; *) exit 1;; esac'
+ 
+ sslnone:
+ 	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+@@ -411,9 +408,6 @@
+ 	@echo ++ SSLTYPE=nopwd
+ 	@echo + You must also have OpenSSL or equivalent installed.
+ 	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+-	@echo
+-	@echo Do you want to continue this build anyway?  Type y or n please:
+-	@$(SH) -c 'read x; case "$$x" in y) exit 0;; *) exit 1;; esac'
+ 
+ 
+ # C compiler types
+@@ -434,7 +428,7 @@
  	$(TOOLS)/$@ "$(LN)" src/tmail tmail
  	$(LN) $(TOOLS)/$@ .
  
@@ -18,7 +38,7 @@
  
  OSTYPE:
  	@echo Building c-client for $(BUILDTYPE)...
-@@ -453,8 +453,7 @@
+@@ -453,8 +447,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