[pkgsrc/trunk]: pkgsrc/net Fix build problems in "gftp-gtk1" package caused b...

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c9ca019c6472
branches:  trunk
changeset: 490069:c9ca019c6472
user:      tron <tron%pkgsrc.org@localhost>
date:      Wed Mar 02 20:43:21 2005 +0000

description:
Fix build problems in "gftp-gtk1" package caused by update to
version 2.0.18.

diffstat:

 net/gftp-gtk1/Makefile    |   4 ++--
 net/gftp/distinfo         |   4 +++-
 net/gftp/patches/patch-ac |  30 ++++++++++++++++++++++++++++++
 net/gftp/patches/patch-ad |  13 +++++++++++++
 4 files changed, 48 insertions(+), 3 deletions(-)

diffs (87 lines):

diff -r eba5dff454f1 -r c9ca019c6472 net/gftp-gtk1/Makefile
--- a/net/gftp-gtk1/Makefile    Wed Mar 02 20:43:19 2005 +0000
+++ b/net/gftp-gtk1/Makefile    Wed Mar 02 20:43:21 2005 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2004/10/03 00:17:51 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/03/02 20:43:21 tron 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 @@
 
 CONFIGURE_ARGS+=       --disable-gtk20
 
+PATCHDIR=      ${.CURDIR}/../gftp/patches
 PLIST_SRC=     ${.CURDIR}/../gftp/PLIST
 DISTINFO_FILE= ${.CURDIR}/../gftp/distinfo
 
diff -r eba5dff454f1 -r c9ca019c6472 net/gftp/distinfo
--- a/net/gftp/distinfo Wed Mar 02 20:43:19 2005 +0000
+++ b/net/gftp/distinfo Wed Mar 02 20:43:21 2005 +0000
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.8 2005/03/02 14:36:53 tron Exp $
+$NetBSD: distinfo,v 1.9 2005/03/02 20:43:21 tron Exp $
 
 SHA1 (gftp-2.0.18.tar.bz2) = c2468f1ff1fe978a5fab3a198e513558f3b48f5a
 RMD160 (gftp-2.0.18.tar.bz2) = 0e0daea8543ae822b25635647360193362a2648d
 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 -r eba5dff454f1 -r c9ca019c6472 net/gftp/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/gftp/patches/patch-ac Wed Mar 02 20:43:21 2005 +0000
@@ -0,0 +1,30 @@
+$NetBSD: patch-ac,v 1.1 2005/03/02 20:43:21 tron 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 -r eba5dff454f1 -r c9ca019c6472 net/gftp/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/gftp/patches/patch-ad Wed Mar 02 20:43:21 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2005/03/02 20:43:21 tron 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