Adapt package to NetBSD

Update to BeroFTPD-1.3.4

6 files changed, 69 insertions, 25 deletions

diff --git a/net/beroftpd/Makefile b/net/beroftpd/Makefile
index d737d2ee220..4f5e1339bf2 100644
--- a/net/beroftpd/Makefile
+++ b/net/beroftpd/Makefile
@@ -1,29 +1,23 @@
-# New ports collection makefile for:   beroftpd
-# Version required:    1.2.1
-# Date created:        6 November 1998
-# Whom:                Bill Fumerola <billf@chc-chimes.com>
-#
-# $Id: Makefile,v 1.1.1.1 1999/03/07 16:49:17 rh Exp $
+# $NetBSD: Makefile,v 1.2 1999/03/07 16:51:44 rh Exp $
+# FreeBSD Id: Makefile,v 1.3 1999/02/23 22:12:30 billf Exp
 #
 
-DISTNAME=	BeroFTPD-1.3.3
-PKGNAME=	beroftpd-1.3.3
+DISTNAME=	BeroFTPD-1.3.4
+PKGNAME=	beroftpd-1.3.4
 CATEGORIES=	net
-MASTER_SITES=	ftp://beroftpd.unix.eu.org/pub/BeroFTPD/ \
+MASTER_SITES=	ftp://bero.x5.net/pub/ \
 		ftp://ftp.croftj.net/usr/bero/BeroFTPD/ \
 		ftp://ftp.kddlabs.co.jp/.2/inet/ftp/BeroFTPD/ \
 		ftp://ftp.rediris.es/mirror/BeroFTPD/ \
 		ftp://sunsite.cnlab-switch.ch/mirror/BeroFTPD/ \
 		ftp://ftp.startrek.eu.org/pub/BeroFTPD/
 
-MAINTAINER=	billf@FreeBSD.org
+MAINTAINER=	rh@NetBSD.org
+HOMEPAGE=	http://www.landfield.com/wu-ftpd/
+
+CONFLICTS+=	wu-ftpd-*
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --with-confdir=${PREFIX}/etc
 
