This commit was manufactured by cvs2svn to create tag 'RELEASE_4_6_2'.release/4.6.2

19 files changed, 0 insertions, 444 deletions

diff --git a/ftp/wu-ftpd+ipv6/Makefile b/ftp/wu-ftpd+ipv6/Makefile
deleted file mode 100644
index 087cd9187eae..000000000000
--- a/ftp/wu-ftpd+ipv6/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# New ports collection makefile for:	wu-ftpd
-# Date created:		18 Oct 1994
-# Whom:			torstenb
-#
-# $FreeBSD$
-#
-# REMINDER: to use ftpaccess(5) you need to specify -a in command line,
-# it is changed from previous versions
-
-PORTNAME=	wu-ftpd
-PORTVERSION=    2.6.2
-CATEGORIES=	ftp
-MASTER_SITES=	ftp://ftp.wu-ftpd.org/pub/wu-ftpd/
-
-MAINTAINER=	ache@FreeBSD.org
-
-USE_AUTOCONF=   yes
-CONFIGURE_ARGS=	--enable-rfc931 --disable-pasvip --enable-opie \
-		--enable-noop --disable-numericuid  --enable-nlst-dirs \
-		--prefix=${PREFIX} --with-etc-dir=${PREFIX}/etc
-
-MAN1=		ftpcount.1 ftpwho.1
-MAN5=		ftpaccess.5 ftphosts.5 ftpconversions.5 xferlog.5 \
-		ftpservers.5
-MAN8=		ftpd.8 ftpshut.8 ftprestart.8 privatepw.8
-
-.include <bsd.port.mk>
diff --git a/ftp/wu-ftpd+ipv6/distinfo b/ftp/wu-ftpd+ipv6/distinfo
deleted file mode 100644
index 943113cf49e9..000000000000
--- a/ftp/wu-ftpd+ipv6/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (wu-ftpd-2.6.2.tar.gz) = b3c271f02aadf663b8811d1bff9da3f6
diff --git a/ftp/wu-ftpd+ipv6/files/patch-aa b/ftp/wu-ftpd+ipv6/files/patch-aa
deleted file mode 100644
index 8ce2f17afbf2..000000000000
--- a/ftp/wu-ftpd+ipv6/files/patch-aa
+++ /dev/null
@@ -1,88 +0,0 @@
---- src/ftpd.c.orig	Tue Oct  2 22:21:17 2001
-+++ src/ftpd.c	Tue Oct  2 22:21:17 2001
-@@ -447,7 +447,6 @@
- #ifdef OPIE
- #include <opie.h>
- int pwok = 0;
--int af_pwok = 0;
- struct opie opiestate;
- #endif
- 
-@@ -1219,10 +1218,6 @@
- 	exit(0);
-     }
- 
--#ifdef OPIE
--    af_pwok = opieaccessfile(remotehost);
--#endif
--
- #ifdef HAVE_LIBRESOLV
-     /* check permitted access based on remote host DNS information */
-     if (!check_reverse_dns()) {
-@@ -1662,9 +1657,9 @@
-     /* Display s/key challenge where appropriate. */
- 
-     if (pwd == NULL || skeychallenge(&skey, pwd->pw_name, sbuf))
--	sprintf(buf, "Password required for %s.", name);
-+	snprintf(buf, 128, "Password required for %s.", name);
-     else
--	sprintf(buf, "%s %s for %s.", sbuf,
-+	snprintf(buf, 128, "%s %s for %s.", sbuf,
- 		pwok ? "allowed" : "required", name);
-     return (buf);
- }
-@@ -2105,16 +2100,17 @@
- #ifdef OPIE
- 	{
- 	    char prompt[OPIE_CHALLENGE_MAX + 1];
--	    opiechallenge(&opiestate, name, prompt);
- 
--	    if (askpasswd == -1) {
--		syslog(LOG_WARNING, "Invalid FTP user name %s attempted from %s", name, remotehost);
--		pwok = 0;
-+	    if (opiechallenge(&opiestate, name, prompt) == 0) {
-+		pwok = (pw != NULL) &&
-+		       opieaccessfile(remotehost) &&
-+		       opiealways(pw->pw_dir);
-+		reply(331, "Response to %s %s for %s.",
-+		      prompt, pwok ? "requested" : "required", name);
-+	    } else {
-+		pwok = 1;
-+		reply(331, "Password required for %s.", name);
- 	    }
--	    else
--		pwok = af_pwok && opiealways(pw->pw_dir);
--	    reply(331, "Response to %s %s for %s.",
--		  prompt, pwok ? "requested" : "required", name);
- 	}
- #else
- 	reply(331, "Password required for %s.", name);
-@@ -2593,8 +2589,8 @@
- 	    if (pw == NULL)
- 		salt = "xx";
- 	    else
--#ifndef OPIE
- 		salt = pw->pw_passwd;
-+#ifndef OPIE
- #ifdef SECUREOSF
- 	    if ((pr = getprpwnam(pw->pw_name)) != NULL) {
- 		if (pr->uflg.fg_newcrypt)
-@@ -2627,9 +2623,15 @@
- 	    xpasswd = crypt(passwd, salt);
- #endif /* SKEY */
- #else /* OPIE */
--	    if (!opieverify(&opiestate, passwd))
--		rval = 0;
--	    xpasswd = crypt(passwd, pw->pw_passwd);
-+	    if (pw != NULL) {
-+		if (opieverify(&opiestate, passwd) == 0)
-+		    xpasswd = pw->pw_passwd;
-+		else if (pwok)
-+		    xpasswd = crypt(passwd, salt);
-+		else
-+		    pw = NULL;
-+	    }
-+	    pwok = 0;
- #endif /* OPIE */
- #ifdef ULTRIX_AUTH
- 	    if ((numfails = ultrix_check_pass(passwd, xpasswd)) >= 0) {
diff --git a/ftp/wu-ftpd+ipv6/files/patch-ab b/ftp/wu-ftpd+ipv6/files/patch-ab
deleted file mode 100644
index 20062d577fff..000000000000
--- a/ftp/wu-ftpd+ipv6/files/patch-ab
+++ /dev/null
@@ -1,81 +0,0 @@
---- makefiles/Makefile.fbs.orig	Sun Jul  2 00:56:26 2000
-+++ makefiles/Makefile.fbs	Tue Sep  4 10:34:51 2001
-@@ -24,19 +24,21 @@
- #
- 
- DESTDIR=
--PREFIX=		/usr/local
-+PREFIX?=        /usr/local
-+
-+ETCDIR=         ${DESTDIR}${PREFIX}/etc
- 
- BINDIR=		${DESTDIR}${PREFIX}/bin
--BINOWN=		bin
--BINGRP=		bin
-+BINOWN=		root
-+BINGRP=		wheel
- 
- SBINDIR=	${DESTDIR}${PREFIX}/libexec
--SBINOWN=	bin
--SBINGRP=	bin
-+SBINOWN=	root
-+SBINGRP=	wheel
- 
- MANDIR=		${DESTDIR}${PREFIX}/man
--MANOWN=		bin
--MANGRP=		bin
-+MANOWN=		root
-+MANGRP=		wheel
- 
- INSTALL=	install
- 
-@@ -52,14 +54,20 @@
- 	@if [ ! -e ${SBINDIR} ]; then \
- 		${INSTALL} -o ${SBINOWN} -g ${SBINGRP} -m 755 -d ${SBINDIR} ; \
- 	fi
--	${INSTALL} -c -o ${SBINOWN} -g ${SBINGRP} -m 110 bin/ftpd           ${SBINDIR}/in.ftpd
--	@( cd ${SBINDIR} ; ln -s -f in.ftpd wu.ftpd   ; chown ${SBINOWN}.${SBINGRP} wu.ftpd   )
--	@( cd ${SBINDIR} ; ln -s -f in.ftpd in.wuftpd ; chown ${SBINOWN}.${SBINGRP} in.wuftpd )
-+	${INSTALL} -c -o ${SBINOWN} -g ${SBINGRP} -m 110 bin/ftpd           ${SBINDIR}/ftpd
-+#	${INSTALL} -c -o ${SBINOWN} -g ${SBINGRP} -m 110 bin/ftpd           ${SBINDIR}/in.ftpd
-+#	@( cd ${SBINDIR} ; ln -s -f in.ftpd wu.ftpd   ; chown ${SBINOWN}.${SBINGRP} wu.ftpd   )
-+#	@( cd ${SBINDIR} ; ln -s -f in.ftpd in.wuftpd ; chown ${SBINOWN}.${SBINGRP} in.wuftpd )
- 	${INSTALL} -c -o ${BINOWN}  -g ${BINGRP}  -m 111 bin/ftpshut        ${BINDIR}/ftpshut
- 	${INSTALL} -c -o ${BINOWN}  -g ${BINGRP}  -m 111 bin/ftprestart     ${BINDIR}/ftprestart
- 	${INSTALL} -c -o ${BINOWN}  -g ${BINGRP}  -m 111 bin/ftpcount       ${BINDIR}/ftpcount
- 	${INSTALL} -c -o ${BINOWN}  -g ${BINGRP}  -m 111 bin/ftpwho         ${BINDIR}/ftpwho
- 	${INSTALL} -c -o ${BINOWN}  -g ${BINGRP}  -m 111 bin/privatepw      ${BINDIR}/privatepw
-+	${INSTALL} -c -o ${BINOWN}  -g ${BINGRP}  -m 644 doc/examples/ftpaccess ${ETCDIR}/ftpaccess.example
-+	${INSTALL} -c -o ${BINOWN}  -g ${BINGRP}  -m 644 doc/examples/ftpusers ${ETCDIR}/ftpusers.example
-+	${INSTALL} -c -o ${BINOWN}  -g ${BINGRP}  -m 644 doc/examples/ftpconversions ${ETCDIR}/ftpconversions.example
-+	${INSTALL} -c -o ${BINOWN}  -g ${BINGRP}  -m 644 doc/examples/ftphosts ${ETCDIR}/ftphosts.example
-+	${INSTALL} -c -o ${BINOWN}  -g ${BINGRP}  -m 644 doc/examples/ftpgroups ${ETCDIR}/ftpgroups.example
- 	@echo installing manpages.
- 	@if [ ! -e ${MANDIR}/man1 ]; then \
- 		${INSTALL} -o ${MANOWN} -g ${MANGRP} -m 755 -d ${MANDIR}/man1 ; \
-@@ -80,14 +88,14 @@
- 	${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m 444 doc/ftpshut.8        ${MANDIR}/man8/ftpshut.8
- 	${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m 444 doc/ftprestart.8     ${MANDIR}/man8/ftprestart.8
- 	${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m 444 util/privatepw/privatepw.8 ${MANDIR}/man8/privatepw.8
--	@echo Compressing manpages
--	gzip -f -9 ${MANDIR}/man1/ftpcount.1
--	gzip -f -9 ${MANDIR}/man1/ftpwho.1
--	gzip -f -9 ${MANDIR}/man5/ftpaccess.5
--	gzip -f -9 ${MANDIR}/man5/ftpconversions.5
--	gzip -f -9 ${MANDIR}/man5/ftphosts.5
--	gzip -f -9 ${MANDIR}/man5/xferlog.5
--	gzip -f -9 ${MANDIR}/man8/ftpd.8
--	gzip -f -9 ${MANDIR}/man8/ftpshut.8
--	gzip -f -9 ${MANDIR}/man8/ftprestart.8
--	gzip -f -9 ${MANDIR}/man8/privatepw.8
-+#	@echo Compressing manpages
-+#	gzip -f -9 ${MANDIR}/man1/ftpcount.1
-+#	gzip -f -9 ${MANDIR}/man1/ftpwho.1
-+#	gzip -f -9 ${MANDIR}/man5/ftpaccess.5
-+#	gzip -f -9 ${MANDIR}/man5/ftpconversions.5
-+#	gzip -f -9 ${MANDIR}/man5/ftphosts.5
-+#	gzip -f -9 ${MANDIR}/man5/xferlog.5
-+#	gzip -f -9 ${MANDIR}/man8/ftpd.8
-+#	gzip -f -9 ${MANDIR}/man8/ftpshut.8
-+#	gzip -f -9 ${MANDIR}/man8/ftprestart.8
-+#	gzip -f -9 ${MANDIR}/man8/privatepw.8
diff --git a/ftp/wu-ftpd+ipv6/files/patch-ad b/ftp/wu-ftpd+ipv6/files/patch-ad
deleted file mode 100644
index 90496cc26cae..000000000000
--- a/ftp/wu-ftpd+ipv6/files/patch-ad
+++ /dev/null
@@ -1,20 +0,0 @@
---- doc/xferlog.5.orig	Thu Jan  9 22:29:03 1997
-+++ doc/xferlog.5	Mon Feb 16 23:34:15 1998
-@@ -7,7 +7,7 @@
- .B xferlog
- file contains logging information from the FTP server daemon,
- .BR ftpd (8).
--This file usually is found in /usr/adm, but can be located anywhere by using a
-+This file usually is found in /var/log, but can be located anywhere by using a
- option to
- .BR ftpd (8).
- Each server entry is composed of a single line of the following form, 
-@@ -135,7 +135,7 @@
- .SH FILES
- .PD 0
- .TP 20
--.B /usr/adm/xferlog
-+.B /var/log/xferlog
- .SH "SEE ALSO"
- .BR ftpd(8),
- .BR ftpaccess(5)
diff --git a/ftp/wu-ftpd+ipv6/files/patch-ae b/ftp/wu-ftpd+ipv6/files/patch-ae
deleted file mode 100644
index 39924aea5bfc..000000000000
--- a/ftp/wu-ftpd+ipv6/files/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/config/config.fbs.bak	Sat Jul  1 22:03:07 2000
-+++ src/config/config.fbs	Sun Jul 29 23:37:56 2001
-@@ -79,10 +79,6 @@
- typedef void SIGNAL_TYPE;
- 
- #include "../config.h"
--/* SKEY should always be defined on FreeBSD */
--#ifndef SKEY
--#define SKEY
--#endif
- #ifdef SKEY
- #define SKEY_NAME
- #endif
diff --git a/ftp/wu-ftpd+ipv6/files/patch-af b/ftp/wu-ftpd+ipv6/files/patch-af
deleted file mode 100644
index fd46f44ebbd3..000000000000
--- a/ftp/wu-ftpd+ipv6/files/patch-af
+++ /dev/null
@@ -1,29 +0,0 @@
---- support/strcasestr.c.orig	Sat Jul  1 22:36:29 2000
-+++ support/strcasestr.c	Wed Oct 10 07:18:17 2001
-@@ -24,22 +24,24 @@
-   $Id: strcasestr.c,v 1.5 2000/07/01 18:36:29 wuftpd Exp $
-  
- ****************************************************************************/
-+#include <ctype.h>
- #include <string.h>
- /*
-  * Find the first occurrence of find in s.
-  */
--char *strcasestr(register char *s, register char *find)
-+char *strcasestr(const char *s, const char *find)
- {
-     register char c, sc;
-     register size_t len;
- 
-     if ((c = *find++) != 0) {
-+	c = tolower((unsigned char)c);
- 	len = strlen(find);
- 	do {
- 	    do {
- 		if ((sc = *s++) == 0)
- 		    return (NULL);
--	    } while (sc != c);
-+	    } while ((char)tolower((unsigned char)sc) != c);
- 	} while (strncasecmp(s, find, len) != 0);
- 	s--;
-     }
diff --git a/ftp/wu-ftpd+ipv6/files/patch-ag b/ftp/wu-ftpd+ipv6/files/patch-ag
deleted file mode 100644
index dabfbce24f9e..000000000000
--- a/ftp/wu-ftpd+ipv6/files/patch-ag
+++ /dev/null
@@ -1,19 +0,0 @@
-*** doc/examples/ftpconversions.orig	Wed Jan 25 22:11:02 1995
---- doc/examples/ftpconversions	Wed Jan 25 22:11:49 1995
-***************
-*** 1,7 ****
-!  :.Z:  :  :/bin/compress -d -c %s:T_REG|T_ASCII:O_UNCOMPRESS:UNCOMPRESS
-   :   : :.Z:/bin/compress -c %s:T_REG:O_COMPRESS:COMPRESS
-   :.gz: :  :/bin/gzip -cd %s:T_REG|T_ASCII:O_UNCOMPRESS:GUNZIP
-   :   : :.gz:/bin/gzip -9 -c %s:T_REG:O_COMPRESS:GZIP
-   :   : :.tar:/bin/tar -c -f - %s:T_REG|T_DIR:O_TAR:TAR
-   :   : :.tar.Z:/bin/tar -c -Z -f - %s:T_REG|T_DIR:O_COMPRESS|O_TAR:TAR+COMPRESS
-!  :   : :.tar.gz:/bin/tar -c -z -f - %s:T_REG|T_DIR:O_COMPRESS|O_TAR:TAR+GZIP
---- 1,7 ----
-!  :.Z:  :  :/bin/gzip -d -c %s:T_REG|T_ASCII:O_UNCOMPRESS:UNCOMPRESS
-   :   : :.Z:/bin/compress -c %s:T_REG:O_COMPRESS:COMPRESS
-   :.gz: :  :/bin/gzip -cd %s:T_REG|T_ASCII:O_UNCOMPRESS:GUNZIP
-   :   : :.gz:/bin/gzip -9 -c %s:T_REG:O_COMPRESS:GZIP
-   :   : :.tar:/bin/tar -c -f - %s:T_REG|T_DIR:O_TAR:TAR
-   :   : :.tar.Z:/bin/tar -c -Z -f - %s:T_REG|T_DIR:O_COMPRESS|O_TAR:TAR+COMPRESS
-!  :   : :.tar.gz:/bin/tar -c -z -f - %s:T_REG|T_DIR:O_COMPRESS|O_TAR:TAR+GZIP
diff --git a/ftp/wu-ftpd+ipv6/files/patch-ah b/ftp/wu-ftpd+ipv6/files/patch-ah
deleted file mode 100644
index 537d8d5e0959..000000000000
--- a/ftp/wu-ftpd+ipv6/files/patch-ah
+++ /dev/null
@@ -1,31 +0,0 @@
-*** doc/examples/ftpusers.orig	Tue Aug  8 19:30:46 1995
---- doc/examples/ftpusers	Tue Aug  8 19:33:46 1995
-***************
-*** 1,14 ****
-  root
-! bin
-! boot
-  daemon
-- digital
-- field
-- gateway
-- guest
-- nobody
-  operator
-! ris
-! sccs
-! sys
-  uucp
---- 1,12 ----
-  root
-! toor
-  daemon
-  operator
-! bin
-! games
-! news
-! man
-  uucp
-+ xten
-+ ingres
-+ nobody
diff --git a/ftp/wu-ftpd+ipv6/files/patch-aj b/ftp/wu-ftpd+ipv6/files/patch-aj
deleted file mode 100644
index c6478879e93a..000000000000
--- a/ftp/wu-ftpd+ipv6/files/patch-aj
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/proto.h.bak	Sat Jul  1 22:17:39 2000
-+++ src/proto.h	Wed Oct 10 07:15:39 2001
-@@ -292,4 +292,4 @@
- /*
-    ** support/strcasestr.c
-  */
--char *strcasestr(register char *s, register char *find);
-+char *strcasestr(const char *s, const char *find);
diff --git a/ftp/wu-ftpd+ipv6/files/patch-al b/ftp/wu-ftpd+ipv6/files/patch-al
deleted file mode 100644
index 1a9774087352..000000000000
--- a/ftp/wu-ftpd+ipv6/files/patch-al
+++ /dev/null
@@ -1,20 +0,0 @@
---- support/makefiles/Makefile.fbs.orig	Sat Jul  1 22:22:55 2000
-+++ support/makefiles/Makefile.fbs	Wed Oct 10 07:11:36 2001
-@@ -33,7 +33,14 @@
- LIBC   = /usr/lib/libc.a
- IFLAGS = 
- LFLAGS = 
--CFLAGS = -O ${IFLAGS} ${LFLAGS}
-+CFLAGS += ${IFLAGS} ${LFLAGS}
- 
--SRCS   = strcasestr.c authuser.c ftw.c
--OBJS   = strcasestr.o authuser.o ftw.o
-+SRCS   = authuser.c ftw.c
-+OBJS   = authuser.o ftw.o
-+
-+HAVE_STRSTR!=   (nm ${LIBC} | grep -q strcasestr) || echo "NO"
-+
-+.if ${HAVE_STRSTR} == "NO"
-+SRCS += strcasestr.c
-+OBJS += strcasestr.o
-+.endif
diff --git a/ftp/wu-ftpd+ipv6/files/patch-am b/ftp/wu-ftpd+ipv6/files/patch-am
deleted file mode 100644
index 63b9551ecc1b..000000000000
--- a/ftp/wu-ftpd+ipv6/files/patch-am
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/makefiles/Makefile.fbs.orig	Sat Jul  1 22:57:50 2000
-+++ src/makefiles/Makefile.fbs	Sun Jul 29 23:33:47 2001
-@@ -30,9 +30,9 @@
- #CC       = cc
- IFLAGS   = -I.. -I../support
- LFLAGS   = -L../support -s
--CFLAGS   = -O ${IFLAGS} ${LFLAGS} -DNO_CRYPT_PROTO
-+CFLAGS   += ${IFLAGS} ${LFLAGS} -DNO_CRYPT_PROTO
- XOBJS    = 
--LIBES    = -lsupport -lutil -lskey -lmd -lcrypt 
-+LIBES    = -lsupport -lutil -lopie -lmd -lcrypt
- LIBC     = /usr/lib/libc.a
- LINTFLAGS=	
- LKERB    = -lauth -lckrb -lkrb -ldes
diff --git a/ftp/wu-ftpd+ipv6/files/patch-an b/ftp/wu-ftpd+ipv6/files/patch-an
deleted file mode 100644
index 09220f4bc9cf..000000000000
--- a/ftp/wu-ftpd+ipv6/files/patch-an
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/makefiles/common.orig	Sun Oct  3 21:51:35 1999
-+++ src/makefiles/common	Wed Oct 20 20:35:25 1999
-@@ -48,7 +48,11 @@
- 	${CC} ${LFLAGS} -o $@ ${UTIL_OBJS} ftprestart.o rdservers.o ${XLIBS}
- 
- ftpd: ${OBJS} ${XOBJS} ../support/libsupport.a
-+.if defined(PACKAGE_BUILDING)
- 	${CC} ${LFLAGS} -o $@ ${OBJS} ${XOBJS} ${XLIBS}
-+.else
-+	${CC} -static ${LFLAGS} -o $@ ${OBJS} ${XOBJS} ${XLIBS}
-+.endif
- 
- ckconfig: ${UTIL_OBJS} ckconfig.o rdservers.o 
- 	${CC} ${LFLAGS} -o $@ ${UTIL_OBJS} ckconfig.o rdservers.o ${XLIBS}
diff --git a/ftp/wu-ftpd+ipv6/files/patch-ap b/ftp/wu-ftpd+ipv6/files/patch-ap
deleted file mode 100644
index 68357225ffe0..000000000000
--- a/ftp/wu-ftpd+ipv6/files/patch-ap
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/glob.c.old	Sat Jul  1 22:17:39 2000
-+++ src/glob.c	Wed Nov 28 13:42:26 2001
-@@ -112,7 +118,7 @@
- 
-     fixpath(v);
-     if (v[0] == '\0')
--	v = "*";
-+	v = ".";
-     else if ((strlen(v) > 1) && (v[strlen(v) - 1] == '/'))
- 	v[strlen(v) - 1] = '\0';
- 
diff --git a/ftp/wu-ftpd+ipv6/files/patch-aq b/ftp/wu-ftpd+ipv6/files/patch-aq
deleted file mode 100644
index 40f3c4e15144..000000000000
--- a/ftp/wu-ftpd+ipv6/files/patch-aq
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.in.orig	Tue Feb  5 23:02:47 2002
-+++ Makefile.in	Tue Feb  5 22:57:32 2002
-@@ -67,7 +67,7 @@
- 	-@mkdir -p $(DESTDIR)/$(mandir)/man1
- 	-@mkdir -p $(DESTDIR)/$(mandir)/man5
- 	-@mkdir -p $(DESTDIR)/@ETCDIR@
--	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftpd $(DESTDIR)/@sbindir@/in.ftpd
-+	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftpd $(DESTDIR)/@libexecdir@/ftpd
- 	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftpshut $(DESTDIR)/@sbindir@/ftpshut
- 	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftpcount $(DESTDIR)/@bindir@/ftpcount
- 	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftpwho $(DESTDIR)/@bindir@/ftpwho
-@@ -87,5 +87,8 @@
- 	@INSTALL_DATA@ -o bin -g bin -m 644 doc/xferlog.5 $(DESTDIR)/$(mandir)/man5/xferlog.5
- 	@INSTALL_DATA@ -o bin -g bin -m 644 doc/ftprestart.8 $(DESTDIR)/$(mandir)/man8/ftprestart.8
- 	@INSTALL_DATA@ -o bin -g bin -m 644 util/privatepw/privatepw.8 $(DESTDIR)/$(mandir)/man8/privatepw.8
--	@if test ! -f $(DESTDIR)/@ETCDIR@/ftpaccess; then echo "Since you didn't have a ftpaccess file, the sample has been"; echo "installed to $(DESTDIR)/@ETCDIR@/ftpaccess."; echo "You will probably want to edit it."; @INSTALL@ -c -o bin -g bin -m 644 doc/examples/ftpaccess $(DESTDIR)/@ETCDIR@/ftpaccess; fi
--	@if test ! -f $(DESTDIR)/@ETCDIR@/ftpconversions; then echo "Since you didn't have a ftpconversions file, the sample has been"; echo "installed to $(DESTDIR)/@ETCDIR@/ftpconversions."; echo "You will probably want to edit it."; @INSTALL@ -c -o bin -g bin -m 644 doc/examples/ftpconversions $(DESTDIR)/@ETCDIR@/ftpconversions; fi
-+	@INSTALL@ -c -o bin -g bin -m 644 doc/examples/ftpaccess $(DESTDIR)/@ETCDIR@/ftpaccess.example
-+	@INSTALL@ -c -o bin -g bin -m 644 doc/examples/ftpconversions $(DESTDIR)/@ETCDIR@/ftpconversions.example
-+	@INSTALL@ -c -o bin -g bin -m 644 doc/examples/ftpgroups $(DESTDIR)/@ETCDIR@/ftpgroups.example
-+	@INSTALL@ -c -o bin -g bin -m 644 doc/examples/ftphosts $(DESTDIR)/@ETCDIR@/ftphosts.example
-+	@INSTALL@ -c -o bin -g bin -m 644 doc/examples/ftpusers $(DESTDIR)/@ETCDIR@/ftpusers.example
diff --git a/ftp/wu-ftpd+ipv6/files/patch-ar b/ftp/wu-ftpd+ipv6/files/patch-ar
deleted file mode 100644
index 8dc8ddb9be94..000000000000
--- a/ftp/wu-ftpd+ipv6/files/patch-ar
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	Sat Jul  1 21:42:15 2000
-+++ configure.in	Tue Feb 19 22:39:52 2002
-@@ -868,7 +870,7 @@
- fi
- if test $opie = yes; then
- 	AC_DEFINE(OPIE)
--	LIBS="$LIBS -lopie"
-+	LIBS="$LIBS -lopie -lmd"
- fi
- if test $newcd = yes; then
- 	AC_DEFINE(ALTERNATE_CD)
diff --git a/ftp/wu-ftpd+ipv6/pkg-comment b/ftp/wu-ftpd+ipv6/pkg-comment
deleted file mode 100644
index 47292e734244..000000000000
--- a/ftp/wu-ftpd+ipv6/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A replacement ftp server for Un*x systems
diff --git a/ftp/wu-ftpd+ipv6/pkg-descr b/ftp/wu-ftpd+ipv6/pkg-descr
deleted file mode 100644
index 46c3c139a6be..000000000000
--- a/ftp/wu-ftpd+ipv6/pkg-descr
+++ /dev/null
@@ -1,22 +0,0 @@
-The package is linked dynamic so that you will get the right crypt
-library.  If you are serious about performance, you may want to recompile
-it by yourself (the port will link static by default).
-
-wu-ftpd is a replacement ftp server for Un*x systems.  Besides
-supporting the ftp protocol defined in RFC 959, it adds the following
-features: logging of transfers, logging of commands, on the fly compression
-and archiving, classification of users on type and location, per class limits,
-per directory upload permissions, restricted guest accounts, system wide
-and per directory messages, directory alias, cdpath, filename filter.
-
-The configuration files are located in /usr/local/etc  This package includes
-a basic working configuration.  The config files are:
-
-  ftpaccess - controls who, what, and how many can access the server
-  ftpconversions - controls the on-the-fly compression/archiving
-  ftpusers - users who, for security reasons, may never use the server
-
-You will also need to change /etc/inetd.conf to point to the new server 
-located at /usr/local/libexec/ftpd
-
-WWW: http://www.wu-ftpd.org/
diff --git a/ftp/wu-ftpd+ipv6/pkg-plist b/ftp/wu-ftpd+ipv6/pkg-plist
deleted file mode 100644
index 9deb110f66c7..000000000000
--- a/ftp/wu-ftpd+ipv6/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-bin/ftpcount
-bin/ftpwho
-sbin/ckconfig
-sbin/ftprestart
-sbin/ftpshut
-sbin/privatepw
-etc/ftpaccess.example
-etc/ftpconversions.example
-etc/ftpgroups.example
-etc/ftphosts.example
-etc/ftpusers.example
-libexec/ftpd