summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaddy <naddy@FreeBSD.org>2002-09-28 17:57:00 +0000
committernaddy <naddy@FreeBSD.org>2002-09-28 17:57:00 +0000
commit4553a4d866202a76f3aca9ca18f50d92ba71efac (patch)
tree8c6e99853fef99aea26d33c747e20f9814f4f346
parent76a66c3c3b3f1fcc53deb1be97681e698abf5689 (diff)
downloadFreeBSD-ports-4553a4d866202a76f3aca9ca18f50d92ba71efac.zip
FreeBSD-ports-4553a4d866202a76f3aca9ca18f50d92ba71efac.tar.gz
* Handle unexpected "125" reply as seen e.g. from ftp.compaq.com.
Obtained from: Dieter Baron <dillo@giga.or.at> * Remove unnecessary gnugetopt dependency. * Remove useless documentation. Approved by: knu (portmgr)
-rw-r--r--ftp/cftp/Makefile13
-rw-r--r--ftp/cftp/files/patch-ftp.c41
-rw-r--r--ftp/cftp/pkg-plist8
3 files changed, 43 insertions, 19 deletions
diff --git a/ftp/cftp/Makefile b/ftp/cftp/Makefile
index 910602d..e8cc929 100644
--- a/ftp/cftp/Makefile
+++ b/ftp/cftp/Makefile
@@ -7,25 +7,14 @@
PORTNAME= cftp
PORTVERSION= 0.12
+PORTREVISION= 1
CATEGORIES= ftp ipv6
MASTER_SITES= ftp://ftp.giga.or.at/pub/nih/cftp/ \
ftp://sunsite.univie.ac.at/pub/nih/cftp/
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-sftp
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt"
-
-post-install:
-.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
-.for file in AUTHORS ChangeLog NEWS README THANKS TODO
- ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
-.endif
.include <bsd.port.mk>
diff --git a/ftp/cftp/files/patch-ftp.c b/ftp/cftp/files/patch-ftp.c
new file mode 100644
index 0000000..6911486
--- /dev/null
+++ b/ftp/cftp/files/patch-ftp.c
@@ -0,0 +1,41 @@
+
+$FreeBSD$
+
+--- ftp.c.orig Tue Sep 17 16:58:18 2002
++++ ftp.c Sat Sep 28 15:49:05 2002
+@@ -311,7 +311,7 @@
+ rftp_list(char *path)
+ {
+ directory *dir;
+- int fd;
++ int fd, resp;
+ FILE *f;
+
+ if (ftp_mode('a') == -1 || ftp_cwd(path) == -1)
+@@ -321,7 +321,7 @@
+ return NULL;
+
+ ftp_put("list");
+- if (ftp_resp() != 150) {
++ if ((resp=ftp_resp()) != 150 && resp != 125) {
+ close(fd);
+ dir = (directory *)malloc(sizeof(directory));
+ dir->line = (direntry *)malloc(sizeof(direntry));
+@@ -379,7 +379,7 @@
+ void *
+ rftp_retr(char *file, int mode, long *startp, long *sizep)
+ {
+- int fd;
++ int fd, resp;
+ char *dir, *name, *can, *p;
+ FILE *fin;
+
+@@ -400,7 +400,7 @@
+ }
+
+ ftp_put("retr %s", name);
+- if (ftp_resp() != 150) {
++ if ((resp=ftp_resp()) != 150 && resp != 125) {
+ close(fd);
+ return NULL;
+ }
diff --git a/ftp/cftp/pkg-plist b/ftp/cftp/pkg-plist
index 68cae12..c1d8eb6 100644
--- a/ftp/cftp/pkg-plist
+++ b/ftp/cftp/pkg-plist
@@ -1,11 +1,5 @@
+@comment $FreeBSD$
bin/cftp
@unexec install-info --delete %D/info/cftp.info %D/info/dir
info/cftp.info
@exec install-info %D/info/cftp.info %D/info/dir
-%%PORTDOCS%%share/doc/cftp/AUTHORS
-%%PORTDOCS%%share/doc/cftp/ChangeLog
-%%PORTDOCS%%share/doc/cftp/NEWS
-%%PORTDOCS%%share/doc/cftp/README
-%%PORTDOCS%%share/doc/cftp/THANKS
-%%PORTDOCS%%share/doc/cftp/TODO
-%%PORTDOCS%%@dirrm share/doc/cftp
OpenPOWER on IntegriCloud