diff options
author | Oliver Lehmann <oliver@FreeBSD.org> | 2003-07-24 17:53:02 +0000 |
---|---|---|
committer | Oliver Lehmann <oliver@FreeBSD.org> | 2003-07-24 17:53:02 +0000 |
commit | 5e8561125c333a2cbf20b6ce863f7507b2b18aa8 (patch) | |
tree | 58458ce5e6612a258c4a8394341a089344177cb4 /ftp/gftp | |
parent | d5bc4626d2feca71c83c7b403227bb953688b811 (diff) | |
download | ports-5e8561125c333a2cbf20b6ce863f7507b2b18aa8.tar.gz ports-5e8561125c333a2cbf20b6ce863f7507b2b18aa8.zip |
update gftp to 2.0.15.rc1
Notes
Notes:
svn path=/head/; revision=85536
Diffstat (limited to 'ftp/gftp')
-rw-r--r-- | ftp/gftp/Makefile | 6 | ||||
-rw-r--r-- | ftp/gftp/distinfo | 2 | ||||
-rw-r--r-- | ftp/gftp/files/patch-af | 4 | ||||
-rw-r--r-- | ftp/gftp/files/patch-configure | 40 | ||||
-rw-r--r-- | ftp/gftp/files/patch-lib::gftp.h | 11 | ||||
-rw-r--r-- | ftp/gftp/files/patch-lib::misc.c | 12 | ||||
-rw-r--r-- | ftp/gftp/files/patch-lib::sshv2.c | 70 | ||||
-rw-r--r-- | ftp/gftp/pkg-plist | 9 |
8 files changed, 55 insertions, 99 deletions
diff --git a/ftp/gftp/Makefile b/ftp/gftp/Makefile index 058d5fc88b68..f748d8afb73a 100644 --- a/ftp/gftp/Makefile +++ b/ftp/gftp/Makefile @@ -6,14 +6,14 @@ # PORTNAME= gftp -PORTVERSION= 2.0.14 -PORTREVISION= 1 +PORTVERSION= 2.0.15.r1 +PORTREVISION= 0 CATEGORIES= ftp MASTER_SITES= http://gftp.seul.org/ \ ftp://gftp.seul.org/pub/gftp/ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/} -MAINTAINER= oliver@freebsd.org +MAINTAINER= oliver@FreeBSD.org COMMENT= A free multithreaded GTK-based GUI ftp and sftp client GNU_CONFIGURE= yes diff --git a/ftp/gftp/distinfo b/ftp/gftp/distinfo index 5ed771b39d68..22bea4221f85 100644 --- a/ftp/gftp/distinfo +++ b/ftp/gftp/distinfo @@ -1 +1 @@ -MD5 (gftp-2.0.14.tar.gz) = 61e1271af88de20b50a90242a648ab2b +MD5 (gftp-2.0.15rc1.tar.gz) = fbc470390df06a61f554c2df88951c13 diff --git a/ftp/gftp/files/patch-af b/ftp/gftp/files/patch-af index 401fd18c332c..3ca58c6fcb6c 100644 --- a/ftp/gftp/files/patch-af +++ b/ftp/gftp/files/patch-af @@ -1,9 +1,9 @@ --- src/text/gftp-text.h.orig Thu Sep 20 03:10:29 2001 +++ src/text/gftp-text.h Wed Jan 2 13:59:28 2002 -@@ -48,7 +48,7 @@ +@@ -53,7 +53,7 @@ /* gftp-text.h */ void gftp_text_log ( gftp_logging_level level, - void *ptr, + gftp_request * request, - const char *string, ... ); + const char *string, ... ) __attribute__((format(printf, 3, 4))); int gftp_text_open ( gftp_request * request, diff --git a/ftp/gftp/files/patch-configure b/ftp/gftp/files/patch-configure index be29119ab3d4..3988d7d0c633 100644 --- a/ftp/gftp/files/patch-configure +++ b/ftp/gftp/files/patch-configure @@ -1,14 +1,34 @@ ---- configure.orig Wed Nov 27 17:25:51 2002 -+++ configure Wed Nov 27 17:30:47 2002 -@@ -3988,6 +3988,7 @@ +--- configure.orig Thu Jul 24 19:13:01 2003 ++++ configure Thu Jul 24 19:27:00 2003 +@@ -3526,7 +3526,7 @@ - GFTP_TEXT="" - EXTRA_LIBS="" -+EXTRA_LIBS="$EXTRA_LIBS -lutil" - USE_READLINE="yes" - READLINE_LIBS="" - if test "x$enable_textport" = "x1" ; then -@@ -4725,9 +4725,9 @@ + fi + +-for ac_func in gai_strerror getaddrinfo getcwd gettimeofday getwd mkdir mktime putenv rmdir select socket strdup strstr strtod strtol uname grantpt openpty getdtablesize ++for ac_func in gai_strerror getaddrinfo getcwd gettimeofday getwd mkdir mktime putenv rmdir select socket strdup strstr strtod strtol uname openpty getdtablesize + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 + echo "configure:3533: checking for $ac_func" >&5 +@@ -3974,6 +3974,9 @@ + if { (eval echo configure:3975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" ++ cat >> confdefs.h <<EOF ++#define HAVE_OPENPTY 1 ++EOF + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +@@ -4372,7 +4375,7 @@ + + fi + if test x${HAVE_LIBREADLINE} = xtrue; then +- READLINE_LIBS="-lreadline ${EXTRA_LIBREADLINE_DEPS}" ++ READLINE_LIBS="-lreadline -lintl ${EXTRA_LIBREADLINE_DEPS}" + fi + fi + +@@ -4813,9 +4816,9 @@ rm -f conf.gtktest diff --git a/ftp/gftp/files/patch-lib::gftp.h b/ftp/gftp/files/patch-lib::gftp.h deleted file mode 100644 index 254d8a453485..000000000000 --- a/ftp/gftp/files/patch-lib::gftp.h +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/gftp.h.orig Wed Nov 27 17:19:22 2002 -+++ lib/gftp.h Wed Nov 27 17:19:43 2002 -@@ -35,7 +35,7 @@ - #endif - #include <sys/wait.h> - #include <sys/utsname.h> --#include <sys/sysmacros.h> -+/* #include <sys/sysmacros.h> */ - #include <netinet/in.h> - #include <arpa/inet.h> - #include <glib.h> diff --git a/ftp/gftp/files/patch-lib::misc.c b/ftp/gftp/files/patch-lib::misc.c deleted file mode 100644 index fc16bc56363b..000000000000 --- a/ftp/gftp/files/patch-lib::misc.c +++ /dev/null @@ -1,12 +0,0 @@ ---- lib/misc.c.orig Fri Dec 6 03:28:19 2002 -+++ lib/misc.c Fri Apr 25 01:51:48 2003 -@@ -881,7 +881,8 @@ - diff += rd; - tempstr[diff] = '\0'; - -- if (diff > 11 && strcmp (tempstr + diff - 10, "password: ") == 0) -+ if ( (strcmp (tempstr, "Password:") == 0) || -+ (diff > 11 && strcmp (tempstr + diff - 10, "password: ") == 0) ) - { - if (wrotepw) - { diff --git a/ftp/gftp/files/patch-lib::sshv2.c b/ftp/gftp/files/patch-lib::sshv2.c index fb8c868b459d..b13e56a65b75 100644 --- a/ftp/gftp/files/patch-lib::sshv2.c +++ b/ftp/gftp/files/patch-lib::sshv2.c @@ -1,62 +1,12 @@ ---- lib/sshv2.c.orig Sat Nov 23 15:34:25 2002 -+++ lib/sshv2.c Thu Apr 24 21:57:04 2003 -@@ -543,8 +543,13 @@ - if (request->sftpserv_path == NULL || - *request->sftpserv_path == '\0') - { -+#ifdef __FreeBSD__ -+ p1 = "/usr/libexec"; -+ p2 = '/'; -+#else - p1 = ""; - p2 = ' '; -+#endif - } - else - { -@@ -570,6 +575,15 @@ - else - { - s[0] = s[1] = 0; -+#ifdef __FreeBSD__ -+ if( openpty( &fdm, &fds, &pts_name, NULL, NULL ) < 0 ) -+ { -+ request->logging_function (gftp_logging_error, request->user_data, -+ _("Cannot create a socket pair: %s\n"), -+ g_strerror (errno)); -+ return (-2); -+ } -+#else - if ((fdm = ptym_open (pts_name)) < 0) - { - request->logging_function (gftp_logging_error, request->user_data, -@@ -577,6 +591,7 @@ - g_strerror (errno)); - return (-2); - } -+#endif - } - - if ((child = fork ()) == 0) -@@ -589,6 +604,13 @@ - } - else +--- lib/sshv2.c.orig Thu Jul 24 18:44:59 2003 ++++ lib/sshv2.c Thu Jul 24 18:47:03 2003 +@@ -291,7 +291,8 @@ + diff += rd; + tempstr[diff] = '\0'; + +- if (diff >= 10 && strcmp (tempstr + diff - 9, "assword: ") == 0) ++ if ( (strcmp (tempstr, "Password:") == 0) || ++ (diff >= 10 && strcmp (tempstr + diff - 9, "assword: ") == 0)) { -+#ifdef __FreeBSD__ -+ close (fdm); -+ if( ioctl( fds, TIOCSCTTY, NULL ) < 0 ) -+ { -+ return( -2 ); -+ } -+#else - if ((fds = ptys_open (fdm, pts_name)) < 0) + if (wrotepw) { - printf ("Cannot open slave pts %s: %s\n", pts_name, -@@ -596,6 +618,7 @@ - return (-1); - } - close (fdm); -+#endif - } - - tty_raw (fds); diff --git a/ftp/gftp/pkg-plist b/ftp/gftp/pkg-plist index 7fdef1e8a79c..01110940bbdc 100644 --- a/ftp/gftp/pkg-plist +++ b/ftp/gftp/pkg-plist @@ -32,6 +32,9 @@ bin/gftp-text %%NOX11:%%%%DATADIR%%/gftp/world.xpm %%NOX11:%%%%GNOME:%%share/gnome/pixmaps/gftp.png share/locale/bg/LC_MESSAGES/gftp.mo +share/locale/am/LC_MESSAGES/gftp.mo +share/locale/ar/LC_MESSAGES/gftp.mo +share/locale/ca/LC_MESSAGES/gftp.mo share/locale/cs/LC_MESSAGES/gftp.mo share/locale/da/LC_MESSAGES/gftp.mo share/locale/de/LC_MESSAGES/gftp.mo @@ -42,14 +45,20 @@ share/locale/hu/LC_MESSAGES/gftp.mo share/locale/it/LC_MESSAGES/gftp.mo share/locale/ja/LC_MESSAGES/gftp.mo share/locale/ko/LC_MESSAGES/gftp.mo +share/locale/mk/LC_MESSAGES/gftp.mo +share/locale/ms/LC_MESSAGES/gftp.mo share/locale/nl/LC_MESSAGES/gftp.mo share/locale/no/LC_MESSAGES/gftp.mo share/locale/pl/LC_MESSAGES/gftp.mo +share/locale/pt/LC_MESSAGES/gftp.mo share/locale/pt_BR/LC_MESSAGES/gftp.mo share/locale/ro/LC_MESSAGES/gftp.mo share/locale/ru/LC_MESSAGES/gftp.mo +share/locale/sr/LC_MESSAGES/gftp.mo +share/locale/sr@Latn/LC_MESSAGES/gftp.mo share/locale/sv/LC_MESSAGES/gftp.mo share/locale/tr/LC_MESSAGES/gftp.mo +share/locale/uk/LC_MESSAGES/gftp.mo share/locale/zh_CN/LC_MESSAGES/gftp.mo share/locale/zh_TW/LC_MESSAGES/gftp.mo %%NOX11:%%@dirrm %%DATADIR%%/gftp |