- Update to 1.1.0.1

- Patches integrated upstream

Approved by:	sat (mentor)

6 files changed, 5 insertions, 76 deletions

diff --git a/irc/bitchx/Makefile b/irc/bitchx/Makefile
index f21e1a792fe8..4ebf0f7e6ea5 100644
--- a/irc/bitchx/Makefile
+++ b/irc/bitchx/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	BitchX
-PORTVERSION=	1.1
-PORTREVISION=	1
+PORTVERSION=	1.1.0.1
 CATEGORIES+=	irc
 MASTER_SITES=	ftp://ftp.bitchx.org/pub/BitchX/source/ \
 		CENKES
-DISTNAME=	ircii-pana-${PORTVERSION}-final
+DISTNAME=	ircii-pana-1.1a-final
 
 MAINTAINER?=	beech@FreeBSD.org
 COMMENT?=	ircII color client with GTK/GNOME support
diff --git a/irc/bitchx/distinfo b/irc/bitchx/distinfo
index d396c394fdbc..c2134e31e323 100644
--- a/irc/bitchx/distinfo
+++ b/irc/bitchx/distinfo
@@ -1,3 +1,3 @@
-MD5 (ircii-pana-1.1-final.tar.gz) = 611d2dda222f00c10140236f4c331572
-SHA256 (ircii-pana-1.1-final.tar.gz) = 7464cd75a10f2d117a10cf0184e5d4b9ece44de03a226402c17bdd3f2c7eca57
-SIZE (ircii-pana-1.1-final.tar.gz) = 2532476
+MD5 (ircii-pana-1.1a-final.tar.gz) = cd77b52b2ba92cc9a082e4ddb631d05c
+SHA256 (ircii-pana-1.1a-final.tar.gz) = 40cea400fa7592bed47071fec9d31e5ff69088d6cf78e5cdfe9cc7ee7198618e
+SIZE (ircii-pana-1.1a-final.tar.gz) = 2599126
diff --git a/irc/bitchx/files/patch-64bit b/irc/bitchx/files/patch-64bit
deleted file mode 100644
index 014a717f84b1..000000000000
--- a/irc/bitchx/files/patch-64bit
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -ur BitchX.orig/include/module.h BitchX/include/module.h
---- BitchX.orig/include/module.h	Fri Apr 11 03:09:07 2003
-+++ include/module.h	Sun Jan  8 17:18:15 2006
-@@ -15,7 +15,7 @@
- 
- #include "struct.h"
- 
--typedef int (*Function_ptr)();
-+typedef long (*Function_ptr)();
- 
- #ifdef WANT_DLL
- #ifdef HPUX
-diff -ur BitchX.orig/include/modval.h BitchX/include/modval.h
---- BitchX.orig/include/modval.h	Fri Apr 11 03:09:07 2003
-+++ include/modval.h	Sun Jan  8 17:18:15 2006
-@@ -318,7 +318,7 @@
- #define show_window(x) ((void) (global[SHOW_WINDOW]((Window *)x)))
- #define get_status_by_refnum(x, y) ((char *) (global[GET_STATUS_BY_REFNUM]((unsigned int)x, (unsigned int)y)))
- #define get_visible_by_refnum(x) ((int) (global[GET_VISIBLE_BY_REFNUM]((char *)x)))
--#define get_window_by_desc(x) ((Window *) (global[GET_WINDOW_BY_DESC]((unsigned int)x)))
-+#define get_window_by_desc(x) ((Window *) (global[GET_WINDOW_BY_DESC]((unsigned long)x)))
- #define get_window_by_refnum(x) ((Window *) (global[GET_WINDOW_BY_REFNUM]((unsigned int)x)))
- #define get_window_by_name(x) ((Window *) (global[GET_WINDOW_BY_NAME]((char *)x)))
- #define next_window(x, y) ((void) (global[FUNC_NEXT_WINDOW]((char)x, (char *)y)))
-diff -ur BitchX.orig/source/screen.c BitchX/source/screen.c
---- BitchX.orig/source/screen.c	Thu Jul 31 09:01:08 2003
-+++ source/screen.c	Sun Jan  8 17:18:18 2006
-@@ -1377,8 +1377,8 @@
- {
- 	if (!w)
- 		w = current_window;
--	if (w->screen)
--		w->screen->cursor_window = w;
-+/*	if (w->screen)
-+		w->screen->cursor_window = w;*/
- }
- 
- /*
diff --git a/irc/bitchx/files/patch-source-ctcp.c b/irc/bitchx/files/patch-source-ctcp.c
deleted file mode 100644
index 473f5da18cf2..000000000000
--- a/irc/bitchx/files/patch-source-ctcp.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/ctcp.c.orig	Mon Dec 18 22:26:09 2006
-+++ source/ctcp.c	Mon Dec 18 22:26:24 2006
-@@ -176,7 +176,7 @@
- 
- /* CDE do ops and unban logging */
- 
--static char	*ctcp_type[] =
-+char	*ctcp_type[] =
- {
- 	"PRIVMSG",
- 	"NOTICE"
diff --git a/irc/bitchx/files/patch-source-timer.c b/irc/bitchx/files/patch-source-timer.c
deleted file mode 100644
index 1e81800db11d..000000000000
--- a/irc/bitchx/files/patch-source-timer.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/timer.c.orig	Mon Dec 18 22:29:15 2006
-+++ source/timer.c	Mon Dec 18 22:29:30 2006
-@@ -148,7 +148,7 @@
-  * This is put here on purpose -- we dont want any of the above functions
-  * to have any knowledge of this struct.
-  */
--static TimerList *PendingTimers;
-+TimerList *PendingTimers;
- static char *schedule_timer (TimerList *ntimer);
- 
- static char *current_exec_timer = empty_string;
diff --git a/irc/bitchx/files/patch-source_term_c b/irc/bitchx/files/patch-source_term_c
deleted file mode 100644
index 3909338c3503..000000000000
--- a/irc/bitchx/files/patch-source_term_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- source/term.c.orig	Fri Jul 23 01:10:02 2004
-+++ source/term.c	Fri Jul 23 01:11:02 2004
-@@ -92,7 +92,6 @@
- #endif
- 
- extern  char    *getenv();
--extern	char	*tparm();
- 
- /*
-  * The old code assumed termcap. termcap is almost always present, but on