diff --git a/ftp/gftp/Makefile b/ftp/gftp/Makefile index 41e45a1a1543..4f4bcf46efef 100644 --- a/ftp/gftp/Makefile +++ b/ftp/gftp/Makefile @@ -1,31 +1,39 @@ PORTNAME= gftp -PORTVERSION= 2.7.0b -PORTREVISION= 1 +PORTVERSION= 2.9.1b CATEGORIES= ftp MAINTAINER= oliver@FreeBSD.org COMMENT= Free multithreaded GTK-based FTP and SFTP client WWW= http://gftp.seul.org/ LICENSE= GPLv2 -USES= autoreconf gnome gmake libtool pathfix pkgconfig ssl tar:bzip2 +LIB_DEPENDS= libharfbuzz.so:print/harfbuzz \ + libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 + +USES= autoreconf desktop-file-utils gettext-tools gnome gmake pathfix \ + pkgconfig ssl tar:bzip2 USE_GITHUB= yes GH_ACCOUNT= masneyb -USE_GNOME= glib20 gtk20 +USE_GNOME= cairo gdkpixbuf2 glib20 gtk20 GNU_CONFIGURE= yes CFLAGS+= -D_WANT_SEMUN OPTIONS_DEFINE= NLS OPTIONS_SUB= yes -NLS_USES= gettext -NLS_USE= GNOME=intltool +NLS_USES= gettext iconv NLS_CONFIGURE_OFF= --disable-nls +NLS_CONFIGURE_ENABLE= nls +NLS_CPPFLAGS= -I${LOCALBASE}/include +NLS_LIBS= -L${LOCALBASE}/lib -lintl post-patch: - @${TOUCH} ${WRKSRC}/config.rpath + @${MKDIR} ${WRKSRC}/autoconf + @${MKDIR} ${WRKSRC}/autoconf-m4 + @${TOUCH} ${WRKSRC}/autoconf/config.rpath .include diff --git a/ftp/gftp/distinfo b/ftp/gftp/distinfo index 48716137aad0..b7c590085e65 100644 --- a/ftp/gftp/distinfo +++ b/ftp/gftp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1631708866 -SHA256 (masneyb-gftp-2.7.0b_GH0.tar.gz) = 164651e19c840e5df148e905fbfcf4d24c65204a2df078dc98ad6c95a421e7f4 -SIZE (masneyb-gftp-2.7.0b_GH0.tar.gz) = 1618157 +TIMESTAMP = 1691171339 +SHA256 (masneyb-gftp-2.9.1b_GH0.tar.gz) = fb134d5479a6b81251b9d37be7264fb8be6edb07bce98569e0e0ba9570587fd6 +SIZE (masneyb-gftp-2.9.1b_GH0.tar.gz) = 1556915 diff --git a/ftp/gftp/files/patch-lib-misc.c b/ftp/gftp/files/patch-lib-misc.c index 9daf864e58ab..e8d2d5347378 100644 --- a/ftp/gftp/files/patch-lib-misc.c +++ b/ftp/gftp/files/patch-lib-misc.c @@ -1,21 +1,19 @@ Fix segmentation fault, when gftpui_run_chdir is called with directory=0x0, and then calls gftp_expand_path (src=0x0), the NULL string was cloned using g_strdup, which returns NULL if its only argument is NULL, then this returned string was unreferenced. lib/misc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) -diff --git a/lib/misc.c b/lib/misc.c -index 16c019b..2791466 100644 ---- lib/misc.c.orig +--- lib/misc.c.orig 2022-02-15 06:31:19 UTC +++ lib/misc.c -@@ -143,6 +143,8 @@ gftp_expand_path (gftp_request * request, const char *src) +@@ -145,6 +145,8 @@ char * gftp_expand_path (gftp_request * request, const tempchar; struct passwd *pw; + g_return_val_if_fail(src != NULL, NULL); + pw = NULL; str = g_strdup (src); diff --git a/ftp/gftp/files/patch-lib-pty.c b/ftp/gftp/files/patch-lib-pty.c index 25f7c385ed39..9b0e8224fcc7 100644 --- a/ftp/gftp/files/patch-lib-pty.c +++ b/ftp/gftp/files/patch-lib-pty.c @@ -1,103 +1,25 @@ ---- lib/pty.c.orig 2007-03-13 02:56:43.000000000 +0100 -+++ lib/pty.c 2010-01-17 17:34:25.000000000 +0100 -@@ -59,6 +59,50 @@ - return (new_fds); - } - -+#elif HAVE_OPENPTY -+ -+#ifdef HAVE_PTY_H -+#include -+#include /* for login_tty */ -+#elif HAVE_LIBUTIL_H -+#include +--- lib/pty.c.orig 2022-02-15 06:31:19 UTC ++++ lib/pty.c +@@ -91,7 +91,9 @@ _gftp_ptys_open (int fdm, int fds, char *pts_name) + #include /* for login_tty */ + #elif HAVE_LIBUTIL_H + #include +-#include /* for login_tty */ +#else +extern int openpty(int *amaster, int *aslave, char *name, struct termios *termp, struct winsize * winp); +extern int login_tty(int fd); -+#endif -+ -+char * -+gftp_get_pty_impl (void) -+{ -+ return ("openpty"); -+} -+ -+ -+static int -+_gftp_ptym_open (char *pts_name, size_t len, int *fds) -+{ -+ int fdm; -+ -+ if (openpty (&fdm, fds, pts_name, NULL, NULL) < 0) -+ return (GFTP_ERETRYABLE); -+ -+ ioctl (*fds, TIOCSCTTY, NULL); -+ -+ return (fdm); -+} -+ -+ -+static int -+_gftp_ptys_open (int fdm, int fds, char *pts_name) -+{ + #endif + + char * +@@ -118,8 +120,10 @@ _gftp_ptys_open (int fdm, int fds, char *pts_name) + static int + _gftp_ptys_open (int fdm, int fds, char *pts_name) + { +- if (login_tty (fds) < 0) + if (login_tty (fds) < 0) { + close(fds); -+ return (GFTP_EFATAL); + return (GFTP_EFATAL); + } -+ -+ return (fds); -+} -+ - #elif HAVE_GRANTPT - #if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)) -@@ -131,49 +192,6 @@ - return (new_fds); + return (fds); } - --#elif HAVE_OPENPTY -- --#ifdef HAVE_PTY_H --#include --#include /* for login_tty */ --#elif HAVE_LIBUTIL_H --#include --#include /* for login_tty */ --#else --extern int openpty(int *amaster, int *aslave, char *name, struct termios *termp, struct winsize * winp); --extern int login_tty(int fd); --#endif -- --char * --gftp_get_pty_impl (void) --{ -- return ("openpty"); --} -- -- --static int --_gftp_ptym_open (char *pts_name, size_t len, int *fds) --{ -- int fdm; -- -- if (openpty (&fdm, fds, pts_name, NULL, NULL) < 0) -- return (GFTP_ERETRYABLE); -- -- ioctl (*fds, TIOCSCTTY, NULL); -- -- return (fdm); --} -- -- --static int --_gftp_ptys_open (int fdm, int fds, char *pts_name) --{ -- if (login_tty (fds) < 0) -- return (GFTP_EFATAL); -- -- return (fds); --} -- - #else - - /* Fall back to *BSD... */ diff --git a/ftp/gftp/pkg-plist b/ftp/gftp/pkg-plist index 2c94155062b4..de969bf2a895 100644 --- a/ftp/gftp/pkg-plist +++ b/ftp/gftp/pkg-plist @@ -1,97 +1,94 @@ bin/gftp bin/gftp-gtk bin/gftp-text man/man1/gftp.1.gz share/applications/gftp.desktop -share/pixmaps/gftp.png share/icons/hicolor/16x16/apps/gftp.png share/icons/hicolor/22x22/apps/gftp.png share/icons/hicolor/32x32/apps/gftp.png share/icons/hicolor/48x48/apps/gftp.png share/icons/hicolor/scalable/apps/gftp.svg %%DATADIR%%/bookmarks %%DATADIR%%/deb.xpm %%DATADIR%%/diff.xpm %%DATADIR%%/dir.xpm %%DATADIR%%/doc.xpm %%DATADIR%%/dotdot.xpm %%DATADIR%%/exe.xpm %%DATADIR%%/gftp-logo.xpm %%DATADIR%%/gftp.png %%DATADIR%%/gftprc %%DATADIR%%/img.xpm %%DATADIR%%/linkdir.xpm %%DATADIR%%/linkfile.xpm %%DATADIR%%/man.xpm %%DATADIR%%/open_dir.xpm %%DATADIR%%/rpm.xpm %%DATADIR%%/sound.xpm %%DATADIR%%/tar.xpm %%DATADIR%%/txt.xpm %%DATADIR%%/world.xpm %%NLS%%share/locale/am/LC_MESSAGES/gftp.mo %%NLS%%share/locale/ar/LC_MESSAGES/gftp.mo %%NLS%%share/locale/as/LC_MESSAGES/gftp.mo %%NLS%%share/locale/az/LC_MESSAGES/gftp.mo %%NLS%%share/locale/be/LC_MESSAGES/gftp.mo %%NLS%%share/locale/bg/LC_MESSAGES/gftp.mo %%NLS%%share/locale/bn/LC_MESSAGES/gftp.mo %%NLS%%share/locale/bn_IN/LC_MESSAGES/gftp.mo %%NLS%%share/locale/bs/LC_MESSAGES/gftp.mo -%%NLS%%share/locale/ca@valencia/LC_MESSAGES/gftp.mo %%NLS%%share/locale/ca/LC_MESSAGES/gftp.mo +%%NLS%%share/locale/ca@valencia/LC_MESSAGES/gftp.mo %%NLS%%share/locale/cs/LC_MESSAGES/gftp.mo %%NLS%%share/locale/da/LC_MESSAGES/gftp.mo %%NLS%%share/locale/de/LC_MESSAGES/gftp.mo %%NLS%%share/locale/dz/LC_MESSAGES/gftp.mo %%NLS%%share/locale/el/LC_MESSAGES/gftp.mo -%%NLS%%share/locale/en_CA/LC_MESSAGES/gftp.mo -%%NLS%%share/locale/en_GB/LC_MESSAGES/gftp.mo %%NLS%%share/locale/eo/LC_MESSAGES/gftp.mo %%NLS%%share/locale/es/LC_MESSAGES/gftp.mo %%NLS%%share/locale/eu/LC_MESSAGES/gftp.mo %%NLS%%share/locale/fi/LC_MESSAGES/gftp.mo %%NLS%%share/locale/fr/LC_MESSAGES/gftp.mo %%NLS%%share/locale/ga/LC_MESSAGES/gftp.mo %%NLS%%share/locale/gl/LC_MESSAGES/gftp.mo %%NLS%%share/locale/gu/LC_MESSAGES/gftp.mo %%NLS%%share/locale/he/LC_MESSAGES/gftp.mo %%NLS%%share/locale/hi/LC_MESSAGES/gftp.mo %%NLS%%share/locale/hr/LC_MESSAGES/gftp.mo %%NLS%%share/locale/hu/LC_MESSAGES/gftp.mo %%NLS%%share/locale/it/LC_MESSAGES/gftp.mo %%NLS%%share/locale/ja/LC_MESSAGES/gftp.mo %%NLS%%share/locale/kn/LC_MESSAGES/gftp.mo %%NLS%%share/locale/ko/LC_MESSAGES/gftp.mo %%NLS%%share/locale/lt/LC_MESSAGES/gftp.mo %%NLS%%share/locale/lv/LC_MESSAGES/gftp.mo %%NLS%%share/locale/mk/LC_MESSAGES/gftp.mo %%NLS%%share/locale/ml/LC_MESSAGES/gftp.mo %%NLS%%share/locale/mr/LC_MESSAGES/gftp.mo %%NLS%%share/locale/ms/LC_MESSAGES/gftp.mo %%NLS%%share/locale/nb/LC_MESSAGES/gftp.mo %%NLS%%share/locale/ne/LC_MESSAGES/gftp.mo %%NLS%%share/locale/nl/LC_MESSAGES/gftp.mo %%NLS%%share/locale/oc/LC_MESSAGES/gftp.mo %%NLS%%share/locale/or/LC_MESSAGES/gftp.mo %%NLS%%share/locale/pa/LC_MESSAGES/gftp.mo %%NLS%%share/locale/pl/LC_MESSAGES/gftp.mo %%NLS%%share/locale/pt/LC_MESSAGES/gftp.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/gftp.mo %%NLS%%share/locale/ro/LC_MESSAGES/gftp.mo %%NLS%%share/locale/ru/LC_MESSAGES/gftp.mo %%NLS%%share/locale/rw/LC_MESSAGES/gftp.mo %%NLS%%share/locale/sk/LC_MESSAGES/gftp.mo %%NLS%%share/locale/sl/LC_MESSAGES/gftp.mo %%NLS%%share/locale/sq/LC_MESSAGES/gftp.mo %%NLS%%share/locale/sr/LC_MESSAGES/gftp.mo %%NLS%%share/locale/sr@Latn/LC_MESSAGES/gftp.mo %%NLS%%share/locale/sv/LC_MESSAGES/gftp.mo %%NLS%%share/locale/ta/LC_MESSAGES/gftp.mo %%NLS%%share/locale/te/LC_MESSAGES/gftp.mo %%NLS%%share/locale/th/LC_MESSAGES/gftp.mo %%NLS%%share/locale/tr/LC_MESSAGES/gftp.mo %%NLS%%share/locale/uk/LC_MESSAGES/gftp.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/gftp.mo %%NLS%%share/locale/zh_HK/LC_MESSAGES/gftp.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/gftp.mo