Update to version 1.8.6. While I'm here, add a WITH_TRANSPARENCY knob

so that non-GNOME users can get transparent windows if so desired.

16 files changed, 32 insertions, 268 deletions

diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile
index 7faa87f69507..7e2a0ca52056 100644
--- a/irc/xchat-gnome/Makefile
+++ b/irc/xchat-gnome/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=		xchat
-PORTVERSION=		1.8.5
-PORTREVISION=		1
+PORTVERSION=		1.8.6
 CATEGORIES+=		irc gnome ipv6
 MASTER_SITES=		http://xchat.org/files/source/1.8/ \
 			http://xchat.linuxpower.org/files/source/1.8/
@@ -52,13 +51,18 @@ USE_OPENSSL=		YES
 CONFIGURE_ARGS+=	--enable-openssl
 .endif
 
+.if defined(WITH_TRANSPARENCY)
+BUILD_DEPENDS+=		${X11BASE}/bin/gdk-pixbuf-config:${PORTSDIR}/graphics/gdk-pixbuf
+CONFIGURE_ARGS+=	--enable-gdk-pixbuf
+.endif
+
 .if defined(HAVE_GNOME)
 USE_GNOME=		yes
 CONFIGURE_ARGS+=	--enable-gnome --enable-panel --enable-gdk-pixbuf \
 			--enable-zvt
 MAKE_ARGS=		icondir="${PREFIX}/share/gnome/pixmaps"
 .else
-CONFIGURE_ARGS+=	--disable-gnome --disable-gdk-pixbuf --disable-zvt
+CONFIGURE_ARGS+=	--disable-gnome --disable-zvt
 .endif
 
 post-patch:
diff --git a/irc/xchat-gnome/distinfo b/irc/xchat-gnome/distinfo
index a7094ec4aebf..14e008095c92 100644
--- a/irc/xchat-gnome/distinfo
+++ b/irc/xchat-gnome/distinfo
@@ -1 +1 @@
-MD5 (xchat-1.8.5.tar.bz2) = d5533374c2b81a28227c5a56793addfb
+MD5 (xchat-1.8.6.tar.bz2) = b17db9d9130eeaacdce0e809cc3ce965
diff --git a/irc/xchat-gnome/files/patch-autoresume b/irc/xchat-gnome/files/patch-autoresume
deleted file mode 100644
index fa01aaddf088..000000000000
--- a/irc/xchat-gnome/files/patch-autoresume
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/common/dcc.c.orig	Fri Oct 12 08:13:04 2001
-+++ src/common/dcc.c	Sat Nov 24 16:47:39 2001
-@@ -1292,8 +1292,12 @@
- 					while (list)
- 					{
- 						d = list->data;
--						if (d != dcc && strcmp (d->destfile, dcc->destfile) == 0)
--							goto dontresume;
-+						if (d->type == TYPE_RECV && d->dccstat != STAT_ABORTED &&
-+							 d->dccstat != STAT_DONE && d->dccstat != STAT_FAILED)
-+						{
-+							if (d != dcc && strcmp (d->destfile, dcc->destfile) == 0)
-+								goto dontresume;
-+						}
- 						list = list->next;
- 					}
- 					dcc_resume (dcc);
diff --git a/irc/xchat-gnome/files/patch-bnc b/irc/xchat-gnome/files/patch-bnc
deleted file mode 100644
index 17bff4c687b8..000000000000
--- a/irc/xchat-gnome/files/patch-bnc
+++ /dev/null
@@ -1,46 +0,0 @@
---- src/common/xchat.c.orig	Sun Oct 14 07:46:36 2001
-+++ src/common/xchat.c	Sat Nov 24 16:48:41 2001
-@@ -69,6 +69,7 @@
- GSList *urlhandler_list = 0;
- static GSList *away_list = 0;
- 
-+static int in_xchat_exit = FALSE;
- int xchat_is_quitting = FALSE;
- int auto_connect = TRUE;
- 
-@@ -730,7 +731,7 @@
- 	free (killsess->current_modes);
- 	free (killsess);
- 
--	if (!sess_list && !xchat_is_quitting)
-+	if (!sess_list && !in_xchat_exit)
- 		xchat_exit ();						/* sess_list is empty, quit! */
- 
- 	list = sess_list;
-@@ -1051,6 +1052,7 @@
- xchat_exit (void)
- {
- 	xchat_is_quitting = TRUE;
-+	in_xchat_exit = TRUE;
- #ifdef USE_PERL
- 	perl_end ();
- #endif
-
---- src/fe-gtk/maingui.c.orig	Thu Oct 25 00:19:29 2001
-+++ src/fe-gtk/maingui.c	Sat Nov 24 16:48:41 2001
-@@ -923,7 +923,6 @@
- static void
- gui_main_window_kill (gpointer userdata)
- {
--#if 0
- 	GSList *list;
- 	session *sess;
- 
-@@ -941,7 +940,6 @@
- 		}
- 		list = list->next;
- 	}
--#endif
- 
- 	main_window = 0;
- 	current_tab = 0;
diff --git a/irc/xchat/Makefile b/irc/xchat/Makefile
index 7faa87f69507..7e2a0ca52056 100644
--- a/irc/xchat/Makefile
+++ b/irc/xchat/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=		xchat
-PORTVERSION=		1.8.5
-PORTREVISION=		1
+PORTVERSION=		1.8.6
 CATEGORIES+=		irc gnome ipv6
 MASTER_SITES=		http://xchat.org/files/source/1.8/ \
 			http://xchat.linuxpower.org/files/source/1.8/
