Index: ports/ftp/lftp/files/patch-doc-lftp.1 =================================================================== --- ports/ftp/lftp/files/patch-doc-lftp.1 (revision 450055) +++ ports/ftp/lftp/files/patch-doc-lftp.1 (nonexistent) @@ -1,146 +0,0 @@ ---- doc/lftp.1.orig 2013-02-04 11:27:43.000000000 +0100 -+++ doc/lftp.1 2013-02-04 11:28:09.000000000 +0100 -@@ -166,7 +166,7 @@ - .Sp - .in +0.5i - .TS --l lx . -+l l . - add [] T{ - add current place or given location to bookmarks and bind to given name - T} -@@ -184,7 +184,7 @@ - .Sp - .in +0.5i - .TS --l lx . -+l l . - stat print cache status (default) - on|off turn on/off caching - flush flush cache -@@ -294,7 +294,7 @@ - .Sp - .in +0.5i - .TS --l lx . -+l l . - \-c continue, reget - \-E delete source files after successful transfer - \-e delete target file before the transfer -@@ -321,7 +321,7 @@ - .Sp - .in +0.5i - .TS --l lx . -+l l . - \-o T{ - destination file name (default - basename of rfile) - T} -@@ -346,7 +346,7 @@ - .Sp - .in +0.5i - .TS --l lx . -+l l . - \-f plain files (default) - \-d directories - \-a all types -@@ -416,7 +416,7 @@ - .Sp - .in +0.5i - .TS --l lx . -+l l . - \-c continue, reget. - \-d T{ - create directories the same as file names and get the files into them instead of current directory. -@@ -439,7 +439,7 @@ - .Sp - .in +0.5i - .TS --l1 l lx . -+l1 l l . - \-c, \-\-continue T{ - continue a mirror job if possible - T} -@@ -624,7 +624,7 @@ - .Sp - .in +0.5i - .TS --l lx . -+l l . - \-c continue, reput - \-d T{ - create directories the same as in file names and put the files into them instead of current directory -@@ -672,7 +672,7 @@ - .Sp - .in +0.5i - .TS --l lx . -+l l . - \-c T{ - continue transfer. Requires \fIlfile.lftp-pget-status\fP file. - T} -@@ -694,7 +694,7 @@ - .Sp - .in +0.5i - .TS --l lx . -+l l . - \-o T{ - specifies remote file name (default - basename of lfile) - T} -@@ -749,7 +749,7 @@ - .Sp - .in +0.5i - .TS --l lx . -+l l . - \-q Be quiet. - \-v Be verbose. - \-Q T{ -@@ -770,7 +770,7 @@ - .Sp - .in +0.5i - .TS --l lx . -+l l . - queue \-d 3 Delete the third item in the queue. - queue \-m 6 4 T{ - Move the sixth item in the queue before the fourth. -@@ -833,7 +833,7 @@ - .Sp - .in +0.5i - .TS --l lx . -+l l . - \-c maximum number of iterations - \-d delay between iterations - \-\-while\-ok stop when command exits with non-zero code -@@ -880,7 +880,7 @@ - .Sp - .in +0.5i - .TS --l lx . -+l l . - \-a list all settings, including default values - \-d list only default values, not necessary current ones - .TE -@@ -939,7 +939,7 @@ - .Sp - .in +0.5i - .TS --l lx . -+l l . - \-O T{ - specifies base directory where files should be placed - T} -@@ -1157,7 +1157,7 @@ - .Sp - .in +0.5i - .TS --l lx . -+l l . - \\a bell - \\e escape - \\n new line Property changes on: ports/ftp/lftp/files/patch-doc-lftp.1 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: ports/ftp/lftp/files/patch-doc_lftp.1 =================================================================== --- ports/ftp/lftp/files/patch-doc_lftp.1 (nonexistent) +++ ports/ftp/lftp/files/patch-doc_lftp.1 (working copy) @@ -0,0 +1,146 @@ +--- doc/lftp.1.orig 2017-08-10 11:04:42 UTC ++++ doc/lftp.1 +@@ -165,7 +165,7 @@ any command that accepts input URLs usin + .Sp + .in +0.5i + .TS +-l lx . ++l l . + add [] T{ + add current place or given location to bookmarks and bind to given name + T} +@@ -184,7 +184,7 @@ The following subcommands are recognized + .Sp + .in +0.5i + .TS +-l lx . ++l l . + stat print cache status (default) + on|off turn on/off caching + flush flush cache +@@ -392,7 +392,7 @@ instances of \fIrfile\fP (and \-o \fIlfi + .Sp + .in +0.5i + .TS +-l lx . ++l l . + \-c continue, reget + \-E delete source files after successful transfer + \-e delete target file before the transfer +@@ -421,7 +421,7 @@ Transfer a single file. Options: + .Sp + .in +0.5i + .TS +-l lx . ++l l . + \-o T{ + destination file name (default - basename of rfile) + T} +@@ -448,7 +448,7 @@ Glob given patterns containing metachara + .Sp + .in +0.5i + .TS +-l lx . ++l l . + \-f plain files (default) + \-d directories + \-a all types +@@ -539,7 +539,7 @@ Gets selected files with expanded wildca + .Sp + .in +0.5i + .TS +-l lx . ++l l . + \-c continue, reget. + \-d T{ + create directories the same as file names and get the files into them instead of current directory. +@@ -565,7 +565,7 @@ directory name. Source and/or target can + .Sp + .in +0.5i + .TS +-l1 l lx . ++l1 l l . + \-c, \-\-continue T{ + continue a mirror job if possible + T} +@@ -819,7 +819,7 @@ local name as remote one. This can be ch + .Sp + .in +0.5i + .TS +-l lx . ++l l . + \-c continue, reput + \-d T{ + create directories the same as in file names and put the files into them instead of current directory +@@ -907,7 +907,7 @@ Options: + .Sp + .in +0.5i + .TS +-l lx . ++l l . + \-c T{ + continue transfer. Requires \fIlfile.lftp-pget-status\fP file. + T} +@@ -932,7 +932,7 @@ of \fIlfile\fP is used as remote name. D + .Sp + .in +0.5i + .TS +-l lx . ++l l . + \-o T{ + specifies remote file name (default - basename of lfile) + T} +@@ -990,7 +990,7 @@ destination is given. + .Sp + .in +0.5i + .TS +-l lx . ++l l . + \-q Be quiet. + \-v Be verbose. + \-Q T{ +@@ -1012,7 +1012,7 @@ Examples: + .Sp + .in +0.5i + .TS +-l lx . ++l l . + queue \-d 3 Delete the third item in the queue. + queue \-m 6 4 T{ + Move the sixth item in the queue before the fourth. +@@ -1076,7 +1076,7 @@ Default delay is one second, default com + .Sp + .in +0.5i + .TS +-l lx . ++l l . + \-c maximum number of iterations + \-d delay between iterations + \-\-while\-ok stop when command exits with non-zero code +@@ -1124,7 +1124,7 @@ It can be changed by options: + .Sp + .in +0.5i + .TS +-l lx . ++l l . + \-a list all settings, including default values + \-d list only default values, not necessary current ones + .TE +@@ -1184,7 +1184,7 @@ Options: + .Sp + .in +0.5i + .TS +-l lx . ++l l . + \-O T{ + specifies base directory where files should be placed + T} +@@ -1462,7 +1462,7 @@ The following escapes are supported: + .Sp + .in +0.5i + .TS +-l lx . ++l l . + \\a bell + \\e escape + \\n new line Property changes on: ports/ftp/lftp/files/patch-doc_lftp.1 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: ports/ftp/lftp/files/patch-lib_cdefs.h =================================================================== --- ports/ftp/lftp/files/patch-lib_cdefs.h (nonexistent) +++ ports/ftp/lftp/files/patch-lib_cdefs.h (working copy) @@ -0,0 +1,16 @@ +--- lib/cdefs.h.orig 2017-09-12 14:13:24 UTC ++++ lib/cdefs.h +@@ -282,13 +282,7 @@ + # define __attribute_format_strfmon__(a,b) /* Ignore */ + #endif + +-/* The nonull function attribute allows to mark pointer parameters which +- must not be NULL. */ +-#if __GNUC_PREREQ (3,3) +-# define __nonnull(params) __attribute__ ((__nonnull__ params)) +-#else + # define __nonnull(params) +-#endif + + /* If fortification mode, we warn about unused results of certain + function calls which can lead to problems. */ Property changes on: ports/ftp/lftp/files/patch-lib_cdefs.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: ports/ftp/lftp/files/patch-po-Makevars =================================================================== --- ports/ftp/lftp/files/patch-po-Makevars (revision 450055) +++ ports/ftp/lftp/files/patch-po-Makevars (nonexistent) @@ -1,20 +0,0 @@ -Add missing PO variables - ---- po/Makevars.orig 2015-06-20 21:14:07.000000000 +0000 -+++ po/Makevars 2015-06-20 21:15:13.000000000 +0000 -@@ -23,3 +23,15 @@ - # This is the list of locale categories, beyond LC_MESSAGES, for which the - # message catalogs shall be used. It is usually empty. - EXTRA_LOCALE_CATEGORIES = -+ -+# This tells whether or not to regenerate a PO file when $(DOMAIN).pot -+# has changed. Possible values are "yes" and "no". Set this to no if -+# the POT file is checked in the repository and the version control -+# program ignores timestamps. -+PO_DEPENDS_ON_POT = yes -+ -+# This tells whether or not to forcibly update $(DOMAIN).pot and -+# regenerate PO files on "make dist". Possible values are "yes" and -+# "no". Set this to no if the POT file and PO files are maintained -+# externally. -+DIST_DEPENDS_ON_UPDATE_PO = yes Property changes on: ports/ftp/lftp/files/patch-po-Makevars ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: ports/ftp/lftp/files/patch-po_Makevars =================================================================== --- ports/ftp/lftp/files/patch-po_Makevars (nonexistent) +++ ports/ftp/lftp/files/patch-po_Makevars (working copy) @@ -0,0 +1,18 @@ +--- po/Makevars.orig 2017-04-21 20:45:54 UTC ++++ po/Makevars +@@ -53,3 +53,15 @@ MSGID_BUGS_ADDRESS = lftp-bugs@lftp.yar. + # This is the list of locale categories, beyond LC_MESSAGES, for which the + # message catalogs shall be used. It is usually empty. + EXTRA_LOCALE_CATEGORIES = ++ ++# This tells whether or not to regenerate a PO file when $(DOMAIN).pot ++# has changed. Possible values are "yes" and "no". Set this to no if ++# the POT file is checked in the repository and the version control ++# program ignores timestamps. ++PO_DEPENDS_ON_POT = yes ++ ++# This tells whether or not to forcibly update $(DOMAIN).pot and ++# regenerate PO files on "make dist". Possible values are "yes" and ++# "no". Set this to no if the POT file and PO files are maintained ++# externally. ++DIST_DEPENDS_ON_UPDATE_PO = yes Property changes on: ports/ftp/lftp/files/patch-po_Makevars ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: ports/ftp/lftp/files/patch-src-Makefile.in =================================================================== --- ports/ftp/lftp/files/patch-src-Makefile.in (revision 450055) +++ ports/ftp/lftp/files/patch-src-Makefile.in (nonexistent) @@ -1,11 +0,0 @@ ---- src/Makefile.in.orig 2008-05-23 15:54:07.000000000 +0200 -+++ src/Makefile.in 2008-05-28 16:41:23.857301294 +0200 -@@ -1217,7 +1217,7 @@ - - info-am: - --install-data-am: install-pkgdataSCRIPTS install-pkgverlibLTLIBRARIES -+install-data-am: install-pkgdataSCRIPTS - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-data-hook - Property changes on: ports/ftp/lftp/files/patch-src-Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: ports/ftp/lftp/files/patch-src-PollVec.cc =================================================================== --- ports/ftp/lftp/files/patch-src-PollVec.cc (revision 450055) +++ ports/ftp/lftp/files/patch-src-PollVec.cc (nonexistent) @@ -1,15 +0,0 @@ -Fix build on i386 [1] - -[1] https://lists.freebsd.org/pipermail/freebsd-pkg-fallout/Week-of-Mon-20170911/539371.html - ---- ./src/PollVec.cc.orig 2017-09-16 22:29:12.266876000 +0200 -+++ ./src/PollVec.cc 2017-09-16 22:31:49.303761000 +0200 -@@ -30,7 +30,7 @@ - - void PollVec::AddTimeoutU(unsigned t) - { -- struct timeval new_timeout={t/1000000,t%1000000}; -+ struct timeval new_timeout={static_cast(t/1000000),static_cast(t%1000000)}; - if(tv_timeout.tv_sec<0 || new_timeout(t/1000000),static_cast(t%1000000)}; + if(tv_timeout.tv_sec<0 || new_timeout