Re: UPDATE: net/lftp

2017-10-16 Thread Rafael Sadowski 
On Wed Oct 11, 2017 at 04:23:32PM +0200, Jeremie Courreges-Anglas wrote:
> On Tue, Oct 10 2017, Stuart Henderson  wrote:
> > On 2017/10/09 22:34, Rafael Sadowski wrote:
> >> +RUN_DEPENDS +=devel/desktop-file-utils \
> >> +  x11/gtk+3,-guic
> >
> > oh yuk, please don't pull that in for a CLI ftp client..
> 
> +1
> 
> 

Please find below a new diff without ${PREFIX}/share/icons and
${PREFIX}/share/applications.


Index: Makefile
===
RCS file: /cvs/ports/net/lftp/Makefile,v
retrieving revision 1.120
diff -u -p -u -p -r1.120 Makefile
--- Makefile22 Aug 2017 15:48:45 -  1.120
+++ Makefile16 Oct 2017 20:12:37 -
@@ -2,21 +2,21 @@
 
 COMMENT=   shell-like command line ftp and sftp client
 
-DISTNAME=  lftp-4.7.8
+DISTNAME=  lftp-4.8.3
 CATEGORIES=net
 
 HOMEPAGE=  https://lftp.tech/
 
-MAINTAINER=Rafael Sadowski 
+MAINTAINER=Rafael Sadowski 
 
 # GPLv3+
 PERMIT_PACKAGE_CDROM=  Yes
 
-WANTLIB += c crypto curses ereadline expat iconv idn intl m ssl
-WANTLIB += ${COMPILER_LIBCXX} util z
+WANTLIB += ${COMPILER_LIBCXX} c crypto curses ereadline expat
+WANTLIB += iconv idn2 intl m ssl unistring util z
 
 # lftp needs add_history_time()
-LIB_DEPENDS=   devel/libidn \
+LIB_DEPENDS=   devel/libidn2 \
devel/gettext \
devel/readline>=6.1p2
 
@@ -38,6 +38,7 @@ NO_TEST=  Yes
 FAKE_FLAGS=sysconfdir=${PREFIX}/share/examples/lftp
 
 post-install:
-   rm -f ${PREFIX}/lib/liblftp-{jobs,tasks}.{a,la}
+   rm -rf ${PREFIX}/lib/liblftp-{jobs,tasks}.{a,la} \
+   ${PREFIX}/share/{icons,applications}
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/net/lftp/distinfo,v
retrieving revision 1.74
diff -u -p -u -p -r1.74 distinfo
--- distinfo22 Aug 2017 15:48:45 -  1.74
+++ distinfo16 Oct 2017 20:12:37 -
@@ -1,2 +1,2 @@
-SHA256 (lftp-4.7.8.tar.gz) = uiPyjeWRNqA9GVKccUL8kip5FsQPyB1qxjm74ZnkSGM=
-SIZE (lftp-4.7.8.tar.gz) = 2777576
+SHA256 (lftp-4.8.3.tar.gz) = z7u9Bnwl/51imCigEMxwAhSFmwLjOyQF3+ftBF0IDw8=
+SIZE (lftp-4.8.3.tar.gz) = 2831712
Index: patches/patch-configure
===
RCS file: /cvs/ports/net/lftp/patches/patch-configure,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 patch-configure
--- patches/patch-configure 22 Aug 2017 15:48:45 -  1.19
+++ patches/patch-configure 16 Oct 2017 20:12:37 -
@@ -5,7 +5,7 @@ Use GNU readline as our base readline la
 Index: configure
 --- configure.orig
 +++ configure
-@@ -49827,7 +49827,7 @@ fi
+@@ -50434,7 +50434,7 @@ fi
readline_include_dir="$readline_include_dir/readline"
fi
  readline_ld_flags="-L$readline_prefix/lib"
Index: patches/patch-doc_lftp_1
===
RCS file: /cvs/ports/net/lftp/patches/patch-doc_lftp_1,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-doc_lftp_1
--- patches/patch-doc_lftp_129 Jun 2017 08:49:33 -  1.1
+++ patches/patch-doc_lftp_116 Oct 2017 20:12:37 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-doc_lftp_1,v 1.1 2017/06
 Index: doc/lftp.1
 --- doc/lftp.1.orig
 +++ doc/lftp.1
-@@ -767,7 +767,8 @@ FXP is automatically used for transfers between FTP se
+@@ -783,7 +783,8 @@ FXP is automatically used for transfers between FTP se
  Some FTP servers hide dot-files by default (e.g. \fI.htaccess\fP), and show
  them only when LIST command is used with \-a option. In such case try to use
  `set ftp:list-options \-a'.
Index: patches/patch-src_Makefile_in
===
RCS file: /cvs/ports/net/lftp/patches/patch-src_Makefile_in,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 patch-src_Makefile_in
--- patches/patch-src_Makefile_in   22 Aug 2017 15:48:45 -  1.15
+++ patches/patch-src_Makefile_in   16 Oct 2017 20:12:37 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.15 2
 Index: src/Makefile.in
 --- src/Makefile.in.orig
 +++ src/Makefile.in
-@@ -240,7 +240,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(p
+@@ -245,7 +245,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(p
"$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
"$(DESTDIR)$(pkgdatadir)"
  LTLIBRARIES = $(lib_LTLIBRARIES) $(pkgverlib_LTLIBRARIES)

Re: UPDATE: net/lftp

2017-10-11 Thread Jeremie Courreges-Anglas 
On Tue, Oct 10 2017, Stuart Henderson  wrote:
> On 2017/10/09 22:34, Rafael Sadowski wrote:
>> +RUN_DEPENDS +=  devel/desktop-file-utils \
>> +x11/gtk+3,-guic
>
> oh yuk, please don't pull that in for a CLI ftp client..

+1

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: UPDATE: net/lftp

2017-10-10 Thread Stuart Henderson 
On 2017/10/09 22:34, Rafael Sadowski wrote:
> +RUN_DEPENDS +=   devel/desktop-file-utils \
> + x11/gtk+3,-guic

oh yuk, please don't pull that in for a CLI ftp client..

Re: UPDATE: net/lftp

2017-10-09 Thread Rafael Sadowski 
On Sat Sep 23, 2017 at 06:17:40PM +, Rafael Sadowski wrote:
> Hi all,
> 
> please find below an update diff for lftp 4.8.1. I add a simple patch to
> avoid running into an assert at the program end.
> 
> Changelog between 4.7.1 and 4.8.1
> 
> Version 4.8.1 - 2017-09-12
> 
> - improved rate limiting to allow per-host limits.
> - ftp: make prefer-epsv default "no".
> - ftp: fixed quote command and ftp:use-stat-for-list setting.
> - switched to libidn2.
> - fixed build with LibreSSL.
> - fixed configure --disable-rpath.
> - fixed coredump when a parent directory was deleted.
> 
> Version 4.8.0 - 2017-07-10
> 
> - mirror: improved performance of --scan-all-first for big trees.
> - mirror: new --flat option to flatten the target directory structure.
> - mmv: new command for file moving; redirect mv to mmv in certain cases.
> - fixed compilation with newer openssl (1.1.0 and later).
> - du: allow multiple --exclude options to be combined.
> - new setting cmd:nullglob for `glob' command prefix.
> - http: use proppatch to set last-modified property.
> - new settings net:connection-limit-timer and ftp:too-many-re.
> - ftp: dynamically ajust connection limit.
> - ftp: fixed core dump on LINK/SYMLINK when the command is not
>   supported.
> - get1: fixed -o option.
> - sftp,fish: connect-program setting is now passed to the shell for
>   execution.
> - get/mget/put/mput: add -P option for parallel transfers and long
>   options.
> - appimage: new make target for making an AppImage file.
> - fixed "local glob".
> 
> Ok? Comments?
> 
> Best regards,
> 
> Rafael Sadowski
> 

*ping* with new diff to bring lftp to 4.8.2 and without bogus assert
patch.

Index: Makefile
===
RCS file: /cvs/ports/net/lftp/Makefile,v
retrieving revision 1.120
diff -u -p -u -p -r1.120 Makefile
--- Makefile22 Aug 2017 15:48:45 -  1.120
+++ Makefile9 Oct 2017 20:28:38 -
@@ -2,23 +2,26 @@
 
 COMMENT=   shell-like command line ftp and sftp client
 
