svn commit: r380792 - in head/ftp/pure-ftpd: . files

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Sun Mar  8 19:38:18 2015
New Revision: 380792
URL: https://svnweb.freebsd.org/changeset/ports/380792
QAT: https://qat.redports.org/buildarchive/r380792/

Log:
  - Enable TLS option by default
  - Allow to change location of pid files
  - Bump PORTREVISION for package change

Modified:
  head/ftp/pure-ftpd/Makefile
  head/ftp/pure-ftpd/files/pure-ftpd.in

Modified: head/ftp/pure-ftpd/Makefile
==============================================================================
--- head/ftp/pure-ftpd/Makefile	Sun Mar  8 19:30:08 2015	(r380791)
+++ head/ftp/pure-ftpd/Makefile	Sun Mar  8 19:38:18 2015	(r380792)
@@ -3,7 +3,7 @@
 
 PORTNAME=	pure-ftpd
 PORTVERSION=	1.0.36
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	http://download.pureftpd.org/pub/pure-ftpd/releases/ \
 		ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/ \
@@ -17,7 +17,7 @@ LICENSE=	ISCL
 OPTIONS_DEFINE=	ANONDELETE ANONRENAME ANONRESUME DOCS EXAMPLES LARGEFILE LDAP \
 		MYSQL PAM PERUSERLIMITS PGSQL PRIVSEP SENDFILE THROTTLING TLS \
 		UPLOADSCRIPT UTF8 VIRTUALCHROOT
-OPTIONS_DEFAULT=PAM PRIVSEP SENDFILE VIRTUALCHROOT
+OPTIONS_DEFAULT=PAM PRIVSEP SENDFILE TLS VIRTUALCHROOT
 ANONDELETE_DESC=	Allow anonymous user to delete files
 ANONRENAME_DESC=	Allow anonymous user to rename files
 ANONRESUME_DESC=	Allow anonymous user to resume file upload
@@ -75,8 +75,8 @@ PGSQL_USES=		pgsql
 PRIVSEP_CONFIGURE_WITH=	privsep
 SENDFILE_CONFIGURE_WITH=sendfile
 THROTTLING_CONFIGURE_WITH=	throttling
-TLS_CONFIGURE_ON=	--with-certfile=${TLS_CERTFILE}
-TLS_CONFIGURE_WITH=	tls
+TLS_CONFIGURE_OFF=	--without-tls
+TLS_CONFIGURE_ON=	--with-certfile=${TLS_CERTFILE} --with-tls
 UPLOADSCRIPT_CONFIGURE_WITH=	uploadscript
 UTF8_CONFIGURE_WITH=	rfc2640
 UTF8_USES=		iconv

Modified: head/ftp/pure-ftpd/files/pure-ftpd.in
==============================================================================
--- head/ftp/pure-ftpd/files/pure-ftpd.in	Sun Mar  8 19:30:08 2015	(r380791)
+++ head/ftp/pure-ftpd/files/pure-ftpd.in	Sun Mar  8 19:38:18 2015	(r380792)
@@ -31,26 +31,26 @@ rcvar=pureftpd_enable
 load_rc_config $name
 
 command=%%PREFIX%%/sbin/pure-config.pl
-pidfile=/var/run/pure-ftpd.pid
+pidfile=${pidfile:-"/var/run/pure-ftpd.pid"}
 procname=pure-ftpd
 pureftpd_config=${pureftpd_config:-"%%PREFIX%%/etc/pure-ftpd.conf"}
 pureftpd_enable=${pureftpd_enable:-"no"}
 required_files=${pureftpd_config}
 # authd
 command_authd=%%PREFIX%%/sbin/pure-authd
-pidfile_authd=/var/run/pure-authd.pid
+pidfile_authd=${pidfile_authd:-"/var/run/pure-authd.pid"}
 pureftpd_authd_enable=${pureftpd_authd_enable:-"no"}
 pureftpd_authdscript=${pureftpd_authdscript:-"%%PREFIX%%/sbin/pure-alwaysfail"}
 pureftpd_authsocket=${pureftpd_authsocket:-"/var/run/ftpd.sock"}
 # uploadscript
 command_upload=%%PREFIX%%/sbin/pure-uploadscript
-pidfile_uploadscript=/var/run/pure-uploadscript.pid
+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
 command_args="${pureftpd_config} -g${pidfile}"
-command_authd_args="-B -r ${pureftpd_authdscript} -s ${pureftpd_authsocket}"
-command_upload_args="-B -r ${pureftpd_uploadscript}"
+command_authd_args="-B -p ${pidfile_authd} -r ${pureftpd_authdscript} -s ${pureftpd_authsocket}"
+command_upload_args="-B -p ${pidfile_uploadscript} -r ${pureftpd_uploadscript}"
 
 start_precmd=start_precmd
 start_postcmd=start_postcmd