Adapt this package to NetBSD using the modifications supplied by Rene Hexel

in PR pkg/5098.

12 files changed, 170 insertions, 221 deletions

diff --git a/net/wu-ftpd/Makefile b/net/wu-ftpd/Makefile
index 42ba1fa3dd9..1e6698e68d6 100644
--- a/net/wu-ftpd/Makefile
+++ b/net/wu-ftpd/Makefile
@@ -3,7 +3,8 @@
 # Date created:		18 Oct 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.1.1.1 1998/03/29 20:40:20 tron Exp $
+# $NetBSD: Makefile,v 1.2 1998/03/29 21:45:26 tron Exp $
+# $FreeBSD Id: Makefile,v 1.16 1997/12/24 17:45:28 ache Exp
 #
 # REMINDER: to use ftpaccess(5) you need to specify -a in command line,
 # it is changed from previous versions
@@ -15,13 +16,20 @@ CATEGORIES=	net
 MASTER_SITES=   ftp://ftp.academ.com/pub/wu-ftpd/private/
 EXTRACT_SUFX=   .tar.Z
 
-do-build:
-	cd ${WRKSRC} && ./build fbs
-
 MAINTAINER=     ache@FreeBSD.org
 
 MAN1=		ftpcount.1 ftpwho.1
 MAN5=		ftpaccess.5 ftphosts.5 ftpconversions.5 xferlog.5
 MAN8=		ftpd.8 ftpshut.8
 
+pre-patch:
+	@cd patches ; for i in ?? ;\
+	do \
+	  sed 's/!!PREFIX!!/${PREFIX:S/\//!!/g}/g' <$$i | \
+	  sed 's/!!/\//g' >patch-$$i; \
+	done
+
+do-build:
+	cd ${WRKSRC} && ./build nbs
+
 .include <bsd.port.mk>
diff --git a/net/wu-ftpd/patches/patch-aa b/net/wu-ftpd/patches/patch-aa
index 0dd5a807967..d41be85a5f2 100644
--- a/net/wu-ftpd/patches/patch-aa
+++ b/net/wu-ftpd/patches/patch-aa
@@ -1,19 +1,57 @@
-*** src/config/config.fbs.bak	Fri Dec 12 18:17:19 1997
---- src/config/config.fbs	Wed Dec 24 20:39:50 1997
+*** makefiles/Makefile.nbs.orig	Mon Mar  2 20:04:28 1998
+--- makefiles/Makefile.nbs	Mon Mar  2 20:07:29 1998
 ***************
