diff options
| author | mm <mm@FreeBSD.org> | 2015-02-02 06:25:50 +0800 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2015-02-02 06:25:50 +0800 |
| commit | 56f389260e69b32aef926c764db25b2412ef5fae (patch) | |
| tree | 1af51ad36051108ff5d150f6514fc7beaa629288 | |
| parent | c950b7e8b116b05f66590d45dd450abaebdba5d7 (diff) | |
| download | freebsd-ports-graphics-56f389260e69b32aef926c764db25b2412ef5fae.tar.gz freebsd-ports-graphics-56f389260e69b32aef926c764db25b2412ef5fae.tar.zst freebsd-ports-graphics-56f389260e69b32aef926c764db25b2412ef5fae.zip | |
Fix mirror sites [1]
Compile with -pthread if using base OpenSSL [2]
Fix rc script [3]
PR: 191011 [1], 195921 [2], 196635 [3]
| -rw-r--r-- | ftp/proftpd/Makefile | 7 | ||||
| -rw-r--r-- | ftp/proftpd/files/proftpd.in | 7 |
2 files changed, 9 insertions, 5 deletions
diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile index 04552e4d93c..272178098ac 100644 --- a/ftp/proftpd/Makefile +++ b/ftp/proftpd/Makefile @@ -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="${LOCALSTATEDIR}" .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) diff --git a/ftp/proftpd/files/proftpd.in b/ftp/proftpd/files/proftpd.in index cf2a338c7e7..fdfb93f0836 100644 --- a/ftp/proftpd/files/proftpd.in +++ b/ftp/proftpd/files/proftpd.in @@ -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" |