Attachment #7375 for bug #16041

View | Details | Raw Unified | Return to bug 16041
Collapse All | Expand All




# New ports collection makefile for:	BitchX ircII client
# Version required:	1.0c15
# Date created:		26 Jan 1998
# Whom:			griffin
#
# $FreeBSD$
#

DISTNAME=	BitchX-1.0c15
PKGNAME=	bitchx-75p3
CATEGORIES=	irc
MASTER_SITES=	ftp://ftp.bitchx.com/pub/	\
		ftp://bitchx.dimension6.com/pub/

MAINTAINER=	griffin@blackhole.iceworld.org

.if defined(GUI)
LIB_DEPENDS+=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12	\
		esd.2:${PORTSDIR}/audio/esound		\
		Imlib.5:${PORTSDIR}/graphics/imlib	\
		gnome.3:${PORTSDIR}/x11/gnomelibs
.endif

GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
WRKSRC=		${WRKDIR}/BitchX

GNU_CONFIGURE=	yes
USE_GMAKE=	yes

.if defined(GUI)
CONFIGURE_ARGS+=		--with-gtk --enable-sound --with-plugins
.else
CONFIGURE_ARGS+=		--with-plugins
.endif

CONFIGURE_ENV=		GLIB_CONFIG="${GLIB_CONFIG}"	\
			GTK_CONFIG="${GTK_CONFIG}"

pre-configure:
		@${ECHO_MSG} "***************************************"
		@${ECHO_MSG} " To compile with GTK type make GUI=yes"
		@${ECHO_MSG} "***************************************"
.if defined(GUI)
		${CP} ${FILESDIR}/plist.common ${PKGDIR}/PLIST
		${ECHO}	bin/gtkBitchX >> ${PKGDIR}/PLIST
		${ECHO} share/bx/plugins/nicklist.so >> ${PKGDIR}/PLIST
.else
		${CP} ${FILESDIR}/plist.common ${PKGDIR}/PLIST
		${ECHO} bin/BitchX >> ${PKGDIR}/PLIST
		${ECHO} bin/scr-bx >> ${PKGDIR}/PLIST
		${ECHO} share/bx/wserv >> ${PKGDIR}/PLIST
.endif
		${ECHO} @dirrm share/bx/translation >> ${PKGDIR}/PLIST
		${ECHO}	@dirrm share/bx/script >> ${PKGDIR}/PLIST
		${ECHO} @dirrm share/bx/plugins >> ${PKGDIR}/PLIST
		${ECHO} @dirrm share/bx >> ${PKGDIR}/PLIST

do-install:
		cd ${WRKSRC} && make INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
		INSTALL_DATA="${INSTALL_DATA}" install
	${INSTALL_PROGRAM} ${WRKSRC}/source/scr-bx ${PREFIX}/bin
	${INSTALL_PROGRAM} ${WRKSRC}/source/wserv ${PREFIX}/bin
	${INSTALL_DATA} ${WRKSRC}/BitchX.help ${PREFIX}/lib/bx
	${INSTALL_MAN} ${WRKSRC}/BitchX.1.gz ${PREFIX}/man/man1

.include <bsd.port.mk>

Line 1 Link Here

(-)/usr/home/cj/ports/bitchx/files/md5 (-1 / +1 lines)
1	MD5 (ircii-pana-75p3.tar.gz) = c8365cc2b7aa187c7857cbf0483fd254	1	MD5 (BitchX-1.0c15.tar.gz) = 5048fd8d6b64302df5b52511e0acc19a




share/bx/BitchX.help
share/bx/BitchX.quit
share/bx/BitchX.reasons
share/bx/BitchX.ircnames
share/bx/script/actplug.gmz
share/bx/script/bxtcl.tcl
share/bx/script/file.tcl
share/bx/script/fserve+vfs.tar.gz
share/bx/script/menu.bx
share/bx/script/bxglobal
share/bx/script/bxglobal.orig
share/bx/plugins/BitchX.hints
share/bx/plugins/acro.so
share/bx/plugins/amp.so
share/bx/plugins/autobot.so
share/bx/plugins/blowfish.so
share/bx/plugins/encrypt.so
share/bx/plugins/fserv.so
share/bx/plugins/hint.so
share/bx/plugins/nap.so
share/bx/plugins/pkga.so
share/bx/plugins/possum.so
share/bx/plugins/qmail.so
share/bx/plugins/scan.so
share/bx/plugins/wavplay.so
share/bx/translation/ASCII
share/bx/translation/CP437
share/bx/translation/CP850
share/bx/translation/DANISH
share/bx/translation/DEC_MCS
share/bx/translation/DG_MCS
share/bx/translation/DUTCH
share/bx/translation/FINNISH
share/bx/translation/FRENCH
share/bx/translation/FRENCH_CANADIAN
share/bx/translation/GERMAN
share/bx/translation/HP_MCS
share/bx/translation/IRV
share/bx/translation/ITALIAN
share/bx/translation/JIS
share/bx/translation/MACINTOSH
share/bx/translation/NEXT
share/bx/translation/NORWEGIAN_1
share/bx/translation/NORWEGIAN_2
share/bx/translation/POLISH
share/bx/translation/POLISH_NOPL
share/bx/translation/PORTUGUESE
share/bx/translation/PORTUGUESE_COM
share/bx/translation/RUSSIAN
share/bx/translation/RUSSIAN_ALT
share/bx/translation/RUSSIAN_WIN
share/bx/translation/SPANISH
share/bx/translation/SWEDISH
share/bx/translation/SWEDISH_NAMES
share/bx/translation/SWEDISH_NAMES_COM
share/bx/translation/SWISS
share/bx/translation/UNITED_KINGDOM
share/bx/translation/UNITED_KINGDOM_COM