-*** 29,35 ****
-  #define VIRTUAL
-  # if defined(__FreeBSD__)
-  #  undef SPT_TYPE
-! #  if __FreeBSD__ == 2
-  #   include <osreldate.h>               /* and this works */
-  #   if __FreeBSD_version >= 199512      /* 2.2-current right now */
-  #    define SPT_TYPE    SPT_BUILTIN
---- 29,35 ----
-  #define VIRTUAL
-  # if defined(__FreeBSD__)
-  #  undef SPT_TYPE
-! #  if __FreeBSD__ >= 2
-  #   include <osreldate.h>               /* and this works */
-  #   if __FreeBSD_version >= 199512      /* 2.2-current right now */
-  #    define SPT_TYPE    SPT_BUILTIN
+*** 2,10 ****
+  # Makefile for NetBSD 1.2
+  # $Id: patch-aa,v 1.2 1998/03/29 21:45:26 tron Exp $
+  #
+! BINDIR=		/usr/local/bin
+! ETCDIR=		/usr/local/libexec
+! MANDIR=		/usr/local/man
+  MANEXT=		8
+  INSTALL=	install
+  
+--- 2,12 ----
+  # Makefile for NetBSD 1.2
+  # $Id: patch-aa,v 1.2 1998/03/29 21:45:26 tron Exp $
+  #
+! PREFIX?=	/usr/pkg
+! BINDIR=		${PREFIX}/bin
+! ETCDIR=		${PREFIX}/etc
+! MANDIR=		${PREFIX}/man
+! LIBEXECDIR=	${PREFIX}/libexec
+  MANEXT=		8
+  INSTALL=	install
+  
+***************
+*** 13,24 ****
+  	@ echo 'You can say "build help" for details on how it works.'
+  
+  install: bin/ftpd bin/ftpcount bin/ftpshut
+! 	-mv -f ${ETCDIR}/ftpd ${ETCDIR}/ftpd-old
+  	@echo installing binaries.
+! 	${INSTALL} -c -o bin -g bin -m 755 bin/ftpd ${ETCDIR}/ftpd
+  	${INSTALL} -c -o bin -g bin -m 755 bin/ftpshut ${BINDIR}/ftpshut
+  	${INSTALL} -c -o bin -g bin -m 755 bin/ftpcount ${BINDIR}/ftpcount
+  	${INSTALL} -c -o bin -g bin -m 755 bin/ftpwho ${BINDIR}/ftpwho
+  	@echo installing manpages.
+  	${INSTALL} -c -o bin -g bin -m 644 doc/ftpd.8 ${MANDIR}/man8/ftpd.8
+  	${INSTALL} -c -o bin -g bin -m 644 doc/ftpcount.1 ${MANDIR}/man1/ftpcount.1
+--- 15,31 ----
+  	@ echo 'You can say "build help" for details on how it works.'
+  
+  install: bin/ftpd bin/ftpcount bin/ftpshut
+! 	-mv -f ${LIBEXECDIR}/ftpd ${LIBEXECDIR}/ftpd-old
+  	@echo installing binaries.
+! 	${INSTALL} -c -o bin -g bin -m 755 bin/ftpd ${LIBEXECDIR}/ftpd
+  	${INSTALL} -c -o bin -g bin -m 755 bin/ftpshut ${BINDIR}/ftpshut
+  	${INSTALL} -c -o bin -g bin -m 755 bin/ftpcount ${BINDIR}/ftpcount
+  	${INSTALL} -c -o bin -g bin -m 755 bin/ftpwho ${BINDIR}/ftpwho
++ 	${INSTALL} -c -o bin -g bin -m 755 bin/ckconfig ${BINDIR}/ftpckconfig
++ 	@echo Installing basic configuration
++ 	${INSTALL} -c -o root -g bin -m 644 doc/examples/ftpaccess ${ETCDIR}/ftpaccess.example
++ 	${INSTALL} -c -o root -g bin -m 644 doc/examples/ftpusers ${ETCDIR}/ftpusers.example
++ 	${INSTALL} -c -o root -g bin -m 644 doc/examples/ftpconversions ${ETCDIR}/ftpconversions.example
+  	@echo installing manpages.
+  	${INSTALL} -c -o bin -g bin -m 644 doc/ftpd.8 ${MANDIR}/man8/ftpd.8
+  	${INSTALL} -c -o bin -g bin -m 644 doc/ftpcount.1 ${MANDIR}/man1/ftpcount.1
diff --git a/net/wu-ftpd/patches/patch-ab b/net/wu-ftpd/patches/patch-ab
index dc2c5ea8368..0588b1ac984 100644
--- a/net/wu-ftpd/patches/patch-ab
+++ b/net/wu-ftpd/patches/patch-ab
@@ -1,84 +1,65 @@
-*** makefiles/Makefile.fbs.orig	Fri Dec 19 08:54:48 1997
---- makefiles/Makefile.fbs	Wed Dec 24 20:20:39 1997
+*** src/pathnames.h.orig	Mon Dec 22 00:25:08 1997
+--- src/pathnames.h	Mon Mar  2 19:13:35 1998
 ***************
