summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net/gftp-gtk1/DESCR6
-rw-r--r--net/gftp-gtk1/Makefile4
-rw-r--r--net/gftp/DESCR6
-rw-r--r--net/gftp/Makefile.common7
-rw-r--r--net/gftp/PLIST8
-rw-r--r--net/gftp/distinfo10
-rw-r--r--net/gftp/patches/patch-aa15
-rw-r--r--net/gftp/patches/patch-ab13
-rw-r--r--net/gftp/patches/patch-ac30
-rw-r--r--net/gftp/patches/patch-ad13
10 files changed, 95 insertions, 17 deletions
diff --git a/net/gftp-gtk1/DESCR b/net/gftp-gtk1/DESCR
index 75fea4158b2..c99e839bbb1 100644
--- a/net/gftp-gtk1/DESCR
+++ b/net/gftp-gtk1/DESCR
@@ -1,10 +1,10 @@
-gFTP is a free multithreaded ftp client for *NIX based machines
+gFTP is a free multithreaded ftp client for *NIX based machines
running X11R6 or later. It has the following features:
- * Distributed under the terms of the GNU Public License
+ * Distributed under the terms of the GNU Public License
* Written in C and has a text interface and a GTK+ 1.2/2.0 interface
* Supports the FTP, HTTP and SSH protocols
- * Supports FXP file transfers (transfering files between 2 remote
+ * Supports FXP file transfers (transfering files between 2 remote
servers via FTP)
* Multithreaded to allow for simultaneous downloads
* File transfer queues to allow for downloading multiple files
diff --git a/net/gftp-gtk1/Makefile b/net/gftp-gtk1/Makefile
index ca2c8b14577..d0aae957acf 100644
--- a/net/gftp-gtk1/Makefile
+++ b/net/gftp-gtk1/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2004/10/03 00:17:51 tv Exp $
+# $NetBSD: Makefile,v 1.6.2.1 2005/03/02 22:15:42 salo Exp $
.include "${.CURDIR}/../gftp/Makefile.common"
PKGNAME= gftp-gtk1-${VERSION}
-PKGREVISION= 1
COMMENT= Multithreaded GTK+ ftp client
CONFLICTS= gftp-[0-9]*
@@ -12,6 +11,7 @@ USE_DIRS+= gnome1-1.0
CONFIGURE_ARGS+= --disable-gtk20
+PATCHDIR= ${.CURDIR}/../gftp/patches
PLIST_SRC= ${.CURDIR}/../gftp/PLIST
DISTINFO_FILE= ${.CURDIR}/../gftp/distinfo
diff --git a/net/gftp/DESCR b/net/gftp/DESCR
index b7c9bdbe6d4..cebb36ddde6 100644
--- a/net/gftp/DESCR
+++ b/net/gftp/DESCR
@@ -1,10 +1,10 @@
-gFTP is a free multithreaded ftp client for *NIX based machines
+gFTP is a free multithreaded ftp client for *NIX based machines
running X11R6 or later. It has the following features:
- * Distributed under the terms of the GNU Public License
+ * Distributed under the terms of the GNU Public License
* Written in C and has a text interface and a GTK+ 1.2/2.0 interface
* Supports the FTP, HTTP and SSH protocols
- * Supports FXP file transfers (transfering files between 2 remote
+ * Supports FXP file transfers (transfering files between 2 remote
servers via FTP)
* Multithreaded to allow for simultaneous downloads
* File transfer queues to allow for downloading multiple files
diff --git a/net/gftp/Makefile.common b/net/gftp/Makefile.common
index 83d70ad96ed..b4c1ddc145e 100644
--- a/net/gftp/Makefile.common
+++ b/net/gftp/Makefile.common
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile.common,v 1.7 2004/10/03 00:17:51 tv Exp $
+# $NetBSD: Makefile.common,v 1.7.2.1 2005/03/02 22:15:42 salo Exp $
DISTNAME= gftp-${VERSION}
-PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= http://gftp.seul.org/ \
ftp://gftp.seul.org/
EXTRACT_SUFX= .tar.bz2
-MAINTAINER= jmcneill@invisible.yi.org
+MAINTAINER= jmcneill@NetBSD.org
HOMEPAGE= http://gftp.seul.org/
BUILD_USES_MSGFMT= yes
@@ -21,7 +20,7 @@ PTHREAD_OPTS= require
CONFIGURE_ARGS+= --with-readline
-VERSION= 2.0.17
+VERSION= 2.0.18
.include "../../mk/bsd.prefs.mk"
diff --git a/net/gftp/PLIST b/net/gftp/PLIST
index 616a9f86370..875e10752eb 100644
--- a/net/gftp/PLIST
+++ b/net/gftp/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.8 2004/04/05 02:45:45 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.8.6.1 2005/03/02 22:15:42 salo Exp $
bin/gftp
bin/gftp-gtk
bin/gftp-text
man/man1/gftp.1
+share/applications/gftp.desktop
share/gftp/COPYING
share/gftp/bookmarks
share/gftp/connect.xpm
@@ -31,7 +32,6 @@ share/gftp/tar.xpm
share/gftp/txt.xpm
share/gftp/up.xpm
share/gftp/world.xpm
-share/gnome/apps/Internet/gftp.desktop
${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gftp.mo
${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gftp.mo
${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gftp.mo
@@ -72,5 +72,9 @@ ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gftp.mo
${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gftp.mo
${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gftp.mo
${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gftp.mo
+${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/gftp.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gftp.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/gftp.mo
+${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/gftp.mo
share/pixmaps/gftp.png
@dirrm share/gftp
diff --git a/net/gftp/distinfo b/net/gftp/distinfo
index cf292439c50..c6ed0cb3b34 100644
--- a/net/gftp/distinfo
+++ b/net/gftp/distinfo
@@ -1,4 +1,8 @@
-$NetBSD: distinfo,v 1.6 2004/04/05 02:45:45 xtraeme Exp $
+$NetBSD: distinfo,v 1.6.6.1 2005/03/02 22:15:42 salo Exp $
-SHA1 (gftp-2.0.17.tar.bz2) = beeb1edfac3aa5b9b7a4a02d0a0a3ed374fc2ce0
-Size (gftp-2.0.17.tar.bz2) = 1228736 bytes
+SHA1 (gftp-2.0.18.tar.bz2) = c2468f1ff1fe978a5fab3a198e513558f3b48f5a
+Size (gftp-2.0.18.tar.bz2) = 1374850 bytes
+SHA1 (patch-aa) = fe0aff2e0f8408d6a5b663e2095b61b9e92e0d84
+SHA1 (patch-ab) = 739be62c545d7644da4bcd53140fb734ec8e19ef
+SHA1 (patch-ac) = 862f2f5856da4f361f2cac660ffd489424a854d8
+SHA1 (patch-ad) = 4024658780e23543b47901b802d0e8d7c469f7b6
diff --git a/net/gftp/patches/patch-aa b/net/gftp/patches/patch-aa
new file mode 100644
index 00000000000..9735054b252
--- /dev/null
+++ b/net/gftp/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.2.10.1 2005/03/02 22:15:42 salo Exp $
+
+--- lib/fsplib/lock.c.orig 2005-01-02 15:45:51.000000000 +0000
++++ lib/fsplib/lock.c 2005-03-02 14:26:27.000000000 +0000
+@@ -2,6 +2,10 @@
+ #include <stdio.h>
+ #include "lock.h"
+
++#if defined(__NetBSD__) || defined(sun)
++#define _SEM_SEMUN_UNDEFINED /**/
++#endif
++
+ /* ************ Locking functions ***************** */
+ #ifndef FSP_NOLOCKING
+
diff --git a/net/gftp/patches/patch-ab b/net/gftp/patches/patch-ab
new file mode 100644
index 00000000000..133f745ee0e
--- /dev/null
+++ b/net/gftp/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.4.10.1 2005/03/02 22:15:42 salo Exp $
+
+--- lib/pty.c.orig 2005-01-04 13:32:11.000000000 +0000
++++ lib/pty.c 2005-03-02 14:28:15.000000000 +0000
+@@ -61,7 +61,7 @@
+
+ #elif HAVE_GRANTPT
+
+-#ifndef __FreeBSD__
++#if !(defined(__FreeBSD__) || defined(__NetBSD__))
+ #include <stropts.h>
+ #endif
+
diff --git a/net/gftp/patches/patch-ac b/net/gftp/patches/patch-ac
new file mode 100644
index 00000000000..ad978e7188d
--- /dev/null
+++ b/net/gftp/patches/patch-ac
@@ -0,0 +1,30 @@
+$NetBSD: patch-ac,v 1.1.2.2 2005/03/02 22:15:42 salo Exp $
+
+--- src/text/gftp-text.c.orig 2005-01-25 01:11:00.000000000 +0000
++++ src/text/gftp-text.c 2005-03-02 20:32:41.000000000 +0000
+@@ -155,7 +155,9 @@
+ gftp_text_ask_question (const char *question, int echo, char *buf, size_t size)
+ {
+ struct termios term, oldterm;
++#if GLIB_MAJOR_VERSION > 1
+ gchar *locale_question;
++#endif
+ sigset_t sig, sigsave;
+ char *pos, *termname;
+ int singlechar;
+@@ -185,6 +187,7 @@
+ else
+ infd = stdin;
+
++#if GLIB_MAJOR_VERSION > 1
+ locale_question = g_locale_from_utf8 (question, -1, NULL, NULL, NULL);
+ if (locale_question != NULL)
+ {
+@@ -193,6 +196,7 @@
+ g_free (locale_question);
+ }
+ else
++#endif
+ printf ("%s%s%s ", GFTPUI_COMMON_COLOR_BLUE, question,
+ GFTPUI_COMMON_COLOR_DEFAULT);
+
diff --git a/net/gftp/patches/patch-ad b/net/gftp/patches/patch-ad
new file mode 100644
index 00000000000..bb796838133
--- /dev/null
+++ b/net/gftp/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1.2.2 2005/03/02 22:15:42 salo Exp $
+
+--- src/gtk/options_dialog.c.orig 2005-01-04 13:32:20.000000000 +0000
++++ src/gtk/options_dialog.c 2005-03-02 20:38:59.000000000 +0000
+@@ -1002,7 +1002,7 @@
+ gtk_widget_show (box);
+
+ #if GTK_MAJOR_VERSION == 1
+- tempwid = gtk_label_new (_("Type:"))
++ tempwid = gtk_label_new (_("Type:"));
+ #else
+ tempwid = gtk_label_new_with_mnemonic (_("_Type:"));
+ #endif
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-16 05:41:02 +0000