5 files changed, 16 insertions, 17 deletions

diff --git a/ftp/pure-ftpd/Makefile b/ftp/pure-ftpd/Makefile
index 4e2ad53a6049..e56ed0820290 100644
--- a/ftp/pure-ftpd/Makefile
+++ b/ftp/pure-ftpd/Makefile
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	pure-ftpd
-PORTVERSION=	1.0.43
+PORTVERSION=	1.0.44
 CATEGORIES=	ftp ipv6
-MASTER_SITES=	http://download.pureftpd.org/pub/pure-ftpd/releases/ \
-		ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/ \
-		SF/pureftpd/Pure-FTPd/${PORTVERSION}
+MASTER_SITES=	https://github.com/jedisct1/${PORTNAME}/releases/download/${PORTVERSION}/ \
+		https://download.pureftpd.org/pub/pure-ftpd/releases/ \
+		ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Small, easy to set up, fast, and secure FTP server
@@ -107,18 +107,18 @@ pre-fetch:
 	@${ECHO_MSG} "  spanish, swedish, traditional-chinese, turkish"
 	@${ECHO_MSG} ""
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|@PERL@|${PERL}|; s|$${exec_prefix}|${PREFIX}|g' ${WRKSRC}/configuration-file/pure-config.pl.in
-
 post-install:
+	${MV} ${STAGEDIR}${PREFIX}/etc/pure-ftpd.conf ${STAGEDIR}${PREFIX}/etc/pure-ftpd.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/pureftpd-ldap.conf ${STAGEDIR}${PREFIX}/etc/pureftpd-ldap.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/pureftpd-mysql.conf ${STAGEDIR}${PREFIX}/etc/pureftpd-mysql.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/pureftpd-pgsql.conf ${STAGEDIR}${PREFIX}/etc/pureftpd-pgsql.conf.sample
-	${INSTALL_DATA} ${WRKSRC}/configuration-file/pure-ftpd.conf ${STAGEDIR}${PREFIX}/etc/pure-ftpd.conf.sample
-	${INSTALL_SCRIPT} ${WRKSRC}/configuration-file/pure-config.pl ${STAGEDIR}${PREFIX}/sbin/
 	${INSTALL_SCRIPT} ${FILESDIR}/pure-alwaysfail ${STAGEDIR}${PREFIX}/sbin/
+
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
+
+post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
 	cd ${WRKSRC}/contrib/ && ${INSTALL_SCRIPT} ${CONTRIB} ${STAGEDIR}${EXAMPLESDIR}/
 	${MKDIR} ${STAGEDIR}${PAM_DIR}/
diff --git a/ftp/pure-ftpd/distinfo b/ftp/pure-ftpd/distinfo
index e4b8f4ebd0de..7ba561ba40af 100644
--- a/ftp/pure-ftpd/distinfo
+++ b/ftp/pure-ftpd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479482590
-SHA256 (pure-ftpd-1.0.43.tar.bz2) = 1289a094c7b5675132cefd1383472d6cab60e757ee75ff3b2687072e8d7df7b2
-SIZE (pure-ftpd-1.0.43.tar.bz2) = 496391
+TIMESTAMP = 1483302327
+SHA256 (pure-ftpd-1.0.44.tar.bz2) = 30b65765cab64db04ebb983a8ff363a6d45fd1f99e9e5ec2fbdd40eba3c68b7a
+SIZE (pure-ftpd-1.0.44.tar.bz2) = 497528
diff --git a/ftp/pure-ftpd/files/pure-ftpd.in b/ftp/pure-ftpd/files/pure-ftpd.in
index 08412fa76709..0acc9af88f75 100644
--- a/ftp/pure-ftpd/files/pure-ftpd.in
+++ b/ftp/pure-ftpd/files/pure-ftpd.in
@@ -31,11 +31,11 @@ rcvar=pureftpd_enable
 
 load_rc_config $name
 
-command=%%PREFIX%%/sbin/pure-config.pl
-pidfile=${pidfile:-"/var/run/pure-ftpd.pid"}
+command=%%PREFIX%%/sbin/pure-ftpd
 procname=pure-ftpd
 pureftpd_config=${pureftpd_config:-"%%PREFIX%%/etc/pure-ftpd.conf"}
 pureftpd_enable=${pureftpd_enable:-"no"}
+pureftpd_pidfile=${pureftpd_pidfile:-"/var/run/pure-ftpd.pid"}
 required_files=${pureftpd_config}
 # authd
 command_authd=%%PREFIX%%/sbin/pure-authd
@@ -49,7 +49,7 @@ pidfile_uploadscript=${pidfile_uploadscript:-"/var/run/pure-uploadscript.pid"}
 pureftpd_upload_enable=${pureftpd_upload_enable:-"no"}
 pureftpd_uploadscript=${pureftpd_uploadscript:-"/usr/bin/touch"}
 # command_args
-flags="${pureftpd_config} -g${pidfile}"
+flags="${pureftpd_config}"
 command_args="${pureftpd_flags}"
 command_authd_args="-B -p ${pidfile_authd} -r ${pureftpd_authdscript} -s ${pureftpd_authsocket}"
 command_upload_args="-B -p ${pidfile_uploadscript} -r ${pureftpd_uploadscript}"
diff --git a/ftp/pure-ftpd/pkg-descr b/ftp/pure-ftpd/pkg-descr
index 0f11c752ebd6..f2af318ee4c4 100644
--- a/ftp/pure-ftpd/pkg-descr
+++ b/ftp/pure-ftpd/pkg-descr
@@ -12,5 +12,5 @@ fortune files, Apache-like log files, fast standalone mode, text / HTML / XML
 real-time status report, virtual users, virtual quotas, privilege separation and
 more.
 
-WWW: http://www.pureftpd.org/
+WWW: https://www.pureftpd.org/
 WWW: https://github.com/jedisct1/pure-ftpd
diff --git a/ftp/pure-ftpd/pkg-plist b/ftp/pure-ftpd/pkg-plist
index ac8b7270ec14..8d734d37968e 100644
--- a/ftp/pure-ftpd/pkg-plist
+++ b/ftp/pure-ftpd/pkg-plist
@@ -16,7 +16,6 @@ man/man8/pure-statsdecode.8.gz
 man/man8/pure-uploadscript.8.gz
 sbin/pure-alwaysfail
 sbin/pure-authd
-sbin/pure-config.pl
 sbin/pure-ftpd
 sbin/pure-ftpwho
 sbin/pure-mrtginfo