-*** 1,7 ****
-! PREFIX=		/usr/local
-  BINDIR=		${PREFIX}/bin
-! ETCDIR=		${PREFIX}/libexec
-  MANDIR=		${PREFIX}/man
-  MANEXT=		8
-  INSTALL=	install
+*** 45,54 ****
+  #define _PATH_CVT       "/etc/ftpd/ftpconversions"
+  #define _PATH_PRIVATE   "/etc/ftpd/ftpgroups"
+  #else
+! #define _PATH_FTPUSERS  "/usr/local/lib/ftpd/ftpusers"
+! #define _PATH_FTPACCESS "/usr/local/lib/ftpd/ftpaccess"
+! #define _PATH_CVT       "/usr/local/lib/ftpd/ftpconversions"
+! #define _PATH_PRIVATE   "/usr/local/lib/ftpd/ftpgroups"
+  #endif
+  #endif
   
---- 1,8 ----
-! PREFIX?=        /usr/local
-  BINDIR=		${PREFIX}/bin
-! ETCDIR=         ${PREFIX}/etc
-  MANDIR=		${PREFIX}/man
-+ LIBEXECDIR=     ${PREFIX}/libexec
-  MANEXT=		8
-  INSTALL=	install
+--- 45,54 ----
+  #define _PATH_CVT       "/etc/ftpd/ftpconversions"
+  #define _PATH_PRIVATE   "/etc/ftpd/ftpgroups"
+  #else
+! #define _PATH_FTPUSERS  "/usr/pkg/etc/ftpusers"
+! #define _PATH_FTPACCESS "/usr/pkg/etc/ftpaccess"
+! #define _PATH_CVT       "/usr/pkg/etc/ftpconversions"
+! #define _PATH_PRIVATE   "/usr/pkg/etc/ftpgroups"
+  #endif
+  #endif
   
 ***************
-*** 10,26 ****
-  	@ echo 'You can say "build help" for details on how it works.'
+*** 69,78 ****
+  #endif
+  #else
+  #ifndef _PATH_PIDNAMES
+! #define _PATH_PIDNAMES  "/usr/local/lib/ftpd/pids/%s"
+  #endif
+  #ifndef _PATH_XFERLOG
+! #define _PATH_XFERLOG   "/usr/local/logs/xferlog"
+  #endif
+  #endif
   
-  install: bin/ftpd bin/ftpcount bin/ftpshut
-! 	-mv -f ${ETCDIR}/ftpd ${ETCDIR}/ftpd-old
-  	@echo installing binaries.
-! 	${INSTALL} -c -o bin -g bin -m 755 bin/ftpd ${ETCDIR}/ftpd
-  	${INSTALL} -c -o bin -g bin -m 755 bin/ftpshut ${BINDIR}/ftpshut
-  	${INSTALL} -c -o bin -g bin -m 755 bin/ftpcount ${BINDIR}/ftpcount
-  	${INSTALL} -c -o bin -g bin -m 755 bin/ftpwho ${BINDIR}/ftpwho
-  	install -c -o bin -g bin -m 755 bin/ckconfig ${BINDIR}/ftpckconfig
-  	@echo NOT Installing basic configuration
-! #	install -c -o root -g bin -m 644 doc/examples/ftpaccess ${ETCDIR}/ftpaccess
-! #	install -c -o root -g bin -m 644 doc/examples/ftpusers ${ETCDIR}/ftpusers
-! #	install -c -o root -g bin -m 644 doc/examples/ftpconversions ${ETCDIR}/ftpconversions
-  	@echo installing manpages.
-  	${INSTALL} -c -o bin -g bin -m 644 doc/ftpd.8 ${MANDIR}/man8/ftpd.8
-  	${INSTALL} -c -o bin -g bin -m 644 doc/ftpcount.1 ${MANDIR}/man1/ftpcount.1
---- 11,27 ----
-  	@ echo 'You can say "build help" for details on how it works.'
+--- 69,78 ----
+  #endif
+  #else
+  #ifndef _PATH_PIDNAMES
+! #define _PATH_PIDNAMES  "/usr/pkg/lib/ftpd/pids/%s"
+  #endif
+  #ifndef _PATH_XFERLOG
+! #define _PATH_XFERLOG   "/usr/pkg/logs/xferlog"
+  #endif
+  #endif
   
