ports/165534: [PATCH] ftp/vsftpd-ext: look for vsftpd.conf in the correct directory

[Florian Smeets]

>Number:         165534
>Category:       ports
>Synopsis:       [PATCH] ftp/vsftpd-ext: look for vsftpd.conf in the correct directory
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Feb 28 16:40:11 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Florian Smeets
>Release:        FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD tb.smeets.im 10.0-CURRENT FreeBSD 10.0-CURRENT #5 r232166M: Sat Feb 25 22:51:00 CET
>Description:
the previous patch was supposed to fix vsftpd so that it would look for the configuration
file in /usr/local/etc/vsftpd.conf but it did not, currently it is looking for the file in
/usr/local/etc/vsftpd//usr/local/etc/vsftpd.conf, the attached patch fixes that.

Port maintainer (gelraen.ua at gmail.com) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- vsftpd-ext-2.3.5.1_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/flo/dev/cvs/ports/ftp/vsftpd-ext/Makefile,v
retrieving revision 1.7
diff -u -u -r1.7 Makefile
--- Makefile	9 Jan 2012 16:39:53 -0000	1.7
+++ Makefile	28 Feb 2012 13:43:47 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	vsftpd-ext
 PORTVERSION=	${UPSTREAMVERSION}.${EXTVERSION}
+PORTREVISION=	1
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	http://vsftpd.devnet.ru/files/${UPSTREAMVERSION}/ext.${EXTVERSION}/
 PKGNAMESUFFIX?=	${SSL_SUFFIX}${PKGNAMESUFFIX2}
@@ -49,9 +50,7 @@
 .endif
 
 do-configure:
-	${REINPLACE_CMD} -e "s|vsftpd.conf|${PREFIX}/etc/vsftpd.conf|" \
-		${WRKSRC}/defs.h ${WRKSRC}/vsftpd.conf
-	${REINPLACE_CMD} -e "s|/etc/vsftpd|${PREFIX}/etc/vsftpd|" \
+	${REINPLACE_CMD} -e "s|/etc/vsftpd|${PREFIX}/etc|" \
 		${WRKSRC}/builddefs.h
 	${REINPLACE_CMD} \
 		-e '/^CC/s/=/?=/' \
--- vsftpd-ext-2.3.5.1_1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: