summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--chat/xchat-python/Makefile3
-rw-r--r--chat/xchat/Makefile5
-rw-r--r--chat/xchat/Makefile.common8
-rw-r--r--chat/xchat/PLIST4
-rw-r--r--chat/xchat/distinfo16
-rw-r--r--chat/xchat/patches/patch-aa13
-rw-r--r--chat/xchat/patches/patch-ac16
-rw-r--r--chat/xchat/patches/patch-ad13
-rw-r--r--chat/xchat/patches/patch-ae24
-rw-r--r--chat/xchat/patches/patch-af13
10 files changed, 12 insertions, 103 deletions
diff --git a/chat/xchat-python/Makefile b/chat/xchat-python/Makefile
index b70759e3000..9d733446a00 100644
--- a/chat/xchat-python/Makefile
+++ b/chat/xchat-python/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2010/02/10 19:17:33 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2010/11/16 12:21:11 tron Exp $
.include "../../chat/xchat/Makefile.common"
PKGNAME= ${DISTNAME:S/-/-python-/}
-PKGREVISION= 2
OWNER= tron@NetBSD.org
COMMENT= Python scripting plugin for XChat
diff --git a/chat/xchat/Makefile b/chat/xchat/Makefile
index 3509b3f2c1b..836f78e9ddd 100644
--- a/chat/xchat/Makefile
+++ b/chat/xchat/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.69 2010/11/15 22:56:30 abs Exp $
+# $NetBSD: Makefile,v 1.70 2010/11/16 12:21:10 tron Exp $
.include "Makefile.common"
-PKGNAME= ${DISTNAME}pl1
-PKGREVISION= 6
+PKGNAME= ${DISTNAME}
OWNER= tron@NetBSD.org
COMMENT= X11 (X Window System) IRC client, using the GTK2 toolkit
diff --git a/chat/xchat/Makefile.common b/chat/xchat/Makefile.common
index 395cfc65c5b..ebe1e002177 100644
--- a/chat/xchat/Makefile.common
+++ b/chat/xchat/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.60 2009/12/20 10:09:42 tron Exp $
+# $NetBSD: Makefile.common,v 1.61 2010/11/16 12:21:10 tron Exp $
-DISTNAME= xchat-2.8.6
+DISTNAME= xchat-2.8.8
CATEGORIES= chat
MASTER_SITES= http://xchat.org/files/source/2.8/
EXTRACT_SUFX= .tar.bz2
@@ -10,10 +10,6 @@ LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
-PATCH_SITES= http://xchat.org/files/source/2.8/patches/
-PATCHFILES= xc286-smallfixes.diff
-PATCH_DIST_STRIP= -p1
-
DISTINFO_FILE= ${.CURDIR}/../../chat/xchat/distinfo
PATCHDIR?= ${.CURDIR}/../../chat/xchat/patches
diff --git a/chat/xchat/PLIST b/chat/xchat/PLIST
index be23c3e876c..7e37cd7af00 100644
--- a/chat/xchat/PLIST
+++ b/chat/xchat/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2009/06/14 18:28:45 joerg Exp $
+@comment $NetBSD: PLIST,v 1.22 2010/11/16 12:21:10 tron Exp $
bin/xchat
share/applications/xchat.desktop
${PLIST.dbus}share/dbus-1/services/org.xchat.service.service
@@ -19,10 +19,12 @@ share/locale/hu/LC_MESSAGES/xchat.mo
share/locale/it/LC_MESSAGES/xchat.mo
share/locale/ja/LC_MESSAGES/xchat.mo
share/locale/ko/LC_MESSAGES/xchat.mo
+share/locale/kn/LC_MESSAGES/xchat.mo
share/locale/lt/LC_MESSAGES/xchat.mo
share/locale/mk/LC_MESSAGES/xchat.mo
share/locale/nl/LC_MESSAGES/xchat.mo
share/locale/pa/LC_MESSAGES/xchat.mo
+share/locale/pl/LC_MESSAGES/xchat.mo
share/locale/pt/LC_MESSAGES/xchat.mo
share/locale/ru/LC_MESSAGES/xchat.mo
share/locale/sq/LC_MESSAGES/xchat.mo
diff --git a/chat/xchat/distinfo b/chat/xchat/distinfo
index b9448221b4c..7cdd100e3d3 100644
--- a/chat/xchat/distinfo
+++ b/chat/xchat/distinfo
@@ -1,14 +1,6 @@
-$NetBSD: distinfo,v 1.41 2010/06/02 18:24:47 tnn Exp $
+$NetBSD: distinfo,v 1.42 2010/11/16 12:21:10 tron Exp $
-SHA1 (xc286-smallfixes.diff) = b13eb421f6d72fca195b398c606d9413aec57fc4
-RMD160 (xc286-smallfixes.diff) = 91c654320b7b1f9d6b13f7b226fb4cec26054319
-Size (xc286-smallfixes.diff) = 2020 bytes
-SHA1 (xchat-2.8.6.tar.bz2) = 7a7463e65cb26c680ed70dd96cec98bcc05435a4
-RMD160 (xchat-2.8.6.tar.bz2) = bc199e3b58a9db3dfd9f2af6bac7fb6162c53d6e
-Size (xchat-2.8.6.tar.bz2) = 1423645 bytes
-SHA1 (patch-aa) = 99ec48125bc394745b5e5d0d8ebd8323d1aca4af
+SHA1 (xchat-2.8.8.tar.bz2) = a4ac161e4e40f4bbabc492675a1ff4380dba8d68
+RMD160 (xchat-2.8.8.tar.bz2) = 1bc3e0ff00e15c83588dd21a3ef3e8e34f953331
+Size (xchat-2.8.8.tar.bz2) = 1509993 bytes
SHA1 (patch-ab) = 109d61363f040d4f9716b6698a002b804847da33
-SHA1 (patch-ac) = 79530959fffa5271cc83aadd32d8340a3e6f27f6
-SHA1 (patch-ad) = 07bbde70d7df4c52ebddf32ad1e42b6f4148880c
-SHA1 (patch-ae) = 8fa6087af55651d131d155e6c969dc10eaa09a38
-SHA1 (patch-af) = 1dee71a702424355b48d06ed29577b43881548e8
diff --git a/chat/xchat/patches/patch-aa b/chat/xchat/patches/patch-aa
deleted file mode 100644
index 20ef171f25d..00000000000
--- a/chat/xchat/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.11 2007/07/20 15:09:23 tron Exp $
-
---- configure.orig 2007-06-30 16:28:18.000000000 +0100
-+++ configure 2007-07-20 15:01:42.000000000 +0100
-@@ -29020,7 +29020,7 @@
- PY_PREFIX=`$pythonpath -c 'import sys; print sys.prefix'`
- PY_EXEC_PREFIX=`$pythonpath -c 'import sys; print sys.exec_prefix'`
- if test -f $PY_INC/Python.h; then
-- PY_LIBS="-L$PY_LIB/config -lpython$PY_VER -lpthread -lutil"
-+ PY_LIBS="-L$PY_LIB/config -lpython$PY_VER ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} -lutil"
- PY_CFLAGS="-I$PY_INC"
- { echo "$as_me:$LINENO: result: ok" >&5
- echo "${ECHO_T}ok" >&6; }
diff --git a/chat/xchat/patches/patch-ac b/chat/xchat/patches/patch-ac
deleted file mode 100644
index 510d7ef00db..00000000000
--- a/chat/xchat/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2008/10/17 11:03:43 tron Exp $
-
-Fix build with GTK+ 2.13.* and newer. Patch taken from this bug report:
-
-http://sourceforge.net/tracker/index.php?func=detail&aid=2070689&group_id=239&atid=100239
-
---- src/fe-gtk/xtext.h.orig 2008-02-24 04:48:02.000000000 +0000
-+++ src/fe-gtk/xtext.h 2008-10-17 11:54:59.000000000 +0100
-@@ -270,6 +270,6 @@
- xtext_buffer *gtk_xtext_buffer_new (GtkXText *xtext);
- void gtk_xtext_buffer_free (xtext_buffer *buf);
- void gtk_xtext_buffer_show (GtkXText *xtext, xtext_buffer *buf, int render);
--GtkType gtk_xtext_get_type (void);
-+GType gtk_xtext_get_type (void);
-
- #endif
diff --git a/chat/xchat/patches/patch-ad b/chat/xchat/patches/patch-ad
deleted file mode 100644
index 8841f3862ac..00000000000
--- a/chat/xchat/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.8 2010/06/02 18:24:47 tnn Exp $
-
---- src/fe-gtk/fe-gtk.c.orig 2008-02-24 08:39:44.000000000 +0000
-+++ src/fe-gtk/fe-gtk.c
-@@ -819,7 +819,7 @@ fe_gui_info (session *sess, int info_typ
- switch (info_type)
- {
- case 0: /* window status */
-- if (!GTK_WIDGET_VISIBLE (GTK_WINDOW (sess->gui->window)))
-+ if (!gtk_widget_get_visible(GTK_WINDOW (sess->gui->window)))
- return 2; /* hidden (iconified or systray) */
- #if GTK_CHECK_VERSION(2,4,0)
- if (gtk_window_is_active (GTK_WINDOW (sess->gui->window)))
diff --git a/chat/xchat/patches/patch-ae b/chat/xchat/patches/patch-ae
deleted file mode 100644
index a9dfda25db8..00000000000
--- a/chat/xchat/patches/patch-ae
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2010/06/02 18:24:47 tnn Exp $
-
---- src/fe-gtk/maingui.c.orig 2008-04-01 08:53:41.000000000 +0000
-+++ src/fe-gtk/maingui.c
-@@ -599,7 +599,7 @@ mg_show_generic_tab (GtkWidget *box)
- int num;
- GtkWidget *f = NULL;
-
-- if (current_sess && GTK_WIDGET_HAS_FOCUS (current_sess->gui->input_box))
-+ if (current_sess && gtk_widget_has_focus(current_sess->gui->input_box))
- f = current_sess->gui->input_box;
-
- num = gtk_notebook_page_num (GTK_NOTEBOOK (mg_gui->note_book), box);
-@@ -809,8 +809,8 @@ mg_set_topic_tip (session *sess)
- static void
- mg_hide_empty_pane (GtkPaned *pane)
- {
-- if ((pane->child1 == NULL || !GTK_WIDGET_VISIBLE (pane->child1)) &&
-- (pane->child2 == NULL || !GTK_WIDGET_VISIBLE (pane->child2)))
-+ if ((pane->child1 == NULL || !gtk_widget_get_visible(pane->child1)) &&
-+ (pane->child2 == NULL || !gtk_widget_get_visible(pane->child2)))
- {
- gtk_widget_hide (GTK_WIDGET (pane));
- return;
diff --git a/chat/xchat/patches/patch-af b/chat/xchat/patches/patch-af
deleted file mode 100644
index 8190a8420b6..00000000000
--- a/chat/xchat/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.3 2010/06/02 18:24:47 tnn Exp $
-
---- src/fe-gtk/menu.c.orig 2008-06-08 07:59:37.000000000 +0000
-+++ src/fe-gtk/menu.c
-@@ -1670,7 +1670,7 @@ static gboolean
- menu_canacaccel (GtkWidget *widget, guint signal_id, gpointer user_data)
- {
- /* GTK2.2 behaviour */
-- return GTK_WIDGET_IS_SENSITIVE (widget);
-+ return gtk_widget_is_sensitive(widget);
- }
-
- #endif