-  install: bin/ftpd bin/ftpcount bin/ftpshut
-! 	-mv -f ${LIBEXECDIR}/ftpd ${LIBEXECDIR}/ftpd-old
-  	@echo installing binaries.
-! 	${INSTALL} -c -o bin -g bin -m 755 bin/ftpd ${LIBEXECDIR}/ftpd
-  	${INSTALL} -c -o bin -g bin -m 755 bin/ftpshut ${BINDIR}/ftpshut
-  	${INSTALL} -c -o bin -g bin -m 755 bin/ftpcount ${BINDIR}/ftpcount
-  	${INSTALL} -c -o bin -g bin -m 755 bin/ftpwho ${BINDIR}/ftpwho
-  	install -c -o bin -g bin -m 755 bin/ckconfig ${BINDIR}/ftpckconfig
-  	@echo NOT Installing basic configuration
-! 	install -c -o root -g bin -m 644 doc/examples/ftpaccess ${ETCDIR}/ftpaccess.example
-! 	install -c -o root -g bin -m 644 doc/examples/ftpusers ${ETCDIR}/ftpusers.example
-! 	install -c -o root -g bin -m 644 doc/examples/ftpconversions ${ETCDIR}/ftpconversions.example
-  	@echo installing manpages.
-  	${INSTALL} -c -o bin -g bin -m 644 doc/ftpd.8 ${MANDIR}/man8/ftpd.8
-  	${INSTALL} -c -o bin -g bin -m 644 doc/ftpcount.1 ${MANDIR}/man1/ftpcount.1
 ***************
-*** 30,41 ****
-  	${INSTALL} -c -o bin -g bin -m 644 doc/ftphosts.5 ${MANDIR}/man5/ftphosts.5
-  	${INSTALL} -c -o bin -g bin -m 644 doc/ftpconversions.5 ${MANDIR}/man5/ftpconversions.5
-  	${INSTALL} -c -o bin -g bin -m 644 doc/xferlog.5 ${MANDIR}/man5/xferlog.5
-! 	@echo Compressing manpages
-! 	gzip -f -9 ${MANDIR}/man8/ftpd.8
-! 	gzip -f -9 ${MANDIR}/man1/ftpcount.1
-! 	gzip -f -9 ${MANDIR}/man1/ftpwho.1
-! 	gzip -f -9 ${MANDIR}/man8/ftpshut.8
-! 	gzip -f -9 ${MANDIR}/man5/ftpaccess.5
-! 	gzip -f -9 ${MANDIR}/man5/ftphosts.5
-! 	gzip -f -9 ${MANDIR}/man5/ftpconversions.5
-! 	gzip -f -9 ${MANDIR}/man5/xferlog.5
---- 31,42 ----
-  	${INSTALL} -c -o bin -g bin -m 644 doc/ftphosts.5 ${MANDIR}/man5/ftphosts.5
-  	${INSTALL} -c -o bin -g bin -m 644 doc/ftpconversions.5 ${MANDIR}/man5/ftpconversions.5
-  	${INSTALL} -c -o bin -g bin -m 644 doc/xferlog.5 ${MANDIR}/man5/xferlog.5
-! #       @echo Compressing manpages
-! #       gzip -f -9 ${MANDIR}/man8/ftpd.8
-! #       gzip -f -9 ${MANDIR}/man1/ftpcount.1
-! #       gzip -f -9 ${MANDIR}/man1/ftpwho.1
-! #       gzip -f -9 ${MANDIR}/man8/ftpshut.8
-! #       gzip -f -9 ${MANDIR}/man5/ftpaccess.5
-! #       gzip -f -9 ${MANDIR}/man5/ftphosts.5
-! #       gzip -f -9 ${MANDIR}/man5/ftpconversions.5
-! #       gzip -f -9 ${MANDIR}/man5/xferlog.5
+*** 117,123 ****
+  #ifdef USE_ETC_FTPD
+  #define _PATH_FTPHOSTS  "/etc/ftpd/ftphosts"
+  #else
+! #define _PATH_FTPHOSTS  "/usr/local/lib/ftpd/ftphosts"
+  #endif
+  #endif
+  #endif
+--- 117,123 ----
+  #ifdef USE_ETC_FTPD
+  #define _PATH_FTPHOSTS  "/etc/ftpd/ftphosts"
+  #else
+! #define _PATH_FTPHOSTS  "/usr/pkg/etc/ftphosts"
+  #endif
+  #endif
+  #endif
diff --git a/net/wu-ftpd/patches/patch-ac b/net/wu-ftpd/patches/patch-ac
index 93749a1da79..9ad1468d842 100644
--- a/net/wu-ftpd/patches/patch-ac
+++ b/net/wu-ftpd/patches/patch-ac
@@ -1,42 +1,19 @@
-*** src/pathnames.h.bak	Mon Jan 20 06:21:45 1997
---- src/pathnames.h	Thu Jan 30 15:42:24 1997
+*** doc/examples/ftpconversions.orig	Fri Apr  1 21:03:23 1994
+--- doc/examples/ftpconversions	Mon Mar  2 19:15:23 1998
 ***************
