Upgrade to beta-16

5 files changed, 65 insertions, 51 deletions

diff --git a/ftp/wu-ftpd/Makefile b/ftp/wu-ftpd/Makefile
index 07abf25bef24..5b1c352124c2 100644
--- a/ftp/wu-ftpd/Makefile
+++ b/ftp/wu-ftpd/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	wu-ftpd
-# Version required:     2.4.2-beta-15
+# Version required:     2.4.2-beta-16
 # Date created:		18 Oct 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.14 1997/09/09 22:59:50 ache Exp $
+# $Id: Makefile,v 1.15 1997/09/15 05:48:22 ache Exp $
 #
 # REMINDER: to use ftpaccess(5) you need to specify -a in command line,
 # it is changed from previous versions
 
-DISTNAME=       wu-ftpd-2.4.2-beta-15
-PKGNAME=        wu-ftpd-2.4.2b15
+DISTNAME=       wu-ftpd-2.4.2-beta-16
+PKGNAME=        wu-ftpd-2.4.2b16
 CATEGORIES=	net
 # AUSCERT recommendation
 MASTER_SITES=   ftp://ftp.academ.com/pub/wu-ftpd/private/
@@ -18,7 +18,7 @@ EXTRACT_SUFX=   .tar.Z
 do-build:
 	cd ${WRKSRC} && ./build fbs
 
-MAINTAINER=	torstenb@FreeBSD.org
+MAINTAINER=     ache@FreeBSD.org
 
 MAN1=		ftpcount.1 ftpwho.1
 MAN5=		ftpaccess.5 ftphosts.5 ftpconversions.5 xferlog.5
diff --git a/ftp/wu-ftpd/distinfo b/ftp/wu-ftpd/distinfo
index 913723942af7..6f4d40b98e6b 100644
--- a/ftp/wu-ftpd/distinfo
+++ b/ftp/wu-ftpd/distinfo
@@ -1 +1 @@
-MD5 (wu-ftpd-2.4.2-beta-15.tar.Z) = 6c8172b83ab2545a5b91a9aba4840630
+MD5 (wu-ftpd-2.4.2-beta-16.tar.Z) = c18c083c2a82eef1ccba6df9a406f026
diff --git a/ftp/wu-ftpd/files/patch-aa b/ftp/wu-ftpd/files/patch-aa
new file mode 100644
index 000000000000..0dd5a8079675
--- /dev/null
+++ b/ftp/wu-ftpd/files/patch-aa
@@ -0,0 +1,19 @@
+*** src/config/config.fbs.bak	Fri Dec 12 18:17:19 1997
+--- src/config/config.fbs	Wed Dec 24 20:39:50 1997
+***************
+*** 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
diff --git a/ftp/wu-ftpd/files/patch-ab b/ftp/wu-ftpd/files/patch-ab
index 7c29fc242065..dc2c5ea83684 100644
--- a/ftp/wu-ftpd/files/patch-ab
+++ b/ftp/wu-ftpd/files/patch-ab
@@ -1,10 +1,10 @@
-*** makefiles/Makefile.fbs.bak	Thu Jan 16 19:57:40 1997
---- makefiles/Makefile.fbs	Thu Jan 30 17:06:29 1997
+*** makefiles/Makefile.fbs.orig	Fri Dec 19 08:54:48 1997
+--- makefiles/Makefile.fbs	Wed Dec 24 20:20:39 1997
 ***************
 *** 1,7 ****
 ! PREFIX=		/usr/local
   BINDIR=		${PREFIX}/bin
-  ETCDIR=		${PREFIX}/etc
+! ETCDIR=		${PREFIX}/libexec
   MANDIR=		${PREFIX}/man
   MANEXT=		8
   INSTALL=	install
@@ -12,14 +12,14 @@
 --- 1,8 ----
 ! PREFIX?=        /usr/local
   BINDIR=		${PREFIX}/bin
-  ETCDIR=		${PREFIX}/etc
+! ETCDIR=         ${PREFIX}/etc
   MANDIR=		${PREFIX}/man
 + LIBEXECDIR=     ${PREFIX}/libexec
   MANEXT=		8
   INSTALL=	install
   
 ***************
-*** 10,41 ****
+*** 10,26 ****
   	@ echo 'You can say "build help" for details on how it works.'
   
   install: bin/ftpd bin/ftpcount bin/ftpshut