@@ -52,13 +51,18 @@ USE_OPENSSL=		YES
 CONFIGURE_ARGS+=	--enable-openssl
 .endif
 
+.if defined(WITH_TRANSPARENCY)
+BUILD_DEPENDS+=		${X11BASE}/bin/gdk-pixbuf-config:${PORTSDIR}/graphics/gdk-pixbuf
+CONFIGURE_ARGS+=	--enable-gdk-pixbuf
+.endif
+
 .if defined(HAVE_GNOME)
 USE_GNOME=		yes
 CONFIGURE_ARGS+=	--enable-gnome --enable-panel --enable-gdk-pixbuf \
 			--enable-zvt
 MAKE_ARGS=		icondir="${PREFIX}/share/gnome/pixmaps"
 .else
-CONFIGURE_ARGS+=	--disable-gnome --disable-gdk-pixbuf --disable-zvt
+CONFIGURE_ARGS+=	--disable-gnome --disable-zvt
 .endif
 
 post-patch:
diff --git a/irc/xchat/distinfo b/irc/xchat/distinfo
index a7094ec4aebf..14e008095c92 100644
--- a/irc/xchat/distinfo
+++ b/irc/xchat/distinfo
@@ -1 +1 @@
-MD5 (xchat-1.8.5.tar.bz2) = d5533374c2b81a28227c5a56793addfb
+MD5 (xchat-1.8.6.tar.bz2) = b17db9d9130eeaacdce0e809cc3ce965
diff --git a/irc/xchat/files/patch-autoresume b/irc/xchat/files/patch-autoresume
deleted file mode 100644
index fa01aaddf088..000000000000
--- a/irc/xchat/files/patch-autoresume
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/common/dcc.c.orig	Fri Oct 12 08:13:04 2001
-+++ src/common/dcc.c	Sat Nov 24 16:47:39 2001
-@@ -1292,8 +1292,12 @@
- 					while (list)
- 					{
- 						d = list->data;
--						if (d != dcc && strcmp (d->destfile, dcc->destfile) == 0)
--							goto dontresume;
-+						if (d->type == TYPE_RECV && d->dccstat != STAT_ABORTED &&
-+							 d->dccstat != STAT_DONE && d->dccstat != STAT_FAILED)
-+						{
-+							if (d != dcc && strcmp (d->destfile, dcc->destfile) == 0)
-+								goto dontresume;
-+						}
- 						list = list->next;
- 					}
- 					dcc_resume (dcc);
diff --git a/irc/xchat/files/patch-bnc b/irc/xchat/files/patch-bnc
deleted file mode 100644
index 17bff4c687b8..000000000000
--- a/irc/xchat/files/patch-bnc
+++ /dev/null
@@ -1,46 +0,0 @@
---- src/common/xchat.c.orig	Sun Oct 14 07:46:36 2001
-+++ src/common/xchat.c	Sat Nov 24 16:48:41 2001
-@@ -69,6 +69,7 @@
- GSList *urlhandler_list = 0;
- static GSList *away_list = 0;
- 
-+static int in_xchat_exit = FALSE;
- int xchat_is_quitting = FALSE;
- int auto_connect = TRUE;
- 
-@@ -730,7 +731,7 @@
- 	free (killsess->current_modes);
- 	free (killsess);
- 
--	if (!sess_list && !xchat_is_quitting)
-+	if (!sess_list && !in_xchat_exit)
- 		xchat_exit ();						/* sess_list is empty, quit! */
- 
- 	list = sess_list;
-@@ -1051,6 +1052,7 @@
- xchat_exit (void)
- {
- 	xchat_is_quitting = TRUE;
-+	in_xchat_exit = TRUE;
- #ifdef USE_PERL
- 	perl_end ();
- #endif
-
---- src/fe-gtk/maingui.c.orig	Thu Oct 25 00:19:29 2001
-+++ src/fe-gtk/maingui.c	Sat Nov 24 16:48:41 2001
-@@ -923,7 +923,6 @@
- static void
- gui_main_window_kill (gpointer userdata)
- {
--#if 0
- 	GSList *list;
- 	session *sess;
- 
-@@ -941,7 +940,6 @@
- 		}
- 		list = list->next;
- 	}
--#endif
- 
- 	main_window = 0;
- 	current_tab = 0;
diff --git a/irc/xchat1/Makefile b/irc/xchat1/Makefile
index 7faa87f69507..7e2a0ca52056 100644
--- a/irc/xchat1/Makefile
+++ b/irc/xchat1/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=		xchat
-PORTVERSION=		1.8.5
-PORTREVISION=		1
+PORTVERSION=		1.8.6
 CATEGORIES+=		irc gnome ipv6
 MASTER_SITES=		http://xchat.org/files/source/1.8/ \
 			http://xchat.linuxpower.org/files/source/1.8/
@@ -52,13 +51,18 @@ USE_OPENSSL=		YES
 CONFIGURE_ARGS+=	--enable-openssl
 .endif
 
+.if defined(WITH_TRANSPARENCY)
+BUILD_DEPENDS+=		${X11BASE}/bin/gdk-pixbuf-config:${PORTSDIR}/graphics/gdk-pixbuf
+CONFIGURE_ARGS+=	--enable-gdk-pixbuf
+.endif
+
 .if defined(HAVE_GNOME)
 USE_GNOME=		yes
 CONFIGURE_ARGS+=	--enable-gnome --enable-panel --enable-gdk-pixbuf \
 			--enable-zvt
 MAKE_ARGS=		icondir="${PREFIX}/share/gnome/pixmaps"
 .else
-CONFIGURE_ARGS+=	--disable-gnome --disable-gdk-pixbuf --disable-zvt
+CONFIGURE_ARGS+=	--disable-gnome --disable-zvt
 .endif
 
 post-patch:
diff --git a/irc/xchat1/distinfo b/irc/xchat1/distinfo
index a7094ec4aebf..14e008095c92 100644
--- a/irc/xchat1/distinfo
+++ b/irc/xchat1/distinfo
@@ -1 +1 @@
-MD5 (xchat-1.8.5.tar.bz2) = d5533374c2b81a28227c5a56793addfb
+MD5 (xchat-1.8.6.tar.bz2) = b17db9d9130eeaacdce0e809cc3ce965
diff --git a/irc/xchat1/files/patch-autoresume b/irc/xchat1/files/patch-autoresume
deleted file mode 100644
index fa01aaddf088..000000000000
--- a/irc/xchat1/files/patch-autoresume
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/common/dcc.c.orig	Fri Oct 12 08:13:04 2001
-+++ src/common/dcc.c	Sat Nov 24 16:47:39 2001
-@@ -1292,8 +1292,12 @@
- 					while (list)
- 					{
- 						d = list->data;
--						if (d != dcc && strcmp (d->destfile, dcc->destfile) == 0)
--							goto dontresume;
-+						if (d->type == TYPE_RECV && d->dccstat != STAT_ABORTED &&
-+							 d->dccstat != STAT_DONE && d->dccstat != STAT_FAILED)
-+						{
-+							if (d != dcc && strcmp (d->destfile, dcc->destfile) == 0)
-+								goto dontresume;
-+						}
- 						list = list->next;
- 					}
- 					dcc_resume (dcc);
diff --git a/irc/xchat1/files/patch-bnc b/irc/xchat1/files/patch-bnc
deleted file mode 100644
index 17bff4c687b8..000000000000
--- a/irc/xchat1/files/patch-bnc
+++ /dev/null
@@ -1,46 +0,0 @@
---- src/common/xchat.c.orig	Sun Oct 14 07:46:36 2001
-+++ src/common/xchat.c	Sat Nov 24 16:48:41 2001
-@@ -69,6 +69,7 @@
- GSList *urlhandler_list = 0;
- static GSList *away_list = 0;
- 
-+static int in_xchat_exit = FALSE;
- int xchat_is_quitting = FALSE;
- int auto_connect = TRUE;
- 
-@@ -730,7 +731,7 @@
- 	free (killsess->current_modes);
- 	free (killsess);
- 
--	if (!sess_list && !xchat_is_quitting)
-+	if (!sess_list && !in_xchat_exit)
- 		xchat_exit ();						/* sess_list is empty, quit! */
- 
- 	list = sess_list;
-@@ -1051,6 +1052,7 @@
- xchat_exit (void)
- {
- 	xchat_is_quitting = TRUE;
-+	in_xchat_exit = TRUE;
- #ifdef USE_PERL
- 	perl_end ();
- #endif
-
---- src/fe-gtk/maingui.c.orig	Thu Oct 25 00:19:29 2001
-+++ src/fe-gtk/maingui.c	Sat Nov 24 16:48:41 2001
-@@ -923,7 +923,6 @@
- static void
- gui_main_window_kill (gpointer userdata)
- {
--#if 0
- 	GSList *list;
- 	session *sess;
- 
-@@ -941,7 +940,6 @@
- 		}
- 		list = list->next;
- 	}
--#endif
- 
- 	main_window = 0;
- 	current_tab = 0;
diff --git a/irc/xchat2/Makefile b/irc/xchat2/Makefile
index 7faa87f69507..7e2a0ca52056 100644
--- a/irc/xchat2/Makefile
+++ b/irc/xchat2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=		xchat
-PORTVERSION=		1.8.5
-PORTREVISION=		1
+PORTVERSION=		1.8.6
 CATEGORIES+=		irc gnome ipv6
 MASTER_SITES=		http://xchat.org/files/source/1.8/ \
 			http://xchat.linuxpower.org/files/source/1.8/