--- source/irc.c.old	Thu Jan  6 14:03:02 2000
+++ source/irc.c	Thu Jan  6 14:03:31 2000
@@ -53,6 +53,10 @@
 #include <signame.h>
 #endif
  
-#define TRANSLATION_PATH "/usr/local/lib/bx/translation"
+#define TRANSLATION_PATH "__PREFIX__/lib/bx/translation"
 
+#ifdef GTK
+extern int gtkipcin[2];
+#endif
+
 #ifndef VERSION
 	const char irc_version[] = "BitchX-1.0c15";
 #else




--- source/gtkbitchx.c.old	Thu Jan  6 14:03:02 2000
+++ source/gtkbitchx.c	Thu Jan  6 14:03:38 2000
@@ -1765,10 +1765,10 @@
 
 void gui_init(void)
 {
-	TI_cols = 80;
-	TI_lines = 25;
-	li = TI_lines;
-	co = TI_cols;
+	current_term->TI_cols = 80;
+	current_term->TI_lines = 25;
+	li = current_term->TI_lines;
+	co = current_term->TI_cols;
 
 	pthread_mutex_init(&evmutex, NULL);
 	pthread_cond_init(&evcond, NULL);
@@ -1936,7 +1936,7 @@
 /* This section is for portability considerations */
 void gui_clreol(void)
 {
-	gtkprintf(TI_el);
+	gtkprintf(current_term->TI_el);
 }
 
 void gui_gotoxy(int col, int row)
@@ -1984,27 +1984,27 @@
 	else
 		rn = n;
 
-	if (TI_csr && (TI_ri || TI_rin) && (TI_ind || TI_indn))
+	if (current_term->TI_csr && (current_term->TI_ri || current_term->TI_rin) && (current_term->TI_ind || current_term->TI_indn))
 	{
 		/*
 		 * Previously there was a test to see if the entire scrolling
 		 * region was the full screen.  That test *always* fails,
 		 * because we never scroll the bottom line of the screen.
 		 */
-		strcpy(start, (char *)tparm(TI_csr, top, bot));
-		strcpy(final, (char *)tparm(TI_csr, 0, TI_lines-1));
+		strcpy(start, (char *)tparm(current_term->TI_csr, top, bot));
+		strcpy(final, (char *)tparm(current_term->TI_csr, 0, current_term->TI_lines-1));
 
 		if (n > 0)
 		{
 			sr = bot;
 			er = top;
-			strcpy(thing, TI_ind);
+			strcpy(thing, current_term->TI_ind);
 		}
 		else
 		{
 			sr = top;
 			er = bot;
-			strcpy (thing, TI_ri);
+			strcpy (thing, current_term->TI_ri);
 		}
 	}
 




*** Makefile.in.bak	Mon Jan 10 15:11:55 2000
--- Makefile.in	Mon Jan 10 15:10:51 2000
***************
*** 42,48 ****
  # Where the BitchX library will be.  Generally this is the place that
  # you put the scripts, help pages and translation tables.  It is
  # very important that you set this correctly.
! IRCLIB = @IRCLIB@
  
  CC = @CC@
  DEFS = -I../include
--- 42,48 ----
  # Where the BitchX library will be.  Generally this is the place that
  # you put the scripts, help pages and translation tables.  It is
  # very important that you set this correctly.
! IRCLIB = /usr/local/share/bx/
  
  CC = @CC@
  DEFS = -I../include
***************
*** 74,83 ****
  ## You probably don't need to change anything below this line
  
  # Full path of the directory for BitchX help files.
! HELPDIR = @HELPDIR@
  
  # Full path of the directory for the BitchX scripts.
! INSTALL_SCRIPT = @INSTALL_SCRIPT@
  
  # Default setting for IRCPATH where BitchX will look for
  # its script files if the environment variable is undefined.
--- 74,83 ----
  ## You probably don't need to change anything below this line
  
  # Full path of the directory for BitchX help files.
! # HELPDIR = /usr/local/share/bx
  
  # Full path of the directory for the BitchX scripts.
! INSTALL_SCRIPT = /usr/local/share/bx/script
  
  # Default setting for IRCPATH where BitchX will look for
  # its script files if the environment variable is undefined.
***************
*** 85,99 ****
  # the Makefile, but it can contain multiple path elements
  # separated by colons. The path MUST lead to an existing directory,
  # because the 'global' script is expected to be found there.
! IRCPATH = @IRCPATH@
  
  # Path for TRANSLATION variable.
! TRANSLATION_PATH=@TRANSLATION_PATH@
  
  # This command will be used to install the BitchX help files.  If you don't
  # want to install them, replace with the following:
! # INSTALL_HELP_CMD = @echo The help files have not been installed.
! INSTALL_HELP_CMD = @INSTALL_HELP_CMD@
  
  # This program allows you to use screen/xterm's to put new BitchX windows
  # on new screen/xterm windows.
--- 85,99 ----
  # the Makefile, but it can contain multiple path elements
  # separated by colons. The path MUST lead to an existing directory,
  # because the 'global' script is expected to be found there.
! IRCPATH = /usr/local/share/bx/script
  
  # Path for TRANSLATION variable.
! TRANSLATION_PATH=/usr/local/share/bx/translation
  
  # This command will be used to install the BitchX help files.  If you don't
  # want to install them, replace with the following:
! INSTALL_HELP_CMD = @echo The help files have not been installed.
! # INSTALL_HELP_CMD = @INSTALL_HELP_CMD@
  
  # This program allows you to use screen/xterm's to put new BitchX windows
  # on new screen/xterm windows.




*** script/bxglobal.old	Mon Jan 10 19:20:27 2000
--- script/bxglobal	Mon Jan 10 19:25:50 2000
***************
*** 2,4 ****
--- 2,5 ----
    ^load menu.bx
    ^loaddll nicklist
  }
