Date: Fri, 28 May 2004 23:30:15 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/67289: Update port: ftp/yafc to 1.1 Message-ID: <20040528233015.29c8e962.tkato@prontomail.com> Resent-Message-ID: <200405281440.i4SEeO7r067984@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 67289
>Category: ports
>Synopsis: Update port: ftp/yafc to 1.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri May 28 07:40:24 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.10-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 1.1
New file:
files/patch-src::rfile.c
Remove file:
files/patch-src::get.c
files/patch-src::put.c
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/ftp/yafc/Makefile ftp/yafc/Makefile
--- /usr/ports/ftp/yafc/Makefile Tue May 11 13:34:44 2004
+++ ftp/yafc/Makefile Sun May 23 22:10:50 2004
@@ -6,8 +6,7 @@
#
PORTNAME= yafc
-PORTVERSION= 1.0
-PORTREVISION= 1
+PORTVERSION= 1.1
CATEGORIES= ftp
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -16,10 +15,19 @@
COMMENT= Yet another ftp client. Similar to ftp(1)
USE_BZIP2= yes
+USE_GETOPT_LONG= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS= --with-socks4=no --with-socks5=no --with-krb4=no \
+ --with-krb5=no --with-gssapi=no
MAN1= yafc.1
INFO= yafc
+
+post-install:
+.if !defined(NOPORTDOCS)
+ @${MKDIR} ${EXAMPLESDIR}
+ ${INSTALL_DATA} ${WRKSRC}/*.sample ${EXAMPLESDIR}
+.endif
.include <bsd.port.mk>
diff -urN /usr/ports/ftp/yafc/distinfo ftp/yafc/distinfo
--- /usr/ports/ftp/yafc/distinfo Thu Jan 29 20:25:02 2004
+++ ftp/yafc/distinfo Sun May 23 21:43:24 2004
@@ -1,2 +1,2 @@
-MD5 (yafc-1.0.tar.bz2) = c9d23600a263ac29505ca0084581a8f7
-SIZE (yafc-1.0.tar.bz2) = 441536
+MD5 (yafc-1.1.tar.bz2) = 877c21d9b70d89474d1a6478a21c1e51
+SIZE (yafc-1.1.tar.bz2) = 463528
diff -urN /usr/ports/ftp/yafc/files/patch-src::ftp::rfile.c ftp/yafc/files/patch-src::ftp::rfile.c
--- /usr/ports/ftp/yafc/files/patch-src::ftp::rfile.c Thu Jan 1 09:00:00 1970
+++ ftp/yafc/files/patch-src::ftp::rfile.c Sun May 23 21:50:09 2004
@@ -0,0 +1,74 @@
+--- src/ftp/rfile.c.orig Thu May 20 20:10:52 2004
++++ src/ftp/rfile.c Sun May 23 21:49:54 2004
+@@ -439,7 +439,11 @@
+ free(saved_field[0]);
+ f->owner = saved_field[1];
+ f->group = saved_field[2];
++#if 0
+ f->size = atoll(saved_field[3]);
++#else
++ f->size = strtoll(saved_field[3], NULL, 10);
++#endif
+ free(saved_field[3]);
+ m = saved_field[4];
+ NEXT_FIELD2;
+@@ -453,7 +457,11 @@
+ free(saved_field[0]);
+ f->owner = saved_field[1];
+ f->group = xstrdup("group");
++#if 0
+ f->size = atoll(saved_field[2]);
++#else
++ f->size = strtoll(saved_field[2], NULL, 10);
++#endif
+ free(saved_field[2]);
+ m = saved_field[3];
+ d = saved_field[4];
+@@ -465,7 +473,11 @@
+ f->nhl = 0;
+ f->owner = xstrdup("owner");;
+ f->group = xstrdup("group");
++#if 0
+ f->size = atoll(saved_field[1]);
++#else
++ f->size = strtoll(saved_field[1], NULL, 10);
++#endif
+ free(saved_field[1]);
+ m = saved_field[2];
+ d = saved_field[3];
+@@ -480,7 +492,11 @@
+ free(saved_field[0]);
+ f->owner = saved_field[1];
+ f->group = saved_field[2];
++#if 0
+ f->size = atoll(saved_field[3]);
++#else
++ f->size = strtoll(saved_field[3], NULL, 10);
++#endif
+ free(saved_field[3]);
+ free(saved_field[4]);
+
+@@ -624,7 +640,11 @@
+ f->perm[0] = 'd';
+ f->size = 0L;
+ } else {
++#if 0
+ f->size = (unsigned long long)atoll(e);
++#else
++ f->size = (unsigned long long)strtoll(e, NULL, 10);
++#endif
+ }
+
+ f->nhl = 1;
+@@ -686,7 +706,11 @@
+ * FTP" Internet draft, but PureFTPd uses it for some
+ * reason for size of directories
+ */
++#if 0
+ f->size = atoll(value);
++#else
++ f->size = strtoll(value, NULL, 10);
++#endif
+ else if(strcasecmp(factname, "type") == 0) {
+ if(strcasecmp(value, "file") == 0)
+ isdir = false;
diff -urN /usr/ports/ftp/yafc/files/patch-src::get.c ftp/yafc/files/patch-src::get.c
--- /usr/ports/ftp/yafc/files/patch-src::get.c Tue May 11 07:45:50 2004
+++ ftp/yafc/files/patch-src::get.c Thu Jan 1 09:00:00 1970
@@ -1,11 +0,0 @@
---- src/get.c.orig Mon May 10 17:24:10 2004
-+++ src/get.c Mon May 10 17:25:04 2004
-@@ -279,7 +279,7 @@
- e = xstrdup(ctime(&sb.st_mtime));
- a = ask(ASKYES|ASKNO|ASKUNIQUE|ASKCANCEL|ASKALL|ASKRESUME,
- ASKRESUME,
-- _("Local file '%s' exists\nLocal: %ld bytes, %sRemote: %ld bytes, %sOverwrite?"),
-+ _("Local file '%s' exists\nLocal: %lld bytes, %sRemote: %ld bytes, %sOverwrite?"),
- shortpath(dest, 42, gvLocalHomeDir),
- sb.st_size, e ? e : "unknown date",
- ftp_filesize(fi->path), ctime(&ft));
diff -urN /usr/ports/ftp/yafc/files/patch-src::put.c ftp/yafc/files/patch-src::put.c
--- /usr/ports/ftp/yafc/files/patch-src::put.c Tue May 11 07:45:50 2004
+++ ftp/yafc/files/patch-src::put.c Thu Jan 1 09:00:00 1970
@@ -1,11 +0,0 @@
---- src/put.c.orig Mon May 10 17:25:01 2004
-+++ src/put.c Mon May 10 17:25:36 2004
-@@ -217,7 +217,7 @@
- e = xstrdup(ctime(&sb->st_mtime));
- a = ask(ASKYES|ASKNO|ASKUNIQUE|ASKCANCEL|ASKALL|ASKRESUME,
- ASKRESUME,
-- _("Remote file '%s' exists\nLocal: %ld bytes, %sRemote: %ld bytes, %sOverwrite?"),
-+ _("Remote file '%s' exists\nLocal: %lld bytes, %sRemote: %ld bytes, %sOverwrite?"),
- shortpath(dest, 42, ftp->homedir),
- sb->st_size, e ? e : "unknown date",
- ftp_filesize(f->path), ctime(&ft));
diff -urN /usr/ports/ftp/yafc/pkg-plist ftp/yafc/pkg-plist
--- /usr/ports/ftp/yafc/pkg-plist Tue May 11 13:34:44 2004
+++ ftp/yafc/pkg-plist Sun May 23 22:11:45 2004
@@ -1 +1,4 @@
bin/yafc
+%%PORTDOCS%%%%EXAMPLESDIR%%/inputrc.sample
+%%PORTDOCS%%%%EXAMPLESDIR%%/yafcrc.sample
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040528233015.29c8e962.tkato>