Index: head/ftp/proftpd/Makefile
===================================================================
--- head/ftp/proftpd/Makefile	(revision 378281)
+++ head/ftp/proftpd/Makefile	(revision 378282)
@@ -1,252 +1,255 @@
 # Created by: Stephane Legrand
 # $FreeBSD$
 
 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}
 .endif
 
 MAINTAINER?=	mm@FreeBSD.org
 COMMENT?=	Highly configurable FTP daemon
 
 LICENSE?=	GPLv2
 LICENSE_FILE?=	${WRKSRC}/COPYING
 
 .if defined(_BUILDING_PROFTPD_MODULE)
 BUILD_DEPENDS+=	${LOCALBASE}/sbin/proftpd:${PORTSDIR}/ftp/proftpd
 RUN_DEPENDS+=	${LOCALBASE}/sbin/proftpd:${PORTSDIR}/ftp/proftpd
 .endif
 
 PROFTPD_VERSION=	1.3.5
 
 .if defined(_BUILDING_PROFTPD_MODULE)
 DISTFILES+=	${DISTNAME}${EXTRACT_SUFX}
 EXTRACT_ONLY+=	${DISTNAME}${EXTRACT_SUFX}
 WRKSRC=		${WRKDIR}/proftpd-${PROFTPD_VERSION}
 . if defined(_PROFTPD_MODULE_EXTRACT_ONLY)
 EXTRACT_ONLY+=	${_PROFTPD_MODULE_EXTRACT_ONLY}
 . endif
 . if defined(_PROFTPD_MODULE_DISTFILES)
 DISTFILES+=	${_PROFTPD_MODULE_DISTFILES}
 . endif
 . if defined(_PROFTPD_MODULE_MASTER_SITES)
 MASTER_SITES+=	${_PROFTPD_MODULE_MASTER_SITES}
 . endif
 .endif
 
 .if !defined(_BUILDING_PROFTPD_MODULE)
 PORTDOCS=	*
 .endif
 
 MAKE_JOBS_UNSAFE=	yes
 USES+=		gmake libtool
 USE_AUTOTOOLS=	autoconf
 GNU_CONFIGURE=	yes
 
 .if !defined(_BUILDING_PROFTPD_MODULE)
 USE_OPENSSL=	yes
 USE_RC_SUBR=	proftpd
 .endif
 
 LOCALSTATEDIR?=	/var/run
 
 CONFIGURE_ARGS=--localstatedir=${LOCALSTATEDIR} \
 		--libexecdir=${PREFIX}/libexec/proftpd \
 		--with-pkgconfig=libdata/pkgconfig \
 		--sysconfdir=${PREFIX}/etc \
 		--enable-ctrls \
 		--enable-dso \
 		--disable-sendfile
 
 CONFIGURE_ENV+=	install_user=`${ID} -u` \
 		install_group=`${ID} -g`
 
 .if defined(_BUILDING_PROFTPD_MODULE)
 MODULES=		${_BUILDING_PROFTPD_MODULE}
 .for m in ${MODULES}
 __MODULES:=${__MODULES}:${m}
 .endfor
 CONFIGURE_ARGS+=	--with-shared=${__MODULES:C/^://g}
 INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include/proftpd
 ALL_TARGET=	shared
 BUILD_WRKSRC=	${WRKSRC}/modules
 INSTALL_WRKSRC=	${WRKSRC}/modules
 PLIST=		${WRKDIR}/PLIST
 .for m in ${MODULES}
 PLIST_FILES+=	libexec/proftpd/${m}.a \
 		libexec/proftpd/${m}.so
 .endfor
 .else
 OPTIONS_DEFINE=	DOCS HTMLDOCS IPV6 NLS MEMCACHE PCRE
 OPTIONS_DEFAULT=	IPV6 NLS PCRE
 
 HTMLDOCS_DESC=		Include HTML documentation
 MEMCACHE_DESC=		Memcache support using libmemcached
 
 PLIST_SUB+=	LOCALSTATEDIR="${LOCALSTATEDIR}"
 
 .endif #!defined(_BUILDING_PROFTPD_MODULE)
 
 .include <bsd.port.options.mk>
 
 .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)
 LIBDIRS?=	${LOCALBASE}/lib
 INCLUDEDIRS?=	${LOCALBASE}/include
 
 # Always built modules
 MODULES+=	mod_ban \
 		mod_copy \
 		mod_ctrls_admin \
 		mod_deflate \
 		mod_dnsbl \
 		mod_dynmasq \
 		mod_exec \
 		mod_ifsession \
 		mod_ifversion \
 		mod_qos \
 		mod_quotatab \
 		mod_quotatab_file \
 		mod_quotatab_radius \
 		mod_quotatab_sql \
 		mod_radius \
 		mod_ratio \
 		mod_readme \
 		mod_rewrite \
 		mod_sftp \
 		mod_sftp_pam \
 		mod_sftp_sql \
 		mod_shaper \
 		mod_site_misc \
 		mod_snmp \
 		mod_sql \
 		mod_sql_passwd \
 		mod_tls \
 		mod_tls_shmcache \
 		mod_unique_id \
 		mod_wrap2 \
 		mod_wrap2_file \
 		mod_wrap2_sql
 
 # FreeBSD-SA-11:07.chroot
 .if ${OSVERSION} < 800000
 CHROOT_TEST !=	${GREP} __FreeBSD_libc_enter_restricted_mode \
 	/usr/include/unistd.h > /dev/null || ${ECHO_CMD} error
 . if ${CHROOT_TEST} == "error"
 BROKEN=__FreeBSD_libc_enter_restricted_mode is not supported
 . endif
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-7-src-fsio.c
 .else
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-8-src-fsio.c
 .endif
 
 .if ${PORT_OPTIONS:MIPV6}
 CONFIGURE_ARGS+=	--enable-ipv6
 .else
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
 CONFIGURE_ARGS+=	--enable-nls
 USES+=	gettext iconv
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPCRE}
 LIB_DEPENDS+=		libpcre.so:${PORTSDIR}/devel/pcre
 CONFIGURE_ARGS+=	--enable-pcre
 .else
 CONFIGURE_ARGS+=	--disable-pcre
 .endif
 
 .if ${PORT_OPTIONS:MMEMCACHE}
 MODULES+=		mod_memcache \
 			mod_tls_memcache
 LIB_DEPENDS+=		libmemcached.so:${PORTSDIR}/databases/libmemcached
 CONFIGURE_ARGS+=	--enable-memcache
 LIBS+=			-L${LOCALBASE}/lib -lmemcached -lmemcachedutil
 PLIST_SUB+=	MEMCACHE=""
 .else
 CONFIGURE_ARGS+=	--disable-memcache
 PLIST_SUB+=	MEMCACHE="@comment "
 .endif
 
 # Generate modules configuration string
 .for m in ${MODULES}
 _MODULES:=${_MODULES}:${m}
 .endfor
 
 # Keep this here below, in case similar constructs need to be made
 CONFIGURE_ARGS+=	--with-shared=${_MODULES:C/^://g}
 
 .endif #!defined(_BUILDING_PROFTPD_MODULE)
 
 CONFIGURE_ARGS+=	--with-includes=${INCLUDEDIRS}
 CONFIGURE_ARGS+=	--with-libraries=${LIBDIRS}
 
 .include <bsd.port.pre.mk>
 
 .if !defined(_BUILDING_PROFTPD_MODULE)
 
 .if empty(ICONV_LIB)
 CONFIGURE_ARGS+=	ac_cv_lib_iconv_iconv_open=no \
 			ac_cv_lib_iconv_libiconv_open=no
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|proftpd\.conf |proftpd.conf.sample |g' ${WRKSRC}/Makefile.in
 
 pre-configure:
 	@${ECHO_MSG} "==> Configuring with following modules:"
 	@${ECHO_MSG} "${MODULES:C/^://g}"
 
 post-configure:
 	${REINPLACE_CMD} -e 's: -lnsl::' ${WRKSRC}/Make.rules
 	${REINPLACE_CMD} -e 's:/usr/sbin:${PREFIX}/sbin:' \
 		-e 's:/usr/bin:${PREFIX}/bin:' \
 		${WRKSRC}/src/proftpd.8 ${WRKSRC}/utils/ftpshut.8 \
 		${WRKSRC}/utils/ftpcount.1
 
 .endif #!defined(_BUILDING_PROFTPD_MODULE)
 
 .if defined(_BUILDING_PROFTPD_MODULE)
 pre-build:
 	@cd ${WRKSRC} && ${MAKE} include/buildstamp.h
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/proftpd
 
 .else
 post-install:
 	@${MKDIR} ${STAGEDIR}/var/run/proftpd
 .if ${PORT_OPTIONS:MDOCS}
 	@${INSTALL} -d ${STAGEDIR}${DOCSDIR}
 	@cd ${WRKSRC} && ${CP} README* RELEASE_NOTES ${STAGEDIR}${DOCSDIR}
 	@cd ${WRKSRC}/doc/ && ${INSTALL_DATA} license.txt ${STAGEDIR}${DOCSDIR}
 . if ${PORT_OPTIONS:MHTMLDOCS}
 	@${INSTALL} -d ${STAGEDIR}${DOCSDIR}/html
 	@cd ${WRKSRC}/doc/ && ${INSTALL_DATA} Configuration.html faq.html ${STAGEDIR}${DOCSDIR}/html
 	@${CP} -RP ${WRKSRC}/doc/contrib ${STAGEDIR}${DOCSDIR}/html/contrib
 	@${CP} -RP ${WRKSRC}/doc/modules ${STAGEDIR}${DOCSDIR}/html/modules
 	@${CP} -RP ${WRKSRC}/doc/howto ${STAGEDIR}${DOCSDIR}/html/howto
 . endif
 .endif
 	@${INSTALL_MAN} ${WRKSRC}/src/ftpdctl.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/
 .endif #!defined(_BUILDING_PROFTPD_MODULE)
 
 .include <bsd.port.post.mk>
Index: head/ftp/proftpd/files/proftpd.in
===================================================================
--- head/ftp/proftpd/files/proftpd.in	(revision 378281)
+++ head/ftp/proftpd/files/proftpd.in	(revision 378282)
@@ -1,41 +1,42 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: proftpd
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
 # KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable proftpd:
 #
 # proftpd_enable="YES"
 # proftpd_flags="<set as needed>"
 #
 # See proftpd(8) for flags
 #
 
 . /etc/rc.subr
 
 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}"
 pidfile=$(grep PidFile ${proftpd_config} | awk '{print($2)}')
 required_files=${proftpd_config}
 
 extra_commands="reload"
 stop_postcmd=stop_postcmd
 stop_postcmd()
 {
   rm -f $pidfile
 }
 
-load_rc_config $name
 run_rc_command "$1"