-MAN1=	ftpcount.1 ftpwho.1
-MAN5=	ftpaccess.5 ftpconversions.5 ftphosts.5 xferlog.5 \
-	ftpservers.5
-MAN8=	ftpd.8 ftpshut.8 ftprestart.8
-
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/beroftpd/files/md5 b/net/beroftpd/files/md5
index 0e448029a5c..f4cdeba0a06 100644
--- a/net/beroftpd/files/md5
+++ b/net/beroftpd/files/md5
@@ -1 +1,3 @@
-MD5 (BeroFTPD-1.3.3.tar.gz) = ac06f16e006d9ac9d79970464134a6e3
+$NetBSD: md5,v 1.2 1999/03/07 16:51:44 rh Exp $
+
+MD5 (BeroFTPD-1.3.4.tar.gz) = a0ca8d444899779367f15d6e4c80c281
diff --git a/net/beroftpd/patches/patch-aa b/net/beroftpd/patches/patch-aa
new file mode 100644
index 00000000000..012e8111c8e
--- /dev/null
+++ b/net/beroftpd/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.1 1999/03/07 16:51:44 rh Exp $
+
+--- Makefile.in.orig	Sun Feb  7 15:01:07 1999
++++ Makefile.in	Sun Mar  7 16:53:16 1999
+@@ -58,5 +58,8 @@
+ 	@INSTALL_DATA@ -o bin -g bin -m 644 doc/ftpservers.5 $(mandir)/man5/ftpservers.5
+ 	@INSTALL_DATA@ -o bin -g bin -m 644 doc/xferlog.5 $(mandir)/man5/xferlog.5
+ 	@INSTALL_DATA@ -o bin -g bin -m 644 doc/ftprestart.8 $(mandir)/man8/ftprestart.8
+-	@if test ! -f @CONFDIR@/ftpaccess; then echo "Since you didn't have a ftpaccess file, the sample has been"; echo "installed to @CONFDIR@/ftpaccess."; echo "You will probably want to edit it."; @INSTALL@ -c -o bin -g bin -m 644 doc/examples/ftpaccess @CONFDIR@/ftpaccess; fi
+-	@if test ! -f @CONFDIR@/ftpconversions; then echo "Since you didn't have a ftpconversions file, the sample has been"; echo "installed to @CONFDIR@/ftpconversions."; echo "You will probably want to edit it."; @INSTALL@ -c -o bin -g bin -m 644 doc/examples/ftpconversions @CONFDIR@/ftpconversions; fi
++	@INSTALL_DATA@ -o bin -g bin -m 644 doc/examples/ftpaccess @CONFDIR@/ftpaccess.example
++	@INSTALL_DATA@ -o bin -g bin -m 644 doc/examples/ftpconversions @CONFDIR@/ftpconversions.example
++	@INSTALL_DATA@ -o bin -g bin -m 644 doc/examples/ftpusers @CONFDIR@/ftpusers.example
++	@INSTALL_DATA@ -o bin -g bin -m 644 doc/examples/ftpgroups @CONFDIR@/ftpgroups.example
++	@INSTALL_DATA@ -o bin -g bin -m 644 doc/examples/ftphosts @CONFDIR@/ftphosts.example
diff --git a/net/beroftpd/patches/patch-ab b/net/beroftpd/patches/patch-ab
new file mode 100644
index 00000000000..a1f566bed3c
--- /dev/null
+++ b/net/beroftpd/patches/patch-ab
@@ -0,0 +1,23 @@
+$NetBSD: patch-ab,v 1.1 1999/03/07 16:51:45 rh Exp $
+
+--- src/ftpcmd.y.orig	Sun Mar  7 16:36:53 1999
++++ src/ftpcmd.y	Sun Mar  7 16:39:23 1999
+@@ -830,16 +830,16 @@
+         = {
+             if (log_commands) syslog(LOG_INFO, "SYST");
+ 	if ($2)
+-#ifdef unix
+ #ifdef BSD
+             reply(215, "UNIX Type: L%d Version: BSD-%d",
+                 NBBY, BSD);
+ #else  /* BSD */
++#ifdef unix
+             reply(215, "UNIX Type: L%d", NBBY);
+-#endif /* BSD */
+ #else  /* unix */
+             reply(215, "UNKNOWN Type: L%d", NBBY);
+ #endif /* unix */
++#endif /* BSD */
+         }
+ 
+         /*
diff --git a/net/beroftpd/pkg/DESCR b/net/beroftpd/pkg/DESCR
index 1c36073198c..e73ca1a5a0b 100644
--- a/net/beroftpd/pkg/DESCR
+++ b/net/beroftpd/pkg/DESCR
@@ -6,7 +6,3 @@ when an anonymous user uploads a file, better support for on-the-fly
 in ftpaccess, an internal ls command (optional, currently experimental),
 the ability to run as standalone daemon, and support for Kerberos5 and
 AFS authentication.
-
-No homepage.
-
-Bill Fumerola <billf@chc-chimes.com>
diff --git a/net/beroftpd/pkg/PLIST b/net/beroftpd/pkg/PLIST
index a6c8255ad06..19e35ac0202 100644
--- a/net/beroftpd/pkg/PLIST
+++ b/net/beroftpd/pkg/PLIST
@@ -1,9 +1,23 @@
+@comment $NetBSD: PLIST,v 1.2 1999/03/07 16:51:45 rh Exp $
+etc/ftpaccess.example
+etc/ftpconversions.example
+etc/ftpgroups.example
+etc/ftphosts.example
+etc/ftpusers.example
 sbin/BeroFTPD
 sbin/ftpshut
 sbin/ftprestart
-bin/ftpcount
-bin/ftpwho
 sbin/ckconfig
 sbin/ftpck
-etc/ftpconversions
-etc/ftpaccess
+bin/ftpcount
+bin/ftpwho
+man/man1/ftpcount.1
+man/man1/ftpwho.1
+man/man5/ftpaccess.5
+man/man5/ftphosts.5
+man/man5/ftpconversions.5
+man/man5/ftpservers.5
+man/man5/xferlog.5
+man/man8/ftpd.8
+man/man8/ftpshut.8
+man/man8/ftprestart.8