Date: Fri, 6 Dec 2002 09:15:19 +0100 (CET) From: Oliver Lehmann <lehmann@ans-netz.de> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Oliver Lehmann <lehmann@ans-netz.de> Subject: ports/46020: update-port: ftp/gftp Message-ID: <200212060815.gB68FJLF040393@kartoffel.salatschuessel.net>
next in thread | raw e-mail | index | archive | help
>Number: 46020 >Category: ports >Synopsis: update-port: ftp/gftp >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Dec 06 00:20:01 PST 2002 >Closed-Date: >Last-Modified: >Originator: Oliver Lehmann >Release: FreeBSD 4.7-STABLE i386 >Organization: >Environment: System: FreeBSD kartoffel.salatschuessel.net 4.7-STABLE FreeBSD 4.7-STABLE #1: Thu Nov 28 15:46:09 CET 2002 olivleh1@nudel.salatschuessel.net:/usr/obj/i386/usr/src/sys/KARTOFFEL i386 >Description: please close ports/45807 update to 2.0.14 make it possible to build w/o X11 add a knob to build with gtk20 instead of gtk12 patch-ac got removed patch-configure && patch-lib::gftp.h are new Changes from 2.0.14rc1 to 2.0.14 * Added key bindings to edit dialogs * Don't ask for SSH password in bookmarks if it's disabled in the config file * Binary/Ascii fixes for ext= lines in the config file * SSH - if the word WARNING appears in the banner, don't log into the server * Updated translations: French, German, Polish and Simplified Chinese Changes from 2.0.13 to 2.0.14rc1 * GTK+ 2.0 improvements - i18n fixes, uses more stock icons * SSHV2 fixes (timeout fixes, improved login) * Small cleanups to the rest of the supported protocols * Improved directory sorting performance * Added save directory listing * Large file support * When canceling transfers, you most likely won't be disconnected from the remote site * DND improvements * Fixed several small bugs * Added/updated Translations: Bulgarian, Danish, Dutch, French, German, Hungarian, Japanese, Korean, Polish, Romanian, Russian, Spanish, Traditional Chinese >How-To-Repeat: >Fix: --- gftp.patch begins here --- diff -ruN /usr/ports/ftp/gftp.old/Makefile gftp/Makefile --- /usr/ports/ftp/gftp.old/Makefile Fri Dec 6 08:40:58 2002 +++ gftp/Makefile Fri Dec 6 08:42:38 2002 @@ -6,32 +6,66 @@ # PORTNAME= gftp -PORTVERSION= 2.0.13 +PORTVERSION= 2.0.14 CATEGORIES= ftp MASTER_SITES= http://gftp.seul.org/ \ ftp://gftp.seul.org/pub/gftp/ +DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/} MAINTAINER= lehmann@ans-netz.de -USE_X_PREFIX= yes -USE_GNOMENG= yes -WANT_GNOME= yes -USE_GNOME= gtk12 gnomehack GNU_CONFIGURE= yes + CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -MAN1= gftp.1 +USE_GNOMENG= yes +USE_GNOME+= gnomehack + +.if defined(WITHOUT_X11) +CONFIGURE_ARGS+= --disable-gtkport --disable-gtk20 +PKGNAMESUFFIX= -nox11 +LIB_DEPENDS+= glib12.3:${PORTSDIR}/devel/glib12 +.else +USE_X_PREFIX= yes +WANT_GNOME= yes +.if defined(WITH_GTK2) +RUN_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkgconfig +LIB_DEPENDS+= glib-2.0.0:${PORTSDIR}/devel/glib20 \ + gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 +CONFIGURE_ENV+= _GTHREAD_LIBS="-lgthread-2.0" +.else +CONFIGURE_ARGS+= --disable-gtk20 +USE_GNOME+= gtk12 +CONFIGURE_ENV+= _GTHREAD_LIBS="-lgthread12" +.endif +.endif .include <bsd.port.pre.mk> +MAN1= gftp.1 + +.if defined(WITHOUT_X11) +PLIST_SUB+= NOX11:="@comment " +.else +PLIST_SUB+= NOX11:="" +.endif + .if ${HAVE_GNOME:Mgnomelibs}!="" USE_GNOME+= gnomeprefix gnomelibs PKGNAMESUFFIX= -gnome PLIST_SUB= DATADIR="share/gnome" .else -PLIST_SUB= DATADIR="share" +PLIST_SUB+= DATADIR="share" .endif + +pre-everything:: + @${ECHO} "" + @${ECHO} "You may use the following build options:" + @${ECHO} "" + @${ECHO} " WITHOUT_X11=yes Only build the text frontend." + @${ECHO} " WITH_GTK2=yes Use gtk 2.x instead of 1.x" + @${ECHO} "" post-patch: @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ diff -ruN /usr/ports/ftp/gftp.old/distinfo gftp/distinfo --- /usr/ports/ftp/gftp.old/distinfo Fri Dec 6 08:40:58 2002 +++ gftp/distinfo Fri Dec 6 08:43:04 2002 @@ -1 +1 @@ -MD5 (gftp-2.0.13.tar.gz) = 5006d3f984b63fe30865fc03e50a6256 +MD5 (gftp-2.0.14.tar.gz) = 61e1271af88de20b50a90242a648ab2b diff -ruN /usr/ports/ftp/gftp.old/files/patch-ab gftp/files/patch-ab --- /usr/ports/ftp/gftp.old/files/patch-ab Fri Dec 6 08:40:58 2002 +++ gftp/files/patch-ab Fri Dec 6 08:41:12 2002 @@ -1,7 +1,13 @@ ---- docs/Makefile.in.orig Fri Dec 21 01:40:24 2001 -+++ docs/Makefile.in Wed Jan 2 13:50:13 2002 -@@ -104,11 +104,13 @@ +--- docs/Makefile.in.orig Wed Nov 27 19:57:25 2002 ++++ docs/Makefile.in Wed Nov 27 20:01:29 2002 +@@ -109,15 +109,19 @@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + + man_MANS = gftp.1 ++.ifndef WITHOUT_X11 SUBDIRS = sample.gftp ++.endif EXTRA_DIST = USERS-GUIDE gftp.1 gftp.desktop gftp.lsm gftp.png parse-netrc.pl +.ifdef HAVE_GNOME diff -ruN /usr/ports/ftp/gftp.old/files/patch-ac gftp/files/patch-ac --- /usr/ports/ftp/gftp.old/files/patch-ac Fri Dec 6 08:40:58 2002 +++ gftp/files/patch-ac Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- src/text/Makefile.in.orig Sun May 26 21:27:10 2002 -+++ src/text/Makefile.in Sun May 26 21:28:58 2002 -@@ -105,7 +105,7 @@ - EXTRA_PROGRAMS = gftp-text - gftp_text_SOURCES = gftp-text.c - INCLUDES = @GLIB_CFLAGS@ -DSHARE_DIR=\"$(datadir)/gftp\" -DLOCALE_DIR=\"$(localedir)\" -I../../intl --LDADD = ../../lib/libgftp.a @INTLLIBS@ @GLIB_LIBS@ @EXTRA_LIBS@ @READLINE_LIBS@ -+LDADD = -lintl ../../lib/libgftp.a @INTLLIBS@ @GLIB_LIBS@ @EXTRA_LIBS@ @READLINE_LIBS@ - noinst_HEADERS = gftp-text.h - localedir = $(prefix)/share/locale - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff -ruN /usr/ports/ftp/gftp.old/files/patch-configure gftp/files/patch-configure --- /usr/ports/ftp/gftp.old/files/patch-configure Thu Jan 1 01:00:00 1970 +++ gftp/files/patch-configure Fri Dec 6 08:41:12 2002 @@ -0,0 +1,14 @@ +--- configure.orig Wed Nov 27 17:25:51 2002 ++++ configure Wed Nov 27 17:30:47 2002 +@@ -4725,9 +4725,9 @@ + + rm -f conf.gtktest + +- GTHREAD_LIBS="-lgthread" ++ GTHREAD_LIBS="$_GTHREAD_LIBS" + else +- GTHREAD_LIBS="-lgthread-2.0" ++ GTHREAD_LIBS="$_GTHREAD_LIBS" + fi + + if test "x$GFTP_GTK" = xgftp-gtk; then diff -ruN /usr/ports/ftp/gftp.old/files/patch-lib::gftp.h gftp/files/patch-lib::gftp.h --- /usr/ports/ftp/gftp.old/files/patch-lib::gftp.h Thu Jan 1 01:00:00 1970 +++ gftp/files/patch-lib::gftp.h Fri Dec 6 08:41:12 2002 @@ -0,0 +1,11 @@ +--- 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 -ruN /usr/ports/ftp/gftp.old/pkg-descr gftp/pkg-descr --- /usr/ports/ftp/gftp.old/pkg-descr Fri Dec 6 08:40:58 2002 +++ gftp/pkg-descr Fri Dec 6 08:41:12 2002 @@ -1,7 +1,7 @@ -gFTP is a free multithreaded ftp client for *NIX based machines running -X11R6 or later. It has the following features: +gFTP is a free multithreaded ftp client for *NIX based machines. +It has the following features: Distributed under the terms of the GNU Public License Agreement - Written in C and uses GTK+ 1.2.x+ for the GUI + Written in C and Can use GTK+ 1.2.x+ or GTK 2.x for the GUI (or text mode) Multithreaded to allow for simultaneous downloads File transfer queues to allow for downloading multiple files Supports downloading entire directories and subdirectories @@ -18,8 +18,4 @@ Allows for passive and non-passive file transfers Eliminates buffer overruns from malicious ftp sites -gFTP is copyright (c) 1998 by Brian Masney <masneyb@newwave.net>. - WWW: http://gftp.seul.org/ - -- Damjan Marion <dmarion@open.hr> diff -ruN /usr/ports/ftp/gftp.old/pkg-plist gftp/pkg-plist --- /usr/ports/ftp/gftp.old/pkg-plist Fri Dec 6 08:40:58 2002 +++ gftp/pkg-plist Fri Dec 6 08:41:12 2002 @@ -1,35 +1,36 @@ bin/gftp -bin/gftp-gtk +%%NOX11:%%bin/gftp-gtk bin/gftp-text -%%GNOME:%%share/gnome/apps/Internet/gftp.desktop -%%DATADIR%%/gftp/COPYING -%%DATADIR%%/gftp/bookmarks -%%DATADIR%%/gftp/connect.xpm -%%DATADIR%%/gftp/deb.xpm -%%DATADIR%%/gftp/down.xpm -%%DATADIR%%/gftp/diff.xpm -%%DATADIR%%/gftp/dir.xpm -%%DATADIR%%/gftp/doc.xpm -%%DATADIR%%/gftp/dotdot.xpm -%%DATADIR%%/gftp/exe.xpm -%%DATADIR%%/gftp/gftp.xpm -%%DATADIR%%/gftp/gftp-logo.xpm -%%DATADIR%%/gftp/gftprc -%%DATADIR%%/gftp/img.xpm -%%DATADIR%%/gftp/left.xpm -%%DATADIR%%/gftp/linkdir.xpm -%%DATADIR%%/gftp/linkfile.xpm -%%DATADIR%%/gftp/man.xpm -%%DATADIR%%/gftp/open_dir.xpm -%%DATADIR%%/gftp/right.xpm -%%DATADIR%%/gftp/rpm.xpm -%%DATADIR%%/gftp/sound.xpm -%%DATADIR%%/gftp/stop.xpm -%%DATADIR%%/gftp/tar.xpm -%%DATADIR%%/gftp/txt.xpm -%%DATADIR%%/gftp/up.xpm -%%DATADIR%%/gftp/world.xpm -%%GNOME:%%share/gnome/pixmaps/gftp.png +%%NOX11:%%%%GNOME:%%share/gnome/apps/Internet/gftp.desktop +%%NOX11:%%%%DATADIR%%/gftp/COPYING +%%NOX11:%%%%DATADIR%%/gftp/bookmarks +%%NOX11:%%%%DATADIR%%/gftp/connect.xpm +%%NOX11:%%%%DATADIR%%/gftp/deb.xpm +%%NOX11:%%%%DATADIR%%/gftp/down.xpm +%%NOX11:%%%%DATADIR%%/gftp/diff.xpm +%%NOX11:%%%%DATADIR%%/gftp/dir.xpm +%%NOX11:%%%%DATADIR%%/gftp/doc.xpm +%%NOX11:%%%%DATADIR%%/gftp/dotdot.xpm +%%NOX11:%%%%DATADIR%%/gftp/exe.xpm +%%NOX11:%%%%DATADIR%%/gftp/gftp.xpm +%%NOX11:%%%%DATADIR%%/gftp/gftp-logo.xpm +%%NOX11:%%%%DATADIR%%/gftp/gftp-mini-logo.xpm +%%NOX11:%%%%DATADIR%%/gftp/gftprc +%%NOX11:%%%%DATADIR%%/gftp/img.xpm +%%NOX11:%%%%DATADIR%%/gftp/left.xpm +%%NOX11:%%%%DATADIR%%/gftp/linkdir.xpm +%%NOX11:%%%%DATADIR%%/gftp/linkfile.xpm +%%NOX11:%%%%DATADIR%%/gftp/man.xpm +%%NOX11:%%%%DATADIR%%/gftp/open_dir.xpm +%%NOX11:%%%%DATADIR%%/gftp/right.xpm +%%NOX11:%%%%DATADIR%%/gftp/rpm.xpm +%%NOX11:%%%%DATADIR%%/gftp/sound.xpm +%%NOX11:%%%%DATADIR%%/gftp/stop.xpm +%%NOX11:%%%%DATADIR%%/gftp/tar.xpm +%%NOX11:%%%%DATADIR%%/gftp/txt.xpm +%%NOX11:%%%%DATADIR%%/gftp/up.xpm +%%NOX11:%%%%DATADIR%%/gftp/world.xpm +%%NOX11:%%%%GNOME:%%share/gnome/pixmaps/gftp.png share/locale/bg/LC_MESSAGES/gftp.mo share/locale/cs/LC_MESSAGES/gftp.mo share/locale/da/LC_MESSAGES/gftp.mo @@ -37,6 +38,7 @@ share/locale/es/LC_MESSAGES/gftp.mo share/locale/fi/LC_MESSAGES/gftp.mo share/locale/fr/LC_MESSAGES/gftp.mo +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 @@ -44,9 +46,10 @@ share/locale/no/LC_MESSAGES/gftp.mo share/locale/pl/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/sv/LC_MESSAGES/gftp.mo share/locale/tr/LC_MESSAGES/gftp.mo -share/locale/zh_CN.GB2312/LC_MESSAGES/gftp.mo -share/locale/zh_TW.Big5/LC_MESSAGES/gftp.mo -@dirrm %%DATADIR%%/gftp +share/locale/zh_CN/LC_MESSAGES/gftp.mo +share/locale/zh_TW/LC_MESSAGES/gftp.mo +%%NOX11:%%@dirrm %%DATADIR%%/gftp --- gftp.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200212060815.gB68FJLF040393>