-DISTNAME=  lftp-4.7.8
+DISTNAME=  lftp-4.8.3
 CATEGORIES=net
 
 HOMEPAGE=  https://lftp.tech/
 
-MAINTAINER=Rafael Sadowski 
+MAINTAINER=Rafael Sadowski 
 
 # GPLv3+
 PERMIT_PACKAGE_CDROM=  Yes
 
-WANTLIB += c crypto curses ereadline expat iconv idn intl m ssl
-WANTLIB += ${COMPILER_LIBCXX} util z
+WANTLIB += ${COMPILER_LIBCXX} c crypto curses ereadline expat
+WANTLIB += iconv idn2 intl m ssl unistring util z
 
 # lftp needs add_history_time()
-LIB_DEPENDS=   devel/libidn \
+LIB_DEPENDS=   devel/libidn2 \
devel/gettext \
devel/readline>=6.1p2
+
+RUN_DEPENDS += devel/desktop-file-utils \
+   x11/gtk+3,-guic
 
 MASTER_SITES=  http://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/ \
http://lftp.yar.ru/ftp/ \
Index: distinfo
===
RCS file: /cvs/ports/net/lftp/distinfo,v
retrieving revision 1.74
diff -u -p -u -p -r1.74 distinfo
--- distinfo22 Aug 2017 15:48:45 -  1.74
+++ distinfo9 Oct 2017 20:28:38 -
@@ -1,2 +1,2 @@
-SHA256 (lftp-4.7.8.tar.gz) = uiPyjeWRNqA9GVKccUL8kip5FsQPyB1qxjm74ZnkSGM=
-SIZE (lftp-4.7.8.tar.gz) = 2777576
+SHA256 (lftp-4.8.3.tar.gz) = z7u9Bnwl/51imCigEMxwAhSFmwLjOyQF3+ftBF0IDw8=
+SIZE (lftp-4.8.3.tar.gz) = 2831712
Index: patches/patch-configure
===
RCS file: /cvs/ports/net/lftp/patches/patch-configure,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 patch-configure
--- patches/patch-configure 22 Aug 2017 15:48:45 -  1.19
+++ patches/patch-configure 9 Oct 2017 20:28:38 -
@@ -5,7 +5,7 @@ Use GNU readline as our base readline la
 Index: configure
 --- configure.orig
 +++ configure
-@@ -49827,7 +49827,7 @@ fi
+@@ -50434,7 +50434,7 @@ fi
readline_include_dir="$readline_include_dir/readline"
fi
  readline_ld_flags="-L$readline_prefix/lib"
Index: patches/patch-doc_lftp_1
===
RCS file: /cvs/ports/net/lftp/patches/patch-doc_lftp_1,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-doc_lftp_1
--- patches/patch-doc_lftp_129 Jun 2017 08:49:33 -  1.1
+++ patches/patch-doc_lftp_19 Oct 2017 20:28:38 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-doc_lftp_1,v 1.1 2017/06
 Index: doc/lftp.1
 --- doc/lftp.1.orig
 +++ doc/lftp.1
