Date: Wed, 25 Jan 2017 16:09:44 +0000 (UTC) From: Max Khon <fjoe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432428 - in head/sysutils/tartarus: . files Message-ID: <201701251609.v0PG9ig9085344@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: fjoe Date: Wed Jan 25 16:09:44 2017 New Revision: 432428 URL: https://svnweb.freebsd.org/changeset/ports/432428 Log: - Fix test expression (/usr/local/bin/tartarus: line 716: [: missing `]') - Add runtime dependency on misc/getopt as base getopt does not understand long options Approved by: maintainer timeout Modified: head/sysutils/tartarus/Makefile head/sysutils/tartarus/files/patch-bin__tartarus Modified: head/sysutils/tartarus/Makefile ============================================================================== --- head/sysutils/tartarus/Makefile Wed Jan 25 16:01:31 2017 (r432427) +++ head/sysutils/tartarus/Makefile Wed Jan 25 16:09:44 2017 (r432428) @@ -3,7 +3,7 @@ PORTNAME= tartarus PORTVERSION= 0.9.8 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils MASTER_SITES= http://wertarbyte.de/tartarus/ \ http://ftp.wilbury.sk/pub/FreeBSD/local/distfiles/ @@ -16,7 +16,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= ${LOCALBASE}/bin/bash:shells/bash \ ${LOCALBASE}/bin/gtar:archivers/gtar \ - ${LOCALBASE}/bin/curl:ftp/curl + ${LOCALBASE}/bin/curl:ftp/curl \ + ${LOCALBASE}/bin/getopt:misc/getopt USES= gmake perl5 shebangfix tar:bzip2 SHEBANG_FILES= ${WRKSRC}/bin/* Modified: head/sysutils/tartarus/files/patch-bin__tartarus ============================================================================== --- head/sysutils/tartarus/files/patch-bin__tartarus Wed Jan 25 16:01:31 2017 (r432427) +++ head/sysutils/tartarus/files/patch-bin__tartarus Wed Jan 25 16:09:44 2017 (r432428) @@ -1,5 +1,5 @@ ---- ./bin/tartarus.orig 2014-06-28 01:35:27.535761589 +0200 -+++ ./bin/tartarus 2014-06-28 01:38:03.361776923 +0200 +--- bin/tartarus.orig 2016-08-08 16:38:21.322171000 +0000 ++++ bin/tartarus 2016-08-08 16:39:07.701706000 +0000 @@ -41,6 +41,8 @@ set -f shopt -s nocasematch @@ -94,7 +94,7 @@ - if isEnabled "$STORAGE_FTP_USE_SFTP"; then - PROTO="sftp" - fi -+ [ "$SFTP_AUTH_METHOD" != "pubkey" && "$STORAGE_FTP_PASSWORD" != "" ] && OPTS="${OPTS}${STORAGE_FTP_PASSWORD}" ++ [ "$SFTP_AUTH_METHOD" != "pubkey" -a "$STORAGE_FTP_PASSWORD" != "" ] && OPTS="${OPTS}${STORAGE_FTP_PASSWORD}" + if isEnabled "$STORAGE_FTP_USE_SFTP"; then + PROTO="sftp" + if isEnabled "$STORAGE_FTP_SSL_INSECURE"; then
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701251609.v0PG9ig9085344>