-*** 45,54 ****
-  #define _PATH_CVT       "/etc/ftpd/ftpconversions"
-  #define _PATH_PRIVATE   "/etc/ftpd/ftpgroups"
-  #else
-! #define _PATH_FTPUSERS  "/usr/local/lib/ftpd/ftpusers"
-! #define _PATH_FTPACCESS "/usr/local/lib/ftpd/ftpaccess"
-! #define _PATH_CVT       "/usr/local/lib/ftpd/ftpconversions"
-! #define _PATH_PRIVATE   "/usr/local/lib/ftpd/ftpgroups"
-  #endif
-  #endif
-  
---- 45,54 ----
-  #define _PATH_CVT       "/etc/ftpd/ftpconversions"
-  #define _PATH_PRIVATE   "/etc/ftpd/ftpgroups"
-  #else
-! #define _PATH_FTPUSERS  "!!PREFIX!!/etc/ftpusers"
-! #define _PATH_FTPACCESS "!!PREFIX!!/etc/ftpaccess"
-! #define _PATH_CVT       "!!PREFIX!!/etc/ftpconversions"
-! #define _PATH_PRIVATE   "!!PREFIX!!/etc/ftpgroups"
-  #endif
-  #endif
-  
-***************
-*** 109,115 ****
-  #ifdef USE_ETC_FTPD
-  #define _PATH_FTPHOSTS  "/etc/ftpd/ftphosts"
-  #else
-! #define _PATH_FTPHOSTS  "/usr/local/lib/ftpd/ftphosts"
-  #endif
-  #endif
-  #endif
---- 109,115 ----
-  #ifdef USE_ETC_FTPD
-  #define _PATH_FTPHOSTS  "/etc/ftpd/ftphosts"
-  #else
-! #define _PATH_FTPHOSTS  "!!PREFIX!!/etc/ftphosts"
-  #endif
-  #endif
-  #endif
+*** 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:  :  :/usr/bin/gzip -d -c %s:T_REG|T_ASCII:O_UNCOMPRESS:UNCOMPRESS
+!  :   : :.Z:/usr/bin/compress -c %s:T_REG:O_COMPRESS:COMPRESS
+!  :.gz: :  :/usr/bin/gzip -cd %s:T_REG|T_ASCII:O_UNCOMPRESS:GUNZIP
+!  :   : :.gz:/usr/bin/gzip -9 -c %s:T_REG:O_COMPRESS:GZIP
+!  :   : :.tar:/usr/bin/tar -c -f - %s:T_REG|T_DIR:O_TAR:TAR
+!  :   : :.tar.Z:/usr/bin/tar -c -Z -f - %s:T_REG|T_DIR:O_COMPRESS|O_TAR:TAR+COMPRESS
+!  :   : :.tar.gz:/usr/bin/tar -c -z -f - %s:T_REG|T_DIR:O_COMPRESS|O_TAR:TAR+GZIP
diff --git a/net/wu-ftpd/patches/patch-ah b/net/wu-ftpd/patches/patch-ad
index 537d8d5e095..aefa52cc22c 100644
--- a/net/wu-ftpd/patches/patch-ah
+++ b/net/wu-ftpd/patches/patch-ad
@@ -1,5 +1,5 @@
-*** doc/examples/ftpusers.orig	Tue Aug  8 19:30:46 1995
---- doc/examples/ftpusers	Tue Aug  8 19:33:46 1995
+*** doc/examples/ftpusers.orig	Fri Apr  1 21:03:23 1994
+--- doc/examples/ftpusers	Mon Mar  2 19:03:10 1998
 ***************
 *** 1,14 ****
   root
