Fix cclient and imap-uw to use the latest UW beta and use the

bsd.port.mk SSL variables

Submitted by:	anders@fix.no

4 files changed, 29 insertions, 35 deletions

diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index 323cc803231e..782dd4bb8df7 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	imap
-PORTVERSION=	0104031813
+PORTVERSION=	0104051333
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/%SUBDIR%/ \
 		ftp://ftp.funet.fi/pub/mirrors/ftp.cac.washington.edu/mail/%SUBDIR%/ \
@@ -23,15 +23,13 @@ LIB_DEPENDS=	c-client4.8:${PORTSDIR}/mail/cclient
 .if defined(WITH_DRAC)
 BUILD_DEPENDS=	${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
 .endif
-.if defined(WITH_SSL)
-USE_OPENSSL=	yes
-.endif
 
 MAN8=		ipopd.8 imapd.8
-.if defined(WITH_SSL)
-ALL_TARGET=	bsf SSLTYPE=unix
-.else
+
 ALL_TARGET=	bsf
+.if defined(WITH_SSL)
+MAKE_ARGS+=	SSLTYPE=unix
+USE_OPENSSL=	yes
 .endif
 
 .include <bsd.port.pre.mk>
@@ -70,7 +68,7 @@ post-install:
 	@${ECHO} "To create and install a new SSL certificate for imapd and ipop3d, type \"make"
 	@${ECHO} "cert\"."
 	@${ECHO}
-	@${ECHO} "Example inetd config for the SSL services:"
+	@${ECHO} "Example inetd config for SSL only services:"
 	@${ECHO}
 	@${ECHO} "pop3s   stream  tcp     nowait  root    /usr/local/libexec/ipop3d       ipop3d"
 	@${ECHO} "imaps   stream  tcp     nowait  root    /usr/local/libexec/imapd        imapd"
diff --git a/mail/imap-uw/distinfo b/mail/imap-uw/distinfo
index e60e98d340ba..b86432ab7993 100644
--- a/mail/imap-uw/distinfo
+++ b/mail/imap-uw/distinfo
@@ -1,2 +1,2 @@
-MD5 (imap-2001.BETA.SNAP-0104031813.tar.Z) = 327a8494019c07880072a855eb24060f
+MD5 (imap-2001.BETA.SNAP-0104051333.tar.Z) = 81453371c29ce2c6b5aaca3a2f35dbc1
 MD5 (imap-utils.tar.Z) = a6453029f201b32e9ed761e662c47b0f
diff --git a/mail/imap-uw/files/patch-ab b/mail/imap-uw/files/patch-ab
index 58e39fa4b7e6..7cdf3f8c8439 100644
--- a/mail/imap-uw/files/patch-ab
+++ b/mail/imap-uw/files/patch-ab
@@ -1,6 +1,6 @@
---- src/osdep/unix/Makefile.orig	Tue Mar  6 07:07:37 2001
-+++ src/osdep/unix/Makefile	Tue Apr  3 23:48:08 2001
-@@ -22,16 +22,23 @@
+--- src/osdep/unix/Makefile.orig	Thu Apr  5 00:45:53 2001
++++ src/osdep/unix/Makefile	Tue Apr 10 01:13:38 2001
+@@ -22,16 +22,16 @@
  
  EXTRAAUTHENTICATORS=
  EXTRADRIVERS=mbox
@@ -12,22 +12,17 @@
  # Extended flags needed for SSL.  You may need to modify.
  
 -SSLDIR=/usr/local/ssl
-+.if ${OSVERSION} >= 400014
-+SSLDIR=/usr
-+SSLCERTS=$(PREFIX)/certs
-+SSLINCLUDE=$(SSLDIR)/include/openssl
-+SSLLIB=$(SSLDIR)/lib
-+.else
-+SSLDIR=$(PREFIX)
- SSLCERTS=$(SSLDIR)/certs
+-SSLCERTS=$(SSLDIR)/certs
 -SSLINCLUDE=$(SSLDIR)/include
-+SSLINCLUDE=$(SSLDIR)/include/openssl
- SSLLIB=$(SSLDIR)/lib
-+.endif
+-SSLLIB=$(SSLDIR)/lib
++SSLDIR=$(OPENSSLBASE)
++SSLCERTS=$(PREFIX)/certs
++SSLINCLUDE=$(OPENSSLINC)
++SSLLIB=$(OPENSSLLIB)
  
  SSLCRYPTO=-lcrypto
  
-@@ -60,7 +67,7 @@
+@@ -60,7 +60,7 @@
  # AFSLDFLAGS may also need -L/usr/ucblib -lucb
  DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\"
  DCELDFLAGS= -ldce
@@ -36,7 +31,7 @@
  
  
  # Build parameters normally set by the individual port
-@@ -97,7 +104,7 @@
+@@ -97,7 +97,7 @@
  # Commands possibly overriden by the individual port
  
  ARRC=ar rc
@@ -45,7 +40,7 @@
  LN=ln -s
  RANLIB=ranlib
  
-@@ -115,7 +122,7 @@
+@@ -115,7 +115,7 @@
   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
@@ -54,7 +49,7 @@
  
  CAT=cat
  MAKE=make
-@@ -198,6 +205,15 @@
+@@ -198,6 +198,15 @@
  	 BASECFLAGS="-g -B/usr/lib/big/ -Dvoid=char -Dconst=" \
  	 RANLIB=true ARRC="ar -rc"
  
@@ -70,7 +65,7 @@
  bs3:	# BSD/i386 3.0 or higher
  	$(BUILD) `$(CAT) SPECIALS` OS=bsi \
  	 CHECKPW=bsi LOGINPW=bsi CRXTYPE=nfs \
-@@ -213,12 +229,13 @@
+@@ -213,12 +222,13 @@
  
  bsf:	# FreeBSD
  	$(BUILD) `$(CAT) SPECIALS` OS=$@ \
@@ -87,7 +82,7 @@
  
  bsi:	# BSD/i386
  	$(BUILD) `$(CAT) SPECIALS` OS=$@ \
-@@ -754,7 +771,7 @@
+@@ -764,7 +774,7 @@
  
  build:	clean once $(ARCHIVE)
  
diff --git a/mail/imap-uw/files/patch-ai b/mail/imap-uw/files/patch-ai
index bdf728892d2c..23635849c43e 100644
--- a/mail/imap-uw/files/patch-ai
+++ b/mail/imap-uw/files/patch-ai
@@ -1,6 +1,6 @@
---- src/imapd/imapd.c.old	Wed Apr  4 00:31:43 2001
-+++ src/imapd/imapd.c	Wed Apr  4 00:34:15 2001
-@@ -29,6 +29,11 @@
+--- src/imapd/imapd.c.old	Tue Apr 10 00:56:28 2001
++++ src/imapd/imapd.c	Tue Apr 10 00:59:08 2001
+@@ -29,6 +29,12 @@
  #include "c-client.h"
  #include <sys/stat.h>
  
@@ -9,10 +9,11 @@
 +#include <arpa/inet.h>
 +#include <stdlib.h>
 +#endif /* DRAC_AUTH */
++
  
  #define CRLF PSOUT ("\015\012")	/* primary output terpri */
  
-@@ -171,6 +176,12 @@
+@@ -172,6 +178,12 @@
  
  /* Global storage */
  
@@ -22,10 +23,10 @@
 +extern char *getenv ();
 +#endif /* DRAC_AUTH */
 +
- char *version = "2001.297";	/* version number of this server */
+ char *version = "2001.298";	/* version number of this server */
  time_t alerttime = 0;		/* time of last alert */
  time_t sysalerttime = 0;	/* time of last system alert */
-@@ -1160,6 +1171,45 @@
+@@ -1161,6 +1173,45 @@
  	      lasterror ());
        return;
      }