Deorbit expired ftp/ftp-tls and ftp/ftpd-tls.

Approved by:	bapt (mentor)

18 files changed, 0 insertions, 561 deletions

diff --git a/ftp/Makefile b/ftp/Makefile
index bbc7f350831a..3f24997d4a4b 100644
--- a/ftp/Makefile
+++ b/ftp/Makefile
@@ -21,10 +21,8 @@
     SUBDIR += fmirror
     SUBDIR += fpc-libcurl
     SUBDIR += frox
-    SUBDIR += ftp-tls
     SUBDIR += ftpcopy
     SUBDIR += ftpcube
-    SUBDIR += ftpd-tls
     SUBDIR += ftpfind
     SUBDIR += ftplib
     SUBDIR += ftplocate
diff --git a/ftp/ftp-tls/Makefile b/ftp/ftp-tls/Makefile
deleted file mode 100644
index a9ef27050075..000000000000
--- a/ftp/ftp-tls/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# Ports collection makefile for:	ftp-tls
-# Date created:				24 October 2002
-# Whom:					marius@alchemy.franken.de
-#
-# $FreeBSD$
-#
-
-PORTNAME=	ftp-tls
-PORTVERSION=	20051021
-CATEGORIES=	ftp security
-MASTER_SITES=	http://www.ford-hutchinson.com/~fh-1-pfh/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	marius
-
-MAINTAINER=	marius@FreeBSD.org
-COMMENT=	Ftp client supporting FTP AUTH TLS
-
-DEPRECATED=	No longer maintained upstream
-EXPIRATION_DATE=	2013-01-31
-
-GNU_CONFIGURE=	yes
-USE_OPENSSL=	yes
-
-MAN1=		ftp-tls.1
-
-CONFIGURE_ARGS=		--with-openssl-dir=${OPENSSLBASE}
-
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/ftp ${PREFIX}/bin/ftp-tls
-	@${INSTALL_MAN} ${WRKSRC}/ftp.1.TLS ${PREFIX}/man/man1/ftp-tls.1
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for i in README.TLS draft-murray-auth-ftp-ssl-16.txt
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-.endfor
-.endif
-
-.include <bsd.port.mk>
diff --git a/ftp/ftp-tls/distinfo b/ftp/ftp-tls/distinfo
deleted file mode 100644
index 47ffcce73838..000000000000
--- a/ftp/ftp-tls/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (ftp-tls-20051021.tar.gz) = 5355389439313517dc02ef6d78f061904caeaa61388f7a85494ef81e8ba46462
-SIZE (ftp-tls-20051021.tar.gz) = 278406
diff --git a/ftp/ftp-tls/files/patch-extern.h b/ftp/ftp-tls/files/patch-extern.h
deleted file mode 100644
index 9239e6bcb047..000000000000
--- a/ftp/ftp-tls/files/patch-extern.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- extern.h.orig	Thu Nov 21 07:52:55 2002
-+++ extern.h	Mon Dec 18 23:23:03 2006
-@@ -65,7 +65,11 @@
-  *	@(#)extern.h	8.3 (Berkeley) 10/9/94
-  */
- 
-+#ifndef __EXTERN_H
-+#define __EXTERN_H
-+
- #include <sys/types.h>
-+#include "ftp_var.h"
- 
- void    abort_remote __P((FILE *));
- void    abortpt __P((int));
-@@ -217,3 +221,5 @@
- extern char	reply_string[];
- extern off_t	restart_point;
- extern int	NCMDS;
-+
-+#endif
diff --git a/ftp/ftp-tls/files/patch-ftp.1.TLS b/ftp/ftp-tls/files/patch-ftp.1.TLS
deleted file mode 100644
index bb7d4ae62a1d..000000000000
--- a/ftp/ftp-tls/files/patch-ftp.1.TLS
+++ /dev/null
@@ -1,91 +0,0 @@
---- ftp.1.TLS.orig	Thu Sep  5 21:00:21 2002
-+++ ftp.1.TLS	Fri Oct 25 15:28:06 2002
-@@ -35,26 +35,26 @@
- .\"	@(#)ftp.1	8.3 (Berkeley) 10/9/94
- .\"
- .Dd August 18, 1997
--.Dt FTP 1
-+.Dt FTP-TLS 1
- .Os
- .Sh NAME
--.Nm ftp
-+.Nm ftp-tls
- .Nd
- .Tn ARPANET
--file transfer program
-+Internet file transfer program supporting AUTH TLS
- .Sh SYNOPSIS
--.Nm ftp
-+.Nm ftp-tls
- .Op Fl AVadegimnptv
- .Op Fl o Ar output
- .Op Fl P Ar port
- .Op Fl r Ar seconds
- .Op Fl z Ar TLS option
- .Op Ar host Op Ar port
--.Nm ftp
-+.Nm ftp-tls
- ftp://[\fIuser\fR:\fIpassword\fR@]\fIhost\fR[:\fIport\fR]/\fIfile\fR[/]
--.Nm ftp
-+.Nm ftp-tls
- http://\fIhost\fR[:\fIport\fR]/\fIfile\fR
--.Nm ftp
-+.Nm ftp-tls
- \fIhost\fR:[/\fIpath\fR/]\fIfile\fR[/]
- .Sh DESCRIPTION
- .Nm
-@@ -299,7 +299,7 @@
- is provided to the user.
- The following commands are recognized
- by
--.Nm ftp :
-+.Nm ftp-tls :
- .Bl -tag -width Fl
- .It Ic \&! Op Ar command Op Ar args
- Invoke an interactive shell on the local machine.
-@@ -351,7 +351,7 @@
- .Tn FTP
- session with the remote server
- and exit
--.Nm ftp .
-+.Nm ftp-tls .
- An end-of-file will also terminate the session and exit.
- .It Ic case
- Toggle remote computer file name case mapping during
-@@ -1135,7 +1135,7 @@
- on remote machine.
- .It Ic status
- Show the current status of
--.Nm ftp .
-+.Nm ftp-tls .
- .It Ic struct Op Ar struct-name
- Set the file transfer
- .Ar structure
-@@ -1374,9 +1374,7 @@
- c.f. the
- .Ic glob
- command.
--If the
--.Nm
--command expects a single local file (e.g.,
-+If the ftp command expects a single local file (e.g.,
- .Ic put ) ,
- only the first filename generated by the
- .Dq globbing
-@@ -1609,6 +1607,7 @@
- .El
- .Sh SEE ALSO
-+.Xr ftp 1 ,
- .Xr tftp 1 ,
- .Xr getservbyname 3 ,
- .Xr editrc 5 ,
- .Xr services 5 ,
-@@ -1616,7 +1615,7 @@
- .Xr ftpd 8
- .Sh HISTORY
- The
--.Nm
-+.Ic ftp
- command appeared in
- .Bx 4.2 .
- .Pp
diff --git a/ftp/ftp-tls/files/patch-ftp_var.h b/ftp/ftp-tls/files/patch-ftp_var.h
deleted file mode 100644
index bbfabd95d24a..000000000000
--- a/ftp/ftp-tls/files/patch-ftp_var.h
+++ /dev/null
@@ -1,63 +0,0 @@
---- ftp_var.h.orig	Thu Jul 25 16:49:16 2002
-+++ ftp_var.h	Mon Dec 18 23:27:38 2006
-@@ -65,6 +65,9 @@
-  *	@(#)ftp_var.h	8.4 (Berkeley) 10/9/94
-  */
- 
-+#ifndef __FTP_VAR_H
-+#define __FTP_VAR_H
-+
- /*
-  * FTP global variables.
-  */
-@@ -86,6 +89,22 @@
- #endif
- 
- #include "stringlist.h"
-+
-+/*
-+ * Format of command table.
-+ */
-+struct cmd {
-+	char	*c_name;	/* name of command */
-+	char	*c_help;	/* help string */
-+	char	 c_bell;	/* give bell when command completes */
-+	char	 c_conn;	/* must be connected to use command */
-+	char	 c_proxy;	/* proxy server may execute */
-+#ifndef SMALL
-+	char	*c_complete;	/* context sensitive completion list */
-+#endif /* !SMALL */
-+	void	(*c_handler) __P((int, char **)); /* function to call */
-+};
-+
- #include "extern.h"
- 
- #define HASHBYTES	1024
-@@ -195,21 +214,6 @@
- 
- int	options;		/* used during socket creation */
- 
--/*
-- * Format of command table.
-- */
--struct cmd {
--	char	*c_name;	/* name of command */
--	char	*c_help;	/* help string */
--	char	 c_bell;	/* give bell when command completes */
--	char	 c_conn;	/* must be connected to use command */
--	char	 c_proxy;	/* proxy server may execute */
--#ifndef SMALL
--	char	*c_complete;	/* context sensitive completion list */
--#endif /* !SMALL */
--	void	(*c_handler) __P((int, char **)); /* function to call */
--};
--
- struct macel {
- 	char mac_name[9];	/* macro name */
- 	char *mac_start;	/* start of macro in macbuf */
-@@ -224,3 +228,5 @@
- 
- /* sig_t isn't what we expect on all platforms so we use a custom one */
- typedef void (*my_sig_t)__P((int));
-+
-+#endif
diff --git a/ftp/ftp-tls/pkg-descr b/ftp/ftp-tls/pkg-descr
deleted file mode 100644
index ce6e895b41bd..000000000000
--- a/ftp/ftp-tls/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Ftp client based on the OpenBSD ftp client code, implements the
-FTP AUTH TLS IETF draft.
-
-WWW: http://www.ford-hutchinson.com/~fh-1-pfh/ftps-ext.html
diff --git a/ftp/ftp-tls/pkg-plist b/ftp/ftp-tls/pkg-plist
deleted file mode 100644
index 4413fb74e0c0..000000000000
--- a/ftp/ftp-tls/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/ftp-tls
-%%PORTDOCS%%%%DOCSDIR%%/README.TLS
-%%PORTDOCS%%%%DOCSDIR%%/draft-murray-auth-ftp-ssl-16.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/ftp/ftpd-tls/Makefile b/ftp/ftpd-tls/Makefile
deleted file mode 100644
index f4f67ee79de2..000000000000
--- a/ftp/ftpd-tls/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-# Ports collection makefile for:	ftpd-tls
-# Date created:				21 August 2003
-# Whom:					marius@alchemy.franken.de
-#
-# $FreeBSD$
-#
-
-PORTNAME=	ftpd-tls
-PORTVERSION=	20031008
-PORTREVISION=	2
-CATEGORIES=	ftp security
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	marius
-
-MAINTAINER=	marius@FreeBSD.org
-COMMENT=	Ftp server supporting FTP AUTH TLS
-
-DEPRECATED=	No longer maintained upstream
-EXPIRATION_DATE=	2013-01-31
-
-GNU_CONFIGURE=	YES
-USE_OPENSSL=	YES
-USE_RC_SUBR=	ftpd-tls
-
-MAN8=		ftpd-tls.8
-
-CONFIGURE_ARGS=		--with-openssl-dir=${OPENSSLBASE}
-PKGMESSAGE=		${WRKDIR}/pkg-message
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} > 900007
-BROKEN=		fails to build with new utmpx
-.endif
-
-post-patch:
-.for i in README.TLS ftpd.8.TLS pathnames.h tlsutil.c
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/${i}
-.endfor
-	@${SED} 's|%%PREFIX%%|${PREFIX}|g; s|%%DOCSDIR%%|${DOCSDIR}|g' \
-		${PKGDIR}/pkg-message > ${WRKDIR}/pkg-message
-
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/ftpd ${PREFIX}/libexec/ftpd-tls
-	@${INSTALL_MAN} ${WRKSRC}/ftpd.8.TLS ${PREFIX}/man/man8/ftpd-tls.8
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for i in README.TLS draft-murray-auth-ftp-ssl-09.txt
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-.endfor
-.endif
-.if !exists(${PREFIX}/etc/ftpd-tls)
-	@${MKDIR} ${PREFIX}/etc/ftpd-tls
-	@${CHMOD} 700 ${PREFIX}/etc/ftpd-tls
-.endif
-.if (!exists(${PREFIX}/etc/ftpd-tls/ftpusers)) && (exists(/etc/ftpusers))
-	@${INSTALL_DATA} /etc/ftpusers ${PREFIX}/etc/ftpd-tls
-.endif
-
-pre-install:
-# Make sure there's no startup script left over from a previous installation.
-	@${RM} -f ${PREFIX}/etc/rc.d/ftpd-tls.sh
-
-post-install:
-	@${CAT} ${WRKDIR}/pkg-message
-
-.include <bsd.port.post.mk>
diff --git a/ftp/ftpd-tls/distinfo b/ftp/ftpd-tls/distinfo
deleted file mode 100644
index 48c3b972b918..000000000000
--- a/ftp/ftpd-tls/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (ftpd-tls-20031008.tar.gz) = 1b77cedba7ad23db335f77bbba8695866a0e1ba76540677ce6b9193be63dd8f1
-SIZE (ftpd-tls-20031008.tar.gz) = 202139
diff --git a/ftp/ftpd-tls/files/ftpd-tls.in b/ftp/ftpd-tls/files/ftpd-tls.in
deleted file mode 100644
index a276e72ca1bc..000000000000
--- a/ftp/ftpd-tls/files/ftpd-tls.in
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: ftpd-tls
-# REQUIRE: LOGIN
-#
-# Available configuration variables for ftpd-tls are:
-#
-# ftpd_tls_enable (bool):	Set to "YES" to enable ftpd-tls.
-#				Defaults to "NO".
-# ftpd_tls_flags (flags):	Extra flags to ftpd-tls (see ftpd-tls(8)).
-#				Defaults to "-U -l".
-#
-# Add at least the following line to /etc/rc.conf or /etc/rc.conf.local to
-# enable ftpd-tls:
-#
-# ftpd_tls_enable="YES"
-#
-
-. /etc/rc.subr
-
-name="ftpd_tls"
-rcvar=ftpd_tls_enable
-
-command=%%PREFIX%%/libexec/ftpd-tls
-command_args="> /dev/null"
-start_precmd="ftpd_tls_precmd"
-pidfile="/var/run/ftpd-tls.pid"
-
-ftpd_tls_precmd()
-{
-	rc_flags="${rc_flags} -D"
-}
-
-load_rc_config $name
-
-: ${ftpd_tls_enable="NO"}
-: ${ftpd_tls_flags="-U -l"}
-
-run_rc_command "$1"
diff --git a/ftp/ftpd-tls/files/patch-README.TLS b/ftp/ftpd-tls/files/patch-README.TLS
deleted file mode 100644
index 7571a102224c..000000000000
--- a/ftp/ftpd-tls/files/patch-README.TLS
+++ /dev/null
@@ -1,10 +0,0 @@
---- README.TLS.orig	Tue Sep  9 03:04:28 2003
-+++ README.TLS	Tue Sep  9 03:05:05 2003
-@@ -33,6 +33,7 @@
- 
- These files is searched for in the following directorys (in this order):
- o  Current working directory of the process.
-+o  %%PREFIX%%/etc/ftpd-tls.
- o  Specified by the `X509_get_default_cert_dir_env()` environment variable
-    (usually $SSL_CERT_DIR).
- o  `X509_get_default_cert_dir()`, usually (openssl-dir)/certs.
diff --git a/ftp/ftpd-tls/files/patch-ftpd.8.TLS b/ftp/ftpd-tls/files/patch-ftpd.8.TLS
deleted file mode 100644
index cb18f91f5ce6..000000000000
--- a/ftp/ftpd-tls/files/patch-ftpd.8.TLS
+++ /dev/null
@@ -1,148 +0,0 @@
---- ftpd.8.TLS.orig	Thu May 16 15:07:51 2002
-+++ ftpd.8.TLS	Tue Sep  9 02:33:26 2003
-@@ -35,13 +35,13 @@
- .\"     @(#)ftpd.8	8.2 (Berkeley) 4/19/94
- .\"
- .Dd June 18, 1996
--.Dt FTPD 8
-+.Dt FTPD-TLS 8
- .Os
- .Sh NAME
--.Nm ftpd
--.Nd Internet File Transfer Protocol server
-+.Nm ftpd-tls
-+.Nd Internet File Transfer Protocol server supporting AUTH TLS
- .Sh SYNOPSIS
--.Nm ftpd
-+.Nm ftpd-tls
- .Op Fl AdDhlMPSU46
- .Op Fl T Ar maxtimeout
- .Op Fl t Ar timeout
-@@ -62,7 +62,7 @@
- .Bl -tag -width Ds
- .It Fl A
- Permit only anonymous ftp connections, accounts listed in
--.Pa /etc/ftpchroot
-+.Pa %%PREFIX%%/etc/ftpd-tls/ftpchroot
- or users in a login class with the
- .Dq ftp-chroot
- variable set (see below).
-@@ -107,7 +107,7 @@
- .It Fl P
- Permit illegal port numbers or addresses for PORT command initiated connects.
- By default
--.Xr ftpd 8
-+.Xr ftpd-tls 8
- violates the RFC and thus constrains the PORT command to non-reserved ports
- and requires it use the same source address as the connection came from.
- This prevents the "FTP bounce attack" against services on both the local
-@@ -116,7 +116,7 @@
- With this option set,
- .Nm
- logs all anonymous downloads to the file
--.Pa /var/log/ftpd
-+.Pa /var/log/ftpd-tls
- when this file exists.
- .It Fl U
- Each concurrent
-@@ -176,20 +176,20 @@
- .El
- .Pp
- The file
--.Pa /etc/nologin
-+.Pa /var/run/nologin
- can be used to disable ftp access.
- If the file exists,
- .Nm
- displays it and exits.
- If the file
--.Pa /etc/ftpwelcome
-+.Pa %%PREFIX%%/etc/ftpd-tls/ftpwelcome
- exists,
- .Nm
- prints it before issuing the
- .Dq ready
- message.
- If the welcome file exists
--.Pa ( /etc/motd
-+.Pa ( %%PREFIX%%/etc/ftpd-tls/motd
- by default),
- .Nm
- prints it after a successful login.
-@@ -320,13 +320,13 @@
- file operations may be performed.
- .It
- The login name must not appear in the file
--.Pa /etc/ftpusers .
-+.Pa %%PREFIX%%/etc/ftpd-tls/ftpusers .
- .It
- The user must have a standard shell as described by
- .Xr shells 5 .
- .It
- If the user name appears in the file
--.Pa /etc/ftpchroot
-+.Pa %%PREFIX%%/etc/ftpd-tls/ftpchroot
- the session's root will be changed to the user's login directory by
- .Xr chroot 2
- as for an
-@@ -432,7 +432,7 @@
- .El
- .Pp
- If logging to the
--.Pa /var/log/ftpd
-+.Pa /var/log/ftpd-tls
- file is enabled, information will be written in the following format:
- .Pp
- .Bl -tag -width XXXXXXXXXXXXXX -offset indent -compact
-@@ -514,24 +514,24 @@
- .It Pa welcome
- The path of the file containing the welcome message.
- If this variable is not set,
--.Pa /etc/motd
-+.Pa %%PREFIX%%/etc/ftpd-tls/motd
- is used.
- .El
- .Sh FILES
--.Bl -tag -width /var/run/ftpd.pid -compact
--.It Pa /etc/ftpusers
-+.Bl -tag -width /var/run/ftpd-tls.pid -compact
-+.It Pa %%PREFIX%%/etc/ftpd-tls/ftpusers
- list of unwelcome/restricted users
--.It Pa /etc/ftpchroot
-+.It Pa %%PREFIX%%/etc/ftpd-tls/ftpchroot
- list of normal users who should be chrooted
--.It Pa /etc/ftpwelcome
-+.It Pa %%PREFIX%%/etc/ftpd-tls/ftpwelcome
- welcome notice
--.It Pa /etc/nologin
-+.It Pa /var/run/nologin
- displayed and access refused
- .It Pa /var/run/utmp
- list of users on the system
--.It Pa /var/run/ftpd.pid
-+.It Pa /var/run/ftpd-tls.pid
- process ID if running in daemon mode
--.It Pa /var/log/ftpd
-+.It Pa /var/log/ftpd-tls
- log file for anonymous downloads
- .El
- .Sh SEE ALSO
-@@ -541,14 +541,16 @@
- .Xr chroot 2 ,
- .Xr login.conf 5 ,
- .Xr shells 5 ,
-+.Xr ftpd 8 ,
- .Xr inetd 8 ,
- .Xr syslogd 8 ,
--.Xr ftp-proxy 8
- .Sh HISTORY
- The
--.Nm
-+.Ic ftpd
- command appeared in
- .Bx 4.2 .
-+.Pp
-+AUTH TLS support added by Peter 'Luna' Runestig <peter@runestig.com>.
- .Sh BUGS
- The server must run as the superuser to create sockets with
- privileged port numbers.
diff --git a/ftp/ftpd-tls/files/patch-pathnames.h b/ftp/ftpd-tls/files/patch-pathnames.h
deleted file mode 100644
index 5a0cdcc6baf2..000000000000
--- a/ftp/ftpd-tls/files/patch-pathnames.h
+++ /dev/null
@@ -1,22 +0,0 @@
---- pathnames.h.orig	Fri May  3 10:15:39 2002
-+++ pathnames.h	Tue Sep  9 02:34:05 2003
-@@ -40,12 +40,13 @@
- #include <paths.h>
- #endif /* HAVE_PATHS_H */
- 
--#define	_PATH_FTPUSERS		"/etc/ftpusers"
--#define	_PATH_FTPCHROOT		"/etc/ftpchroot"
--#define	_PATH_FTPWELCOME	"/etc/ftpwelcome"
--#define	_PATH_FTPLOGINMESG	"/etc/motd"
--#define _PATH_FTPDSTATFILE	"/var/log/ftpd"
--#define _PATH_FTPDPID		"/var/run/ftpd.pid"
-+#undef	_PATH_FTPUSERS
-+#define	_PATH_FTPUSERS		"%%PREFIX%%/etc/ftpd-tls/ftpusers"
-+#define	_PATH_FTPCHROOT		"%%PREFIX%%/etc/ftpd-tls/ftpchroot"
-+#define	_PATH_FTPWELCOME	"%%PREFIX%%/etc/ftpd-tls/ftpwelcome"
-+#define	_PATH_FTPLOGINMESG	"%%PREFIX%%/etc/ftpd-tls/motd"
-+#define _PATH_FTPDSTATFILE	"/var/log/ftpd-tls"
-+#define _PATH_FTPDPID		"/var/run/ftpd-tls.pid"
- #define _PATH_CWDMESG		".message"
- #ifndef _PATH_NOLOGIN
- #define _PATH_NOLOGIN		"/etc/nologin"
diff --git a/ftp/ftpd-tls/files/patch-tlsutil.c b/ftp/ftpd-tls/files/patch-tlsutil.c
deleted file mode 100644
index 8401f6549ffd..000000000000
--- a/ftp/ftpd-tls/files/patch-tlsutil.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- tlsutil.c.orig	Tue Sep  9 02:55:27 2003
-+++ tlsutil.c	Tue Sep  9 02:57:58 2003
-@@ -218,6 +218,13 @@
-     	fclose(file);
- 	return fn;
-     }
-+
-+    snprintf(fp, sizeof(fp), "%s/%s", "%%PREFIX%%" "/etc/ftpd-tls", fn);
-+    if ((file = fopen(fp, "r"))) {
-+    	fclose(file);
-+	return fp;
-+    }
-+
-     if (!(dir = getenv(X509_get_default_cert_dir_env())))  /* $SSL_CERT_DIR */
-     	dir = (char *) X509_get_default_cert_dir();
-     snprintf(fp, sizeof(fp), "%s/%s", dir, fn);
diff --git a/ftp/ftpd-tls/pkg-descr b/ftp/ftpd-tls/pkg-descr
deleted file mode 100644
index 2ce0552ac070..000000000000
--- a/ftp/ftpd-tls/pkg-descr
+++ /dev/null
@@ -1,2 +0,0 @@
-Ftp server based on the OpenBSD ftp server code, implements the
-FTP AUTH TLS IETF draft plus a custom SSL/TLS client authentication.
diff --git a/ftp/ftpd-tls/pkg-message b/ftp/ftpd-tls/pkg-message
deleted file mode 100644
index 3be1d01ab658..000000000000
--- a/ftp/ftpd-tls/pkg-message
+++ /dev/null
@@ -1,20 +0,0 @@
-===========================================================================
-
-Depending on how you would like to start ftpd-tls(8) you have two choices:
-1) Add the following line to /etc/rc.conf or /etc/rc.conf.local:
-
-ftpd_tls_enable="YES"
-
-For further available configuration variables when using this method see
-%%PREFIX%%/etc/rc.d/ftpd-tls{,.sh}.
-
-2) Add the following entries to your /etc/inetd.conf:
-
-ftp stream tcp  nowait root %%PREFIX%%/libexec/ftpd-tls ftpd-tls -U -l
-ftp stream tcp6 nowait root %%PREFIX%%/libexec/ftpd-tls ftpd-tls -U -l
-
-See %%DOCSDIR%%/README.TLS and the openssl(1) manual
-page for further information on how to generate the certificates and
-the keys and where to place them.
-
-===========================================================================
diff --git a/ftp/ftpd-tls/pkg-plist b/ftp/ftpd-tls/pkg-plist
deleted file mode 100644
index 9e5cd11270d5..000000000000
--- a/ftp/ftpd-tls/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-libexec/ftpd-tls
-%%PORTDOCS%%%%DOCSDIR%%/README.TLS
-%%PORTDOCS%%%%DOCSDIR%%/draft-murray-auth-ftp-ssl-09.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@exec mkdir -p %D/etc/ftpd-tls && chmod 700 %D/etc/ftpd-tls
-@exec if [ ! -f %D/etc/ftpd-tls/ftpusers ] && [ -f /etc/ftpusers ]; then cp /etc/ftpusers %D/etc/ftpd-tls/ftpusers; fi
-@unexec if cmp -s %D/etc/ftpd-tls/ftpusers /etc/ftpusers; then rm -f %D/etc/ftpd-tls/ftpusers; fi
-@unexec rmdir %D/etc/ftpd-tls 2> /dev/null || echo "If permanently deleting this package, %D/etc/ftpd-tls and its contents must be removed manually."