diff options
author | Koop Mast <kwm@rainbow-runner.nl> | 2019-07-14 02:52:13 +0800 |
---|---|---|
committer | Koop Mast <kwm@rainbow-runner.nl> | 2019-07-27 03:32:17 +0800 |
commit | e28d115bbd120ac7a51ba3118dd76aa213ee23fb (patch) | |
tree | 4cc1d70ea7bad75360ed2b2c847f2e86ff87cf5e /ftp | |
parent | 69cf31911812a191795d674f635f763f863eaa9f (diff) | |
parent | dbc077bbc1ba74ae27a50f33ac98c4b908ccdf38 (diff) | |
download | freebsd-ports-gnome-e28d115bbd120ac7a51ba3118dd76aa213ee23fb.tar.gz freebsd-ports-gnome-e28d115bbd120ac7a51ba3118dd76aa213ee23fb.tar.zst freebsd-ports-gnome-e28d115bbd120ac7a51ba3118dd76aa213ee23fb.zip |
Git and myself don't get along, I messed up the master branch really good
attempt to correct this.
Diffstat (limited to 'ftp')
36 files changed, 171 insertions, 239 deletions
diff --git a/ftp/Makefile b/ftp/Makefile index 557be6bb5c68..18a0aa355a19 100644 --- a/ftp/Makefile +++ b/ftp/Makefile @@ -31,7 +31,6 @@ SUBDIR += gnustep-ftp SUBDIR += gstreamer1-plugins-curl SUBDIR += horde-gollem - SUBDIR += hs-curl SUBDIR += hsftp SUBDIR += jftp SUBDIR += jftpgw @@ -44,7 +43,6 @@ SUBDIR += mirror SUBDIR += multiget SUBDIR += ncftp3 - SUBDIR += ncftpd SUBDIR += net2ftp SUBDIR += netdumpd SUBDIR += ocaml-ocurl diff --git a/ftp/R-cran-RCurl/Makefile b/ftp/R-cran-RCurl/Makefile index 0dbee6a0d8d3..7468eb0dab0c 100644 --- a/ftp/R-cran-RCurl/Makefile +++ b/ftp/R-cran-RCurl/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= RCurl -DISTVERSION= 1.95-4.11 -PORTREVISION= 1 +DISTVERSION= 1.95-4.12 CATEGORIES= ftp DISTNAME= ${PORTNAME}_${DISTVERSION} @@ -18,6 +17,7 @@ BUILD_DEPENDS= curl-config:ftp/curl \ RUN_DEPENDS= ${CRAN_DEPENDS} LIB_DEPENDS= libcurl.so:ftp/curl -USES= cran:auto-plist,compiles +USES= cran:auto-plist,compiles gnome +USE_GNOME= libxml2 .include <bsd.port.mk> diff --git a/ftp/R-cran-RCurl/distinfo b/ftp/R-cran-RCurl/distinfo index 0468296917ed..55967aa85a19 100644 --- a/ftp/R-cran-RCurl/distinfo +++ b/ftp/R-cran-RCurl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1532053058 -SHA256 (RCurl_1.95-4.11.tar.gz) = 792a091cf5b80c460d98ed80fe1cad5d9406d0afc32e466e970ee4d2f68c97bf -SIZE (RCurl_1.95-4.11.tar.gz) = 916667 +TIMESTAMP = 1562409764 +SHA256 (RCurl_1.95-4.12.tar.gz) = 393779efafdf40823dac942a1e028905d65c34f3d41cfd21bcd225e411385ff4 +SIZE (RCurl_1.95-4.12.tar.gz) = 916763 diff --git a/ftp/R-cran-curl/Makefile b/ftp/R-cran-curl/Makefile index 462553cd49d4..da1173b90c6a 100644 --- a/ftp/R-cran-curl/Makefile +++ b/ftp/R-cran-curl/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= curl -PORTVERSION= 3.2 -PORTREVISION= 1 +PORTVERSION= 3.3 CATEGORIES= ftp DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/ftp/R-cran-curl/distinfo b/ftp/R-cran-curl/distinfo index 0230f1491784..82c858362f54 100644 --- a/ftp/R-cran-curl/distinfo +++ b/ftp/R-cran-curl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523323400 -SHA256 (curl_3.2.tar.gz) = 1636aea6422a0ad81cfd2e2a1ccd7e6924cc486711fc8d7d72168230c2f11596 -SIZE (curl_3.2.tar.gz) = 367047 +TIMESTAMP = 1561027607 +SHA256 (curl_3.3.tar.gz) = 0cb0b9a9280edc42ebed94708541ec86b4f48779e722171e45227eab8a88a5bd +SIZE (curl_3.3.tar.gz) = 371740 diff --git a/ftp/R-cran-curl/files/patch-src_curl.c b/ftp/R-cran-curl/files/patch-src_curl.c new file mode 100644 index 000000000000..6e4ba1654c42 --- /dev/null +++ b/ftp/R-cran-curl/files/patch-src_curl.c @@ -0,0 +1,20 @@ +--- src/curl.c.orig 2019-01-09 22:29:50 UTC ++++ src/curl.c +@@ -24,6 +24,8 @@ + #define BSWAP_32 OSSwapInt32 + #elif (defined(__OpenBSD__)) + #define BSWAP_32(x) swap32(x) ++#elif (defined(__FreeBSD__)) ++#include <sys/endian.h> + #elif (defined(__GLIBC__)) + #include <byteswap.h> + #define BSWAP_32(x) bswap_32(x) +@@ -146,7 +148,7 @@ static size_t rcurl_read(void *target, size_t sz, size + static int rcurl_fgetc(Rconnection con) { + int x = 0; + #ifdef WORDS_BIGENDIAN +- return rcurl_read(&x, 1, 1, con) ? BSWAP_32(x) : R_EOF; ++ return rcurl_read(&x, 1, 1, con) ? bswap32(x) : R_EOF; + #else + return rcurl_read(&x, 1, 1, con) ? x : R_EOF; + #endif diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile index cf69ede606af..91714b590ede 100644 --- a/ftp/curl/Makefile +++ b/ftp/curl/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= curl -PORTVERSION= 7.64.1 -PORTREVISION= 1 +PORTVERSION= 7.65.1 CATEGORIES= ftp net www MASTER_SITES= https://curl.haxx.se/download/ \ LOCAL/sunpoet @@ -132,7 +131,7 @@ PSL_LIB_DEPENDS= libpsl.so:dns/libpsl RTMP_CONFIGURE_WITH= librtmp RTMP_LIB_DEPENDS= librtmp.so:multimedia/librtmp RTMP_USES= pkgconfig -RTSP_ENABLE= rtsp +RTSP_CONFIGURE_ENABLE= rtsp SMB_CONFIGURE_ENABLE= smb SMTP_CONFIGURE_ENABLE= smtp TELNET_CONFIGURE_ENABLE=telnet diff --git a/ftp/curl/distinfo b/ftp/curl/distinfo index 2e2eb3e2ad66..ff2eb3319ba2 100644 --- a/ftp/curl/distinfo +++ b/ftp/curl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1553765263 -SHA256 (curl-7.64.1.tar.xz) = 9252332a7f871ce37bfa7f78bdd0a0e3924d8187cc27cb57c76c9474a7168fb3 -SIZE (curl-7.64.1.tar.xz) = 2385360 +TIMESTAMP = 1559751348 +SHA256 (curl-7.65.1.tar.xz) = f6c22074877f235aebc7c53057dbc7ee82358f8ae58bfb767e955c18c859a77a +SIZE (curl-7.65.1.tar.xz) = 2392672 diff --git a/ftp/curl/files/patch-lib-cookie.c b/ftp/curl/files/patch-lib-cookie.c index a854fd95fe31..e69de29bb2d1 100644 --- a/ftp/curl/files/patch-lib-cookie.c +++ b/ftp/curl/files/patch-lib-cookie.c @@ -1,19 +0,0 @@ ---- lib/cookie.c.orig 2019-03-25 08:42:50 UTC -+++ lib/cookie.c -@@ -1085,6 +1085,8 @@ Curl_cookie_add(struct Curl_easy *data, - return co; - } - -+#endif /* CURL_DISABLE_HTTP || CURL_DISABLE_COOKIES */ -+ - /* - * get_line() makes sure to only return complete whole lines that fit in 'len' - * bytes and end with a newline. -@@ -1112,6 +1114,7 @@ char *Curl_get_line(char *buf, int len, - return NULL; - } - -+#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_COOKIES) - - /***************************************************************************** - * diff --git a/ftp/curl/files/patch-lib-url.c b/ftp/curl/files/patch-lib-url.c index f58cbde71101..770a9ca50b38 100644 --- a/ftp/curl/files/patch-lib-url.c +++ b/ftp/curl/files/patch-lib-url.c @@ -3,16 +3,16 @@ Forwarded: not-needed Author: Peter Pentchev <roam@FreeBSD.org> Last-Update: 2010-12-18 ---- lib/url.c.orig 2019-02-05 14:00:12 UTC +--- lib/url.c.orig 2019-05-21 17:57:39 UTC +++ lib/url.c -@@ -536,6 +536,10 @@ CURLcode Curl_init_userdefined(struct Cu - set->fnmatch = ZERO_NULL; - set->upkeep_interval_ms = CURL_UPKEEP_INTERVAL_DEFAULT; - set->maxconnects = DEFAULT_CONNCACHE_SIZE; /* for easy handles */ +@@ -552,6 +552,10 @@ CURLcode Curl_init_userdefined(struct Cu + CURL_HTTP_VERSION_1_1 + #endif + ; +#if defined(__FreeBSD_version) + /* different handling of signals and threads */ + set->no_signal = TRUE; +#endif - set->http09_allowed = TRUE; - set->httpversion = - #ifdef USE_NGHTTP2 + Curl_http2_init_userset(set); + return result; + } diff --git a/ftp/curl/pkg-plist b/ftp/curl/pkg-plist index ebe131fd352c..7da9b3d149e7 100644 --- a/ftp/curl/pkg-plist +++ b/ftp/curl/pkg-plist @@ -201,6 +201,7 @@ man/man3/CURLOPT_LOW_SPEED_TIME.3.gz man/man3/CURLOPT_MAIL_AUTH.3.gz man/man3/CURLOPT_MAIL_FROM.3.gz man/man3/CURLOPT_MAIL_RCPT.3.gz +man/man3/CURLOPT_MAXAGE_CONN.3.gz man/man3/CURLOPT_MAXCONNECTS.3.gz man/man3/CURLOPT_MAXFILESIZE.3.gz man/man3/CURLOPT_MAXFILESIZE_LARGE.3.gz diff --git a/ftp/hs-curl/Makefile b/ftp/hs-curl/Makefile index ce4994fb914a..e69de29bb2d1 100644 --- a/ftp/hs-curl/Makefile +++ b/ftp/hs-curl/Makefile @@ -1,19 +0,0 @@ -# $FreeBSD$ - -PORTNAME= curl -PORTVERSION= 1.3.8 -PORTREVISION= 15 -CATEGORIES= ftp haskell - -MAINTAINER= haskell@FreeBSD.org -COMMENT= Haskell binding to libcurl - -LICENSE= BSD3CLAUSE - -DEPRECATED= Haskell libraries are getting pushed out of the ports tree. If you are using this port for development, consider switching to cabal sandboxes (old way), cabal new-build (new way), or use devel/stack. If you believe this port shouldn't be removed, contact haskell@FreeBSD.org -EXPIRATION_DATE= 2019-04-14 - -LIB_DEPENDS= libcurl.so:ftp/curl - -.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" -.include <bsd.port.mk> diff --git a/ftp/hs-curl/distinfo b/ftp/hs-curl/distinfo index 707fe0d5b889..e69de29bb2d1 100644 --- a/ftp/hs-curl/distinfo +++ b/ftp/hs-curl/distinfo @@ -1,2 +0,0 @@ -SHA256 (cabal/curl-1.3.8.tar.gz) = 9087c936bfcdb865bad3166baa3f12bf37acf076fa76010e3b5f82a1d485446e -SIZE (cabal/curl-1.3.8.tar.gz) = 47704 diff --git a/ftp/hs-curl/pkg-descr b/ftp/hs-curl/pkg-descr index 2e1d74feeab9..e69de29bb2d1 100644 --- a/ftp/hs-curl/pkg-descr +++ b/ftp/hs-curl/pkg-descr @@ -1,9 +0,0 @@ -libcurl is a client-side URL transfer library, supporting FTP, FTPS, -HTTP, HTTPS, SCP, SFTP, TFTP, TELNET, DICT, LDAP, LDAPS and FILE. -libcurl supports SSL certificates, HTTP POST, HTTP PUT, FTP uploading, -HTTP form based upload, proxies, cookies, user+password authentication -(Basic, Digest, NTLM, Negotiate, Kerberos4), file transfer resume, http -proxy tunneling and more! This package provides a Haskell binding to -libcurl. - -WWW: http://hackage.haskell.org/package/curl diff --git a/ftp/linux-c6-curl/Makefile b/ftp/linux-c6-curl/Makefile index 1843a06adb00..6a8a9835bb2b 100644 --- a/ftp/linux-c6-curl/Makefile +++ b/ftp/linux-c6-curl/Makefile @@ -3,20 +3,22 @@ PORTNAME= curl PORTVERSION= 7.19.7 +DISTVERSIONSUFFIX= -53.el6_9 PORTREVISION= 9 CATEGORIES= ftp linux -LIB_DISTNAMES= lib${DISTNAME} MAINTAINER= emulation@FreeBSD.org COMMENT= Command line tool for transferring files with URL syntax (Linux CentOS ${LINUX_DIST_VER}) -DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 53.el6_9 USES= linux:c6 USE_LDCONFIG= yes USE_LINUX= libssh2 nspr nss openldap USE_LINUX_RPM= nolib +LIB_DISTNAMES= lib${DISTNAME} + +DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr + OPTIONS_DEFINE= DOCS .include <bsd.port.mk> diff --git a/ftp/linux-c7-curl/Makefile b/ftp/linux-c7-curl/Makefile index 94559a90cea6..f1d23abc095f 100644 --- a/ftp/linux-c7-curl/Makefile +++ b/ftp/linux-c7-curl/Makefile @@ -3,24 +3,25 @@ PORTNAME= curl PORTVERSION= 7.29.0 -PORTREVISION= 4 +DISTVERSIONSUFFIX= -51.el7 +PORTREVISION= 5 CATEGORIES= ftp linux -LIB_DISTNAMES= lib${DISTNAME} MAINTAINER= emulation@FreeBSD.org COMMENT= Tool for transferring files with URL syntax (Linux CentOS ${LINUX_DIST_VER}) LICENSE= MIT -CONFLICTS= linux-c6-${PORTNAME}-[0-9]* - -DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -RPMVERSION= 42.el7_4.1 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX= libssh2 nspr nss openldap USE_LINUX_RPM= nolib +LIB_DISTNAMES= lib${DISTNAME} + +CONFLICTS= linux-c6-${PORTNAME}-[0-9]* +DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr + OPTIONS_DEFINE= DOCS .include <bsd.port.mk> diff --git a/ftp/linux-c7-curl/distinfo b/ftp/linux-c7-curl/distinfo index d060655e3d4c..0ec67122c9cd 100644 --- a/ftp/linux-c7-curl/distinfo +++ b/ftp/linux-c7-curl/distinfo @@ -1,11 +1,11 @@ -TIMESTAMP = 1513003041 -SHA256 (centos/curl-7.29.0-42.el7_4.1.i686.rpm) = 4eb1bfbede0a65384240a9294e8a9b5fbfdc278a6a8d2c23722db47a892f65b6 -SIZE (centos/curl-7.29.0-42.el7_4.1.i686.rpm) = 272964 -SHA256 (centos/curl-7.29.0-42.el7_4.1.x86_64.rpm) = 12128ce4bbba8672939e49a25dc1bfe1a04e639ac96aa5b732c3d053ddb721ea -SIZE (centos/curl-7.29.0-42.el7_4.1.x86_64.rpm) = 273312 -SHA256 (centos/libcurl-7.29.0-42.el7_4.1.i686.rpm) = 04d8b20bd1d0b3f9085d0c842288fc4cba43f954a90c110d85ff9570162e0976 -SIZE (centos/libcurl-7.29.0-42.el7_4.1.i686.rpm) = 227256 -SHA256 (centos/libcurl-7.29.0-42.el7_4.1.x86_64.rpm) = a7402b46263a2e50e9606dfc8ca9311108f1262feb6e239b276e53a693caa4fb -SIZE (centos/libcurl-7.29.0-42.el7_4.1.x86_64.rpm) = 224756 -SHA256 (centos/curl-7.29.0-42.el7_4.1.src.rpm) = 6af0b6df53096c0cc73dc0646a342612cc47630009ee833d537edec482d0f43a -SIZE (centos/curl-7.29.0-42.el7_4.1.src.rpm) = 2308368 +TIMESTAMP = 1544531658 +SHA256 (centos/curl-7.29.0-51.el7.i686.rpm) = f1868056f78b452e32032048f5ddcfefb3fb3eb875f6b55088fb3039a9bef718 +SIZE (centos/curl-7.29.0-51.el7.i686.rpm) = 275036 +SHA256 (centos/curl-7.29.0-51.el7.x86_64.rpm) = f6515f870eab991b9a9fac7e65acdb72e0d2d1baa1dc170d870b462191c40cd0 +SIZE (centos/curl-7.29.0-51.el7.x86_64.rpm) = 275400 +SHA256 (centos/libcurl-7.29.0-51.el7.i686.rpm) = 6fa0a94a6c633cf3d8c30123af89566e7b03a1a40f331dfa4d5710469eb6c799 +SIZE (centos/libcurl-7.29.0-51.el7.i686.rpm) = 229660 +SHA256 (centos/libcurl-7.29.0-51.el7.x86_64.rpm) = 5ba5eb9f538c219511aa9237416e2e9453abda53fa4b418d05a4a067007b1e0b +SIZE (centos/libcurl-7.29.0-51.el7.x86_64.rpm) = 226772 +SHA256 (centos/curl-7.29.0-51.el7.src.rpm) = 43ca5b50a713bbc564086cfb179ad9fae880904a834a41a7d88fdee67d21ffe8 +SIZE (centos/curl-7.29.0-51.el7.src.rpm) = 2369544 diff --git a/ftp/ncftpd/Makefile b/ftp/ncftpd/Makefile index 19dd7cb196e2..e69de29bb2d1 100644 --- a/ftp/ncftpd/Makefile +++ b/ftp/ncftpd/Makefile @@ -1,55 +0,0 @@ -# Created by: Justin Stanford <jus@security.za.net> -# $FreeBSD$ - -PORTNAME= ncftpd -PORTVERSION= 2.8.7 -CATEGORIES= ftp -MASTER_SITES= ftp://ftp.ncftp.com/ncftpd/${PORTVERSION}/ \ - ftp://ftp.nl.uu.net/pub/unix/ftp/ncftpd/${PORTVERSION}/ \ - LOCAL/beech -DISTNAME= ${PORTNAME}-${PORTVERSION}-freebsd${BINVER}-${DIST_ARCH}-export - -MAINTAINER= ports@FreeBSD.org -COMMENT= Commercial FTP daemon with a 30-day evaluation license - -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - -ONLY_FOR_ARCHS= amd64 -ONLY_FOR_ARCHS_REASON= only available for amd64 - -NO_BUILD= yes -RESTRICTED= 30 day evaluation license - -USE_RC_SUBR= ncftpd -SUB_FILES= pkg-message - -OPTIONS_DEFINE= DOCS - -PORTDOCS= install.html README README.freebsd LICENSE - -BINVER= 9.0 -IGNORE_DragonFly= requires FreeBSD - -.include <bsd.port.pre.mk> - -.if ${ARCH} == amd64 -DIST_ARCH= x86_64 -.else -DIST_ARCH= i386 -.endif - -do-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/etc/ncftpd - ${INSTALL_PROGRAM} ${WRKSRC}/ncftpd ${STAGEDIR}${PREFIX}/sbin - ${INSTALL_PROGRAM} ${WRKSRC}/ncftpd_edquota ${STAGEDIR}${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/ncftpd_passwd ${STAGEDIR}${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/ncftpd_repquota ${STAGEDIR}${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/ncftpd_spy ${STAGEDIR}${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/conf/general.cf-dist ${STAGEDIR}${PREFIX}/etc/ncftpd - ${INSTALL_DATA} ${WRKSRC}/conf/domain.cf-dist ${STAGEDIR}${PREFIX}/etc/ncftpd - -do-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) - -.include <bsd.port.post.mk> diff --git a/ftp/ncftpd/distinfo b/ftp/ncftpd/distinfo index 15dcf9609615..e69de29bb2d1 100644 --- a/ftp/ncftpd/distinfo +++ b/ftp/ncftpd/distinfo @@ -1,2 +0,0 @@ -SHA256 (ncftpd-2.8.7-freebsd9.0-x86_64-export.tar.gz) = 3506dca3bc97315ad251afe5490b3afa381816dbbb423f358bb284f79c2fae3e -SIZE (ncftpd-2.8.7-freebsd9.0-x86_64-export.tar.gz) = 499272 diff --git a/ftp/ncftpd/files/ncftpd.in b/ftp/ncftpd/files/ncftpd.in index dcdc33a42d57..e69de29bb2d1 100644 --- a/ftp/ncftpd/files/ncftpd.in +++ b/ftp/ncftpd/files/ncftpd.in @@ -1,29 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ -# -# PROVIDE: ncftpd -# REQUIRE: DAEMON -# -# Add the following lines to /etc/rc.conf.local or /etc/rc.conf -# to enable ncftpd: -# -# ncftpd_enable="YES" -# ncftpd_flags="-dq" # Not required -# ncftpd_config="/path/to/general.cf /path/to/domain.cf" # Not required - -. /etc/rc.subr - -name="ncftpd" -rcvar=ncftpd_enable - -load_rc_config $name -: ${ncftpd_enable:="NO"} -: ${ncftpd_flags:="-dq"} -: ${ncftpd_config:="%%PREFIX%%/etc/ncftpd/general.cf %%PREFIX%%/etc/ncftpd/domain.cf"} - -command=%%PREFIX%%/sbin/${name} -required_files="${ncftpd_config}" -command_args="${ncftpd_flags} ${ncftpd_config}" - -run_rc_command "$1" diff --git a/ftp/ncftpd/files/pkg-message.in b/ftp/ncftpd/files/pkg-message.in index f689fadefed4..e69de29bb2d1 100644 --- a/ftp/ncftpd/files/pkg-message.in +++ b/ftp/ncftpd/files/pkg-message.in @@ -1,16 +0,0 @@ -* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - -NOTE: This is commercial software that only supplies you with -an evaluation license valid for 30 days from the date of installation. -Please read the LICENSE in "%%PREFIX%%/share/doc/ncftpd" before -using this software. - -If you wish to allow anonymous FTP, an FTP user needs to be created -for this purpose. NcFTPd defaults to the users "daemon", "web", or "www" -in the absence of an FTP user. For details see the installation help file -"%%PREFIX%%/share/doc/ncftpd/install.html". - -Remove "-dist" from the filenames of the configuration files in -"%%PREFIX%%/etc/ncftpd" and edit them to suit. - -* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * diff --git a/ftp/ncftpd/pkg-descr b/ftp/ncftpd/pkg-descr index bef1f33dac55..e69de29bb2d1 100644 --- a/ftp/ncftpd/pkg-descr +++ b/ftp/ncftpd/pkg-descr @@ -1,4 +0,0 @@ -A well known commercial FTP daemon with a restrictive 30-day -evaluation license. NcFTPd is fast, secure, and supports virtual-hosts. - -WWW: http://www.ncftp.com/ncftpd/ diff --git a/ftp/ncftpd/pkg-plist b/ftp/ncftpd/pkg-plist index aa7518c1e7af..e69de29bb2d1 100644 --- a/ftp/ncftpd/pkg-plist +++ b/ftp/ncftpd/pkg-plist @@ -1,7 +0,0 @@ -sbin/ncftpd -bin/ncftpd_edquota -bin/ncftpd_passwd -bin/ncftpd_repquota -bin/ncftpd_spy -etc/ncftpd/general.cf-dist -etc/ncftpd/domain.cf-dist diff --git a/ftp/netdumpd/Makefile b/ftp/netdumpd/Makefile index bb2a8d224d90..c9a5048c7a26 100644 --- a/ftp/netdumpd/Makefile +++ b/ftp/netdumpd/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= netdumpd -PORTVERSION= 20180511 -PORTREVISION= 1 +PORTVERSION= 20190518 +PORTREVISION= 0 CATEGORIES= ftp MASTER_SITES= LOCAL/markj diff --git a/ftp/netdumpd/distinfo b/ftp/netdumpd/distinfo index 4a2350e3be5a..eab4de7ea76b 100644 --- a/ftp/netdumpd/distinfo +++ b/ftp/netdumpd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1526051779 -SHA256 (netdumpd-20180511.tar.gz) = 245584941f01cf56ca76783b884b67427e95dba26e8ef923ff9ba3f32ad9da6f -SIZE (netdumpd-20180511.tar.gz) = 17376 +TIMESTAMP = 1558204420 +SHA256 (netdumpd-20190518.tar.gz) = cac88663b8424f12013508deadcd5ac44d12fa61acd8c6380bb71cd313d61cee +SIZE (netdumpd-20190518.tar.gz) = 17620 diff --git a/ftp/p5-File-Fetch/Makefile b/ftp/p5-File-Fetch/Makefile index 4e23efd92677..60daa29c2e62 100644 --- a/ftp/p5-File-Fetch/Makefile +++ b/ftp/p5-File-Fetch/Makefile @@ -15,13 +15,7 @@ LICENSE_COMB= dual USES= perl5 USE_PERL5= configure -NO_ARCH= yes - -.include <bsd.port.pre.mk> -.if ${PERL_LEVEL} < 502504 -BUILD_DEPENDS+= p5-Module-Load-Conditional>=0.66:devel/p5-Module-Load-Conditional -RUN_DEPENDS+= p5-Module-Load-Conditional>=0.66:devel/p5-Module-Load-Conditional -.endif +NO_ARCH= yes -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/ftp/py-pycurl/Makefile b/ftp/py-pycurl/Makefile index 82332228ce72..bd60d730b938 100644 --- a/ftp/py-pycurl/Makefile +++ b/ftp/py-pycurl/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= pycurl -PORTVERSION= 7.43.0.2 +PORTVERSION= 7.43.0.3 CATEGORIES= ftp python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,15 +12,15 @@ COMMENT= Python interface to libcurl LICENSE= LGPL21 MIT LICENSE_COMB= dual -LICENSE_LGPL21= ${WRKSRC}/COPYING-LGPL -LICENSE_MIT= ${WRKSRC}/COPYING-MIT +LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING-LGPL +LICENSE_FILE_MIT= ${WRKSRC}/COPYING-MIT LIB_DEPENDS= libcurl.so:ftp/curl OPTIONS_DEFINE= DOCS -USE_PYTHON= autoplist concurrent distutils USES= python ssl +USE_PYTHON= autoplist concurrent distutils PORTDOCS= AUTHORS INSTALL.rst README.rst RELEASE-NOTES.rst diff --git a/ftp/py-pycurl/distinfo b/ftp/py-pycurl/distinfo index 826a3fcd7f87..24585ee2fd0f 100644 --- a/ftp/py-pycurl/distinfo +++ b/ftp/py-pycurl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1528017304 -SHA256 (pycurl-7.43.0.2.tar.gz) = 0f0cdfc7a92d4f2a5c44226162434e34f7d6967d3af416a6f1448649c09a25a4 -SIZE (pycurl-7.43.0.2.tar.gz) = 214212 +TIMESTAMP = 1560957708 +SHA256 (pycurl-7.43.0.3.tar.gz) = 6f08330c5cf79fa8ef68b9912b9901db7ffd34b63e225dce74db56bb21deda8e +SIZE (pycurl-7.43.0.3.tar.gz) = 215003 diff --git a/ftp/uftp/Makefile b/ftp/uftp/Makefile index 9bcc467fe1bf..3e015efa4b80 100644 --- a/ftp/uftp/Makefile +++ b/ftp/uftp/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= uftp -PORTVERSION= 4.9.9 +PORTVERSION= 4.9.11 PORTEPOCH= 1 CATEGORIES= ftp MASTER_SITES= SF/uftp-multicast/source-tar diff --git a/ftp/uftp/distinfo b/ftp/uftp/distinfo index 40c077c00051..81ead0f81ce1 100644 --- a/ftp/uftp/distinfo +++ b/ftp/uftp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1550559592 -SHA256 (uftp-4.9.9.tar.gz) = c04bc75a88fc3d57504269f260be4d0b1bc440508b5a5ca587df6c16b771aa48 -SIZE (uftp-4.9.9.tar.gz) = 244995 +TIMESTAMP = 1557828608 +SHA256 (uftp-4.9.11.tar.gz) = 2ddc835a35f669d55df27ab6883ba19bb00bc8e4b66897ceaedb160b02246b1a +SIZE (uftp-4.9.11.tar.gz) = 245299 diff --git a/ftp/weex/Makefile b/ftp/weex/Makefile index 016a9b801d0c..db3b21cae311 100644 --- a/ftp/weex/Makefile +++ b/ftp/weex/Makefile @@ -3,6 +3,7 @@ PORTNAME= weex PORTVERSION= 2.8.2 +PORTREVISION= 1 CATEGORIES= ftp MASTER_SITES= SF/weex/weex DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -14,16 +15,25 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/doc/COPYING USES= autoreconf gmake ssl gettext-tools -GNU_CONFIGURE= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-cafile=${LOCALBASE}/share/certs/ca-root-nss.crt +CPPFLAGS+= -I${OPENSSLINC} +LIBS+= -L${OPENSSLLIB} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -# NLS support is very broken in this release -CONFIGURE_ARGS= --disable-nls +OPTIONS_DEFINE= EXAMPLES NLS +OPTIONS_SUB= yes + +NLS_CONFIGURE_ENABLE= nls +NLS_USES= gettext-runtime post-patch: - @${REINPLACE_CMD} -e 's|^\(SUBDIRS.*\)debian|\1|' \ - ${WRKSRC}/Makefile.in + @${RM} -r ${WRKSRC}/intl + +pre-configure: + ${CP} ${LOCALBASE}/share/gettext/po/Makevars.template \ + ${WRKSRC}/po/Makevars post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} diff --git a/ftp/weex/files/patch-Makefile.am b/ftp/weex/files/patch-Makefile.am new file mode 100644 index 000000000000..1fe744f94c4e --- /dev/null +++ b/ftp/weex/files/patch-Makefile.am @@ -0,0 +1,8 @@ +--- Makefile.am.orig 2000-06-13 11:56:56 UTC ++++ Makefile.am +@@ -1,4 +1,4 @@ + AUTOMAKE_OPTIONS=foreign + +-SUBDIRS=po intl src doc man debian ++SUBDIRS=po src doc man debian + EXTRA_DIST=weex-2.6.1.spec diff --git a/ftp/weex/files/patch-configure.in b/ftp/weex/files/patch-configure.in new file mode 100644 index 000000000000..0c9c08eb9032 --- /dev/null +++ b/ftp/weex/files/patch-configure.in @@ -0,0 +1,36 @@ +--- configure.in.orig 2014-09-19 21:34:27 UTC ++++ configure.in +@@ -1,5 +1,6 @@ + dnl Process this file with autoconf to produce a configure script. + AC_INIT(src/weex.c) ++AC_CONFIG_MACRO_DIR([m4]) + + PACKAGE=weex + VERSION=2.8.0 +@@ -24,8 +25,8 @@ AC_PROG_CC + AC_PROG_INSTALL + + dnl for gettext +-AM_GNU_GETTEXT +-AC_CHECK_FUNC(gettext,,AC_CHECK_LIB(intl, gettext)) ++AM_GNU_GETTEXT_VERSION([0.20]) ++AM_GNU_GETTEXT([external]) + localedir='${prefix}/share/locale' + AC_SUBST(localedir) + +@@ -33,7 +34,7 @@ dnl Checks for libraries. + AC_CHECK_LIB(socket,socket) + AC_CHECK_LIB(nsl,gethostbyname) + AC_CHECK_LIB([crypto],[CRYPTO_new_ex_data], +- AC_CHECK_LIB([ssl],[SSL_library_init], ++ AC_CHECK_LIB([ssl],[SSL_new], + [LIBS="$LIBS -lssl -lcrypto"; CFLAGS="$CFLAGS -DUSE_SSL=1"], []) + ) + +@@ -79,5 +80,5 @@ if test x$CC = xgcc; then + fi + + +-AC_OUTPUT(Makefile intl/Makefile src/Makefile po/Makefile.in \ ++AC_OUTPUT(Makefile src/Makefile po/Makefile.in \ + debian/Makefile doc/Makefile man/Makefile) diff --git a/ftp/weex/files/patch-po-fr.po b/ftp/weex/files/patch-po-fr.po new file mode 100644 index 000000000000..184aab736903 --- /dev/null +++ b/ftp/weex/files/patch-po-fr.po @@ -0,0 +1,11 @@ +--- po/fr.po.orig 2000-06-13 11:57:11 UTC ++++ po/fr.po +@@ -32,7 +32,7 @@ msgstr "Création d'un nouveau fichier.\n" + #: src/cache.c:83 src/cache.c:89 + #, c-format + msgid "Cache file `%s' is broken at line %d.\n" +-msgstr "Le fichier de cache a une erreur à la ligne %d.\n" ++msgstr "Le fichier de cache `%s' a une erreur à la ligne %d.\n" + + #: src/cache.c:200 + msgid "Internal error: cache facility is broken.\n" diff --git a/ftp/weex/files/patch-src-Makefile.am b/ftp/weex/files/patch-src-Makefile.am new file mode 100644 index 000000000000..38d86e86acd0 --- /dev/null +++ b/ftp/weex/files/patch-src-Makefile.am @@ -0,0 +1,10 @@ +--- src/Makefile.am.orig 2014-09-19 09:09:22 UTC ++++ src/Makefile.am +@@ -3,6 +3,5 @@ weex_SOURCES=config.c ftplib.c ftplib.h weex.c intl.h + parsecfg.c parsecfg.h proto.h shhopt.c shhopt.h strlib.c strlib.h variable.h \ + ftpmain.c message.c cache.c sub.c filedata.c log.c + +-LDADD=$(INTLLIBS) ++LDADD=$(LIBINTL) + AM_CPPFLAGS=-DLOCALEDIR=\""$(localedir)"\" +-INCLUDES=-I$(top_srcdir)/intl -I$(top_builddir)/intl diff --git a/ftp/weex/pkg-plist b/ftp/weex/pkg-plist index 224d57c7e386..d0d96f1cb15c 100644 --- a/ftp/weex/pkg-plist +++ b/ftp/weex/pkg-plist @@ -1,3 +1,8 @@ bin/weex man/man1/weex.1.gz -%%EXAMPLESDIR%%/sample.weexrc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.weexrc +%%NLS%%share/locale/de/LC_MESSAGES/weex.mo +%%NLS%%share/locale/es/LC_MESSAGES/weex.mo +%%NLS%%share/locale/fr/LC_MESSAGES/weex.mo +%%NLS%%share/locale/ja/LC_MESSAGES/weex.mo +%%NLS%%share/locale/nl/LC_MESSAGES/weex.mo |