diff options
author | David E. O'Brien <obrien@FreeBSD.org> | 2004-01-05 08:03:05 +0000 |
---|---|---|
committer | David E. O'Brien <obrien@FreeBSD.org> | 2004-01-05 08:03:05 +0000 |
commit | c1d5a3efd7f615bb205e1148280ca7fa931fc33b (patch) | |
tree | abf396fc0b56c6077e2ad56553ef7577e8f22527 /ftp | |
parent | Update to 2.09 (diff) |
Upgrade to version 3.1.6.
Notes
Notes:
svn path=/head/; revision=97334
Diffstat (limited to 'ftp')
-rw-r--r-- | ftp/ncftp3/Makefile | 6 | ||||
-rw-r--r-- | ftp/ncftp3/distinfo | 2 | ||||
-rw-r--r-- | ftp/ncftp3/files/patch-ae | 11 | ||||
-rw-r--r-- | ftp/ncftp3/files/patch-af | 9 | ||||
-rw-r--r-- | ftp/ncftp3/files/patch-getline.c | 24 | ||||
-rw-r--r-- | ftp/ncftp3/files/patch-sio-Makefile.in | 10 |
6 files changed, 4 insertions, 58 deletions
diff --git a/ftp/ncftp3/Makefile b/ftp/ncftp3/Makefile index 13559507610b..055ff3256cd7 100644 --- a/ftp/ncftp3/Makefile +++ b/ftp/ncftp3/Makefile @@ -7,14 +7,14 @@ # PORTNAME= ncftp -PORTVERSION= 3.1.5 -PORTREVISION= 2 +PORTVERSION= 3.1.6 +PORTREVISION?= 0 CATEGORIES= ftp ipv6 MASTER_SITES= ftp://ftp.ncftp.com/ncftp/ DISTNAME= ncftp-${PORTVERSION}-src PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/ -PATCHFILES= ncftp-315-v6-20030207.diff.gz +#PATCHFILES= ncftp-315-v6-20030207.diff.gz PATCH_DIST_STRIP= -p1 MAINTAINER= obrien@FreeBSD.org diff --git a/ftp/ncftp3/distinfo b/ftp/ncftp3/distinfo index 19d0fe5c236c..cd5efea830ee 100644 --- a/ftp/ncftp3/distinfo +++ b/ftp/ncftp3/distinfo @@ -1,2 +1,2 @@ -MD5 (ncftp-3.1.5-src.tar.bz2) = 686ee315742a34bd4132f0d077d2c172 +MD5 (ncftp-3.1.6-src.tar.bz2) = 4324d913499dc735dca961618879d21a MD5 (ncftp-315-v6-20030207.diff.gz) = 1fb8d9125cd6aa838aa2665e2bffb61a diff --git a/ftp/ncftp3/files/patch-ae b/ftp/ncftp3/files/patch-ae deleted file mode 100644 index 59a39996305d..000000000000 --- a/ftp/ncftp3/files/patch-ae +++ /dev/null @@ -1,11 +0,0 @@ ---- libncftp/Makefile.in.orig Wed Nov 12 17:43:48 1997 -+++ libncftp/Makefile.in Sat Sep 26 19:48:19 1998 -@@ -55,7 +55,7 @@ - - $(LIBSO): $(SOBJS) - /bin/rm -f $(LIBSO) $(LIBSOS) -- gcc -shared -Wl,-soname,$(LIBSO) -o $(LIBSO) $(SOBJS) -+ $(CC) -shared -Wl,-x -o $(LIBSO) `lorder $(SOBJS) | tsort -q` - /bin/ln -s $(LIBSO) $(LIBSOS) - -@/bin/ls -l $(LIBSO) - diff --git a/ftp/ncftp3/files/patch-af b/ftp/ncftp3/files/patch-af deleted file mode 100644 index eef95b492156..000000000000 --- a/ftp/ncftp3/files/patch-af +++ /dev/null @@ -1,9 +0,0 @@ ---- Strn/Makefile.in.orig Sat Oct 12 17:01:11 2002 -+++ Strn/Makefile.in Wed Mar 12 10:00:33 2003 -@@ -63,5 +63,5 @@ - $(LIBSO): $(SOBJS) - /bin/rm -f "$(LIBSO)" "$(LIBSOS)" -- gcc -shared "-Wl,-soname,$(LIBSO)" -o "$(LIBSO)" $(SOBJS) -+ $(CC) -shared "-Wl,-soname,$(LIBSO)" -o "$(LIBSO)" $(SOBJS) - /bin/ln -s "$(LIBSO)" "$(LIBSOS)" - -@/bin/ls -l "$(LIBSOS)" "$(LIBSO)" diff --git a/ftp/ncftp3/files/patch-getline.c b/ftp/ncftp3/files/patch-getline.c deleted file mode 100644 index 610c8424fe75..000000000000 --- a/ftp/ncftp3/files/patch-getline.c +++ /dev/null @@ -1,24 +0,0 @@ ---- ncftp/getline.c.orig Sat Apr 7 16:55:16 2001 -+++ ncftp/getline.c Sun Jul 29 11:10:37 2001 -@@ -367,7 +367,7 @@ - { - int c; - #ifdef __unix__ -- char ch; -+ unsigned char ch; - #endif - - #ifdef __unix__ -@@ -974,7 +974,12 @@ - kill(0, sig); - gl_init(); - gl_redraw(); -+#if 0 - return gl_buf; -+#else -+ /* FALLTHROUGH */ -+ c = 0; /* no beep */ -+#endif - #endif - } - #endif /* __unix__ */ diff --git a/ftp/ncftp3/files/patch-sio-Makefile.in b/ftp/ncftp3/files/patch-sio-Makefile.in deleted file mode 100644 index 8517e610b939..000000000000 --- a/ftp/ncftp3/files/patch-sio-Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- sio/Makefile.in.orig Sun Oct 13 01:17:13 2002 -+++ sio/Makefile.in Fri Jan 24 22:55:29 2003 -@@ -73,5 +73,6 @@ - $(LIBSO): $(SOBJS) - /bin/rm -f "$(LIBSO)" "$(LIBSOS)" -- gcc -shared "-Wl,-soname,$(LIBSO)" -o "$(LIBSO)" $(SOBJS) -+ $(CC) -shared "-Wl,-soname,$(LIBSO)" -o "$(LIBSO)" $(SOBJS) -+ $(CC) -shared -Wl,-x -o $(LIBSO) `lorder $(SOBJS) | tsort -q` - chmod a+r "$(LIBSO)" sio.h usio.h - /bin/ln -s "$(LIBSO)" "$(LIBSOS)" |