9 files changed, 139 insertions, 10 deletions

diff --git a/net/fspclient/Makefile b/net/fspclient/Makefile
index 8fec5562706e..cc30b6b87371 100644
--- a/net/fspclient/Makefile
+++ b/net/fspclient/Makefile
@@ -1,18 +1,18 @@
-# New ports collection makefile for:    fspclient
-# Version required:     0.0-h+
-# Date created:         7 Nov 1994
-# Whom:                 ache
+# New ports collection makefile for:	fspclient
+# Version required:	0.0-h+
+# Date created:		7 Nov 1994
+# Whom:			ache
 #
 # $FreeBSD$
 #
 
-DISTNAME=       fspclient.0.0-h+
-PKGNAME=        fspclient-0.0.h
+DISTNAME=	fspclient
+PKGNAME=	fspclient-0.0.h
 CATEGORIES=	net
-MASTER_SITES=   ftp://ftp.germany.eu.net/pub/networking/fsp/
-EXTRACT_SUFX=   .tar.z
+MASTER_SITES=	${MASTER_SITE_SUNSITE}
+MASTER_SITE_SUBDIR=	system/network/file-transfer
 
-MAINTAINER=     ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/fspclient
 GNU_CONFIGURE=	yes
diff --git a/net/fspclient/distinfo b/net/fspclient/distinfo
index 9a36695baa9f..2c812ee3db68 100644
--- a/net/fspclient/distinfo
+++ b/net/fspclient/distinfo
@@ -1 +1 @@
-MD5 (fspclient.0.0-h+.tar.z) = b60ae745e1bd26df6d80cf3a3f4ec61f
+MD5 (fspclient.tar.gz) = 78242a16ceae2acb9b1b79f905a1283d
diff --git a/net/fspclient/files/patch-ae b/net/fspclient/files/patch-ae
new file mode 100644
index 000000000000..13156fc2c1b9
--- /dev/null
+++ b/net/fspclient/files/patch-ae
@@ -0,0 +1,26 @@
+--- Makefile.in.orig	Thu May  6 10:11:58 1993
++++ Makefile.in	Mon Dec 27 22:07:20 1999
+@@ -3,19 +3,19 @@
+ srcdir = @srcdir@
+ VPATH = @srcdir@
+ 
+-CC = @CC@
++#CC = @CC@
+ AR = ar
+ # set RANLIB = @: if your system doesn't have or need ranlib
+ RANLIB = @RANLIB@
+ # use cp if you don't have install
+ INSTALL = @INSTALL@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_PROGRAM = install -c -s -o bin -g bin -m 555
+ INSTALL_DATA = @INSTALL_DATA@
+ 
+ DEFS = @DEFS@
+ 
+-CFLAGS = -g
+-LDFLAGS = $(CFLAGS)
++#CFLAGS = -g
++#LDFLAGS = $(CFLAGS)
+ LIBS = @LIBS@
+ 
+ prefix = /usr/local
diff --git a/net/fspclient/files/patch-af b/net/fspclient/files/patch-af
new file mode 100644
index 000000000000..f93516e0a2cd
--- /dev/null
+++ b/net/fspclient/files/patch-af
@@ -0,0 +1,11 @@
+--- bsd/getopt.c.orig	Mon May  3 11:56:29 1993
++++ bsd/getopt.c	Mon Dec 27 21:05:38 1999
+@@ -31,7 +31,7 @@
+  * SUCH DAMAGE.
+  */
+ 
+-#if !defined(hpux) && !defined(sun)
++#if !defined(hpux) && !defined(sun) && !defined(__FreeBSD__)
+ 
+ /* guarantee that we have a `working' getopt() function */
+ #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/net/fspclient/files/patch-ag b/net/fspclient/files/patch-ag
new file mode 100644
index 000000000000..2be5abd1fe15
--- /dev/null
+++ b/net/fspclient/files/patch-ag
@@ -0,0 +1,11 @@
+--- bsd/ls.c.orig	Fri Dec 10 10:32:12 1993
++++ bsd/ls.c	Mon Dec 27 21:04:47 1999
+@@ -96,7 +96,7 @@
+ #ifndef ANSI_PROTOTYPES
+ 	extern int getopt();
+ #else /* ANSI_PROTOTYPES */
+-#ifdef linux
++#if defined(linux) || defined(__FreeBSD__)
+ 	extern int getopt();
+ #else	
+ 	extern int getopt(int argc, char **argv, char *opts); 
diff --git a/net/fspclient/files/patch-ah b/net/fspclient/files/patch-ah
new file mode 100644
index 000000000000..d0fc26da2544
--- /dev/null
+++ b/net/fspclient/files/patch-ah
@@ -0,0 +1,11 @@
+--- client.0.0-h+/Makefile.in.orig	Wed Apr 28 03:53:43 1993
++++ client.0.0-h+/Makefile.in	Mon Dec 27 20:53:08 1999
+@@ -52,7 +52,7 @@
+ .c.o:
+ 	$(CC) -c $(CFLAGS) $(CPPFLAGS) $(DEFS) $(INCLUDES) $<
+ 
+-install: all
++install:
+ 	$(INSTALL_PROGRAM) fsp $(bindir)/fsp
+ 	-$(INSTALL_DATA) $(srcdir)/fsp.man $(man1dir)/fsp$(man1ext)
+ 
diff --git a/net/fspclient/files/patch-ai b/net/fspclient/files/patch-ai
new file mode 100644
index 000000000000..e535db3feb9f
--- /dev/null
+++ b/net/fspclient/files/patch-ai
@@ -0,0 +1,14 @@
+--- client.0.0-h+/lock.c.orig	Thu May  6 14:23:44 1993
++++ client.0.0-h+/lock.c	Mon Dec 27 20:53:16 1999
+@@ -14,7 +14,11 @@
+ #ifndef NOLOCKING
+ 
+ #ifndef KEY_PREFIX
++#ifdef __FreeBSD__
++#  define KEY_PREFIX "/tmp/.FL"
++#else
+ #  define KEY_PREFIX "/usr/tmp/.FL"
++#endif
+ #endif
+ 
+ static char key_string[sizeof(KEY_PREFIX)+32];
diff --git a/net/fspclient/files/patch-aj b/net/fspclient/files/patch-aj
new file mode 100644
index 000000000000..3b9b4bb9c05d
--- /dev/null
+++ b/net/fspclient/files/patch-aj
@@ -0,0 +1,44 @@
+--- client.0.0-h+/remote/rget.c.orig	Mon May  3 11:31:20 1993
++++ client.0.0-h+/remote/rget.c	Mon Dec 27 20:53:08 1999
+@@ -36,7 +36,7 @@
+ static int recursive;
+ 
+ typedef enum { GET_WHOLE, GET_HEAD, GET_MIDDLE, GET_TAIL } GetOp;
+-static GetOp getmode;
++static GetOp _getmode;
+ 
+ static int
+ #ifndef ANSI_PROTOTYPES
+@@ -87,7 +87,7 @@
+     else
+ 	remname = name;
+ 
+-    switch (getmode)
++    switch (_getmode)
+     {
+       case GET_WHOLE:
+ 	if (access(path, W_OK) == 0)
+@@ -304,11 +304,11 @@
+     errcnt = 0;
+ 
+     if (strcmp(argv[0], "head") == 0)
+-	getmode = GET_HEAD;
++	_getmode = GET_HEAD;
+     else if (strcmp(argv[0], "tail") == 0)
+-	getmode = GET_TAIL;
++	_getmode = GET_TAIL;
+     else
+-	getmode = GET_WHOLE;
++	_getmode = GET_WHOLE;
+ 
+     while ((ch = getopt(argc, argv, "ftnr")) != EOF)
+         switch (ch)
+@@ -326,7 +326,7 @@
+         return 1;
+ 
+ #if 0
+-    if (getmode == GET_WHOLE && (frompos != 0 || getlen XXX))
++    if (_getmode == GET_WHOLE && (frompos != 0 || getlen XXX))
+ 	;
+ #endif
+ 
diff --git a/net/fspclient/files/patch-ak b/net/fspclient/files/patch-ak
new file mode 100644
index 000000000000..c19e52fb8d12
--- /dev/null
+++ b/net/fspclient/files/patch-ak
@@ -0,0 +1,12 @@
+--- common/common.h.orig	Fri May  7 02:04:30 1993
++++ common/common.h	Mon Dec 27 20:53:08 1999
+@@ -92,7 +92,9 @@
+ /* definitions missing from many system headers */
+ extern int errno;
+ extern int sys_nerr;
++#ifndef __FreeBSD__
+ extern char *sys_errlist[];
++#endif
+ 
+ #if !HAVE_STRDUP
+ #ifndef ANSI_PROTOTYPES