+ set LOAD_PATH ~/.BitchX:~/.BitchX/plugins:.:/usr/local/share/bx/plugins:/usr/local/share/bx/script:/usr/local/share/bx/translation:/usr/local/share/bx
+#define DEFAULT_FORMAT_NICK_AUTO_FSET "$0:$1-"
 
 #define DEFAULT_FORMAT_STATUS_FSET "%4%W$0-"
 #define DEFAULT_FORMAT_STATUS1_FSET "%4%W$0-"




--- source/misc.c.orig	Sat Sep 18 17:41:15 1999
+++ source/misc.c	Sat Sep 18 17:46:53 1999
@@ -4332,7 +4332,7 @@
 #define MAX_RECURSE 5
 #define RECURSE_CPARSE
 
-char *convert_output_format_raw(const char *format, const char *str, va_list args)
+char *convert_output_format_raw(const char *format, const char *str, ...)
 {
 static unsigned char buffer[MAX_RECURSE*BIG_BUFFER_SIZE+1];
 char buffer2[3*BIG_BUFFER_SIZE+1];
@@ -4344,7 +4344,7 @@
 int old_who_level = who_level;
 int bold = 0;
 extern int in_chelp;
-/*va_list args;*/
+va_list args;
 int arg_flags;
 char color_mod[] = "kbgcrmywKBGCRMYWn"; 
 
@@ -4362,7 +4362,7 @@
 	{
 
 		p = (char *)str;
-/*		va_start(args, str);*/
+		va_start(args, str);
 		while(p && *p)
 		{
 			if (*p == '%')
@@ -4433,7 +4433,7 @@
 				p++;
 			}
 		}
-/*		va_end(args);*/
+		va_end(args);
 	} 
 	else if (str)
 		strcpy(buffer2, str);

Line 1 Link Here

(-)/usr/home/cj/ports/bitchx/pkg/COMMENT (-1 / +1 lines)
1	An alternative ircII color client	1	BitchX IRC client

Lines 1-3 Link Here

(-)/usr/home/cj/ports/bitchx/pkg/DESCR (-3 / +7 lines)
1	BitchX is an enhanced ircII client. It includes many built-in features	1	BitchX is an IRC (Internet Relay Chat) client by Colten Edwards aka
2	normally found only in scripts. Including, full ANSI color, userlists,	2	panasync@efnet, it is based on it's predecessors ircII and EPIC.
3	flood protection, and built CDCC (XDCC) file offering.	3	BitchX was originally started as a script by Trench and HappyCrappy
		4	for the popular UNIX IRC client ircII. Around Christmas of 1994 the
		5	script was patched directly into the client by panasync.
		6
		7	WWW: http://www.bitchx.com




