From owner-svn-ports-branches@FreeBSD.ORG  Fri Feb  6 22:36:46 2015
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 199AE253;
 Fri,  6 Feb 2015 22:36:46 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DFA33953;
 Fri,  6 Feb 2015 22:36:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t16MajlZ077654;
 Fri, 6 Feb 2015 22:36:45 GMT (envelope-from mm@FreeBSD.org)
Received: (from mm@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t16Majev077652;
 Fri, 6 Feb 2015 22:36:45 GMT (envelope-from mm@FreeBSD.org)
Message-Id: <201502062236.t16Majev077652@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: mm set sender to mm@FreeBSD.org
 using -f
From: Martin Matuska <mm@FreeBSD.org>
Date: Fri, 6 Feb 2015 22:36:45 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r378565 - in branches/2015Q1/ftp/proftpd: . files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Feb 2015 22:36:46 -0000

Author: mm
Date: Fri Feb  6 22:36:44 2015
New Revision: 378565
URL: https://svnweb.freebsd.org/changeset/ports/378565
QAT: https://qat.redports.org/buildarchive/r378565/

Log:
  MFH: r378282,378298,378300
  
  ftp/proftpd: unbreak mod_sftp and fix rc script
  
  - fix mirror sites
  - fix rc script
  - compile with -lpthread
  
  PR:	191011, 195921, 196635, 197290
  
  Approved by:	portmgr (mat)

Modified:
  branches/2015Q1/ftp/proftpd/Makefile
  branches/2015Q1/ftp/proftpd/files/proftpd.in
Directory Properties:
  branches/2015Q1/   (props changed)

Modified: branches/2015Q1/ftp/proftpd/Makefile
==============================================================================
--- branches/2015Q1/ftp/proftpd/Makefile	Fri Feb  6 22:35:54 2015	(r378564)
+++ branches/2015Q1/ftp/proftpd/Makefile	Fri Feb  6 22:36:44 2015	(r378565)
@@ -5,11 +5,11 @@ PORTNAME?=	proftpd
 .if !defined(DISTVERSION)
 PORTVERSION?=	${PROFTPD_VERSION}
 .endif
-PORTREVISION?=	4
+PORTREVISION?=	6
 CATEGORIES?=	ftp
 MASTER_SITES=	ftp://ftp.proftpd.org/distrib/source/ \
 		https://github.com/downloads/proftpd/proftpd.github.com/ \
-		ftp://proftpd.networkedsystems.co.uk/distrib/source/ \
+		ftp://ftpmirror.uk/ftp.proftpd.org/distrib/source/ \
 		http://www.mirrorservice.org/sites/ftp.proftpd.org/distrib/source/
 .if defined(_BUILDING_PROFTPD_MODULE)
 DISTNAME=	proftpd-${PROFTPD_VERSION}
@@ -101,6 +101,7 @@ PLIST_SUB+=	LOCALSTATEDIR="${LOCALSTATED
 .if !defined(_BUILDING_PROFTPD_MODULE)
 CPPFLAGS+=	-DHAVE_OPENSSL -I${OPENSSLINC}
 LIBS+=		-lssl -lcrypto -L${OPENSSLLIB}
+LDFLAGS+=	-lpthread
 .endif
 
 .if !defined(_BUILDING_PROFTPD_MODULE)

Modified: branches/2015Q1/ftp/proftpd/files/proftpd.in
==============================================================================
--- branches/2015Q1/ftp/proftpd/files/proftpd.in	Fri Feb  6 22:35:54 2015	(r378564)
+++ branches/2015Q1/ftp/proftpd/files/proftpd.in	Fri Feb  6 22:36:44 2015	(r378565)
@@ -22,8 +22,10 @@
 name=proftpd
 rcvar=proftpd_enable
 
-proftpd_enable=${proftpd_enable:="NO"}
-proftpd_config=${proftpd_config:="%%PREFIX%%/etc/proftpd.conf"}
+load_rc_config $name
+
+: ${proftpd_enable:="NO"}
+: ${proftpd_config:="%%PREFIX%%/etc/proftpd.conf"}
 
 command=%%PREFIX%%/sbin/proftpd
 command_args="-c ${proftpd_config}"
@@ -37,5 +39,4 @@ stop_postcmd()
   rm -f $pidfile
 }
 
-load_rc_config $name
 run_rc_command "$1"