Date: Mon, 27 Dec 1999 07:08:08 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@freebsd.org Subject: ports/15720: Update port: net/fspclient Message-ID: <19991227150808.EFF6814F2D@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 15720 >Category: ports >Synopsis: Update port: net/fspclient >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Dec 27 07:10:05 PST 1999 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 3.4-RELEASE i386 >Organization: >Environment: >Description: * Fixed MASTER_SITES New file: patches/patch-aa patches/patch-ab patches/patch-ac patches/patch-ad Remove file: patches/patch-ae patches/patch-af patches/patch-ag patches/patch-ah patches/patch-ai patches/patch-aj patches/patch-ak >How-To-Repeat: >Fix: diff -urN /usr/ports/net/fspclient/Makefile net/fspclient/Makefile --- /usr/ports/net/fspclient/Makefile Thu Dec 23 20:17:17 1999 +++ net/fspclient/Makefile Mon Dec 27 22:15:48 1999 @@ -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: ports/net/fspclient/Makefile,v 1.13 1999/12/23 03:41:49 ache Exp $ # -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 -urN /usr/ports/net/fspclient/files/md5 net/fspclient/files/md5 --- /usr/ports/net/fspclient/files/md5 Sun Dec 18 09:27:43 1994 +++ net/fspclient/files/md5 Mon Dec 27 20:27:52 1999 @@ -1 +1 @@ -MD5 (fspclient.0.0-h+.tar.z) = b60ae745e1bd26df6d80cf3a3f4ec61f +MD5 (fspclient.tar.gz) = 78242a16ceae2acb9b1b79f905a1283d diff -urN /usr/ports/net/fspclient/patches/patch-aa net/fspclient/patches/patch-aa --- /usr/ports/net/fspclient/patches/patch-aa Tue Nov 8 02:29:02 1994 +++ net/fspclient/patches/patch-aa Thu Jan 1 09:00:00 1970 @@ -1,141 +0,0 @@ -*** Makefile.in.old Mon Nov 7 08:46:19 1994 ---- Makefile.in Mon Nov 7 09:04:52 1994 -*************** -*** 3,9 **** - srcdir = @srcdir@ - VPATH = @srcdir@ - -- CC = @CC@ - AR = ar - # set RANLIB = @: if your system doesn't have or need ranlib - RANLIB = @RANLIB@ ---- 3,8 ---- -*************** -*** 14,21 **** - - DEFS = @DEFS@ - -! CFLAGS = -g -! LDFLAGS = $(CFLAGS) - LIBS = @LIBS@ - - prefix = /usr/local ---- 13,19 ---- - - DEFS = @DEFS@ - -! LDFLAGS = -s - LIBS = @LIBS@ - - prefix = /usr/local -*** common/common.h.old Mon Nov 7 08:48:01 1994 ---- common/common.h Mon Nov 7 08:48:57 1994 -*************** -*** 92,98 **** ---- 92,100 ---- - /* 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 -*** client/remote/rget.c.old Mon Nov 7 08:59:31 1994 ---- client/remote/rget.c Mon Nov 7 08:59:46 1994 -*************** -*** 36,42 **** - static int recursive; - - typedef enum { GET_WHOLE, GET_HEAD, GET_MIDDLE, GET_TAIL } GetOp; -! static GetOp getmode; - - static int - #ifndef ANSI_PROTOTYPES ---- 36,42 ---- - static int recursive; - - typedef enum { GET_WHOLE, GET_HEAD, GET_MIDDLE, GET_TAIL } GetOp; -! static GetOp _getmode; - - static int - #ifndef ANSI_PROTOTYPES -*************** -*** 87,93 **** - else - remname = name; - -! switch (getmode) - { - case GET_WHOLE: - if (access(path, W_OK) == 0) ---- 87,93 ---- - else - remname = name; - -! switch (_getmode) - { - case GET_WHOLE: - if (access(path, W_OK) == 0) -*************** -*** 304,314 **** - errcnt = 0; - - if (strcmp(argv[0], "head") == 0) -! getmode = GET_HEAD; - else if (strcmp(argv[0], "tail") == 0) -! getmode = GET_TAIL; - else -! getmode = GET_WHOLE; - - while ((ch = getopt(argc, argv, "ftnr")) != EOF) - switch (ch) ---- 304,314 ---- - errcnt = 0; - - if (strcmp(argv[0], "head") == 0) -! _getmode = GET_HEAD; - else if (strcmp(argv[0], "tail") == 0) -! _getmode = GET_TAIL; - else -! _getmode = GET_WHOLE; - - while ((ch = getopt(argc, argv, "ftnr")) != EOF) - switch (ch) -*************** -*** 326,332 **** - return 1; - - #if 0 -! if (getmode == GET_WHOLE && (frompos != 0 || getlen XXX)) - ; - #endif - ---- 326,332 ---- - return 1; - - #if 0 -! if (_getmode == GET_WHOLE && (frompos != 0 || getlen XXX)) - ; - #endif - -*** client/Makefile.in.old Mon Nov 7 09:21:57 1994 ---- client/Makefile.in Mon Nov 7 09:22:32 1994 -*************** -*** 52,58 **** - .c.o: - $(CC) -c $(CFLAGS) $(CPPFLAGS) $(DEFS) $(INCLUDES) $< - -! install: all - $(INSTALL_PROGRAM) fsp $(bindir)/fsp - -$(INSTALL_DATA) $(srcdir)/fsp.man $(man1dir)/fsp$(man1ext) - ---- 52,58 ---- - .c.o: - $(CC) -c $(CFLAGS) $(CPPFLAGS) $(DEFS) $(INCLUDES) $< - -! install: - $(INSTALL_PROGRAM) fsp $(bindir)/fsp - -$(INSTALL_DATA) $(srcdir)/fsp.man $(man1dir)/fsp$(man1ext) - diff -urN /usr/ports/net/fspclient/patches/patch-ab net/fspclient/patches/patch-ab --- /usr/ports/net/fspclient/patches/patch-ab Tue Nov 8 12:46:48 1994 +++ net/fspclient/patches/patch-ab Thu Jan 1 09:00:00 1970 @@ -1,19 +0,0 @@ -*** Makefile.in.bak Mon Nov 7 19:41:07 1994 ---- Makefile.in Mon Nov 7 19:45:00 1994 -*************** -*** 7,13 **** - # 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_DATA = @INSTALL_DATA@ - ---- 7,13 ---- - # set RANLIB = @: if your system doesn't have or need ranlib - RANLIB = @RANLIB@ - # use cp if you don't have install -! INSTALL = /usr/bin/install -c -o bin -g bin - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ - diff -urN /usr/ports/net/fspclient/patches/patch-ac net/fspclient/patches/patch-ac --- /usr/ports/net/fspclient/patches/patch-ac Fri Nov 11 21:19:15 1994 +++ net/fspclient/patches/patch-ac Thu Jan 1 09:00:00 1970 @@ -1,16 +0,0 @@ -*** client/lock.c.old Wed Nov 9 18:52:14 1994 ---- client/lock.c Wed Nov 9 18:53:03 1994 -*************** -*** 14,20 **** ---- 14,24 ---- - #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 -urN /usr/ports/net/fspclient/patches/patch-ad net/fspclient/patches/patch-ad --- /usr/ports/net/fspclient/patches/patch-ad Sat Apr 26 07:41:20 1997 +++ net/fspclient/patches/patch-ad Thu Jan 1 09:00:00 1970 @@ -1,36 +0,0 @@ ---- ./bsd/ls.c.org Wed May 5 23:02:53 1993 -+++ ./bsd/ls.c Thu Apr 24 14:04:44 1997 -@@ -96,7 +96,9 @@ - #ifndef ANSI_PROTOTYPES - extern int getopt(); - #else /* ANSI_PROTOTYPES */ -+#if !defined(__FreeBSD__) - extern int getopt(int argc, char **argv, char *opts); -+#endif /* __FreeBSD__ */ - #endif /* ANSI_PROTOTYPES */ - extern int optind, opterr; - int ch, exit_after_options; ---- ./bsd/getopt.c.org Sun May 2 19:56:29 1993 -+++ ./bsd/getopt.c Thu Apr 24 14:10:51 1997 -@@ -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) ---- ./client.0.0-h+/main.c.org Wed May 5 22:22:34 1993 -+++ ./client.0.0-h+/main.c Thu Apr 24 14:14:54 1997 -@@ -414,7 +414,9 @@ - #ifndef ANSI_PROTOTYPES - extern int getopt(); - #else /* ANSI_PROTOTYPES */ -+#if !defined(__FreeBSD__) - extern int getopt(int argc, char **argv, char *optstring); -+#endif /* __FreeBSD__ */ - #endif /* ANSI_PROTOTYPES */ - extern char *optarg; - extern int optind, opterr; - diff -urN /usr/ports/net/fspclient/patches/patch-ae net/fspclient/patches/patch-ae --- /usr/ports/net/fspclient/patches/patch-ae Thu Jan 1 09:00:00 1970 +++ net/fspclient/patches/patch-ae Mon Dec 27 22:07:31 1999 @@ -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 -urN /usr/ports/net/fspclient/patches/patch-af net/fspclient/patches/patch-af --- /usr/ports/net/fspclient/patches/patch-af Thu Jan 1 09:00:00 1970 +++ net/fspclient/patches/patch-af Mon Dec 27 21:10:27 1999 @@ -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 -urN /usr/ports/net/fspclient/patches/patch-ag net/fspclient/patches/patch-ag --- /usr/ports/net/fspclient/patches/patch-ag Thu Jan 1 09:00:00 1970 +++ net/fspclient/patches/patch-ag Mon Dec 27 21:10:36 1999 @@ -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 -urN /usr/ports/net/fspclient/patches/patch-ah net/fspclient/patches/patch-ah --- /usr/ports/net/fspclient/patches/patch-ah Thu Jan 1 09:00:00 1970 +++ net/fspclient/patches/patch-ah Mon Dec 27 21:11:13 1999 @@ -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 -urN /usr/ports/net/fspclient/patches/patch-ai net/fspclient/patches/patch-ai --- /usr/ports/net/fspclient/patches/patch-ai Thu Jan 1 09:00:00 1970 +++ net/fspclient/patches/patch-ai Mon Dec 27 21:11:34 1999 @@ -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 -urN /usr/ports/net/fspclient/patches/patch-aj net/fspclient/patches/patch-aj --- /usr/ports/net/fspclient/patches/patch-aj Thu Jan 1 09:00:00 1970 +++ net/fspclient/patches/patch-aj Mon Dec 27 21:11:56 1999 @@ -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 -urN /usr/ports/net/fspclient/patches/patch-ak net/fspclient/patches/patch-ak --- /usr/ports/net/fspclient/patches/patch-ak Thu Jan 1 09:00:00 1970 +++ net/fspclient/patches/patch-ak Mon Dec 27 21:10:54 1999 @@ -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 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19991227150808.EFF6814F2D>