svn commit: r376656 - head/ftp/vsftpd-ext

[Kurt Jaeger]

Author: pi
Date: Fri Jan  9 20:11:59 2015
New Revision: 376656
URL: https://svnweb.freebsd.org/changeset/ports/376656
QAT: https://qat.redports.org/buildarchive/r376656/

Log:
  ftp/vsftpd-ext: fixing path to vsftpd.conf
  
  PR:		195239
  Submitted by:	Xu Jing <xjflyttp at gmail.com> (maintainer)

Modified:
  head/ftp/vsftpd-ext/Makefile

Modified: head/ftp/vsftpd-ext/Makefile
==============================================================================
--- head/ftp/vsftpd-ext/Makefile	Fri Jan  9 20:00:30 2015	(r376655)
+++ head/ftp/vsftpd-ext/Makefile	Fri Jan  9 20:11:59 2015	(r376656)
@@ -3,7 +3,7 @@
 
 PORTNAME=	vsftpd-ext
 PORTVERSION=	${UPSTREAMVERSION}.${EXTVERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	http://vsftpd.devnet.ru/files/${UPSTREAMVERSION}/ext.${EXTVERSION}/
 PKGNAMESUFFIX?=	${SSL_SUFFIX}${PKGNAMESUFFIX2}
@@ -71,8 +71,10 @@ do-configure:
 		"s|#undef VSF_BUILD_TCPWRAPPERS|#define VSF_BUILD_TCPWRAPPERS 1|" \
 		${WRKSRC}/builddefs.h
 .endif
-	${REINPLACE_CMD} -e "s|\"vsftpd.conf\"|\"${PREFIX}/etc/vsftpd.conf\"|" \
-		${WRKSRC}/defs.h
+	${REINPLACE_CMD} -e \
+		"s|#define VSF_CONFIG_PATH \"/etc/vsftpd/\"|#define VSF_CONFIG_PATH \"${PREFIX}/etc/\"|" \
+		-e "s|#define VSF_CONFIG_PREFIX \"\"|#define VSF_CONFIG_PREFIX \"vsftpd.\"|" \
+		${WRKSRC}/builddefs.h
 	${REINPLACE_CMD} -e "s|/etc/v|${PREFIX}/etc/v|" \
 		${WRKSRC}/vsftpd.8 ${WRKSRC}/vsftpd.conf.5
 	${REINPLACE_CMD} -e "s|/usr/share/empty|${PREFIX}/share/vsftpd/empty|" \