share/bx/BitchX.help
share/bx/BitchX.quit
share/bx/BitchX.reasons
share/bx/BitchX.ircnames
share/bx/script/actplug.gmz
share/bx/script/bxtcl.tcl
share/bx/script/file.tcl
share/bx/script/fserve+vfs.tar.gz
share/bx/script/menu.bx
share/bx/script/bxglobal
share/bx/script/bxglobal.orig
share/bx/plugins/BitchX.hints
share/bx/plugins/acro.so
share/bx/plugins/amp.so
share/bx/plugins/autobot.so
share/bx/plugins/blowfish.so
share/bx/plugins/encrypt.so
share/bx/plugins/fserv.so
share/bx/plugins/hint.so
share/bx/plugins/nap.so
share/bx/plugins/pkga.so
share/bx/plugins/possum.so
share/bx/plugins/qmail.so
share/bx/plugins/scan.so
share/bx/plugins/wavplay.so
share/bx/translation/ASCII
share/bx/translation/CP437
share/bx/translation/CP850
share/bx/translation/DANISH
share/bx/translation/DEC_MCS
share/bx/translation/DG_MCS
share/bx/translation/DUTCH
share/bx/translation/FINNISH
share/bx/translation/FRENCH
share/bx/translation/FRENCH_CANADIAN
share/bx/translation/GERMAN
share/bx/translation/HP_MCS
share/bx/translation/IRV
share/bx/translation/ITALIAN
share/bx/translation/JIS
share/bx/translation/MACINTOSH
share/bx/translation/NEXT
share/bx/translation/NORWEGIAN_1
share/bx/translation/NORWEGIAN_2
share/bx/translation/POLISH
share/bx/translation/POLISH_NOPL
share/bx/translation/PORTUGUESE
share/bx/translation/PORTUGUESE_COM
share/bx/translation/RUSSIAN
share/bx/translation/RUSSIAN_ALT
share/bx/translation/RUSSIAN_WIN
share/bx/translation/SPANISH
share/bx/translation/SWEDISH
share/bx/translation/SWEDISH_NAMES
share/bx/translation/SWEDISH_NAMES_COM
share/bx/translation/SWISS
share/bx/translation/UNITED_KINGDOM
share/bx/translation/UNITED_KINGDOM_COM
bin/gtkBitchX
share/bx/plugins/nicklist.so
@dirrm share/bx/translation
@dirrm share/bx/script
@dirrm share/bx/plugins
@dirrm share/bx

Return to bug 16041

Lines 1-36 Link Here

(-)/usr/home/cj/ports/bitchx/Makefile (-18 / +44 lines)
1	# New ports collection makefile for: BitchX ircII client	1	# New ports collection makefile for: BitchX ircII client
2	# Version required: 75p3	2	# Version required: 1.0c15
3	# Date created: 26 Jan 1998	3	# Date created: 26 Jan 1998
4	# Whom: griffin	4	# Whom: griffin
5	#	5	#
6	# $FreeBSD: ports/irc/bitchx/Makefile,v 1.7 1999/08/25 06:12:35 obrien Exp $	6	# $FreeBSD$
7	#	7	#
8		8
9	DISTNAME= ircii-pana-75p3	9	DISTNAME= BitchX-1.0c15
10	PKGNAME= bitchx-75p3
11	CATEGORIES= irc	10	CATEGORIES= irc
12	MASTER_SITES= ftp://ftp.bitchx.org/pub/BitchX/source/ \	11	MASTER_SITES= ftp://ftp.bitchx.com/pub/ \
13	ftp://ftp.buk.net/pub/software/bitchx/source/	12	ftp://bitchx.dimension6.com/pub/
14		13
15	MAINTAINER= griffin@blackhole.iceworld.org	14	MAINTAINER= griffin@blackhole.iceworld.org
16		15
17	GNU_CONFIGURE= yes	16	.if defined(GUI)
		17	LIB_DEPENDS+= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
		18	esd.2:${PORTSDIR}/audio/esound \
		19	Imlib.5:${PORTSDIR}/graphics/imlib \
		20	gnome.3:${PORTSDIR}/x11/gnomelibs
		21	.endif
18		22
		23	GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
		24	GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