@@ -31,28 +31,13 @@
   	${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 755 doc/examples/ftpaccess ${ETCDIR}/ftpaccess
-! #	install -c -o root -g bin -m 755 doc/examples/ftpusers ${ETCDIR}/ftpusers
-! #	install -c -o root -g bin -m 755 doc/examples/ftpconversions ${ETCDIR}/ftpconversions
+! #	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 755 doc/ftpd.8 ${MANDIR}/man8/ftpd.8
-! 	${INSTALL} -c -o bin -g bin -m 755 doc/ftpcount.1 ${MANDIR}/man1/ftpcount.1
-! 	${INSTALL} -c -o bin -g bin -m 755 doc/ftpwho.1 ${MANDIR}/man1/ftpwho.1
-! 	${INSTALL} -c -o bin -g bin -m 755 doc/ftpshut.8 ${MANDIR}/man8/ftpshut.8
-! 	${INSTALL} -c -o bin -g bin -m 755 doc/ftpaccess.5 ${MANDIR}/man5/ftpaccess.5
-! 	${INSTALL} -c -o bin -g bin -m 755 doc/ftphosts.5 ${MANDIR}/man5/ftphosts.5
-! 	${INSTALL} -c -o bin -g bin -m 755 doc/ftpconversions.5 ${MANDIR}/man5/ftpconversions.5
-! 	${INSTALL} -c -o bin -g bin -m 755 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
---- 11,42 ----
+  	${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.'
   
   install: bin/ftpd bin/ftpcount bin/ftpshut
@@ -64,18 +49,30 @@
   	${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 755 doc/examples/ftpaccess ${ETCDIR}/ftpaccess.example
-! 	install -c -o root -g bin -m 755 doc/examples/ftpusers ${ETCDIR}/ftpusers.example
-! 	install -c -o root -g bin -m 755 doc/examples/ftpconversions ${ETCDIR}/ftpconversions.example
+! 	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
-! 	${INSTALL} -c -o bin -g bin -m 644 doc/ftpwho.1 ${MANDIR}/man1/ftpwho.1
-! 	${INSTALL} -c -o bin -g bin -m 644 doc/ftpshut.8 ${MANDIR}/man8/ftpshut.8
-! 	${INSTALL} -c -o bin -g bin -m 644 doc/ftpaccess.5 ${MANDIR}/man5/ftpaccess.5
-! 	${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
+  	${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
diff --git a/ftp/wu-ftpd/files/patch-am b/ftp/wu-ftpd/files/patch-am
index a126effdc366..04297b0bb716 100644
--- a/ftp/wu-ftpd/files/patch-am
+++ b/ftp/wu-ftpd/files/patch-am
@@ -1,24 +1,22 @@
-*** src/makefiles/Makefile.fbs.orig	Tue Aug 12 07:43:39 1997
---- src/makefiles/Makefile.fbs	Tue Sep  9 20:10:33 1997
+*** src/makefiles/Makefile.fbs.orig	Sun Dec 21 07:04:49 1997
+--- src/makefiles/Makefile.fbs	Wed Dec 24 20:26:01 1997
 ***************
-*** 4,11 ****
+*** 4,10 ****
   #CC       = cc
   IFLAGS   = -I.. -I../support
   LFLAGS   = -L../support -s
 ! CFLAGS   = -O ${IFLAGS} ${LFLAGS}
-! LIBES    = -lsupport -lutil -lcrypt 
+  LIBES    = -lsupport -lutil -lskey -lmd -lcrypt 
   LIBC     = /usr/lib/libc.a
   LINTFLAGS=	
-  LKERB    = -lauth -lckrb -lkrb -ldes
---- 4,11 ----
+--- 4,10 ----
   #CC       = cc
   IFLAGS   = -I.. -I../support
   LFLAGS   = -L../support -s
 ! CFLAGS   += ${IFLAGS} ${LFLAGS}
-! LIBES    = -lsupport -lutil -lcrypt -lskey -lmd
+  LIBES    = -lsupport -lutil -lskey -lmd -lcrypt 
   LIBC     = /usr/lib/libc.a
   LINTFLAGS=	
-  LKERB    = -lauth -lckrb -lkrb -ldes
 ***************
 *** 27,33 ****
 --- 27,37 ----