diff options
| -rw-r--r-- | ftp/ftp-tls/Makefile | 6 | ||||
| -rw-r--r-- | ftp/ftp-tls/files/patch-extern.h | 20 | ||||
| -rw-r--r-- | ftp/ftp-tls/files/patch-ftp_var.h | 63 |
3 files changed, 87 insertions, 2 deletions
diff --git a/ftp/ftp-tls/Makefile b/ftp/ftp-tls/Makefile index 5269f07a1bf9..4240a4c30c5a 100644 --- a/ftp/ftp-tls/Makefile +++ b/ftp/ftp-tls/Makefile @@ -8,7 +8,9 @@ PORTNAME= ftp-tls PORTVERSION= 20051021 CATEGORIES= ftp security -MASTER_SITES= http://www.ford-hutchinson.com/~fh-1-pfh/ +MASTER_SITES= http://www.ford-hutchinson.com/~fh-1-pfh/ \ + ${MASTER_SITE_LOCAL} +MASTER_SITE_SUBDIR= marius MAINTAINER= marius@FreeBSD.org COMMENT= Ftp client supporting FTP AUTH TLS @@ -24,7 +26,7 @@ CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} .include <bsd.port.pre.mk> .if ${OSVERSION} < 400000 -BROKEN= "Not supported on systems prior to FreeBSD 4.0 (missing getaddrinfo())" +BROKEN= Not supported on systems prior to FreeBSD 4.0 (missing getaddrinfo()) .endif do-install: diff --git a/ftp/ftp-tls/files/patch-extern.h b/ftp/ftp-tls/files/patch-extern.h new file mode 100644 index 000000000000..9239e6bcb047 --- /dev/null +++ b/ftp/ftp-tls/files/patch-extern.h @@ -0,0 +1,20 @@ +--- extern.h.orig Thu Nov 21 07:52:55 2002 ++++ extern.h Mon Dec 18 23:23:03 2006 +@@ -65,7 +65,11 @@ + * @(#)extern.h 8.3 (Berkeley) 10/9/94 + */ + ++#ifndef __EXTERN_H ++#define __EXTERN_H ++ + #include <sys/types.h> ++#include "ftp_var.h" + + void abort_remote __P((FILE *)); + void abortpt __P((int)); +@@ -217,3 +221,5 @@ + extern char reply_string[]; + extern off_t restart_point; + extern int NCMDS; ++ ++#endif diff --git a/ftp/ftp-tls/files/patch-ftp_var.h b/ftp/ftp-tls/files/patch-ftp_var.h new file mode 100644 index 000000000000..bbfabd95d24a --- /dev/null +++ b/ftp/ftp-tls/files/patch-ftp_var.h @@ -0,0 +1,63 @@ +--- ftp_var.h.orig Thu Jul 25 16:49:16 2002 ++++ ftp_var.h Mon Dec 18 23:27:38 2006 +@@ -65,6 +65,9 @@ + * @(#)ftp_var.h 8.4 (Berkeley) 10/9/94 + */ + ++#ifndef __FTP_VAR_H ++#define __FTP_VAR_H ++ + /* + * FTP global variables. + */ +@@ -86,6 +89,22 @@ + #endif + + #include "stringlist.h" ++ ++/* ++ * Format of command table. ++ */ ++struct cmd { ++ char *c_name; /* name of command */ ++ char *c_help; /* help string */ ++ char c_bell; /* give bell when command completes */ ++ char c_conn; /* must be connected to use command */ ++ char c_proxy; /* proxy server may execute */ ++#ifndef SMALL ++ char *c_complete; /* context sensitive completion list */ ++#endif /* !SMALL */ ++ void (*c_handler) __P((int, char **)); /* function to call */ ++}; ++ + #include "extern.h" + + #define HASHBYTES 1024 +@@ -195,21 +214,6 @@ + + int options; /* used during socket creation */ + +-/* +- * Format of command table. +- */ +-struct cmd { +- char *c_name; /* name of command */ +- char *c_help; /* help string */ +- char c_bell; /* give bell when command completes */ +- char c_conn; /* must be connected to use command */ +- char c_proxy; /* proxy server may execute */ +-#ifndef SMALL +- char *c_complete; /* context sensitive completion list */ +-#endif /* !SMALL */ +- void (*c_handler) __P((int, char **)); /* function to call */ +-}; +- + struct macel { + char mac_name[9]; /* macro name */ + char *mac_start; /* start of macro in macbuf */ +@@ -224,3 +228,5 @@ + + /* sig_t isn't what we expect on all platforms so we use a custom one */ + typedef void (*my_sig_t)__P((int)); ++ ++#endif |