19	WRKSRC= ${WRKDIR}/BitchX	25	WRKSRC= ${WRKDIR}/BitchX
20		26
21	MAN1= BitchX.1	27	GNU_CONFIGURE= yes
22	MANCOMPRESSED= yes	28	USE_GMAKE= yes
23		29
24	post-patch:	30	.if defined(GUI)
25	@${SED} -e s,__PREFIX__,$(PREFIX), $(WRKSRC)/include/config.h > $(WRKSRC)/include/config.h.new	31	CONFIGURE_ARGS+= --with-gtk --enable-sound --with-plugins
26	@${MV} $(WRKSRC)/include/config.h.new $(WRKSRC)/include/config.h	32	.else
		33	CONFIGURE_ARGS+= --with-plugins
		34	.endif
		35
		36	CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" \
		37	GTK_CONFIG="${GTK_CONFIG}"
		38
		39	pre-configure:
		40	@${ECHO_MSG} "***************************************"
		41	@${ECHO_MSG} " To compile with GTK type make GUI=yes"
		42	@${ECHO_MSG} "***************************************"
		43	.if defined(GUI)
		44	${CP} ${FILESDIR}/plist.common ${PKGDIR}/PLIST
		45	${ECHO} bin/gtkBitchX >> ${PKGDIR}/PLIST
		46	${ECHO} share/bx/plugins/nicklist.so >> ${PKGDIR}/PLIST
		47	.else
		48	${CP} ${FILESDIR}/plist.common ${PKGDIR}/PLIST
		49	${ECHO} bin/BitchX >> ${PKGDIR}/PLIST
		50	${ECHO} bin/scr-bx >> ${PKGDIR}/PLIST
		51	${ECHO} share/bx/wserv >> ${PKGDIR}/PLIST
		52	.endif
		53	${ECHO} @dirrm share/bx/translation >> ${PKGDIR}/PLIST
		54	${ECHO} @dirrm share/bx/script >> ${PKGDIR}/PLIST
		55	${ECHO} @dirrm share/bx/plugins >> ${PKGDIR}/PLIST
		56	${ECHO} @dirrm share/bx >> ${PKGDIR}/PLIST
27		57
28	do-install:	58	do-install:
29	${MKDIR} ${PREFIX}/lib/bx	59	cd ${WRKSRC} && make INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
30	${INSTALL_PROGRAM} ${WRKSRC}/source/BitchX ${PREFIX}/bin	60	INSTALL_DATA="${INSTALL_DATA}" install
31	${INSTALL_PROGRAM} ${WRKSRC}/source/scr-bx ${PREFIX}/bin
32	${INSTALL_PROGRAM} ${WRKSRC}/source/wserv ${PREFIX}/bin
33	${INSTALL_DATA} ${WRKSRC}/BitchX.help ${PREFIX}/lib/bx
34	${INSTALL_MAN} ${WRKSRC}/BitchX.1.gz ${PREFIX}/man/man1
35		61
36	.include <bsd.port.mk>	62	.include <bsd.port.mk>

Line 0 Link Here

(-)/usr/home/cj/ports/bitchx/files/plist.common (+58 lines)
	1	share/bx/BitchX.help
	2	share/bx/BitchX.quit
	3	share/bx/BitchX.reasons
	4	share/bx/BitchX.ircnames
	5	share/bx/script/actplug.gmz
	6	share/bx/script/bxtcl.tcl
	7	share/bx/script/file.tcl
	8	share/bx/script/fserve+vfs.tar.gz
	9	share/bx/script/menu.bx
	10	share/bx/script/bxglobal
	11	share/bx/script/bxglobal.orig
	12	share/bx/plugins/BitchX.hints
	13	share/bx/plugins/acro.so
	14	share/bx/plugins/amp.so
	15	share/bx/plugins/autobot.so
	16	share/bx/plugins/blowfish.so
	17	share/bx/plugins/encrypt.so
	18	share/bx/plugins/fserv.so
	19	share/bx/plugins/hint.so
	20	share/bx/plugins/nap.so
	21	share/bx/plugins/pkga.so
	22	share/bx/plugins/possum.so
	23	share/bx/plugins/qmail.so
	24	share/bx/plugins/scan.so
	25	share/bx/plugins/wavplay.so
	26	share/bx/translation/ASCII
	27	share/bx/translation/CP437
	28	share/bx/translation/CP850
	29	share/bx/translation/DANISH
	30	share/bx/translation/DEC_MCS
	31	share/bx/translation/DG_MCS
	32	share/bx/translation/DUTCH
	33	share/bx/translation/FINNISH
	34	share/bx/translation/FRENCH
	35	share/bx/translation/FRENCH_CANADIAN
	36	share/bx/translation/GERMAN
	37	share/bx/translation/HP_MCS
	38	share/bx/translation/IRV
	39	share/bx/translation/ITALIAN
	40	share/bx/translation/JIS
	41	share/bx/translation/MACINTOSH
	42	share/bx/translation/NEXT
	43	share/bx/translation/NORWEGIAN_1
	44	share/bx/translation/NORWEGIAN_2
	45	share/bx/translation/POLISH
	46	share/bx/translation/POLISH_NOPL
	47	share/bx/translation/PORTUGUESE
	48	share/bx/translation/PORTUGUESE_COM
	49	share/bx/translation/RUSSIAN
	50	share/bx/translation/RUSSIAN_ALT
	51	share/bx/translation/RUSSIAN_WIN
	52	share/bx/translation/SPANISH
	53	share/bx/translation/SWEDISH
	54	share/bx/translation/SWEDISH_NAMES
	55	share/bx/translation/SWEDISH_NAMES_COM
	56	share/bx/translation/SWISS
	57	share/bx/translation/UNITED_KINGDOM
	58	share/bx/translation/UNITED_KINGDOM_COM

