svn commit: r378282 - in head/ftp/proftpd: . files

[Martin Matuska]

Author: mm
Date: Sun Feb  1 22:25:50 2015
New Revision: 378282
URL: https://svnweb.freebsd.org/changeset/ports/378282
QAT: https://qat.redports.org/buildarchive/r378282/

Log:
  Fix mirror sites [1]
  Compile with -pthread if using base OpenSSL [2]
  Fix rc script [3]
  
  PR:	191011 [1], 195921 [2], 196635 [3]

Modified:
  head/ftp/proftpd/Makefile
  head/ftp/proftpd/files/proftpd.in

Modified: head/ftp/proftpd/Makefile
==============================================================================
--- head/ftp/proftpd/Makefile	Sun Feb  1 22:10:50 2015	(r378281)
+++ head/ftp/proftpd/Makefile	Sun Feb  1 22:25:50 2015	(r378282)
@@ -5,11 +5,11 @@ PORTNAME?=	proftpd
 .if !defined(DISTVERSION)
 PORTVERSION?=	${PROFTPD_VERSION}
 .endif
-PORTREVISION?=	4
+PORTREVISION?=	5
 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,9 @@ PLIST_SUB+=	LOCALSTATEDIR="${LOCALSTATED
 .if !defined(_BUILDING_PROFTPD_MODULE)
 CPPFLAGS+=	-DHAVE_OPENSSL -I${OPENSSLINC}
 LIBS+=		-lssl -lcrypto -L${OPENSSLLIB}
+. if !defined(WITH_OPENSSL_PORT)
+LDFLAGS+=	-pthread
+. endif
 .endif
 
 .if !defined(_BUILDING_PROFTPD_MODULE)

Modified: head/ftp/proftpd/files/proftpd.in
==============================================================================
--- head/ftp/proftpd/files/proftpd.in	Sun Feb  1 22:10:50 2015	(r378281)
+++ head/ftp/proftpd/files/proftpd.in	Sun Feb  1 22:25:50 2015	(r378282)
@@ -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"