diff options
author | Oliver Lehmann <oliver@FreeBSD.org> | 2003-08-08 13:27:51 +0000 |
---|---|---|
committer | Oliver Lehmann <oliver@FreeBSD.org> | 2003-08-08 13:27:51 +0000 |
commit | 0079714ffab59fb9baaefea13e184725d9a9708b (patch) | |
tree | 1a64184eaca3ed43167c3fd2e4881499f219775a /ftp/gftp | |
parent | Update to 0.5.4. (diff) |
update to 2.0.15.rc2 which fixes several bugs introduced by rc1
Notes
Notes:
svn path=/head/; revision=86578
Diffstat (limited to 'ftp/gftp')
-rw-r--r-- | ftp/gftp/Makefile | 15 | ||||
-rw-r--r-- | ftp/gftp/distinfo | 2 | ||||
-rw-r--r-- | ftp/gftp/files/patch-ae | 11 | ||||
-rw-r--r-- | ftp/gftp/files/patch-af | 11 | ||||
-rw-r--r-- | ftp/gftp/files/patch-configure | 19 | ||||
-rw-r--r-- | ftp/gftp/files/patch-lib::sshv2.c | 12 | ||||
-rw-r--r-- | ftp/gftp/files/patch-src::gtk::transfer.c | 16 | ||||
-rw-r--r-- | ftp/gftp/pkg-plist | 1 |
8 files changed, 13 insertions, 74 deletions
diff --git a/ftp/gftp/Makefile b/ftp/gftp/Makefile index f748d8afb73a..410d85948daa 100644 --- a/ftp/gftp/Makefile +++ b/ftp/gftp/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gftp -PORTVERSION= 2.0.15.r1 +PORTVERSION= 2.0.15.r2 PORTREVISION= 0 CATEGORIES= ftp MASTER_SITES= http://gftp.seul.org/ \ @@ -18,6 +18,7 @@ COMMENT= A free multithreaded GTK-based GUI ftp and sftp client GNU_CONFIGURE= yes +CONFIGURE_ARGS= --without-included-gettext CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" @@ -71,9 +72,15 @@ pre-everything:: @${ECHO} "" post-patch: +# @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ +# s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ +# s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ +# s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ - s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ - s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure + s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ + s|"-lssl |& -lcrypto|' ${WRKSRC}/configure +# @${REINPLACE_CMD} -e 's|LDADD = |& @LIBINTL@ |g' \ +# ${WRKSRC}/src/text/Makefile.in ${WRKSRC}/src/gtk/Makefile.in .include <bsd.port.post.mk> diff --git a/ftp/gftp/distinfo b/ftp/gftp/distinfo index 22bea4221f85..a9c93f9c0ae6 100644 --- a/ftp/gftp/distinfo +++ b/ftp/gftp/distinfo @@ -1 +1 @@ -MD5 (gftp-2.0.15rc1.tar.gz) = fbc470390df06a61f554c2df88951c13 +MD5 (gftp-2.0.15rc2.tar.gz) = 8f56f59cef9d92a709c8ab2a9e8a6a1d diff --git a/ftp/gftp/files/patch-ae b/ftp/gftp/files/patch-ae deleted file mode 100644 index 798b6dc00b1e..000000000000 --- a/ftp/gftp/files/patch-ae +++ /dev/null @@ -1,11 +0,0 @@ ---- src/gtk/gftp-gtk.h.orig Wed Dec 19 03:52:39 2001 -+++ src/gtk/gftp-gtk.h Wed Jan 2 13:57:06 2002 -@@ -200,7 +200,7 @@ - void ftp_log ( gftp_logging_level level, - void *ptr, - const char *string, -- ... ); -+ ... ) __attribute__((format(printf, 3, 4))); - - void refresh ( gftp_window_data * wdata ); - diff --git a/ftp/gftp/files/patch-af b/ftp/gftp/files/patch-af deleted file mode 100644 index 3ca58c6fcb6c..000000000000 --- a/ftp/gftp/files/patch-af +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 -@@ -53,7 +53,7 @@ - /* gftp-text.h */ - void gftp_text_log ( gftp_logging_level level, - gftp_request * request, -- const char *string, ... ); -+ const char *string, ... ) __attribute__((format(printf, 3, 4))); - int gftp_text_open ( gftp_request * request, - char *command, - gpointer *data ); diff --git a/ftp/gftp/files/patch-configure b/ftp/gftp/files/patch-configure index 3988d7d0c633..ed7fea8e8c94 100644 --- a/ftp/gftp/files/patch-configure +++ b/ftp/gftp/files/patch-configure @@ -1,24 +1,5 @@ --- configure.orig Thu Jul 24 19:13:01 2003 +++ configure Thu Jul 24 19:27:00 2003 -@@ -3526,7 +3526,7 @@ - - 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 diff --git a/ftp/gftp/files/patch-lib::sshv2.c b/ftp/gftp/files/patch-lib::sshv2.c deleted file mode 100644 index b13e56a65b75..000000000000 --- a/ftp/gftp/files/patch-lib::sshv2.c +++ /dev/null @@ -1,12 +0,0 @@ ---- 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)) - { - if (wrotepw) - { diff --git a/ftp/gftp/files/patch-src::gtk::transfer.c b/ftp/gftp/files/patch-src::gtk::transfer.c deleted file mode 100644 index 52dca999238a..000000000000 --- a/ftp/gftp/files/patch-src::gtk::transfer.c +++ /dev/null @@ -1,16 +0,0 @@ ---- src/gtk/transfer.c.orig Sun Jul 27 03:17:01 2003 -+++ src/gtk/transfer.c Sun Jul 27 03:18:23 2003 -@@ -570,6 +570,13 @@ - transfer->current_file_number++; - g_static_mutex_unlock (&transfer->structmutex); - -+ if (*(curfle->file+strlen(curfle->file)-1)=='/' ) { -+ *(curfle->file+strlen(curfle->file)-1)=(char)0; -+ } -+ if (*(curfle->destfile+strlen(curfle->destfile)-1)=='/' ) { -+ *(curfle->destfile+strlen(curfle->destfile)-1)=(char)0; -+ } -+ - if (curfle->transfer_action == GFTP_TRANS_ACTION_SKIP) - { - g_static_mutex_lock (&transfer->structmutex); diff --git a/ftp/gftp/pkg-plist b/ftp/gftp/pkg-plist index 01110940bbdc..4834b4edbef9 100644 --- a/ftp/gftp/pkg-plist +++ b/ftp/gftp/pkg-plist @@ -34,6 +34,7 @@ bin/gftp-text share/locale/bg/LC_MESSAGES/gftp.mo share/locale/am/LC_MESSAGES/gftp.mo share/locale/ar/LC_MESSAGES/gftp.mo +share/locale/be/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 |