Lines 1-9 Link Here

(-)/usr/home/cj/ports/bitchx/patches/patch-aa (-8 / +12 lines)
1	--- include/config.h.orig Sun Apr 11 00:40:33 1999	1	--- source/irc.c.old Thu Jan 6 14:03:02 2000
2	+++ include/config.h Sun Apr 11 00:42:28 1999	2	+++ source/irc.c Thu Jan 6 14:03:31 2000
3	@@ -188,7 +188,7 @@	3	@@ -53,6 +53,10 @@
4	* translation tables from ircII for this to work. Also enable /set TRANSLATE	4	#include <signame.h>
5	*/	5	#endif
6
7	-#define TRANSLATION_PATH "/usr/local/lib/bx/translation"
8	+#define TRANSLATION_PATH "__PREFIX__/lib/bx/translation"
9		6
		7	+#ifdef GTK
		8	+extern int gtkipcin[2];
		9	+#endif
		10	+
		11	#ifndef VERSION
		12	const char irc_version[] = "BitchX-1.0c15";
		13	#else

Line 0 Link Here

(-)/usr/home/cj/ports/bitchx/patches/patch-ab (+59 lines)
	1	--- source/gtkbitchx.c.old Thu Jan 6 14:03:02 2000
	2	+++ source/gtkbitchx.c Thu Jan 6 14:03:38 2000
	3	@@ -1765,10 +1765,10 @@
	4
	5	void gui_init(void)
	6	{
	7	- TI_cols = 80;
	8	- TI_lines = 25;
	9	- li = TI_lines;
	10	- co = TI_cols;
	11	+ current_term->TI_cols = 80;
	12	+ current_term->TI_lines = 25;
	13	+ li = current_term->TI_lines;
	14	+ co = current_term->TI_cols;
	15
	16	pthread_mutex_init(&evmutex, NULL);
	17	pthread_cond_init(&evcond, NULL);
	18	@@ -1936,7 +1936,7 @@
	19	/* This section is for portability considerations */
	20	void gui_clreol(void)
	21	{
	22	- gtkprintf(TI_el);
	23	+ gtkprintf(current_term->TI_el);
	24	}
	25
	26	void gui_gotoxy(int col, int row)
	27	@@ -1984,27 +1984,27 @@
	28	else
	29	rn = n;
	30
	31	- if (TI_csr && (TI_ri \|\| TI_rin) && (TI_ind \|\| TI_indn))
	32	+ if (current_term->TI_csr && (current_term->TI_ri \|\| current_term->TI_rin) && (current_term->TI_ind \|\| current_term->TI_indn))
	33	{
	34	/*
	35	* Previously there was a test to see if the entire scrolling
	36	* region was the full screen. That test always fails,
	37	* because we never scroll the bottom line of the screen.
	38	*/
	39	- strcpy(start, (char *)tparm(TI_csr, top, bot));
	40	- strcpy(final, (char *)tparm(TI_csr, 0, TI_lines-1));
	41	+ strcpy(start, (char *)tparm(current_term->TI_csr, top, bot));
	42	+ strcpy(final, (char *)tparm(current_term->TI_csr, 0, current_term->TI_lines-1));
	43
	44	if (n > 0)
	45	{
	46	sr = bot;
	47	er = top;
	48	- strcpy(thing, TI_ind);
	49	+ strcpy(thing, current_term->TI_ind);
	50	}
	51	else
	52	{
	53	sr = top;
	54	er = bot;
	55	- strcpy (thing, TI_ri);
	56	+ strcpy (thing, current_term->TI_ri);
	57	}
	58	}
	59

Line 0 Link Here

(-)/usr/home/cj/ports/bitchx/patches/patch-ac (+75 lines)
		1	*** Makefile.in.bak Mon Jan 10 15:11:55 2000
		2	--- Makefile.in Mon Jan 10 15:10:51 2000
		3	***************
		4	* 42,48 **
		5	# Where the BitchX library will be. Generally this is the place that
		6	# you put the scripts, help pages and translation tables. It is
		7	# very important that you set this correctly.
		8	! IRCLIB = @IRCLIB@
		9
		10	CC = @CC@
		11	DEFS = -I../include
		12	--- 42,48 ----
		13	# Where the BitchX library will be. Generally this is the place that
		14	# you put the scripts, help pages and translation tables. It is
		15	# very important that you set this correctly.
		16	! IRCLIB = /usr/local/share/bx/
		17
		18	CC = @CC@
		19	DEFS = -I../include
		20	***************
		21	* 74,83 **
		22	## You probably don't need to change anything below this line
		23
		24	# Full path of the directory for BitchX help files.
		25	! HELPDIR = @HELPDIR@
		26
		27	# Full path of the directory for the BitchX scripts.
		28	! INSTALL_SCRIPT = @INSTALL_SCRIPT@
		29
		30	# Default setting for IRCPATH where BitchX will look for
		31	# its script files if the environment variable is undefined.
		32	--- 74,83 ----
		33	## You probably don't need to change anything below this line
		34
		35	# Full path of the directory for BitchX help files.
		36	! # HELPDIR = /usr/local/share/bx
		37
		38	# Full path of the directory for the BitchX scripts.
		39	! INSTALL_SCRIPT = /usr/local/share/bx/script
		40
		41	# Default setting for IRCPATH where BitchX will look for
		42	# its script files if the environment variable is undefined.
		43	***************
		44	* 85,99 **
		45	# the Makefile, but it can contain multiple path elements
		46	# separated by colons. The path MUST lead to an existing directory,
		47	# because the 'global' script is expected to be found there.
		48	! IRCPATH = @IRCPATH@
		49
		50	# Path for TRANSLATION variable.
		51	! TRANSLATION_PATH=@TRANSLATION_PATH@
		52
		53	# This command will be used to install the BitchX help files. If you don't
		54	# want to install them, replace with the following:
		55	! # INSTALL_HELP_CMD = @echo The help files have not been installed.
		56	! INSTALL_HELP_CMD = @INSTALL_HELP_CMD@
		57
		58	# This program allows you to use screen/xterm's to put new BitchX windows
		59	# on new screen/xterm windows.
		60	--- 85,99 ----
		61	# the Makefile, but it can contain multiple path elements
		62	# separated by colons. The path MUST lead to an existing directory,
		63	# because the 'global' script is expected to be found there.
		64	! IRCPATH = /usr/local/share/bx/script
65
66	# Path for TRANSLATION variable.
67	! TRANSLATION_PATH=/usr/local/share/bx/translation
68
69	# This command will be used to install the BitchX help files. If you don't
70	# want to install them, replace with the following:
71	! INSTALL_HELP_CMD = @echo The help files have not been installed.
72	! # INSTALL_HELP_CMD = @INSTALL_HELP_CMD@
73
74	# This program allows you to use screen/xterm's to put new BitchX windows
75	# on new screen/xterm windows.

Lines 1-13 Link Here

(-)/usr/home/cj/ports/bitchx/patches/patch-ad (-13 / +9 lines)
1	--- include/color.h.orig Sun Apr 11 01:40:51 1999	1	*** script/bxglobal.old Mon Jan 10 19:20:27 2000
2	+++ include/color.h Sun Apr 11 01:41:11 1999	2	--- script/bxglobal Mon Jan 10 19:25:50 2000
3	@@ -707,8 +707,8 @@	3	***************
4		4	* 2,4 **
5	#define DEFAULT_FORMAT_NICK_MSG_FSET "$0 $1 $2-"	5	--- 2,5 ----
6		6	^load menu.bx
7	-#define DEFAULT_FORMAT_NICK_COMP_FSET "$0\002:\002$1-"	7	^loaddll nicklist
8	-#define DEFAULT_FORMAT_NICK_AUTO_FSET "$0\002:\002$1-"	8	}
9	+#define DEFAULT_FORMAT_NICK_COMP_FSET "$0:$1-"	9	+ set LOAD_PATH ~/.BitchX:~/.BitchX/plugins:.:/usr/local/share/bx/plugins:/usr/local/share/bx/script:/usr/local/share/bx/translation:/usr/local/share/bx
10	+#define DEFAULT_FORMAT_NICK_AUTO_FSET "$0:$1-"
11
12	#define DEFAULT_FORMAT_STATUS_FSET "%4%W$0-"
13	#define DEFAULT_FORMAT_STATUS1_FSET "%4%W$0-"

Lines 1-38 Link Here

(-)/usr/home/cj/ports/bitchx/patches.alpha/patch-ae (-38 lines)
1	--- source/misc.c.orig Sat Sep 18 17:41:15 1999
2	+++ source/misc.c Sat Sep 18 17:46:53 1999
3	@@ -4332,7 +4332,7 @@
4	#define MAX_RECURSE 5
5	#define RECURSE_CPARSE
6
7	-char convert_output_format_raw(const char format, const char *str, va_list args)
8	+char convert_output_format_raw(const char format, const char *str, ...)
9	{
10	static unsigned char buffer[MAX_RECURSE*BIG_BUFFER_SIZE+1];
11	char buffer2[3*BIG_BUFFER_SIZE+1];
12	@@ -4344,7 +4344,7 @@
13	int old_who_level = who_level;
14	int bold = 0;
15	extern int in_chelp;
16	-/va_list args;/
17	+va_list args;
18	int arg_flags;
19	char color_mod[] = "kbgcrmywKBGCRMYWn";
20
21	@@ -4362,7 +4362,7 @@
22	{
23
24	p = (char *)str;
25	-/* va_start(args, str);*/
26	+ va_start(args, str);
27	while(p && *p)
28	{
29	if (*p == '%')
30	@@ -4433,7 +4433,7 @@
31	p++;
32	}
33	}
34	-/* va_end(args);*/
35	+ va_end(args);
36	}
37	else if (str)
38	strcpy(buffer2, str);

Lines 1-5 Link Here

(-)/usr/home/cj/ports/bitchx/pkg/PLIST (-5 / +64 lines)
1	bin/BitchX	1	share/bx/BitchX.help
2	bin/scr-bx	2	share/bx/BitchX.quit
3	bin/wserv	3	share/bx/BitchX.reasons
4	lib/bx/BitchX.help	4	share/bx/BitchX.ircnames
5	@dirrm lib/bx	5	share/bx/script/actplug.gmz
		6	share/bx/script/bxtcl.tcl
		7	share/bx/script/file.tcl
		8	share/bx/script/fserve+vfs.tar.gz
		9	share/bx/script/menu.bx
		10	share/bx/script/bxglobal
		11	share/bx/script/bxglobal.orig
		12	share/bx/plugins/BitchX.hints
		13	share/bx/plugins/acro.so
		14	share/bx/plugins/amp.so
		15	share/bx/plugins/autobot.so
		16	share/bx/plugins/blowfish.so
		17	share/bx/plugins/encrypt.so
		18	share/bx/plugins/fserv.so
		19	share/bx/plugins/hint.so
		20	share/bx/plugins/nap.so
		21	share/bx/plugins/pkga.so
		22	share/bx/plugins/possum.so
		23	share/bx/plugins/qmail.so
		24	share/bx/plugins/scan.so
		25	share/bx/plugins/wavplay.so
		26	share/bx/translation/ASCII
		27	share/bx/translation/CP437
		28	share/bx/translation/CP850
		29	share/bx/translation/DANISH
		30	share/bx/translation/DEC_MCS
		31	share/bx/translation/DG_MCS
		32	share/bx/translation/DUTCH
		33	share/bx/translation/FINNISH
		34	share/bx/translation/FRENCH
		35	share/bx/translation/FRENCH_CANADIAN
		36	share/bx/translation/GERMAN
		37	share/bx/translation/HP_MCS
		38	share/bx/translation/IRV
		39	share/bx/translation/ITALIAN
		40	share/bx/translation/JIS
		41	share/bx/translation/MACINTOSH
		42	share/bx/translation/NEXT
		43	share/bx/translation/NORWEGIAN_1
		44	share/bx/translation/NORWEGIAN_2
		45	share/bx/translation/POLISH
		46	share/bx/translation/POLISH_NOPL
		47	share/bx/translation/PORTUGUESE
		48	share/bx/translation/PORTUGUESE_COM
		49	share/bx/translation/RUSSIAN
		50	share/bx/translation/RUSSIAN_ALT
		51	share/bx/translation/RUSSIAN_WIN
		52	share/bx/translation/SPANISH
		53	share/bx/translation/SWEDISH
		54	share/bx/translation/SWEDISH_NAMES
		55	share/bx/translation/SWEDISH_NAMES_COM
		56	share/bx/translation/SWISS
		57	share/bx/translation/UNITED_KINGDOM
		58	share/bx/translation/UNITED_KINGDOM_COM
		59	bin/gtkBitchX
		60	share/bx/plugins/nicklist.so
		61	@dirrm share/bx/translation
		62	@dirrm share/bx/script
		63	@dirrm share/bx/plugins
		64	@dirrm share/bx