@@ -52,13 +51,18 @@ USE_OPENSSL=		YES
 CONFIGURE_ARGS+=	--enable-openssl
 .endif
 
+.if defined(WITH_TRANSPARENCY)
+BUILD_DEPENDS+=		${X11BASE}/bin/gdk-pixbuf-config:${PORTSDIR}/graphics/gdk-pixbuf
+CONFIGURE_ARGS+=	--enable-gdk-pixbuf
+.endif
+
 .if defined(HAVE_GNOME)
 USE_GNOME=		yes
 CONFIGURE_ARGS+=	--enable-gnome --enable-panel --enable-gdk-pixbuf \
 			--enable-zvt
 MAKE_ARGS=		icondir="${PREFIX}/share/gnome/pixmaps"
 .else
-CONFIGURE_ARGS+=	--disable-gnome --disable-gdk-pixbuf --disable-zvt
+CONFIGURE_ARGS+=	--disable-gnome --disable-zvt
 .endif
 
 post-patch:
diff --git a/irc/xchat2/distinfo b/irc/xchat2/distinfo
index a7094ec4aebf..14e008095c92 100644
--- a/irc/xchat2/distinfo
+++ b/irc/xchat2/distinfo
@@ -1 +1 @@
-MD5 (xchat-1.8.5.tar.bz2) = d5533374c2b81a28227c5a56793addfb
+MD5 (xchat-1.8.6.tar.bz2) = b17db9d9130eeaacdce0e809cc3ce965
diff --git a/irc/xchat2/files/patch-autoresume b/irc/xchat2/files/patch-autoresume
deleted file mode 100644
index fa01aaddf088..000000000000
--- a/irc/xchat2/files/patch-autoresume
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/common/dcc.c.orig	Fri Oct 12 08:13:04 2001
-+++ src/common/dcc.c	Sat Nov 24 16:47:39 2001
-@@ -1292,8 +1292,12 @@
- 					while (list)
- 					{
- 						d = list->data;
--						if (d != dcc && strcmp (d->destfile, dcc->destfile) == 0)
--							goto dontresume;
-+						if (d->type == TYPE_RECV && d->dccstat != STAT_ABORTED &&
-+							 d->dccstat != STAT_DONE && d->dccstat != STAT_FAILED)
-+						{
-+							if (d != dcc && strcmp (d->destfile, dcc->destfile) == 0)
-+								goto dontresume;
-+						}
- 						list = list->next;
- 					}
- 					dcc_resume (dcc);
diff --git a/irc/xchat2/files/patch-bnc b/irc/xchat2/files/patch-bnc
deleted file mode 100644
index 17bff4c687b8..000000000000
--- a/irc/xchat2/files/patch-bnc
+++ /dev/null
@@ -1,46 +0,0 @@
---- src/common/xchat.c.orig	Sun Oct 14 07:46:36 2001
-+++ src/common/xchat.c	Sat Nov 24 16:48:41 2001
-@@ -69,6 +69,7 @@
- GSList *urlhandler_list = 0;
- static GSList *away_list = 0;
- 
-+static int in_xchat_exit = FALSE;
- int xchat_is_quitting = FALSE;
- int auto_connect = TRUE;
- 
-@@ -730,7 +731,7 @@
- 	free (killsess->current_modes);
- 	free (killsess);
- 
--	if (!sess_list && !xchat_is_quitting)
-+	if (!sess_list && !in_xchat_exit)
- 		xchat_exit ();						/* sess_list is empty, quit! */
- 
- 	list = sess_list;
-@@ -1051,6 +1052,7 @@
- xchat_exit (void)
- {
- 	xchat_is_quitting = TRUE;
-+	in_xchat_exit = TRUE;
- #ifdef USE_PERL
- 	perl_end ();
- #endif
-
---- src/fe-gtk/maingui.c.orig	Thu Oct 25 00:19:29 2001
-+++ src/fe-gtk/maingui.c	Sat Nov 24 16:48:41 2001
-@@ -923,7 +923,6 @@
- static void
- gui_main_window_kill (gpointer userdata)
- {
--#if 0
- 	GSList *list;
- 	session *sess;
- 
-@@ -941,7 +940,6 @@
- 		}
- 		list = list->next;
- 	}
--#endif
- 
- 	main_window = 0;
- 	current_tab = 0;