On Thu Nov 24, 2016 at 04:45:13AM +0100, Jeremie Courreges-Anglas wrote: > Rafael Sadowski <raf...@sizeofvoid.org> writes: > > > On Wed Nov 23, 2016 at 12:24:01PM +0000, 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 -0000 1.110 > +++ Makefile 24 Nov 2016 03:29:19 -0000 > @@ -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 <raf...@sizeofvoid.org> > > @@ -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 -0000 1.69 > +++ distinfo 24 Nov 2016 03:28:18 -0000 > @@ -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 -0000 1.14 > +++ patches/patch-configure 24 Nov 2016 03:28:18 -0000 > @@ -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 > readline_ld_flags="-L$readline_prefix/lib" > Index: patches/patch-src_Makefile_in > =================================================================== > RCS file: /d/cvs/ports/net/lftp/patches/patch-src_Makefile_in,v > retrieving revision 1.12 > diff -u -p -r1.12 patch-src_Makefile_in > --- patches/patch-src_Makefile_in 27 May 2016 12:08:46 -0000 1.12 > +++ patches/patch-src_Makefile_in 24 Nov 2016 03:28:18 -0000 > @@ -1,7 +1,7 @@ > $OpenBSD: patch-src_Makefile_in,v 1.12 2016/05/27 12:08:46 jca Exp $ > ---- src/Makefile.in.orig Mon May 23 17:34:28 2016 > -+++ src/Makefile.in Mon May 23 17:35:10 2016 > -@@ -235,7 +235,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(p > +--- src/Makefile.in.orig Wed Nov 16 14:11:29 2016 > ++++ src/Makefile.in Thu Nov 17 18:51:19 2016 > +@@ -237,7 +237,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 16 Sep 2014 12:35:18 -0000 1.12 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,12 +0,0 @@ > -$OpenBSD: patch-src_Resolver_cc,v 1.12 2014/09/16 12:35:18 sthen Exp $ > ---- src/Resolver.cc.orig Wed Aug 27 09:34:02 2014 > -+++ src/Resolver.cc Tue Sep 16 13:21:48 2014 > -@@ -801,8 +801,6 @@ void Resolver::LookupOne(const char *name) > - # undef h_errno // it could be a macro, but we want it to be local > variable. > - int h_errno=0; > - ha=getipnodebyname(name,af,0,&h_errno); > --# elif defined(HAVE_GETHOSTBYNAME2) > -- ha=gethostbyname2(name,af); > - # else > - if(af==AF_INET) > - ha=gethostbyname(name); > Index: patches/patch-src_lftp_rl_c > =================================================================== > RCS file: patches/patch-src_lftp_rl_c > diff -N patches/patch-src_lftp_rl_c > --- patches/patch-src_lftp_rl_c 27 May 2016 12:09:20 -0000 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,14 +0,0 @@ > -$OpenBSD: patch-src_lftp_rl_c,v 1.1 2016/05/27 12:09:20 jca Exp $ > ---- src/lftp_rl.c.orig Mon May 23 17:46:56 2016 > -+++ src/lftp_rl.c Mon May 23 17:47:33 2016 > -@@ -19,8 +19,8 @@ > - > - #include <config.h> > - #include <stdio.h> > --#include <readline.h> > --#include <history.h> > -+#include <readline/readline.h> > -+#include <readline/history.h> > - #include <stdlib.h> > - #include <string.h> > - #include "lftp_rl.h" > > -- > jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
