ports/148442: Update irc/xchat to latest 2.8.8
Joseph S. Atkinson
jsa at wickedmachine.net
Wed Jul 7 23:10:01 UTC 2010
>Number: 148442
>Category: ports
>Synopsis: Update irc/xchat to latest 2.8.8
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Jul 07 23:10:00 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Joseph S. Atkinson
>Release:
>Organization:
>Environment:
>Description:
Hell froze over and XChat released a 2.8.8 version back in May. This patch updates to the latest and adds the LICENSE information to the port.
>How-To-Repeat:
>Fix:
The following files were obsoleted:
files/patch-src_fe-gtk_xtext.h
files/patch-xc286-smallfixes
Patch attached with submission follows:
diff -ruN /usr/ports/irc/xchat/Makefile ./Makefile
--- /usr/ports/irc/xchat/Makefile 2010-06-03 17:30:20.000000000 -0400
+++ ./Makefile 2010-07-07 18:50:31.000000000 -0400
@@ -7,16 +7,17 @@
#
PORTNAME= xchat
-PORTVERSION= 2.8.6
-PORTREVISION= 7
+PORTVERSION= 2.8.8
CATEGORIES= irc gnome ipv6
MASTER_SITES= SF \
http://xchat.org/files/source/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/
-
MAINTAINER= gnome at FreeBSD.org
COMMENT= An X11 IRC client using the GTK+ 2 toolkit
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
+
CONFLICTS= xchat-1* xchat-systray-plugin-[0-9]*
USE_BZIP2= yes
@@ -38,6 +39,10 @@
TCL "Enable TCL support" off \
SOCKS "Build with socks5 support" off
+.if defined(WITH_PYTHON)
+USE_PYTHON= yes
+.endif
+
.include <bsd.port.pre.mk>
.if !defined(WITHOUT_DBUS)
@@ -86,7 +91,6 @@
.endif
.if defined(WITH_PYTHON)
-USE_PYTHON= yes
.include "${PORTSDIR}/Mk/bsd.python.mk"
CONFIGURE_ARGS+=--enable-python
PLIST_SUB+= PYTHON=""
@@ -118,10 +122,6 @@
post-patch:
@${REINPLACE_CMD} -E -e 's|PY_LIBS=.*|PY_LIBS="-L\$$PY_EXEC_PREFIX/lib/python\$$PY_VER/config -lpython\$$PY_VER ${PTHREAD_LIBS} -lutil"|' \
${WRKSRC}/configure
-.for file in dccgui.c fe-gtk.c maingui.c menu.c plugin-tray.c sexy-spell-entry.c xtext.c xtext.h
- @${REINPLACE_CMD} -e 's|#define GTK_DISABLE_DEPRECATED||g' \
- ${WRKSRC}/src/fe-gtk/${file}
-.endfor
# Create plugins directory even when no plugins are installed
post-install:
diff -ruN /usr/ports/irc/xchat/distinfo ./distinfo
--- /usr/ports/irc/xchat/distinfo 2008-06-14 12:25:41.000000000 -0400
+++ ./distinfo 2010-07-07 18:31:26.000000000 -0400
@@ -1,3 +1,3 @@
-MD5 (xchat-2.8.6.tar.bz2) = 1f2670865d43a23a9abc596dde999aca
-SHA256 (xchat-2.8.6.tar.bz2) = 8c89dbf36304b99363a7f090d695447653102b4528ca2aa367a2abe5cff1746d
-SIZE (xchat-2.8.6.tar.bz2) = 1423645
+MD5 (xchat-2.8.8.tar.bz2) = 6775c44f38e84d06c06c336b32c4a452
+SHA256 (xchat-2.8.8.tar.bz2) = 0d6d69437b5e1e45f3e66270fe369344943de8a1190e498fafa5296315a27db0
+SIZE (xchat-2.8.8.tar.bz2) = 1509993
diff -ruN /usr/ports/irc/xchat/files/patch-src_fe-gtk_xtext.h ./files/patch-src_fe-gtk_xtext.h
--- /usr/ports/irc/xchat/files/patch-src_fe-gtk_xtext.h 2009-01-10 00:21:30.000000000 -0500
+++ ./files/patch-src_fe-gtk_xtext.h 1969-12-31 19:00:00.000000000 -0500
@@ -1,10 +0,0 @@
---- src/fe-gtk/xtext.h.orig 2008-08-06 09:47:05.000000000 +0200
-+++ src/fe-gtk/xtext.h 2008-08-06 09:51:01.000000000 +0200
-@@ -270,6 +270,6 @@ void gtk_xtext_set_wordwrap (GtkXText *x
- 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 -ruN /usr/ports/irc/xchat/files/patch-xc286-smallfixes ./files/patch-xc286-smallfixes
--- /usr/ports/irc/xchat/files/patch-xc286-smallfixes 2008-08-03 22:46:24.000000000 -0400
+++ ./files/patch-xc286-smallfixes 1969-12-31 19:00:00.000000000 -0500
@@ -1,68 +0,0 @@
-#
-# Various small fixes from CVS that are considered safe to apply to 2.8.6.
-#
---- xchat-2.8.6/src/common/cfgfiles.c 2008-02-05 21:02:47.000000000 +1100
-+++ src/common/cfgfiles.c 2008-06-15 13:45:43.000000000 +1000
-@@ -886,7 +886,6 @@
- set_showval (session *sess, const struct prefs *var, char *tbuf)
- {
- int len, dots, j;
-- static const char *offon[] = { "OFF", "ON" };
-
- len = strlen (var->name);
- memcpy (tbuf, var->name, len);
-@@ -909,8 +908,10 @@
- *((int *) &prefs + var->offset));
- break;
- case TYPE_BOOL:
-- sprintf (tbuf + len, "\0033:\017 %s\n", offon[
-- *((int *) &prefs + var->offset)]);
-+ if (*((int *) &prefs + var->offset))
-+ sprintf (tbuf + len, "\0033:\017 %s\n", "ON");
-+ else
-+ sprintf (tbuf + len, "\0033:\017 %s\n", "OFF");
- break;
- }
- PrintText (sess, tbuf);
---- xchat-2.8.6/src/common/chanopt.c 2008-06-10 22:00:55.000000000 +1000
-+++ src/common/chanopt.c 2008-06-15 13:48:04.000000000 +1000
-@@ -32,7 +32,7 @@
-
- #define S_F(xx) STRUCT_OFFSET_STR(struct session,xx)
-
--channel_options chanopt[] =
-+static const channel_options chanopt[] =
- {
- {"alert_beep", "BEEP", S_F(alert_beep)},
- {"alert_taskbar", NULL, S_F(alert_taskbar)},
---- xchat-2.8.6/src/common/servlist.c 2008-04-01 19:22:34.000000000 +1100
-+++ src/common/servlist.c 2008-06-15 13:57:41.000000000 +1000
-@@ -509,6 +509,8 @@
- list = g_slist_nth (net->servlist, net->selected);
- if (!list)
- list = net->servlist;
-+ if (!list)
-+ return;
- ircserv = list->data;
-
- /* incase a protocol switch is added to the servlist gui */
---- xchat-2.8.6/src/common/text.c 2008-03-28 13:20:04.000000000 +1100
-+++ src/common/text.c 2008-06-15 13:59:59.000000000 +1000
-@@ -216,7 +216,7 @@
- static void
- scrollback_save (session *sess, char *text)
- {
-- char buf[1024];
-+ char buf[512 * 4];
- time_t stamp;
- int len;
-
-@@ -266,7 +266,7 @@
- scrollback_load (session *sess)
- {
- int fh;
-- char buf[1024];
-+ char buf[512 * 4];
- char *text;
- time_t stamp;
- int lines;
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list