Attachment 38731 Details for Bug 61214 – file.diff

[patch] file.diff

file.diff (text/plain), 5.50 KB, created by Radim Kolar on 2004-01-11 19:30:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Radim Kolar

Created: 2004-01-11 19:30:12 UTC

Size: 5.50 KB

patch

obsolete

>diff -ruN fspclient.bak/Makefile fspclient/Makefile
>--- fspclient.bak/Makefile	Thu Feb 20 19:50:56 2003
>+++ fspclient/Makefile	Sat Jan 10 10:07:17 2004
>@@ -6,17 +6,16 @@
> #
> 
> PORTNAME=	fspclient
>-PORTVERSION=	0.0.h
>+PORTVERSION=	0.0.6
> CATEGORIES=	net
>-MASTER_SITES=	${MASTER_SITE_SUNSITE}
>-MASTER_SITE_SUBDIR=	system/network/file-transfer
>-DISTNAME=	fspclient
>+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
>+MASTER_SITE_SUBDIR=	${PORTNAME}
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hsn@netmag.cz
> COMMENT=	A client for the fsp service
> 
>-WRKSRC=		${WRKDIR}/fspclient
> GNU_CONFIGURE=	yes
>+USE_BZIP2=	yes
> MAN1=		fsp.1
> 
> .include <bsd.port.mk>
>diff -ruN fspclient.bak/distinfo fspclient/distinfo
>--- fspclient.bak/distinfo	Mon Dec 27 22:35:50 1999
>+++ fspclient/distinfo	Fri Jan  9 21:22:34 2004
>@@ -1 +1 @@
>-MD5 (fspclient.tar.gz) = 78242a16ceae2acb9b1b79f905a1283d
>+MD5 (fspclient-0.0.6.tar.bz2) = d15585e2f24d9d33f8084f3e3d222431
>diff -ruN fspclient.bak/files/patch-ae fspclient/files/patch-ae
>--- fspclient.bak/files/patch-ae	Mon Dec 27 22:35:54 1999
>+++ fspclient/files/patch-ae	Thu Jan  1 01:00:00 1970
>@@ -1,26 +0,0 @@
>---- 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 -ruN fspclient.bak/files/patch-af fspclient/files/patch-af
>--- fspclient.bak/files/patch-af	Mon Dec 27 22:35:54 1999
>+++ fspclient/files/patch-af	Thu Jan  1 01:00:00 1970
>@@ -1,11 +0,0 @@
>---- 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 -ruN fspclient.bak/files/patch-ag fspclient/files/patch-ag
>--- fspclient.bak/files/patch-ag	Mon Dec 27 22:35:54 1999
>+++ fspclient/files/patch-ag	Thu Jan  1 01:00:00 1970
>@@ -1,11 +0,0 @@
>---- 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 -ruN fspclient.bak/files/patch-ah fspclient/files/patch-ah
>--- fspclient.bak/files/patch-ah	Mon Dec 27 22:35:54 1999
>+++ fspclient/files/patch-ah	Thu Jan  1 01:00:00 1970
>@@ -1,11 +0,0 @@
>---- 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 -ruN fspclient.bak/files/patch-ai fspclient/files/patch-ai
>--- fspclient.bak/files/patch-ai	Mon Dec 27 22:35:54 1999
>+++ fspclient/files/patch-ai	Thu Jan  1 01:00:00 1970
>@@ -1,14 +0,0 @@
>---- 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 -ruN fspclient.bak/files/patch-aj fspclient/files/patch-aj
>--- fspclient.bak/files/patch-aj	Mon Dec 27 22:35:55 1999
>+++ fspclient/files/patch-aj	Thu Jan  1 01:00:00 1970
>@@ -1,44 +0,0 @@
>---- 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 -ruN fspclient.bak/files/patch-ak fspclient/files/patch-ak
>--- fspclient.bak/files/patch-ak	Wed May 15 21:51:08 2002
>+++ fspclient/files/patch-ak	Thu Jan  1 01:00:00 1970
>@@ -1,13 +0,0 @@
>---- 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;
>-+extern const int sys_nerr;
>-+#ifndef __FreeBSD__
>- extern char *sys_errlist[];
>-+#endif
>- 
>- #if !HAVE_STRDUP
>- #ifndef ANSI_PROTOTYPES

Actions: View | Diff

Attachments on bug 61214: 38731