From e736dd9db42c14eb6ff439ecc08445267f42c3cb Mon Sep 17 00:00:00 2001
From: Pete Fritchman <petef@FreeBSD.org>
Date: Tue, 18 Dec 2001 04:38:53 +0000
Subject: - update to 1.0.1 - style (spaces -> ^I) - clean up post-patch target
 - make sure /var/ftp exists

PR:		32929, 32939
Submitted by:	Matthias Andree <matthias.andree@web.de>,
                Miguel Mendez <flynn@energyhq.homeip.net>
Approved by:	nbm (approval to update the port while he is away)
---
 ftp/vsftpd/Makefile  | 29 ++++++++++++++++++-----------
 ftp/vsftpd/distinfo  |  2 +-
 ftp/vsftpd/pkg-plist |  7 +++++--
 3 files changed, 24 insertions(+), 14 deletions(-)

(limited to 'ftp')

diff --git a/ftp/vsftpd/Makefile b/ftp/vsftpd/Makefile
index dcb4aeba30bd..85258a7d81ca 100644
--- a/ftp/vsftpd/Makefile
+++ b/ftp/vsftpd/Makefile
@@ -6,33 +6,40 @@
 #
 
 PORTNAME=	vsftpd
-PORTVERSION=	0.0.15
+PORTVERSION=	1.0.1
 CATEGORIES=	ftp
-MASTER_SITES= 	ftp://ferret.lmh.ox.ac.uk/pub/linux/
+MASTER_SITES=	ftp://ferret.lmh.ox.ac.uk/pub/linux/
 
 MAINTAINER=	nbm@FreeBSD.org
 
 ALL_TARGET=	vsftpd
 
+MAN5=		vsftpd.conf.5
+
+MAN8=		vsftpd.8
+
 post-patch:
-	@${PERL} -i -p -e \
-		's@^(#define VSFTP_DEFAULT_CONFIG    )"[/]etc/vsftpd.conf"@\1"${PREFIX}/etc/vsftpd.conf"@' \
+	@${PERL} -pi -e 's@/etc/vsftpd.conf@${PREFIX}/etc/vsftpd.conf@' \
 		${WRKSRC}/defs.h
-	@${PERL} -i -p \
-		-e 's@ -ldl@@;' \
-		-e 's@^CFLAGS.*$$@@' \
-		${WRKSRC}/Makefile
-	@${ECHO} "secure_chroot_dir=${PREFIX}/share/vsftpd/empty" >> ${WRKSRC}/vsftpd.conf
+	@${PERL} -pi -e 's@ -ldl@@; s@^CFLAGS.*$$@@' ${WRKSRC}/Makefile
+	@${ECHO} "secure_chroot_dir=${PREFIX}/share/vsftpd/empty" >> \
+		${WRKSRC}/vsftpd.conf
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/vsftpd ${PREFIX}/libexec/
 	@${INSTALL_DATA} ${WRKSRC}/vsftpd.conf ${PREFIX}/etc/vsftpd.conf.dist
-	@#
 	@${INSTALL} -d ${PREFIX}/share/vsftpd/empty
 	@if [ ! -e ${PREFIX}/etc/vsftpd.conf ]; then \
 		${INSTALL_DATA} ${WRKSRC}/vsftpd.conf ${PREFIX}/etc/ ; \
 	fi
-	@#
+	@${MKDIR} ${PREFIX}/share/vsftpd/empty
+	@for i in ${MAN8} ; do \
+		${INSTALL_MAN} -m 644 ${WRKSRC}/$${i} ${MANPREFIX}/man/man8/ ; \
+		done
+	@for i in ${MAN5} ; do \
+		${INSTALL_MAN} -m 644 ${WRKSRC}/$${i} ${MANPREFIX}/man/man5/ ; \
+		done
 	@${PERL5} ${PKGINSTALL}
+	@${MKDIR} /var/ftp
 
 .include <bsd.port.mk>
diff --git a/ftp/vsftpd/distinfo b/ftp/vsftpd/distinfo
index a7ad44a0f284..7c662c9c0d3e 100644
--- a/ftp/vsftpd/distinfo
+++ b/ftp/vsftpd/distinfo
@@ -1 +1 @@
-MD5 (vsftpd-0.0.15.tar.gz) = 74eadb6c203cc90359632c91e6bb2b9a
+MD5 (vsftpd-1.0.1.tar.gz) = a30724a5e56091164f538bbdce10cdf4
diff --git a/ftp/vsftpd/pkg-plist b/ftp/vsftpd/pkg-plist
index 73fbe069d3e8..6dde76ce1fd8 100644
--- a/ftp/vsftpd/pkg-plist
+++ b/ftp/vsftpd/pkg-plist
@@ -1,6 +1,9 @@
 libexec/vsftpd
+@exec mkdir -p %D/share/vsftpd/empty
 @unexec if ! `grep -q %D/etc/vsftpd.conf %D/etc/vsftpd.conf.dist`; then rm %D/etc/vsftpd.conf; fi
 etc/vsftpd.conf.dist
 @exec if [ ! -f %B/vsftpd.conf ]; then cp %B/vsftpd.conf.dist %B/vsftpd.conf; fi
-@unexec rmdir %D/share/vsftpd/empty 2>/dev/null || true
-@unexec rmdir %D/share/vsftpd 2>/dev/null || true
+@exec if [ ! -d /var/ftp ]; then mkdir /var/ftp ; fi
+@unexec rmdir /var/ftp 2>/dev/null || true
+@dirrm share/vsftpd/empty
+@dirrm share/vsftpd
-- 
cgit v1.2.3