- Add MASTER_SITE_LOCAL as a backup master site, the primary one suffers

from outages at times.
- Fix compilation with GCC 4.x. [1]
- Quiet portlint.

Approved by:	netchild
Reported by:	kris [1]
Obtained from:	Fink [1]
This commit is contained in:
Marius Strobl 2006-12-19 23:10:55 +00:00
parent ced048eafb
commit 1e087a49e7
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=180211
3 changed files with 87 additions and 2 deletions

View file

@ -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:

View file

@ -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

View file

@ -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