mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00
Code Issues Releases Activity

update to 2.0.15.rc2 which fixes several bugs introduced by rc1

Browse Source
This commit is contained in:
Oliver Lehmann 2003-08-08 13:27:51 +00:00
parent 4e00dbebbe
commit 0079714ffa
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=86578
8 changed files with 14 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ftp/gftp/Makefile
View File

@ -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|"-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>

2
ftp/gftp/distinfo
View File

@ -1 +1 @@
MD5 (gftp-2.0.15rc1.tar.gz) = fbc470390df06a61f554c2df88951c13
MD5 (gftp-2.0.15rc2.tar.gz) = 8f56f59cef9d92a709c8ab2a9e8a6a1d

11
ftp/gftp/files/patch-ae
View File

@ -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 );

11
ftp/gftp/files/patch-af
View File

@ -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 );

19
ftp/gftp/files/patch-configure
View File

@ -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

12
ftp/gftp/files/patch-lib::sshv2.c
View File

@ -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)
{

16
ftp/gftp/files/patch-src::gtk::transfer.c
View File

@ -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);

1
ftp/gftp/pkg-plist
View File

@ -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