diff --git a/net/wu-ftpd/patches/patch-ai b/net/wu-ftpd/patches/patch-ae
index eeee626462d..7254cc68be6 100644
--- a/net/wu-ftpd/patches/patch-ai
+++ b/net/wu-ftpd/patches/patch-ae
@@ -1,5 +1,5 @@
-*** config.h.orig	Fri Sep 12 19:44:00 1997
---- config.h	Mon Sep 15 09:27:39 1997
+*** config.h.orig	Mon Dec 22 00:01:41 1997
+--- config.h	Mon Mar  2 19:03:10 1998
 ***************
 *** 72,76 ****
    * See FIXES-2.4-HOBBIT for more information on this option.
diff --git a/net/wu-ftpd/patches/patch-al b/net/wu-ftpd/patches/patch-af
index 90c5246d7d5..dfddb8caa74 100644
--- a/net/wu-ftpd/patches/patch-al
+++ b/net/wu-ftpd/patches/patch-af
@@ -1,5 +1,5 @@
-*** support/makefiles/Makefile.fbs.bak	Mon Mar  3 12:11:54 1997
---- support/makefiles/Makefile.fbs	Sun Apr 27 21:13:35 1997
+*** support/makefiles/Makefile.nbs.orig	Mon Mar  2 19:21:53 1998
+--- support/makefiles/Makefile.nbs	Mon Mar  2 19:22:38 1998
 ***************
 *** 8,14 ****
   LIBC   = /usr/lib/libc.a
@@ -13,7 +13,7 @@
   LIBC   = /usr/lib/libc.a
   IFLAGS = 
   LFLAGS = 
-! CFLAGS += ${IFLAGS} ${LFLAGS} -DNO_MALLOC_PROTO
+! CFLAGS+= ${IFLAGS} ${LFLAGS} -DNO_MALLOC_PROTO
   
   SRCS   = strcasestr.c authuser.c ftw.c
   OBJS   = strcasestr.o authuser.o ftw.o
diff --git a/net/wu-ftpd/patches/patch-ag b/net/wu-ftpd/patches/patch-ag
index dabfbce24f9..510f2050827 100644
--- a/net/wu-ftpd/patches/patch-ag
+++ b/net/wu-ftpd/patches/patch-ag
@@ -1,19 +1,19 @@
-*** doc/examples/ftpconversions.orig	Wed Jan 25 22:11:02 1995
---- doc/examples/ftpconversions	Wed Jan 25 22:11:49 1995
+*** src/makefiles/Makefile.nbs.orig	Mon Mar  2 19:24:23 1998
+--- src/makefiles/Makefile.nbs	Mon Mar  2 19:24:44 1998
 ***************