-@@ -767,7 +767,8 @@ FXP is automatically used for transfers between FTP se
+@@ -783,7 +783,8 @@ FXP is automatically used for transfers between FTP se
  Some FTP servers hide dot-files by default (e.g. \fI.htaccess\fP), and show
  them only when LIST command is used with \-a option. In such case try to use
  `set ftp:list-options \-a'.
Index: patches/patch-src_Makefile_in
===
RCS file: /cvs/ports/net/lftp/patches/patch-src_Makefile_in,v

Re: UPDATE: net/lftp 4.7.6

2017-02-15 Thread Rafael Sadowski 
On Wed Feb 15, 2017 at 09:42:54PM +, Stuart Henderson wrote:
> On 2017/02/15 22:13, Rafael Sadowski wrote:
> > - add gettext-tools as RUN_DEPENDS to calm portcheck.
> 
> that doesn't make sense.

D'oh! I always fall back on it. lftp needs gettext and this comes with
devel/libidn. I would like to add gettext explicit as LIB_DEPENDS.

Thanks Stuart!


Index: Makefile
===
RCS file: /cvs/ports/net/lftp/Makefile,v
retrieving revision 1.112
diff -u -p -u -p -r1.112 Makefile
--- Makefile15 Feb 2017 15:27:48 -  1.112
+++ Makefile15 Feb 2017 21:57:37 -
@@ -2,7 +2,7 @@
 
 COMMENT=   shell-like command line ftp and sftp client
 
-DISTNAME=  lftp-4.7.5
+DISTNAME=  lftp-4.7.6
 CATEGORIES=net
 
 HOMEPAGE=  https://lftp.tech/
@@ -19,7 +19,8 @@ USE_GROFF=Yes
 
 # lftp needs add_history_time()
 LIB_DEPENDS=   devel/libidn \
-   devel/readline>=6.1p2 \
+   devel/gettext \
+   devel/readline>=6.1p2
 
 MASTER_SITES=  http://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/ \
http://lftp.yar.ru/ftp/ \
Index: distinfo
===
RCS file: /cvs/ports/net/lftp/distinfo,v
retrieving revision 1.71
diff -u -p -u -p -r1.71 distinfo
--- distinfo15 Feb 2017 15:27:48 -  1.71
+++ distinfo15 Feb 2017 21:57:37 -
@@ -1,2 +1,2 @@
-SHA256 (lftp-4.7.5.tar.gz) = TvwATyIM4EkML5YSSDwHQca0LszLZp/CMamT582YKp0=
-SIZE (lftp-4.7.5.tar.gz) = 2753728
+SHA256 (lftp-4.7.6.tar.gz) = LIdzmT7Ab1nXpXNAkOZOw38Qb5iyULjEdsVcwLNap10=
+SIZE (lftp-4.7.6.tar.gz) = 2760657
Index: patches/patch-configure
===
RCS file: /cvs/ports/net/lftp/patches/patch-configure,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 patch-configure
--- patches/patch-configure 15 Feb 2017 15:27:48 -  1.16
+++ patches/patch-configure 15 Feb 2017 21:57:37 -
@@ -2,9 +2,9 @@ $OpenBSD: patch-configure,v 1.16 2017/02
 
 Use GNU readline as our base readline lacks add_history_time().
 
 configure.orig Sun Jan  1 18:26:12 2017
-+++ configure  Mon Jan 16 14:58:09 2017
-@@ -49079,7 +49079,7 @@ fi
+--- configure.orig Wed Feb 15 07:48:02 2017
 configure  Wed Feb 15 21:53:13 2017
+@@ -49232,7 +49232,7 @@ fi
readline_include_dir="$readline_include_dir/readline"
fi
  readline_ld_flags="-L$readline_prefix/lib"
Index: patches/patch-src_Makefile_in
===
RCS file: /cvs/ports/net/lftp/patches/patch-src_Makefile_in,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 patch-src_Makefile_in
--- patches/patch-src_Makefile_in   25 Nov 2016 23:05:11 -  1.13
+++ patches/patch-src_Makefile_in   15 Feb 2017 21:57:37 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-src_Makefile_in,v 1.13 2016/11/25 23:05:11 jca Exp $
 src/Makefile.in.orig   Wed Nov 16 14:11:29 2016
-+++ src/Makefile.inThu Nov 17 18:51:19 2016
-@@ -237,7 +237,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(p
+--- src/Makefile.in.orig   Wed Feb 15 07:48:01 2017
 src/Makefile.inWed Feb 15 21:53:13 2017
+@@ -239,7 +239,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(p
"$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
"$(DESTDIR)$(pkgdatadir)"
  LTLIBRARIES = $(lib_LTLIBRARIES) $(pkgverlib_LTLIBRARIES)
Index: patches/patch-src_Resolver_cc
===
RCS file: patches/patch-src_Resolver_cc
diff -N patches/patch-src_Resolver_cc
--- patches/patch-src_Resolver_cc   15 Feb 2017 15:27:48 -  1.14
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_Resolver_cc,v 1.14 2017/02/15 15:27:48 sthen Exp $
-
-"Cast address to IN6_IS_ADDR_LINKLOCAL."
-
-backport from github 259d642e1fea2ddf38763d49e8e7701f0a947d4c
-
 src/Resolver.cc.orig   Mon Jan 16 21:44:52 2017
-+++ src/Resolver.ccMon Jan 16 21:45:30 2017
-@@ -318,7 +318,7 @@ void Resolver::AddAddress(int family,const char *addre
-case AF_INET6:
-   if(sizeof(add.in6.sin6_addr) != len)
-  return;
--  if(IN6_IS_ADDR_LINKLOCAL(address) && scope==0) {
-+  if(IN6_IS_ADDR_LINKLOCAL((const struct in6_addr*)address) && scope==0) {
-error=_("Link-local IPv6 address should have a scope");
-return;
-   }

Re: UPDATE: net/lftp 4.7.6

2017-02-15 Thread Stuart Henderson 
On 2017/02/15 22:13, Rafael Sadowski wrote:
> - add gettext-tools as RUN_DEPENDS to calm portcheck.

that doesn't make sense.

Re: UPDATE: net/lftp

2017-02-15 Thread Rafael Sadowski 
*ping*

On Tue Jan 24, 2017 at 07:39:08PM +0100, Rafael Sadowski wrote:
> Hi ports@,
> 
> simple update to 4.7.5. Changelog:
> 
> Version 4.7.5 - 2017-01-01:
> 
> - http: recognize apache listing with ISO date/time.
> - ipv6: ignore link-local address without a scope.
> - new settings log:prefix-{recv,send,note,error}.
> - documentation and help improvements.
> - mirror: fixed recursion mode initialization.
> - mirror: fixed assertion failure when creating remote symlinks.
> - mirror: show chmod errors when verbose.
> - fixed debug command to switch output to stderr if no output file given.
> - ftp: add "site mkdir" support for "mkdir -p".
> - ftp: fixed a long delay in "mode z" with ProFTPD.
> - ftp: fixed a failed assertion in "mode z".
> 
> Tested on amd64.
> 
> Best regards,
> 
> Rafael Sadowski
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/lftp/Makefile,v
> retrieving revision 1.111
> diff -u -p -u -p -r1.111 Makefile
> --- Makefile  25 Nov 2016 23:05:11 -  1.111
> +++ Makefile  24 Jan 2017 18:21:51 -
> @@ -2,7 +2,7 @@
>  
>  COMMENT= shell-like command line ftp and sftp client
>  
> -DISTNAME=lftp-4.7.4
> +DISTNAME=lftp-4.7.5
>  CATEGORIES=  net
>  
>  HOMEPAGE=https://lftp.tech/
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/lftp/distinfo,v
> retrieving revision 1.70
> diff -u -p -u -p -r1.70 distinfo
> --- distinfo  25 Nov 2016 23:05:11 -  1.70
> +++ distinfo  24 Jan 2017 18:21:51 -
> @@ -1,2 +1,2 @@
> -SHA256 (lftp-4.7.4.tar.gz) = j1XDfP37ziSpy0e2IcoSf0DTp95bTEn4xJ8Xv/co+zE=
> -SIZE (lftp-4.7.4.tar.gz) = 2766143
> +SHA256 (lftp-4.7.5.tar.gz) = TvwATyIM4EkML5YSSDwHQca0LszLZp/CMamT582YKp0=
> +SIZE (lftp-4.7.5.tar.gz) = 2753728
> Index: patches/patch-configure
> ===
> RCS file: /cvs/ports/net/lftp/patches/patch-configure,v
> retrieving revision 1.15
> diff -u -p -u -p -r1.15 patch-configure
> --- patches/patch-configure   25 Nov 2016 23:05:11 -  1.15
> +++ patches/patch-configure   24 Jan 2017 18:21:51 -
> @@ -2,9 +2,9 @@ $OpenBSD: patch-configure,v 1.15 2016/11
>  
>  Use GNU readline as our base readline lacks add_history_time().
>  
>  configure.orig   Wed Nov 16 14:11:30 2016
> -+++ configureThu Nov 17 18:51:19 2016
> -@@ -48854,7 +48854,7 @@ fi
> +--- configure.orig   Sun Jan  1 18:26:12 2017
>  configureMon Jan 16 14:58:09 2017
> +@@ -49079,7 +49079,7 @@ fi
>   readline_include_dir="$readline_include_dir/readline"
>   fi
>   readline_ld_flags="-L$readline_prefix/lib"
> Index: patches/patch-src_Resolver_cc
> ===
> RCS file: patches/patch-src_Resolver_cc
> diff -N patches/patch-src_Resolver_cc
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_Resolver_cc 24 Jan 2017 18:21:51 -
> @@ -0,0 +1,17 @@
> +$OpenBSD$
> +
> +"Cast address to IN6_IS_ADDR_LINKLOCAL."
> +
> +backport from github 259d642e1fea2ddf38763d49e8e7701f0a947d4c
> +
> +--- src/Resolver.cc.orig Mon Jan 16 21:44:52 2017
>  src/Resolver.cc  Mon Jan 16 21:45:30 2017
> +@@ -318,7 +318,7 @@ void Resolver::AddAddress(int family,const char *addre
> +case AF_INET6:
> +   if(sizeof(add.in6.sin6_addr) != len)
> +  return;
> +-  if(IN6_IS_ADDR_LINKLOCAL(address) && scope==0) {
> ++  if(IN6_IS_ADDR_LINKLOCAL((const struct in6_addr*)address) && 
> scope==0) {
> +  error=_("Link-local IPv6 address should have a scope");
> +  return;
> +   }

Re: UPDATE: net/lftp

2016-11-24 Thread Rafael Sadowski 
On Thu Nov 24, 2016 at 04:45:13AM +0100, Jeremie Courreges-Anglas wrote:
> Rafael Sadowski  writes:
> 
> > On Wed Nov 23, 2016 at 12:24:01PM +, Stuart Henderson wrote:
> >> On 2016/11/22 04:40, Jeremie Courreges-Anglas wrote:
> >> > >  # lftp needs add_history_time()
> >> > >  LIB_DEPENDS=  devel/libidn \
> >> > >devel/readline>=6.1p2 \
> >> > > +
> >> > > +RUN_DEPENDS=  devel/gettext
> >> > 
> >> > I do not understand this.  gettext could be part of LIB_DEPENDS, but why
> >> > would it be a RUN_DEPENDS?
> >
> > It was an hint from portcheck:
> > "translation file(s) found without devel/gettext dependency in RUN_DEPENDS"
> >
> >> > 
> >> > Even if lftp directly uses gettext, it seems that the preferred approach
> >> > is not to explicitely add it to LIB_DEPENDS, as libidn already brings
> >> > it.
> >
> > I forgot it again. Yes gettext comes with libidn so I prefer a small diff
> > without any gettext changes.
> 
> Fine with me...
> 
> >> 
> >> Personally I prefer listing as a LIB_DEPENDS if it's known that a port
> >> uses it directly, it reduces the fallout if a well-used dependency is
> >> dropped later (like with curl/libidn). But I know for sure that opinions
> >> vary here :-)
> 
> but I'm with Stuart on that one.
> 
> >> > > +BUILD_DEPENDS =   devel/gettext-tools
> >> > 
> >> > I see that there are tests for these tools at configure time, however
> >> > they don't seem to be strictly needed to build a proper package.  No
> >> > objection if you want to keep this in BUILD_DEPENDS, if you think it
> >> > might prevent failures in bulks one day.
> >> 
> >> Simple test: make configure with gettext-tools installed, pkg_delete 
> >> gettext-tools, see if it still builds+packages.
> >
> > Oh, so simple, great advice. Tested with deleted gettext-tools and lftp
> > builds/packages fine.
> >
> >> 
> >> > >  MASTER_SITES= https://lftp.yar.ru/ftp/
> >> > 
> >> > There is a problem with MASTER_SITES and redirections here.
> >> > 
> >> > ritchie /usr/ports/net/lftp$ ftp 
> >> > https://lftp.yar.ru/ftp/lftp-4.7.4.tar.gz
> >> > Trying 213.187.99.145...
> >> > Requesting https://lftp.yar.ru/ftp/lftp-4.7.4.tar.gz
> >> > Redirected to https://lftp.tech/ftp/lftp-4.7.4.tar.gz
> >> > Trying 213.187.99.145...
> >> > Requesting https://lftp.tech/ftp/lftp-4.7.4.tar.gz
> >> > Redirected to https://lftp.tech/get.html
> >> > Trying 213.187.99.145...
> >> > Requesting https://lftp.tech/get.html
> >> > 100% |[...]***| 10156   00:00
> >> > 10156 bytes received in 0.02 seconds (399.32 KB/s)
> >> > ritchie /usr/ports/net/lftp$ ftp http://lftp.tech/ftp/lftp-4.7.4.tar.gz
> >> > Trying 213.187.99.145...
> >> > Requesting http://lftp.tech/ftp/lftp-4.7.4.tar.gz
> >> > Redirected to http://lftp.tech/get.html
> >> > Trying 213.187.99.145...
> >> > Requesting http://lftp.tech/get.html
> >> > 100% |[...]***| 10156   00:00
> >> > 10156 bytes received in 0.02 seconds (412.92 KB/s)
> >> > 
> >> > Did you use ''make fetch'' to grab the tarball?
> >> 
> >> Oh "nice", it looks like they redirect by default, but skip the redirection
> >> if it's curl or wget.
> 
> ...
> 
> >> > -MASTER_SITES=   https://lftp.yar.ru/ftp/
> >> > +MASTER_SITES=   https://lftp.yar.ru/ftp/ \
> >> > +ftp://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/
> >> 
> >> Could you s/ftp/http/ (or add http first) please?
> >
> > That's new. I prefer to switch ftp.st.ryukoku.ac.jp as number one.
> 
> As noted by Stuart, I propose to also add ftp:// last, for ''make
> peek-ftp''.
> 
> So, are you both ok with the following diff? :)

I'm ok with the diff below.

Thanks,

Rafael

> 
> 
> Index: Makefile
> ===
> RCS file: /d/cvs/ports/net/lftp/Makefile,v
> retrieving revision 1.110
> diff -u -p -r1.110 Makefile
> --- Makefile  7 Aug 2016 21:40:20 -   1.110
> +++ Makefile  24 Nov 2016 03:29:19 -
> @@ -2,10 +2,10 @@
>  
>  COMMENT= shell-like command line ftp and sftp client
>  
> -DISTNAME=lftp-4.7.3
> +DISTNAME=lftp-4.7.4
>  CATEGORIES=  net
>  
> -HOMEPAGE=https://lftp.yar.ru/
> +HOMEPAGE=https://lftp.tech/
>  
>  MAINTAINER=  Rafael Sadowski 
>  
> @@ -21,7 +21,9 @@ USE_GROFF=  Yes
>  LIB_DEPENDS= devel/libidn \
>   devel/readline>=6.1p2 \
>  
> -MASTER_SITES=https://lftp.yar.ru/ftp/
> +MASTER_SITES=http://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/ \
> + http://lftp.yar.ru/ftp/ \
> + ftp://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/
>  
>  LIBTOOL_FLAGS=   --tag=disable-shared
>  CONFIGURE_STYLE= gnu
> Index: distinfo
> ===
> RCS file: /d/cvs/ports/net/lftp/distinfo,v
> retrieving revision 1.69
> diff -u -p -r1.69 distinfo
> --- distinfo  7 Aug 2016 21:40:20 -   1.69
> +++ distinfo  24 Nov 2016 03:28:18 -
> @@ -1,2 +1,2 @@
>

Re: UPDATE: net/lftp

2016-11-23 Thread Jeremie Courreges-Anglas 
Rafael Sadowski  writes:

> On Wed Nov 23, 2016 at 12:24:01PM +, Stuart Henderson wrote:
>> On 2016/11/22 04:40, Jeremie Courreges-Anglas wrote:
>> > >  # lftp needs add_history_time()
>> > >  LIB_DEPENDS=devel/libidn \
>> > >  devel/readline>=6.1p2 \
>> > > +
>> > > +RUN_DEPENDS=devel/gettext
>> > 
>> > I do not understand this.  gettext could be part of LIB_DEPENDS, but why
>> > would it be a RUN_DEPENDS?
>
> It was an hint from portcheck:
> "translation file(s) found without devel/gettext dependency in RUN_DEPENDS"
>
>> > 
>> > Even if lftp directly uses gettext, it seems that the preferred approach
>> > is not to explicitely add it to LIB_DEPENDS, as libidn already brings
>> > it.
>
> I forgot it again. Yes gettext comes with libidn so I prefer a small diff
> without any gettext changes.

Fine with me...

>> 
>> Personally I prefer listing as a LIB_DEPENDS if it's known that a port
>> uses it directly, it reduces the fallout if a well-used dependency is
>> dropped later (like with curl/libidn). But I know for sure that opinions
>> vary here :-)

but I'm with Stuart on that one.

>> > > +BUILD_DEPENDS = devel/gettext-tools
>> > 
>> > I see that there are tests for these tools at configure time, however
>> > they don't seem to be strictly needed to build a proper package.  No
>> > objection if you want to keep this in BUILD_DEPENDS, if you think it
>> > might prevent failures in bulks one day.
>> 
>> Simple test: make configure with gettext-tools installed, pkg_delete 
>> gettext-tools, see if it still builds+packages.
>
> Oh, so simple, great advice. Tested with deleted gettext-tools and lftp
> builds/packages fine.
>
>> 
>> > >  MASTER_SITES=   https://lftp.yar.ru/ftp/
>> > 
>> > There is a problem with MASTER_SITES and redirections here.
>> > 
>> > ritchie /usr/ports/net/lftp$ ftp https://lftp.yar.ru/ftp/lftp-4.7.4.tar.gz
>> > Trying 213.187.99.145...
>> > Requesting https://lftp.yar.ru/ftp/lftp-4.7.4.tar.gz
>> > Redirected to https://lftp.tech/ftp/lftp-4.7.4.tar.gz
>> > Trying 213.187.99.145...
>> > Requesting https://lftp.tech/ftp/lftp-4.7.4.tar.gz
>> > Redirected to https://lftp.tech/get.html
>> > Trying 213.187.99.145...
>> > Requesting https://lftp.tech/get.html
>> > 100% |[...]***| 10156   00:00
>> > 10156 bytes received in 0.02 seconds (399.32 KB/s)
>> > ritchie /usr/ports/net/lftp$ ftp http://lftp.tech/ftp/lftp-4.7.4.tar.gz
>> > Trying 213.187.99.145...
>> > Requesting http://lftp.tech/ftp/lftp-4.7.4.tar.gz
>> > Redirected to http://lftp.tech/get.html
>> > Trying 213.187.99.145...
>> > Requesting http://lftp.tech/get.html
>> > 100% |[...]***| 10156   00:00
>> > 10156 bytes received in 0.02 seconds (412.92 KB/s)
>> > 
>> > Did you use ''make fetch'' to grab the tarball?
>> 
>> Oh "nice", it looks like they redirect by default, but skip the redirection
>> if it's curl or wget.

...

>> > -MASTER_SITES= https://lftp.yar.ru/ftp/
>> > +MASTER_SITES= https://lftp.yar.ru/ftp/ \
>> > +  ftp://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/
>> 
>> Could you s/ftp/http/ (or add http first) please?
>
> That's new. I prefer to switch ftp.st.ryukoku.ac.jp as number one.

As noted by Stuart, I propose to also add ftp:// last, for ''make
peek-ftp''.

So, are you both ok with the following diff? :)


Index: Makefile
===
RCS file: /d/cvs/ports/net/lftp/Makefile,v
retrieving revision 1.110
diff -u -p -r1.110 Makefile
--- Makefile7 Aug 2016 21:40:20 -   1.110
+++ Makefile24 Nov 2016 03:29:19 -
@@ -2,10 +2,10 @@
 
 COMMENT=   shell-like command line ftp and sftp client
 
-DISTNAME=  lftp-4.7.3
+DISTNAME=  lftp-4.7.4
 CATEGORIES=net
 
-HOMEPAGE=  https://lftp.yar.ru/
+HOMEPAGE=  https://lftp.tech/
 
 MAINTAINER=Rafael Sadowski 
 
@@ -21,7 +21,9 @@ USE_GROFF=Yes
 LIB_DEPENDS=   devel/libidn \
devel/readline>=6.1p2 \
 
-MASTER_SITES=  https://lftp.yar.ru/ftp/
+MASTER_SITES=  http://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/ \
+   http://lftp.yar.ru/ftp/ \
+   ftp://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/
 
 LIBTOOL_FLAGS= --tag=disable-shared
 CONFIGURE_STYLE= gnu
Index: distinfo
===
RCS file: /d/cvs/ports/net/lftp/distinfo,v
retrieving revision 1.69
diff -u -p -r1.69 distinfo
--- distinfo7 Aug 2016 21:40:20 -   1.69
+++ distinfo24 Nov 2016 03:28:18 -
@@ -1,2 +1,2 @@
-SHA256 (lftp-4.7.3.tar.gz) = zmUZgxYDwZws8uPBC0HW3ch6FgSbmTg+e5t3+8dwchQ=
-SIZE (lftp-4.7.3.tar.gz) = 2715817
+SHA256 (lftp-4.7.4.tar.gz) = j1XDfP37ziSpy0e2IcoSf0DTp95bTEn4xJ8Xv/co+zE=
+SIZE (lftp-4.7.4.tar.gz) = 2766143
Index: patches/patch-configure
===
RCS file: /d/cvs/ports/net/lftp/patches/patch-configure,v

Re: UPDATE: net/lftp

2016-11-23 Thread Rafael Sadowski 
On Wed Nov 23, 2016 at 12:24:01PM +, Stuart Henderson wrote:
> On 2016/11/22 04:40, Jeremie Courreges-Anglas wrote:
> > >  # lftp needs add_history_time()
> > >  LIB_DEPENDS= devel/libidn \
> > >   devel/readline>=6.1p2 \
> > > +
> > > +RUN_DEPENDS= devel/gettext
> > 
> > I do not understand this.  gettext could be part of LIB_DEPENDS, but why
> > would it be a RUN_DEPENDS?

It was an hint from portcheck:
"translation file(s) found without devel/gettext dependency in RUN_DEPENDS"

> > 
> > Even if lftp directly uses gettext, it seems that the preferred approach
> > is not to explicitely add it to LIB_DEPENDS, as libidn already brings
> > it.

I forgot it again. Yes gettext comes with libidn so I prefer a small diff
without any gettext changes.

> 
> Personally I prefer listing as a LIB_DEPENDS if it's known that a port
> uses it directly, it reduces the fallout if a well-used dependency is
> dropped later (like with curl/libidn). But I know for sure that opinions
> vary here :-)
> 
> > > +BUILD_DEPENDS =  devel/gettext-tools
> > 
> > I see that there are tests for these tools at configure time, however
> > they don't seem to be strictly needed to build a proper package.  No
> > objection if you want to keep this in BUILD_DEPENDS, if you think it
> > might prevent failures in bulks one day.
> 
> Simple test: make configure with gettext-tools installed, pkg_delete 
> gettext-tools, see if it still builds+packages.

Oh, so simple, great advice. Tested with deleted gettext-tools and lftp
builds/packages fine.

> 
> > >  MASTER_SITES=https://lftp.yar.ru/ftp/
> > 
> > There is a problem with MASTER_SITES and redirections here.
> > 
> > ritchie /usr/ports/net/lftp$ ftp https://lftp.yar.ru/ftp/lftp-4.7.4.tar.gz
> > Trying 213.187.99.145...
> > Requesting https://lftp.yar.ru/ftp/lftp-4.7.4.tar.gz
> > Redirected to https://lftp.tech/ftp/lftp-4.7.4.tar.gz
> > Trying 213.187.99.145...
> > Requesting https://lftp.tech/ftp/lftp-4.7.4.tar.gz
> > Redirected to https://lftp.tech/get.html
> > Trying 213.187.99.145...
> > Requesting https://lftp.tech/get.html
> > 100% |[...]***| 10156   00:00
> > 10156 bytes received in 0.02 seconds (399.32 KB/s)
> > ritchie /usr/ports/net/lftp$ ftp http://lftp.tech/ftp/lftp-4.7.4.tar.gz
> > Trying 213.187.99.145...
> > Requesting http://lftp.tech/ftp/lftp-4.7.4.tar.gz
> > Redirected to http://lftp.tech/get.html
> > Trying 213.187.99.145...
> > Requesting http://lftp.tech/get.html
> > 100% |[...]***| 10156   00:00
> > 10156 bytes received in 0.02 seconds (412.92 KB/s)
> > 
> > Did you use ''make fetch'' to grab the tarball?
> 
> Oh "nice", it looks like they redirect by default, but skip the redirection
> if it's curl or wget.
> 
> > -MASTER_SITES=  https://lftp.yar.ru/ftp/
> > +MASTER_SITES=  https://lftp.yar.ru/ftp/ \
> > +   ftp://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/
> 
> Could you s/ftp/http/ (or add http first) please?

That's new. I prefer to switch ftp.st.ryukoku.ac.jp as number one.

Thanks jca@ and sthen@ fir your review and notes. New diff, see below:

Cheers,

Rafael

Index: Makefile
===
RCS file: /cvs/ports/net/lftp/Makefile,v
retrieving revision 1.110
diff -u -p -u -p -r1.110 Makefile
--- Makefile7 Aug 2016 21:40:20 -   1.110
+++ Makefile23 Nov 2016 18:24:59 -
@@ -2,10 +2,10 @@
 
 COMMENT=   shell-like command line ftp and sftp client
 
-DISTNAME=  lftp-4.7.3
+DISTNAME=  lftp-4.7.4
 CATEGORIES=net
 
-HOMEPAGE=  https://lftp.yar.ru/
+HOMEPAGE=  https://lftp.tech/
 
 MAINTAINER=Rafael Sadowski 
 
@@ -21,7 +21,8 @@ USE_GROFF=Yes
 LIB_DEPENDS=   devel/libidn \
devel/readline>=6.1p2 \
 
-MASTER_SITES=  https://lftp.yar.ru/ftp/
+MASTER_SITES=  http://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/ \
+   http://lftp.yar.ru/ftp/
 
 LIBTOOL_FLAGS= --tag=disable-shared
 CONFIGURE_STYLE= gnu
Index: distinfo
===
RCS file: /cvs/ports/net/lftp/distinfo,v
retrieving revision 1.69
diff -u -p -u -p -r1.69 distinfo
--- distinfo7 Aug 2016 21:40:20 -   1.69
+++ distinfo23 Nov 2016 18:24:59 -
@@ -1,2 +1,2 @@
-SHA256 (lftp-4.7.3.tar.gz) = zmUZgxYDwZws8uPBC0HW3ch6FgSbmTg+e5t3+8dwchQ=
-SIZE (lftp-4.7.3.tar.gz) = 2715817
+SHA256 (lftp-4.7.4.tar.gz) = j1XDfP37ziSpy0e2IcoSf0DTp95bTEn4xJ8Xv/co+zE=
+SIZE (lftp-4.7.4.tar.gz) = 2766143
Index: patches/patch-configure
===
RCS file: /cvs/ports/net/lftp/patches/patch-configure,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 patch-configure
--- patches/patch-configure 7 Aug 2016 21:40:20 -   1.14
+++ patches/patch-configure 23 Nov 2016 18:24:59 -
@@ -2,9 +2,9 @@ $OpenBSD: patch-configure,v 1.14 2016/08
 
 Use GNU readline as our base readline

Re: UPDATE: net/lftp

2016-11-23 Thread Stuart Henderson 
On 2016/11/22 04:40, Jeremie Courreges-Anglas wrote:
> >  # lftp needs add_history_time()
> >  LIB_DEPENDS=   devel/libidn \
> > devel/readline>=6.1p2 \
> > +
> > +RUN_DEPENDS=   devel/gettext
> 
> I do not understand this.  gettext could be part of LIB_DEPENDS, but why
> would it be a RUN_DEPENDS?
> 
> Even if lftp directly uses gettext, it seems that the preferred approach
> is not to explicitely add it to LIB_DEPENDS, as libidn already brings
> it.

Personally I prefer listing as a LIB_DEPENDS if it's known that a port
uses it directly, it reduces the fallout if a well-used dependency is
dropped later (like with curl/libidn). But I know for sure that opinions
vary here :-)

> > +BUILD_DEPENDS =devel/gettext-tools
> 
> I see that there are tests for these tools at configure time, however
> they don't seem to be strictly needed to build a proper package.  No
> objection if you want to keep this in BUILD_DEPENDS, if you think it
> might prevent failures in bulks one day.

Simple test: make configure with gettext-tools installed, pkg_delete 
gettext-tools, see if it still builds+packages.

> >  MASTER_SITES=  https://lftp.yar.ru/ftp/
> 
> There is a problem with MASTER_SITES and redirections here.
> 
> ritchie /usr/ports/net/lftp$ ftp https://lftp.yar.ru/ftp/lftp-4.7.4.tar.gz
> Trying 213.187.99.145...
> Requesting https://lftp.yar.ru/ftp/lftp-4.7.4.tar.gz
> Redirected to https://lftp.tech/ftp/lftp-4.7.4.tar.gz
> Trying 213.187.99.145...
> Requesting https://lftp.tech/ftp/lftp-4.7.4.tar.gz
> Redirected to https://lftp.tech/get.html
> Trying 213.187.99.145...
> Requesting https://lftp.tech/get.html
> 100% |[...]***| 10156   00:00
> 10156 bytes received in 0.02 seconds (399.32 KB/s)
> ritchie /usr/ports/net/lftp$ ftp http://lftp.tech/ftp/lftp-4.7.4.tar.gz
> Trying 213.187.99.145...
> Requesting http://lftp.tech/ftp/lftp-4.7.4.tar.gz
> Redirected to http://lftp.tech/get.html
> Trying 213.187.99.145...
> Requesting http://lftp.tech/get.html
> 100% |[...]***| 10156   00:00
> 10156 bytes received in 0.02 seconds (412.92 KB/s)
> 
> Did you use ''make fetch'' to grab the tarball?

Oh "nice", it looks like they redirect by default, but skip the redirection
if it's curl or wget.

> -MASTER_SITES=https://lftp.yar.ru/ftp/
> +MASTER_SITES=https://lftp.yar.ru/ftp/ \
> + ftp://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/

Could you s/ftp/http/ (or add http first) please?

Re: UPDATE: net/lftp

2016-11-21 Thread Jeremie Courreges-Anglas 
Rafael Sadowski  writes:

> Hi @ports,
>
> below is an update diff to net/lftp 4.7.4. Tested on amd64.
>
> OK, comments?

Please see below,

> Kind regards,
>
> Rafael Sadowski
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/lftp/Makefile,v
> retrieving revision 1.110
> diff -u -p -u -p -r1.110 Makefile
> --- Makefile  7 Aug 2016 21:40:20 -   1.110
> +++ Makefile  19 Nov 2016 20:31:17 -
> @@ -2,10 +2,10 @@
>  
>  COMMENT= shell-like command line ftp and sftp client
>  
> -DISTNAME=lftp-4.7.3
> +DISTNAME=lftp-4.7.4
>  CATEGORIES=  net
>  
> -HOMEPAGE=https://lftp.yar.ru/
> +HOMEPAGE=https://lftp.tech/
>  
>  MAINTAINER=  Rafael Sadowski 
>  
> @@ -20,6 +20,10 @@ USE_GROFF= Yes
>  # lftp needs add_history_time()
>  LIB_DEPENDS= devel/libidn \
>   devel/readline>=6.1p2 \
> +
> +RUN_DEPENDS= devel/gettext

I do not understand this.  gettext could be part of LIB_DEPENDS, but why
would it be a RUN_DEPENDS?

Even if lftp directly uses gettext, it seems that the preferred approach
is not to explicitely add it to LIB_DEPENDS, as libidn already brings
it.

> +BUILD_DEPENDS =  devel/gettext-tools

I see that there are tests for these tools at configure time, however
they don't seem to be strictly needed to build a proper package.  No
objection if you want to keep this in BUILD_DEPENDS, if you think it
might prevent failures in bulks one day.

>  MASTER_SITES=https://lftp.yar.ru/ftp/

There is a problem with MASTER_SITES and redirections here.

ritchie /usr/ports/net/lftp$ ftp https://lftp.yar.ru/ftp/lftp-4.7.4.tar.gz
Trying 213.187.99.145...
Requesting https://lftp.yar.ru/ftp/lftp-4.7.4.tar.gz
Redirected to https://lftp.tech/ftp/lftp-4.7.4.tar.gz
Trying 213.187.99.145...
Requesting https://lftp.tech/ftp/lftp-4.7.4.tar.gz
Redirected to https://lftp.tech/get.html
Trying 213.187.99.145...
Requesting https://lftp.tech/get.html
100% |[...]***| 10156   00:00
10156 bytes received in 0.02 seconds (399.32 KB/s)
ritchie /usr/ports/net/lftp$ ftp http://lftp.tech/ftp/lftp-4.7.4.tar.gz
Trying 213.187.99.145...
Requesting http://lftp.tech/ftp/lftp-4.7.4.tar.gz
Redirected to http://lftp.tech/get.html
Trying 213.187.99.145...
Requesting http://lftp.tech/get.html
100% |[...]***| 10156   00:00
10156 bytes received in 0.02 seconds (412.92 KB/s)

Did you use ''make fetch'' to grab the tarball?

In the meantime we could add another mirror to MASTER_SITES, as in the
updated diff below (which also does rm patches/patch-src_Resolver_cc, as
we have getaddrinfo).


Index: Makefile
===
RCS file: /d/cvs/ports/net/lftp/Makefile,v
retrieving revision 1.110
diff -u -p -r1.110 Makefile
--- Makefile7 Aug 2016 21:40:20 -   1.110
+++ Makefile22 Nov 2016 03:20:41 -
@@ -2,10 +2,10 @@
 
 COMMENT=   shell-like command line ftp and sftp client
 
-DISTNAME=  lftp-4.7.3
+DISTNAME=  lftp-4.7.4
 CATEGORIES=net
 
-HOMEPAGE=  https://lftp.yar.ru/
+HOMEPAGE=  https://lftp.tech/
 
 MAINTAINER=Rafael Sadowski 
 
@@ -17,11 +17,13 @@ WANTLIB += stdc++ util z
 
 USE_GROFF= Yes
 
+BUILD_DEPENDS =devel/gettext-tools
 # lftp needs add_history_time()
 LIB_DEPENDS=   devel/libidn \
devel/readline>=6.1p2 \
 
-MASTER_SITES=  https://lftp.yar.ru/ftp/
+MASTER_SITES=  https://lftp.yar.ru/ftp/ \
+   ftp://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/
 
 LIBTOOL_FLAGS= --tag=disable-shared
 CONFIGURE_STYLE= gnu
Index: distinfo
===
RCS file: /d/cvs/ports/net/lftp/distinfo,v
retrieving revision 1.69
diff -u -p -r1.69 distinfo
--- distinfo7 Aug 2016 21:40:20 -   1.69
+++ distinfo22 Nov 2016 02:57:25 -
@@ -1,2 +1,2 @@
-SHA256 (lftp-4.7.3.tar.gz) = zmUZgxYDwZws8uPBC0HW3ch6FgSbmTg+e5t3+8dwchQ=
-SIZE (lftp-4.7.3.tar.gz) = 2715817
+SHA256 (lftp-4.7.4.tar.gz) = j1XDfP37ziSpy0e2IcoSf0DTp95bTEn4xJ8Xv/co+zE=
+SIZE (lftp-4.7.4.tar.gz) = 2766143
Index: patches/patch-configure
===
RCS file: /d/cvs/ports/net/lftp/patches/patch-configure,v
retrieving revision 1.14
diff -u -p -r1.14 patch-configure
--- patches/patch-configure 7 Aug 2016 21:40:20 -   1.14
+++ patches/patch-configure 22 Nov 2016 02:57:25 -
@@ -2,9 +2,9 @@ $OpenBSD: patch-configure,v 1.14 2016/08
 
 Use GNU readline as our base readline lacks add_history_time().
 
 configure.orig Fri Jul 15 12:43:04 2016
-+++ configure  Thu Jul 21 05:20:48 2016
-@@ -48435,7 +48435,7 @@ fi
+--- configure.orig Wed Nov 16 14:11:30 2016
 configure  Thu Nov 17 18:51:19 2016
+@@ -48854,7 +48854,7 @@ fi
readline_include_dir="$readline_include_dir/readline"
fi

Re: UPDATE: net/lftp

2015-12-11 Thread Rafael Sadowski 
On Thu Dec 10, 2015 at 11:48:50PM +, Stuart Henderson wrote:
> On 2015/12/11 00:22, Rafael Sadowski wrote:
> > Dear lftp users and OpenBSD ports,
> > 
> > simple bugfix update.
> > 
> > lftp 4.6.5:
> > 
> > - sftp: fixed handling of out-of-order replies.
> > - fixed futex_wait issue in SIGCHLD handler.
> > - ftp: fixed ls freezing with unstable server connection.
> > - torrent: show more correct ETA on the status line.
> > - fixed gnutls priority string.
> > - mirror: fixed excessive stack usage on large directories.
> > - documented some hard to fix bugs.
> > - improved man page on open command and cmd:prompt setting.
> > - translations updated (zh_TW).
> > 
> > lftp port:
> > 
> > - update DESCR with more protocol informations. lftp handle not only
> >   FTP(s).
> > 
> > OK?
> 
> Looks good, how about this for an updated DESCR?
> 

Thanks Stuart, looks very good for me. New diff with your updated DESCR:

Index: Makefile
===
RCS file: /cvs/ports/net/lftp/Makefile,v
retrieving revision 1.107
diff -u -p -u -p -r1.107 Makefile
--- Makefile31 Aug 2015 07:50:59 -  1.107
+++ Makefile11 Dec 2015 17:17:59 -
@@ -2,7 +2,7 @@
 
 COMMENT=   shell-like command line ftp and sftp client
 
-DISTNAME=  lftp-4.6.4
+DISTNAME=  lftp-4.6.5
 CATEGORIES=net
 
 HOMEPAGE=  http://lftp.yar.ru/
Index: distinfo
===
RCS file: /cvs/ports/net/lftp/distinfo,v
retrieving revision 1.66
diff -u -p -u -p -r1.66 distinfo
--- distinfo31 Aug 2015 07:50:59 -  1.66
+++ distinfo11 Dec 2015 17:17:59 -
@@ -1,2 +1,2 @@
-SHA256 (lftp-4.6.4.tar.gz) = eR54N3nT1rUZ0MIxVUMLl4XyhUAj64NMcW9bp4hzsVo=
-SIZE (lftp-4.6.4.tar.gz) = 2656129
+SHA256 (lftp-4.6.5.tar.gz) = KdHILWEIA9XAF2V9dmPgX6Ab1Y8OBhgPMG5DDweBYpk=
+SIZE (lftp-4.6.5.tar.gz) = 2666338
Index: patches/patch-configure
===
RCS file: /cvs/ports/net/lftp/patches/patch-configure,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 patch-configure
--- patches/patch-configure 31 Aug 2015 07:50:59 -  1.11
+++ patches/patch-configure 11 Dec 2015 17:17:59 -
@@ -2,9 +2,9 @@ $OpenBSD: patch-configure,v 1.11 2015/08
 
 Use GNU readline as our base readline lacks add_history_time().
 
 configure.orig Thu Aug 20 11:49:32 2015
-+++ configure  Sun Aug 30 17:51:08 2015
-@@ -47962,7 +47962,7 @@ if ${lftp_cv_precompiled_readline+:} false; then :
+--- configure.orig Thu Dec 10 14:20:13 2015
 configure  Fri Dec 11 00:08:40 2015
+@@ -48137,7 +48137,7 @@ if ${lftp_cv_precompiled_readline+:} false; then :
  else
  
 old_LIBS="$LIBS"
@@ -13,7 +13,7 @@ Use GNU readline as our base readline la
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  extern int (*rl_getc_function)();
-@@ -48002,7 +48002,7 @@ if test $lftp_cv_precompiled_readline = yes; then
+@@ -48177,7 +48177,7 @@ if test $lftp_cv_precompiled_readline = yes; then
 READLINE_DIR=''
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
Index: patches/patch-src_Makefile_in
===
RCS file: /cvs/ports/net/lftp/patches/patch-src_Makefile_in,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 patch-src_Makefile_in
--- patches/patch-src_Makefile_in   31 Aug 2015 07:50:59 -  1.10
+++ patches/patch-src_Makefile_in   11 Dec 2015 17:17:59 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-src_Makefile_in,v 1.10 2015/08/31 07:50:59 benoit Exp $
 src/Makefile.in.orig   Thu Aug 20 11:49:33 2015
-+++ src/Makefile.inSun Aug 30 17:51:08 2015
-@@ -227,7 +227,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(p
+--- src/Makefile.in.orig   Thu Dec 10 14:20:12 2015
 src/Makefile.inFri Dec 11 00:08:40 2015
+@@ -236,7 +236,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(p
"$(DESTDIR)$(pkgdatadir)"
  LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) \
$(pkgverlib_LTLIBRARIES)
Index: pkg/DESCR
===
RCS file: /cvs/ports/net/lftp/pkg/DESCR,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 DESCR
--- pkg/DESCR   24 Sep 2009 06:40:05 -  1.5
+++ pkg/DESCR   11 Dec 2015 17:17:59 -
@@ -1,7 +1,10 @@
-LFTP is a shell-like command line ftp and sftp client.  It is reliable:
-can retry operations and does reget automatically.  It can do several
-transfers simultaneously in background.  You can start a transfer in
-background and continue browsing the ftp site or another one. This all
-is done in one process.  Background jobs will be completed in nohup mode
-if you exit or close modem connection. Lftp has reput, mirror, reverse
-mirror among its features.
+LFTP is a command-line driven, shell-like, reliable file transfer program.
+It supports FTP/FTPS,

Re: UPDATE: net/lftp

2015-12-10 Thread Stuart Henderson 
On 2015/12/11 00:22, Rafael Sadowski wrote:
> Dear lftp users and OpenBSD ports,
> 
> simple bugfix update.
> 
> lftp 4.6.5:
> 
> - sftp: fixed handling of out-of-order replies.
> - fixed futex_wait issue in SIGCHLD handler.
> - ftp: fixed ls freezing with unstable server connection.
> - torrent: show more correct ETA on the status line.
> - fixed gnutls priority string.
> - mirror: fixed excessive stack usage on large directories.
> - documented some hard to fix bugs.
> - improved man page on open command and cmd:prompt setting.
> - translations updated (zh_TW).
> 
> lftp port:
> 
> - update DESCR with more protocol informations. lftp handle not only
>   FTP(s).
> 
> OK?

Looks good, how about this for an updated DESCR?

LFTP is a command-line driven, shell-like, reliable file transfer program.
It supports FTP/FTPS, HTTP/HTTPS (including emulated directory listings),
FISH, SFTP, BitTorrent, file and partial support for WebDAV. Features include:

- automatic reconnect and retry after errors or timeout
- modification time preservation
- mirroring, reverse mirroring, reget/reput
- rate throttling
- job queueing, multiple background transfers
- bookmarks and aliases

Re: update: net/lftp 4.6.3a -> 4.6.4

2015-08-31 Thread Benoit Lecocq 
On 08/30/15 18:32, Rafael Sadowski wrote:
> hi @ports,
> 
> simple maintainer update to next stable version.
> 
>  Version 4.6.4 - 2015-08-20
> 
> mirror: new option --transfer-all.
> torrent: new setting torrent:timeout to limit time without any progress.
> torrent: fixed handling of udp tracker without explicit port number.
> torrent: improved transfer start time after metadata download.
> improved sftp put -c to use a single FSETSTAT.
> mirror --skip-noaccess now uses user name to check for permissions.
> don't rename temporary file to the target name when transfer fails.
> new cmd:prompt escapes \l and \L for local working directory.
> translations updated (pl, ru, uk).
> new configure option --disable-ipv6.
> fixed compilation with an old gcc.
> 
> 
> Tested on amd64.

Committed, thanks !

> 
> Cheers, Rafael
> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/lftp/Makefile,v
> retrieving revision 1.106
> diff -u -p -u -p -r1.106 Makefile
> --- Makefile  17 Jun 2015 15:13:05 -  1.106
> +++ Makefile  30 Aug 2015 16:29:31 -
> @@ -2,7 +2,7 @@
>  
>  COMMENT= shell-like command line ftp and sftp client
>  
> -DISTNAME=lftp-4.6.3a
> +DISTNAME=lftp-4.6.4
>  CATEGORIES=  net
>  
>  HOMEPAGE=http://lftp.yar.ru/
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/lftp/distinfo,v
> retrieving revision 1.65
> diff -u -p -u -p -r1.65 distinfo
> --- distinfo  17 Jun 2015 15:13:05 -  1.65
> +++ distinfo  30 Aug 2015 16:29:31 -
> @@ -1,2 +1,2 @@
> -SHA256 (lftp-4.6.3a.tar.gz) = qLU+XKLBrL7NGByH8hqGc8qQONyfK+arjCN5C9kf1EY=
> -SIZE (lftp-4.6.3a.tar.gz) = 2645906
> +SHA256 (lftp-4.6.4.tar.gz) = eR54N3nT1rUZ0MIxVUMLl4XyhUAj64NMcW9bp4hzsVo=
> +SIZE (lftp-4.6.4.tar.gz) = 2656129
> Index: patches/patch-configure
> ===
> RCS file: /cvs/ports/net/lftp/patches/patch-configure,v
> retrieving revision 1.10
> diff -u -p -u -p -r1.10 patch-configure
> --- patches/patch-configure   17 Jun 2015 15:13:05 -  1.10
> +++ patches/patch-configure   30 Aug 2015 16:29:31 -
> @@ -2,9 +2,9 @@ $OpenBSD: patch-configure,v 1.10 2015/06
>  
>  Use GNU readline as our base readline lacks add_history_time().
>  
>  configure.orig   Wed Jun 17 16:04:35 2015
> -+++ configureWed Jun 17 16:36:48 2015
> -@@ -47773,7 +47773,7 @@ if ${lftp_cv_precompiled_readline+:} false; then :
> +--- configure.orig   Thu Aug 20 11:49:32 2015
>  configureSun Aug 30 17:51:08 2015
> +@@ -47962,7 +47962,7 @@ if ${lftp_cv_precompiled_readline+:} false; then :
>   else
>   
>  old_LIBS="$LIBS"
> @@ -13,7 +13,7 @@ Use GNU readline as our base readline la
>  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
>   /* end confdefs.h.  */
>   extern int (*rl_getc_function)();
> -@@ -47813,7 +47813,7 @@ if test $lftp_cv_precompiled_readline = yes; then
> +@@ -48002,7 +48002,7 @@ if test $lftp_cv_precompiled_readline = yes; then
>  READLINE_DIR=''
>  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
>   $as_echo "yes" >&6; }
> Index: patches/patch-src_Makefile_in
> ===
> RCS file: /cvs/ports/net/lftp/patches/patch-src_Makefile_in,v
> retrieving revision 1.9
> diff -u -p -u -p -r1.9 patch-src_Makefile_in
> --- patches/patch-src_Makefile_in 24 Apr 2014 16:29:03 -  1.9
> +++ patches/patch-src_Makefile_in 30 Aug 2015 16:29:31 -
> @@ -1,7 +1,7 @@
>  $OpenBSD: patch-src_Makefile_in,v 1.9 2014/04/24 16:29:03 benoit Exp $
>  src/Makefile.in.orig Fri Jan 24 08:59:54 2014
> -+++ src/Makefile.in  Sun Apr 13 08:55:09 2014
> -@@ -225,7 +225,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(p
> +--- src/Makefile.in.orig Thu Aug 20 11:49:33 2015
>  src/Makefile.in  Sun Aug 30 17:51:08 2015
> +@@ -227,7 +227,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(p
>   "$(DESTDIR)$(pkgdatadir)"
>   LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) \
>   $(pkgverlib_LTLIBRARIES)
>

Re: UPDATE: net/lftp Version 4.6.3

2015-06-17 Thread Stuart Henderson 
On 2015/06/17 16:59, Rafael Sadowski wrote:
 Hi @ports,
 
 simple lftp update to last version 4.6.3:
 
 Changes (Some bugs fixed, minor features add):
 
 new mirror setting mirror:overwrite and options 
 --overwrite/--no-overwrite.
 new mirror option --upload-older.
 new mirror option --recursion={always,never,missing,newer}.
 try to download zero sized files as they may be non-empty.
 torrent: new options --only-new, --only-incomplete.
 torrent: fixed endless loop in FD deallocation.
 fixed a memleak when parsing a directory listing with special files.
 fixed one byte buffer overflow in cls.
 fixed cmd:fail-exit description in the man page.
 fixed large stack usage when parsing fish directory listings.
 
 I would like to take the maintainer rights because I follow lftp and
 use it very often. If it's not okay, please commit without
 MAINTAINER.

Committed, thanks.

This is a super-useful port as you can use it to connect over http and
present an ftp-like interface (with 'ls' etc working like magic), and do
batch sftp transfers in places where you are stuck and unable to use
pubkey auth ;-)

Re: UPDATE: net/lftp

2007-10-01 Thread Mattieu Baptiste 
On 10/1/07, Stuart Henderson [EMAIL PROTECTED] wrote:
  -MASTER_SITES=http://ftp.yars.free.net/pub/source/lftp/ \
  - http://ftp.yars.free.net/pub/source/lftp/old/

 This should be left as it is, so that fetches from the master site
 continue to work when a new version is released and this one gets
 moved to old/.



Sorry, thanks for pointing that out. Here is the new diff, also
available at my previous link.
Cheers,
Mattieu

Index: Makefile
===
RCS file: /cvs/ports/net/lftp/Makefile,v
retrieving revision 1.68
diff -u -r1.68 Makefile
--- Makefile15 Sep 2007 22:36:54 -  1.68
+++ Makefile1 Oct 2007 08:02:08 -
@@ -2,8 +2,8 @@

 COMMENT=   shell-like command line ftp and sftp client

-DISTNAME=  lftp-3.5.4
-PKGNAME=   ${DISTNAME}p1
+DISTNAME=  lftp-3.5.14
+PKGNAME=   ${DISTNAME}
 CATEGORIES=net

 HOMEPAGE=  http://lftp.yar.ru/
@@ -19,7 +19,6 @@

 MASTER_SITES=  http://ftp.yars.free.net/pub/source/lftp/ \
http://ftp.yars.free.net/pub/source/lftp/old/
-EXTRACT_SUFX=  .tar.bz2

 USE_LIBTOOL=   Yes
 USE_X11=   Yes
Index: distinfo
===
RCS file: /cvs/ports/net/lftp/distinfo,v
retrieving revision 1.37
diff -u -r1.37 distinfo
--- distinfo5 Apr 2007 16:20:10 -   1.37
+++ distinfo1 Oct 2007 08:02:08 -
@@ -1,5 +1,5 @@
-MD5 (lftp-3.5.4.tar.bz2) = HH9JgieT0DWI/UCAxAKBpw==
-RMD160 (lftp-3.5.4.tar.bz2) = v6aUwpYj9FGfHxG2E3zvxwPz97Q=
-SHA1 (lftp-3.5.4.tar.bz2) = Gd5C3pfHc3y3oWkiSzd4YBkCr8M=
-SHA256 (lftp-3.5.4.tar.bz2) = lOWZE2I1Aj1sDXuXHWYC8Iwc/JPIxdwFiAtMP2f3JaE=
-SIZE (lftp-3.5.4.tar.bz2) = 1320471
+MD5 (lftp-3.5.14.tar.gz) = 37AZNVrX9+00fmSznk0dPA==
+RMD160 (lftp-3.5.14.tar.gz) = A9PXs27slG4lBWVT78SqXNsEVr8=
+SHA1 (lftp-3.5.14.tar.gz) = BjwBYAV3sJNVGM50UF7elMBzjUw=
+SHA256 (lftp-3.5.14.tar.gz) = uta+iJUjkhcT6Casn6E05ZUTN1w/DUMDE9u5L9Czm3I=
+SIZE (lftp-3.5.14.tar.gz) = 1801236


-- 
Mattieu Baptiste
/earth is 102% full ... please delete anyone you can.

Re: UPDATE: net/lftp

2007-10-01 Thread Kevin Lo 
Mattieu Baptiste wrote:
 On 10/1/07, Stuart Henderson [EMAIL PROTECTED] wrote:
   -MASTER_SITES=http://ftp.yars.free.net/pub/source/lftp/ \
   - http://ftp.yars.free.net/pub/source/lftp/old/
 
  This should be left as it is, so that fetches from the master site
  continue to work when a new version is released and this one gets
  moved to old/.
 
 
 
 Sorry, thanks for pointing that out. Here is the new diff, also
 available at my previous link.

Looks good to me, thanks.

 Cheers,
 Mattieu

Kevin

Re: UPDATE: net/lftp

2007-09-30 Thread Stuart Henderson 
On 2007/09/30 20:29, Mattieu Baptiste wrote:
 Tested on i386.

This looks like a worthwhile update - works fine for me on
amd64 and sparc64.

 -EXTRACT_SUFX=.tar.bz2

good :-)

 -MASTER_SITES=http://ftp.yars.free.net/pub/source/lftp/ \
 - http://ftp.yars.free.net/pub/source/lftp/old/

This should be left as it is, so that fetches from the master site
continue to work when a new version is released and this one gets
moved to old/.