aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2023-12-16 10:45:17 +0000
committerRene Ladan <rene@FreeBSD.org>2023-12-16 10:47:33 +0000
commitf84592e8a377182164a40b3751d2e7c71b6f7edc (patch)
tree17ed972fc701596cfe6fdc26b6d07a1707348085
parent710fa155cc3fd09b10f83773939403b2ba4e775c (diff)
downloadports-f84592e8a377182164a40b3751d2e7c71b6f7edc.tar.gz
ports-f84592e8a377182164a40b3751d2e7c71b6f7edc.zip
mail/cclient: Remove expired port
2023-12-16 mail/cclient: Last upstream release was in 2007 so use the fork mail/panda-cclient
-rw-r--r--MOVED1
-rw-r--r--mail/Makefile1
-rw-r--r--mail/cclient/Makefile119
-rw-r--r--mail/cclient/distinfo2
-rw-r--r--mail/cclient/files/patch-Makefile78
-rw-r--r--mail/cclient/files/patch-src_c-client_c-client.h26
-rw-r--r--mail/cclient/files/patch-src_osdep_unix_Makefile152
-rw-r--r--mail/cclient/files/patch-src_osdep_unix_os_bsi.h21
-rw-r--r--mail/cclient/files/patch-src_osdep_unix_ssl__unix.c59
-rw-r--r--mail/cclient/pkg-descr5
-rw-r--r--mail/cclient/pkg-message-ssl9
-rw-r--r--mail/cclient/pkg-plist36
12 files changed, 1 insertions, 508 deletions
diff --git a/MOVED b/MOVED
index aafb3a6cafcf..ffb3a39e1711 100644
--- a/MOVED
+++ b/MOVED
@@ -8181,3 +8181,4 @@ devel/rubygem-cucumber-messages23|devel/rubygem-cucumber-messages|2023-12-14|Rem
devel/py-astroid253|devel/py-astroid|2023-12-14|Remove obsoleted port. Use devel/py-astroid instead
mail/imap-uw|mail/panda-imap|2023-12-16|Has expired: Last upstream release was in 2007 so use the fork mail/panda-imap
mail/mailsync||2023-12-16|Has expired: Depends on outdated mail/cclient
+mail/cclient|mail/panda-cclient|2023-12-16|Has expired: Last upstream release was in 2007 so use the fork mail/panda-cclient
diff --git a/mail/Makefile b/mail/Makefile
index f9305184e9cb..fa708bd99747 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -38,7 +38,6 @@
SUBDIR += bsmtp
SUBDIR += bulk_mailer
SUBDIR += c-sig
- SUBDIR += cclient
SUBDIR += claws-mail
SUBDIR += claws-mail-acpi_notifier
SUBDIR += claws-mail-address_keeper
diff --git a/mail/cclient/Makefile b/mail/cclient/Makefile
deleted file mode 100644
index c4754b786c6c..000000000000
--- a/mail/cclient/Makefile
+++ /dev/null
@@ -1,119 +0,0 @@
-PORTNAME= cclient
-PORTVERSION= 2007f
-PORTREVISION= 5
-PORTEPOCH= 1
-CATEGORIES= mail devel
-MASTER_SITES= ftp://ftp.cac.washington.edu/imap/%SUBDIR%/ \
- http://atreides.freenix.no/~anders/%SUBDIR%/ \
- ftp://ftp.funet.fi/pub/mirrors/ftp.cac.washington.edu/imap/%SUBDIR%/ \
- ftp://ftp.nuug.no/pub/anders/distfiles/%SUBDIR%/
-MASTER_SITE_SUBDIR= . old
-DISTNAME= imap-${PORTVERSION}
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= C-client mail access routines by Mark Crispin
-WWW= http://www.washington.edu/imap/
-
-LICENSE= APACHE20
-LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-
-DEPRECATED= Last upstream release was in 2007 so use the fork mail/panda-cclient
-EXPIRATION_DATE= 2023-12-16
-
-CONFLICTS_INSTALL= panda-cclient-20*
-
-OPTIONS_DEFINE= SSL SSL_AND_PLAINTEXT IPV6 MBX_DEFAULT
-OPTIONS_DEFAULT= SSL
-SSL_AND_PLAINTEXT_DESC= Allow plain text passwords and SSL
-MBX_DEFAULT_DESC= Use MBX as default mailbox format
-
-ALL_TARGET= bsf
-MAKE_JOBS_UNSAFE= yes
-USE_LDCONFIG= yes
-
-SSL_USES= ssl
-
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
-CFLAGS+= -Wno-error=incompatible-function-pointer-types
-.endif
-
-.if ${PORT_OPTIONS:MSSL}
-PKGMESSAGE= pkg-message-ssl
-.endif
-
-.if ! ${PORT_OPTIONS:MSSL}
-MAKE_ARGS+= SSLTYPE=none SSLDIR=${OPENSSLBASE}
-.else
-.if ${PORT_OPTIONS:MSSL_AND_PLAINTEXT}
-MAKE_ARGS+= SSLTYPE=unix SSLDIR=${OPENSSLDIR}
-.else
-MAKE_ARGS+= SSLTYPE=unix.nopwd SSLDIR=${OPENSSLDIR}
-.endif
-.endif
-
-WRKSRC= ${WRKDIR}/${DISTNAME}
-MAKE_ARGS+= EXTRACFLAGS="${CFLAGS}"
-
-SHLIBBASE= c-client4
-SHLIBMAJ= 9
-SHLIBNAME= lib${SHLIBBASE}.so.${SHLIBMAJ}
-MAKE_ENV+= SHLIBNAME=${SHLIBNAME} SHLIBBASE=${SHLIBBASE}
-PLIST_SUB+= SHLIBNAME=${SHLIBNAME} SHLIBBASE=${SHLIBBASE}
-
-post-patch:
-.for file in Makefile src/osdep/unix/Makefile src/osdep/unix/Makefile.gss
- @${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|g" ${WRKSRC}/${file}
-.endfor
- @${REINPLACE_CMD} -e "s:/etc/ssl/certs:${PREFIX}/certs:g; \
- s:/etc/ssl/private:${PREFIX}/certs:g" ${WRKSRC}/Makefile
- @${REINPLACE_CMD} -e "s:/etc/c-client.cf:${PREFIX}/etc/c-client.cf:" \
- ${WRKSRC}/src/osdep/unix/env_unix.h
-.if ${PORT_OPTIONS:MSSL}
- @${REINPLACE_CMD} -e " \
- s:SSLINCLUDE=/usr/include/openssl SSLLIB=/usr/lib:SSLINCLUDE=${OPENSSLINC} SSLLIB=${OPENSSLLIB}: \
- " ${WRKSRC}/Makefile
-.endif
-.if ${PORT_OPTIONS:MIPV6}
- @${REINPLACE_CMD} -e "s|^IP=4|IP=6|" ${WRKSRC}/Makefile \
- ${WRKSRC}/src/osdep/unix/Makefile
-.endif
-.if ${PORT_OPTIONS:MMBX_DEFAULT}
- @${REINPLACE_CMD} -e "s|^CREATEPROTO=unixproto|CREATEPROTO=mbxproto|" \
- ${WRKSRC}/src/osdep/unix/Makefile
-.endif
-
-post-configure:
- @${ECHO_MSG} ">> The c-client shared library will be named ${SHLIBNAME}"
-
-HEADERS= c-client.h dummy.h env.h env_unix.h fdstring.h flockcyg.h \
- flocksim.h flstring.h fs.h ftl.h imap4r1.h linkage.c linkage.h \
- mail.h misc.h netmsg.h newsrc.h nl.h nntp.h osdep.h pseudo.h \
- rfc822.h smtp.h sslio.h tcp.h tcp_unix.h unix.h utf8.h \
- utf8aux.h
-PORTREV_H= ${WRKDIR}/portrevision.h
-
-post-build:
- @${ECHO_CMD} "#define CCLIENT_PORTVERSION \"${PORTVERSION}\"" >${PORTREV_H}
-.if ${PORT_OPTIONS:MSSL}
- @${ECHO_CMD} "#define CCLIENT_SSLENABLED \"yes\"" >>${PORTREV_H}
-.else
- @${ECHO_CMD} "#define CCLIENT_SSLENABLED \"no\"" >>${PORTREV_H}
-.endif
-
-do-install:
- ${MKDIR} ${STAGEDIR}${PREFIX}/include/c-client
-.for f in ${HEADERS}
- ${INSTALL_DATA} ${WRKSRC}/c-client/${f} ${STAGEDIR}${PREFIX}/include/c-client
-.endfor
- ${INSTALL_LIB} ${WRKSRC}/c-client/${SHLIBNAME} ${STAGEDIR}${PREFIX}/lib
- ${LN} -sf ${SHLIBNAME} ${STAGEDIR}${PREFIX}/lib/lib${SHLIBBASE}.so
- ${INSTALL_DATA} ${WRKSRC}/c-client/c-client.a \
- ${STAGEDIR}${PREFIX}/lib/lib${SHLIBBASE}.a
- ${INSTALL_DATA} ${WRKSRC}/c-client/CFLAGS ${STAGEDIR}${PREFIX}/include/c-client
- ${INSTALL_DATA} ${WRKSRC}/c-client/LDFLAGS ${STAGEDIR}${PREFIX}/include/c-client
- ${INSTALL_DATA} ${WRKSRC}/c-client/OSCFLAGS ${STAGEDIR}${PREFIX}/include/c-client
- ${INSTALL_DATA} ${PORTREV_H} ${STAGEDIR}${PREFIX}/include/c-client
-
-.include <bsd.port.mk>
diff --git a/mail/cclient/distinfo b/mail/cclient/distinfo
deleted file mode 100644
index 2970605d3063..000000000000
--- a/mail/cclient/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (imap-2007f.tar.gz) = 53e15a2b5c1bc80161d42e9f69792a3fa18332b7b771910131004eb520004a28
-SIZE (imap-2007f.tar.gz) = 1990304
diff --git a/mail/cclient/files/patch-Makefile b/mail/cclient/files/patch-Makefile
deleted file mode 100644
index 1e10918790a8..000000000000
--- a/mail/cclient/files/patch-Makefile
+++ /dev/null
@@ -1,78 +0,0 @@
-*** Makefile.orig Wed May 9 00:50:45 2007
---- Makefile Mon Jul 23 16:02:26 2007
-***************
-*** 294,300 ****
-
- # Make the IMAP Toolkit
-
-! all: c-client SPECIALS rebuild bundled
-
- c-client:
- @echo Not processed yet. In a first-time build, you must specify
---- 294,300 ----
-
- # Make the IMAP Toolkit
-
-! all: c-client SPECIALS rebuild
-
- c-client:
- @echo Not processed yet. In a first-time build, you must specify
-***************
-*** 559,567 ****
- @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;; *) (make nounenc;exit 1);; esac'
-
- nounenc:
- @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
---- 559,564 ----
-***************
-*** 582,590 ****
- @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;; *) (make nonossl;exit 1);; esac'
-
- nonossl:
- @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
---- 579,584 ----
-***************
-*** 659,665 ****
- $(TOOLS)/$@ "$(LN)" src/tmail tmail
- $(LN) $(TOOLS)/$@ .
-
-! build: OSTYPE rebuild rebuildclean bundled
-
- OSTYPE:
- @$(MAKE) ip$(IP)
---- 653,659 ----
- $(TOOLS)/$@ "$(LN)" src/tmail tmail
- $(LN) $(TOOLS)/$@ .
-
-! build: OSTYPE rebuild rebuildclean
-
- OSTYPE:
- @$(MAKE) ip$(IP)
-***************
-*** 679,686 ****
- @$(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
-! $(CD) c-client;$(MAKE) all CC=`$(CAT) CCTYPE` \
-! CFLAGS="`$(CAT) CFLAGS`" `$(CAT) SPECIALS`
-
- rebuildclean:
- $(SH) -c '$(RM) rebuild || true'
---- 673,679 ----
- @$(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
-! $(CD) c-client;$(MAKE) all CFLAGS="`$(CAT) CFLAGS`" `$(CAT) SPECIALS`
-
- rebuildclean:
- $(SH) -c '$(RM) rebuild || true'
diff --git a/mail/cclient/files/patch-src_c-client_c-client.h b/mail/cclient/files/patch-src_c-client_c-client.h
deleted file mode 100644
index d9123468f14c..000000000000
--- a/mail/cclient/files/patch-src_c-client_c-client.h
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/c-client/c-client.h.orig 2011-07-23 00:20:18 UTC
-+++ src/c-client/c-client.h
-@@ -39,7 +39,23 @@ extern "C" {
- #endif
-
- #include "mail.h" /* primary interfaces */
-+
-+#ifdef __cplusplus /* undo hacks before including OS headers */
-+#undef private
-+#undef and
-+#undef or
-+#undef not
-+#endif
-+
- #include "osdep.h" /* OS-dependent routines */
-+
-+#ifdef __cplusplus /* redo hacks after including OS headers */
-+#define private cclientPrivate
-+#define and cclientAnd
-+#define or cclientOr
-+#define not cclientNot
-+#endif
-+
- #include "rfc822.h" /* RFC822 and MIME routines */
- #include "smtp.h" /* SMTP sending routines */
- #include "nntp.h" /* NNTP sending routines */
diff --git a/mail/cclient/files/patch-src_osdep_unix_Makefile b/mail/cclient/files/patch-src_osdep_unix_Makefile
deleted file mode 100644
index b11998a467c4..000000000000
--- a/mail/cclient/files/patch-src_osdep_unix_Makefile
+++ /dev/null
@@ -1,152 +0,0 @@
---- src/osdep/unix/Makefile.orig 2011-07-23 00:20:10.000000000 +0000
-+++ src/osdep/unix/Makefile 2014-11-24 10:19:06.579841371 +0000
-@@ -28,9 +28,9 @@
-
- EXTRAAUTHENTICATORS=
- EXTRADRIVERS=mbox
--PASSWDTYPE=std
--SSLTYPE=nopwd
--IP=4
-+PASSWDTYPE=pam
-+SSLTYPE=unix.nopwd
-+IP=6
-
-
- # The optimization level here for GCC ports is set here for a reason. It's
-@@ -54,13 +54,13 @@
-
- # Extended flags needed for SSL. You may need to modify.
-
--SSLDIR=/usr/local/ssl
--SSLCERTS=$(SSLDIR)/certs
-+#SSLDIR=/usr/local/ssl
-+SSLCERTS=$(PREFIX)/certs
- SSLKEYS=$(SSLCERTS)
- SSLINCLUDE=$(SSLDIR)/include
- SSLLIB=$(SSLDIR)/lib
-
--SSLCRYPTO=-lcrypto
-+SSLCRYPTO=-lcrypto -lcrypt
-
- # Older versions of MIT Kerberos also have a libcrypto. If so, you may need
- # to use this instead
-@@ -87,7 +87,7 @@
- # AFSLDFLAGS may also need -L/usr/ucblib -lucb
- DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\"
- DCELDFLAGS= -ldce
--PAMLDFLAGS= -lpam -ldl
-+PAMLDFLAGS= # -lpam -lcrypt
-
-
- # Build parameters normally set by the individual port
-@@ -130,7 +130,7 @@
- # Commands possibly overriden by the individual port
-
- ARRC=ar rc
--CC=cc
-+#CC=cc
- LN=ln -s
- RANLIB=ranlib
-
-@@ -154,7 +154,7 @@
- dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
- rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
- unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o mix.o
--CFLAGS=-g
-+CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS)
-
- CAT=cat
- MAKE=make
-@@ -171,6 +171,10 @@
- PASSWDTYPE=$(PASSWDTYPE) SSLTYPE=$(SSLTYPE) IP=$(IP)
-
-
-+# Need this for the shared library rule to work correctly
-+.SUFFIXES: .o .so
-+SOFILES=${BINARIES:.o=.so}
-+
- # Here if no make argument established
-
- missing: osdep.h
-@@ -259,13 +263,14 @@
- BASECFLAGS="-g -Dconst="
-
- bsf: # FreeBSD
-- $(BUILD) `$(CAT) SPECIALS` OS=$@ \
-+ $(BUILD) `$(CAT) SPECIALS` OS=$@ CHECKPW=pam \
- SIGTYPE=psx CRXTYPE=nfs \
- SPOOLDIR=/var \
- ACTIVEFILE=/usr/local/news/lib/active \
- RSHPATH=/usr/bin/rsh \
-+ LOCKPGM=$(PREFIX)/libexec/mlock \
- BASECFLAGS="$(GCCCFLAGS)" \
-- BASELDFLAGS="-lcrypt"
-+ BASELDFLAGS="-lpam"
-
- bsi: # BSD/i386
- $(BUILD) `$(CAT) SPECIALS` OS=$@ \
-@@ -853,23 +858,31 @@
-
- # Build it!
-
--build: clean once $(ARCHIVE)
-+build: clean once $(ARCHIVE) $(SHLIBNAME)
-
--all: $(ARCHIVE)
-+all: $(ARCHIVE) $(SHLIBNAME)
-
- $(ARCHIVE): $(BINARIES)
- sh -c '$(RM) $(ARCHIVE) || true'
- @$(CAT) ARCHIVE
- @$(SH) ARCHIVE
-
-+$(SHLIBNAME): $(SOFILES)
-+ $(CC) -shared -Wl,-soname=$(SHLIBNAME) -o $(SHLIBNAME) $(SOFILES) `cat LDFLAGS`
-+ $(LN) $(SHLIBNAME) lib$(SHLIBBASE).so
-+
-+.c.so: osdep.h
-+ $(CC) -fPIC -DPIC -c `cat CFLAGS` ${@:.so=.c} -o $@
-+
- .c.o:
-- `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c
-+ $(CC) -c `cat CFLAGS` $*.c
-
-
- # Cleanup
-
- clean:
- sh -c '$(RM) auths.c crexcl.c ip_unix.c linkage.[ch] siglocal.c osdep*.[ch] *.o ARCHIVE *FLAGS *TYPE $(ARCHIVE) || true'
-+ sh -c '$(RM) *.so $(SHLIBNAME)'
-
-
- # Dependencies
-@@ -904,7 +917,7 @@
-
- # OS-dependent
-
--osdep.o:mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
-+OSDEPS= mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
- 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 ip_unix.c\
- auths.c crexcl.c flockcyg.c flocklnx.c flocksim.c fsync.c \
-@@ -918,12 +931,19 @@
- write.c sslstdio.c \
- strerror.c strpbrk.c strstr.c strtok.c strtoul.c \
- OSCFLAGS
-+
-+osdep.o: $(OSDEPS)
-+ $(CC) `$(CAT) 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 `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` osdep.c -o $@
-
- osdep.c: osdepbas.c osdepckp.c osdeplog.c osdepssl.c
- $(CAT) osdepbas.c osdepckp.c osdeplog.c osdepssl.c > osdep.c
diff --git a/mail/cclient/files/patch-src_osdep_unix_os_bsi.h b/mail/cclient/files/patch-src_osdep_unix_os_bsi.h
deleted file mode 100644
index ade4d1289237..000000000000
--- a/mail/cclient/files/patch-src_osdep_unix_os_bsi.h
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/osdep/unix/os_bsi.h.orig Wed Apr 11 10:53:03 2001
-+++ src/osdep/unix/os_bsi.h Wed Apr 11 10:55:32 2001
-@@ -22,7 +22,18 @@
- #include <unistd.h>
- #include <string.h>
- #include <sys/types.h>
-+
-+/*
-+ * FreeBSD v3.x and onward whines about <sys/dir.h> being obsolete, so switch
-+ * to POSIX semantics.
-+ */
-+#if __FreeBSD__ >= 3
-+#include <dirent.h>
-+#define direct dirent
-+#else
- #include <sys/dir.h>
-+#endif
-+
- #include <fcntl.h>
- #include <syslog.h>
- #include <sys/file.h>
diff --git a/mail/cclient/files/patch-src_osdep_unix_ssl__unix.c b/mail/cclient/files/patch-src_osdep_unix_ssl__unix.c
deleted file mode 100644
index 6dbd2e44e5e0..000000000000
--- a/mail/cclient/files/patch-src_osdep_unix_ssl__unix.c
+++ /dev/null
@@ -1,59 +0,0 @@
-Description: Support OpenSSL 1.1
- When building with OpenSSL 1.1 and newer, use the new built-in
- hostname verification instead of code that doesn't compile due to
- structs having been made opaque.
-Bug-Debian: https://bugs.debian.org/828589
-
-Obtained from: https://sources.debian.org/data/main/u/uw-imap/8:2007f~dfsg-5/debian/patches/1006_openssl1.1_autoverify.patch
---- src/osdep/unix/ssl_unix.c.orig
-+++ src/osdep/unix/ssl_unix.c
-@@ -227,8 +227,16 @@ static char *ssl_start_work (SSLSTREAM *
- /* disable certificate validation? */
- if (flags & NET_NOVALIDATECERT)
- SSL_CTX_set_verify (stream->context,SSL_VERIFY_NONE,NIL);
-- else SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
-+ else {
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000
-+ X509_VERIFY_PARAM *param = SSL_CTX_get0_param(stream->context);
-+ X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
-+ X509_VERIFY_PARAM_set1_host(param, host, 0);
-+#endif
-+
-+ SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
- /* set default paths to CAs... */
-+ }
- SSL_CTX_set_default_verify_paths (stream->context);
- /* ...unless a non-standard path desired */
- if (s = (char *) mail_parameters (NIL,GET_SSLCAPATH,NIL))
-@@ -266,6 +274,7 @@ static char *ssl_start_work (SSLSTREAM *
- if (SSL_write (stream->con,"",0) < 0)
- return ssl_last_error ? ssl_last_error : "SSL negotiation failed";
- /* need to validate host names? */
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
- if (!(flags & NET_NOVALIDATECERT) &&
- (err = ssl_validate_cert (cert = SSL_get_peer_certificate (stream->con),
- host))) {
-@@ -275,6 +284,7 @@ static char *ssl_start_work (SSLSTREAM *
- sprintf (tmp,"*%.128s: %.255s",err,cert ? cert->name : "???");
- return ssl_last_error = cpystr (tmp);
- }
-+#endif
- return NIL;
- }
-
-@@ -313,6 +323,7 @@ static int ssl_open_verify (int ok,X509_
- * Returns: NIL if validated, else string of error message
- */
-
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
- static char *ssl_validate_cert (X509 *cert,char *host)
- {
- int i,n;
-@@ -342,6 +353,7 @@ static char *ssl_validate_cert (X509 *ce
- else ret = "Unable to locate common name in certificate";
- return ret;
- }
-+#endif
-
- /* Case-independent wildcard pattern match
- * Accepts: base string
diff --git a/mail/cclient/pkg-descr b/mail/cclient/pkg-descr
deleted file mode 100644
index 144dcb24d19d..000000000000
--- a/mail/cclient/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-C-client is a common API for accessing mailboxes. It is used internally by
-the popular PINE mail reader as well as the University of Washington's IMAP
-server.
-
-For more information, please see the UW IMAP homepage:
diff --git a/mail/cclient/pkg-message-ssl b/mail/cclient/pkg-message-ssl
deleted file mode 100644
index 52bc3ebf8f6a..000000000000
--- a/mail/cclient/pkg-message-ssl
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-{ type: install
- message: <<EOM
-Warning: You have chosen to include SSL support. Applications/ports that use
-the cclient library but do not support SSL may stop working or have problems
-linking. Linking them explicitly with ssl (-lssl -lcrypto) may or may not help.
-EOM
-}
-]
diff --git a/mail/cclient/pkg-plist b/mail/cclient/pkg-plist
deleted file mode 100644
index f948c0970bee..000000000000
--- a/mail/cclient/pkg-plist
+++ /dev/null
@@ -1,36 +0,0 @@
-include/c-client/c-client.h
-include/c-client/dummy.h
-include/c-client/env.h
-include/c-client/env_unix.h
-include/c-client/fdstring.h
-include/c-client/flockcyg.h
-include/c-client/flocksim.h
-include/c-client/flstring.h
-include/c-client/fs.h
-include/c-client/ftl.h
-include/c-client/imap4r1.h
-include/c-client/linkage.c
-include/c-client/linkage.h
-include/c-client/mail.h
-include/c-client/misc.h
-include/c-client/netmsg.h
-include/c-client/newsrc.h
-include/c-client/nl.h
-include/c-client/nntp.h
-include/c-client/osdep.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/unix.h
-include/c-client/utf8.h
-include/c-client/utf8aux.h
-include/c-client/portrevision.h
-include/c-client/CFLAGS
-include/c-client/LDFLAGS
-include/c-client/OSCFLAGS
-lib/%%SHLIBNAME%%
-lib/libc-client4.a
-lib/libc-client4.so