-*** 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
+*** 5,11 ****
+  CC       = cc
+  IFLAGS   = -I.. -I../support
+  LFLAGS   = -L../support
+! CFLAGS   = -O ${IFLAGS} ${LFLAGS}
+  LIBES    = -lsupport -lcrypt
+  LIBC     = /usr/lib/libc.a
+  LINTFLAGS=	
+--- 5,11 ----
+  CC       = cc
+  IFLAGS   = -I.. -I../support
+  LFLAGS   = -L../support
+! CFLAGS  += ${IFLAGS} ${LFLAGS}
+  LIBES    = -lsupport -lcrypt
+  LIBC     = /usr/lib/libc.a
+  LINTFLAGS=	
diff --git a/net/wu-ftpd/patches/patch-am b/net/wu-ftpd/patches/patch-am
deleted file mode 100644
index 04297b0bb71..00000000000
--- a/net/wu-ftpd/patches/patch-am
+++ /dev/null
@@ -1,33 +0,0 @@
-*** src/makefiles/Makefile.fbs.orig	Sun Dec 21 07:04:49 1997
---- src/makefiles/Makefile.fbs	Wed Dec 24 20:26:01 1997
-***************
-*** 4,10 ****
-  #CC       = cc
-  IFLAGS   = -I.. -I../support
-  LFLAGS   = -L../support -s
-! CFLAGS   = -O ${IFLAGS} ${LFLAGS}
-  LIBES    = -lsupport -lutil -lskey -lmd -lcrypt 
-  LIBC     = /usr/lib/libc.a
-  LINTFLAGS=	
---- 4,10 ----
-  #CC       = cc
-  IFLAGS   = -I.. -I../support
-  LFLAGS   = -L../support -s
-! CFLAGS   += ${IFLAGS} ${LFLAGS}
-  LIBES    = -lsupport -lutil -lskey -lmd -lcrypt 
-  LIBC     = /usr/lib/libc.a
-  LINTFLAGS=	
-***************
-*** 27,33 ****
---- 27,37 ----
-  	${CC} ${CFLAGS} -o $@ ftpshut.c vers.o ${LIBES}
-  
-  ftpd: ${OBJS} ${LIBC}
-+ .if defined(PACKAGE_BUILDING)
-  	${CC} ${CFLAGS} -o $@ ${OBJS} ${LIBES}
-+ .else
-+ 	${CC} -static ${CFLAGS} -o $@ ${OBJS} ${LIBES}
-+ .endif
-  
-  ckconfig:   ckconfig.c
-  	${CC} ${CFLAGS} -o $@ ckconfig.c
diff --git a/net/wu-ftpd/pkg/DESCR b/net/wu-ftpd/pkg/DESCR
index 1fbd9889541..c0122679abc 100644
--- a/net/wu-ftpd/pkg/DESCR
+++ b/net/wu-ftpd/pkg/DESCR
@@ -1,12 +1,10 @@
 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).
-
 -Satoshi (Nov 14, 1995)
 
 REMINDER: to use ftpaccess(5) you need to specify -a in command line,
 it is changed from previous versions.
-
 -Ache
 ---
 WASHINGTON UNIVERSITY FTP SERVER, RELEASE 2.4
@@ -24,17 +22,3 @@ features:
     o  directory alias
     o  cdpath
     o  filename filter
-
-
-CONFIGURATION NOTES
-
-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
-
diff --git a/net/wu-ftpd/pkg/PLIST b/net/wu-ftpd/pkg/PLIST
index c8462479ad9..c6b66026b7c 100644
--- a/net/wu-ftpd/pkg/PLIST
+++ b/net/wu-ftpd/pkg/PLIST
@@ -1,3 +1,4 @@
+@comment $NetBSD: PLIST,v 1.2 1998/03/29 21:45:27 tron Exp $
 etc/ftpaccess.example
 etc/ftpconversions.example
 etc/ftpusers.example
diff --git a/net/wu-ftpd/scripts/configure b/net/wu-ftpd/scripts/configure
deleted file mode 100644
index ecea5f4297e..00000000000
--- a/net/wu-ftpd/scripts/configure
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-#
-# configure,v 1.1.1.1 1994/10/23 01:36:59 torstenb Exp
-#
-
-mv ${WRKSRC}/src/pathnames.h ${WRKSRC}/src/pathnames.h.bak
-sed <${WRKSRC}/src/pathnames.h.bak >${WRKSRC}/src/pathnames.h s+!!PREFIX!!+$PREFIX+g