Date: Fri, 6 Feb 2015 22:36:45 +0000 (UTC) From: Martin Matuska <mm@FreeBSD.org> 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 Message-ID: <201502062236.t16Majev077652@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502062236.t16Majev077652>