Date: Tue, 11 Jan 2000 17:27:52 +0100 (CET) From: calle.madestrand@norrgarden.se To: FreeBSD-gnats-submit@freebsd.org Subject: ports/16066: BitchX IRC client port Message-ID: <200001111627.RAA14165@norrgarden1.norrgarden.se>
next in thread | raw e-mail | index | archive | help
>Number: 16066
>Category: ports
>Synopsis: BitchX IRC client port
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Jan 11 08:30:01 PST 2000
>Closed-Date:
>Last-Modified:
>Originator: Carl Johan Madestrand
>Release: FreeBSD 3.4-STABLE i386
>Organization:
>Environment:
>Description:
This port now uses ${TMPPLIST} instead.
Files to be added and removed:
add /usr/ports/irc/bitchx/patches/patch-ab
add /usr/ports/irc/bitchx/patches/patch-ac
remove /usr/ports/irc/bitchx/patches.alpha
>How-To-Repeat:
>Fix:
diff -ruN /usr/ports/irc/bitchx/Makefile /usr/home/cj/ports/bitchx/Makefile
--- /usr/ports/irc/bitchx/Makefile Wed Aug 25 08:12:35 1999
+++ /usr/home/cj/ports/bitchx/Makefile Tue Jan 11 16:31:30 2000
@@ -1,36 +1,61 @@
# New ports collection makefile for: BitchX ircII client
-# Version required: 75p3
+# Version required: 1.0c15
# Date created: 26 Jan 1998
# Whom: griffin
#
-# $FreeBSD: ports/irc/bitchx/Makefile,v 1.7 1999/08/25 06:12:35 obrien Exp $
+# $FreeBSD$
#
-DISTNAME= ircii-pana-75p3
-PKGNAME= bitchx-75p3
+DISTNAME= BitchX-1.0c15
CATEGORIES= irc
-MASTER_SITES= ftp://ftp.bitchx.org/pub/BitchX/source/ \
- ftp://ftp.buk.net/pub/software/bitchx/source/
+MASTER_SITES= ftp://ftp.bitchx.com/pub/ \
+ ftp://bitchx.dimension6.com/pub/
MAINTAINER= griffin@blackhole.iceworld.org
-GNU_CONFIGURE= yes
+.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
-MAN1= BitchX.1
-MANCOMPRESSED= yes
-
-post-patch:
- @${SED} -e s,__PREFIX__,$(PREFIX), $(WRKSRC)/include/config.h > $(WRKSRC)/include/config.h.new
- @${MV} $(WRKSRC)/include/config.h.new $(WRKSRC)/include/config.h
+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} "***************************************"
do-install:
- ${MKDIR} ${PREFIX}/lib/bx
- ${INSTALL_PROGRAM} ${WRKSRC}/source/BitchX ${PREFIX}/bin
- ${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
+ cd ${WRKSRC} && make INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
+ INSTALL_DATA="${INSTALL_DATA}" install
+post-install:
+
+.if defined(GUI)
+ ${ECHO} bin/gtkBitchX >> ${TMPPLIST}
+ ${ECHO} share/bx/plugins/nicklist.so >> ${TMPPLIST}
+.else
+ ${ECHO} bin/BitchX >> ${TMPPLIST}
+ ${ECHO} bin/scr-bx >> ${TMPPLIST}
+ ${ECHO} share/bx/wserv >> ${TMPPLIST}
+.endif
+ ${ECHO} @dirrm share/bx/translation >> ${TMPPLIST}
+ ${ECHO} @dirrm share/bx/script >> ${TMPPLIST}
+ ${ECHO} @dirrm share/bx/plugins >> ${TMPPLIST}
+ ${ECHO} @dirrm share/bx >> ${TMPPLIST}
.include <bsd.port.mk>
diff -ruN /usr/ports/irc/bitchx/files/md5 /usr/home/cj/ports/bitchx/files/md5
--- /usr/ports/irc/bitchx/files/md5 Mon Apr 12 01:40:04 1999
+++ /usr/home/cj/ports/bitchx/files/md5 Fri Jan 7 01:55:17 2000
@@ -1 +1 @@
-MD5 (ircii-pana-75p3.tar.gz) = c8365cc2b7aa187c7857cbf0483fd254
+MD5 (BitchX-1.0c15.tar.gz) = 5048fd8d6b64302df5b52511e0acc19a
diff -ruN /usr/ports/irc/bitchx/patches/patch-aa /usr/home/cj/ports/bitchx/patches/patch-aa
--- /usr/ports/irc/bitchx/patches/patch-aa Tue Oct 5 18:03:03 1999
+++ /usr/home/cj/ports/bitchx/patches/patch-aa Thu Jan 6 22:07:22 2000
@@ -1,9 +1,13 @@
---- include/config.h.orig Sun Apr 11 00:40:33 1999
-+++ include/config.h Sun Apr 11 00:42:28 1999
-@@ -188,7 +188,7 @@
- * translation tables from ircII for this to work. Also enable /set TRANSLATE
- */
-
--#define TRANSLATION_PATH "/usr/local/lib/bx/translation"
-+#define TRANSLATION_PATH "__PREFIX__/lib/bx/translation"
+--- 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
++#ifdef GTK
++extern int gtkipcin[2];
++#endif
++
+ #ifndef VERSION
+ const char irc_version[] = "BitchX-1.0c15";
+ #else
diff -ruN /usr/ports/irc/bitchx/patches/patch-ab /usr/home/cj/ports/bitchx/patches/patch-ab
--- /usr/ports/irc/bitchx/patches/patch-ab Thu Jan 1 01:00:00 1970
+++ /usr/home/cj/ports/bitchx/patches/patch-ab Thu Jan 6 22:07:22 2000
@@ -0,0 +1,59 @@
+--- 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);
+ }
+ }
+
diff -ruN /usr/ports/irc/bitchx/patches/patch-ac /usr/home/cj/ports/bitchx/patches/patch-ac
--- /usr/ports/irc/bitchx/patches/patch-ac Thu Jan 1 01:00:00 1970
+++ /usr/home/cj/ports/bitchx/patches/patch-ac Mon Jan 10 19:19:46 2000
@@ -0,0 +1,75 @@
+*** 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.
diff -ruN /usr/ports/irc/bitchx/patches/patch-ad /usr/home/cj/ports/bitchx/patches/patch-ad
--- /usr/ports/irc/bitchx/patches/patch-ad Mon Apr 12 01:40:04 1999
+++ /usr/home/cj/ports/bitchx/patches/patch-ad Mon Jan 10 19:28:56 2000
@@ -1,13 +1,9 @@
---- include/color.h.orig Sun Apr 11 01:40:51 1999
-+++ include/color.h Sun Apr 11 01:41:11 1999
-@@ -707,8 +707,8 @@
-
- #define DEFAULT_FORMAT_NICK_MSG_FSET "$0 $1 $2-"
-
--#define DEFAULT_FORMAT_NICK_COMP_FSET "$0\002:\002$1-"
--#define DEFAULT_FORMAT_NICK_AUTO_FSET "$0\002:\002$1-"
-+#define DEFAULT_FORMAT_NICK_COMP_FSET "$0:$1-"
-+#define DEFAULT_FORMAT_NICK_AUTO_FSET "$0:$1-"
-
- #define DEFAULT_FORMAT_STATUS_FSET "%4%W$0-"
- #define DEFAULT_FORMAT_STATUS1_FSET "%4%W$0-"
+*** 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
diff -ruN /usr/ports/irc/bitchx/patches.alpha/patch-ae /usr/home/cj/ports/bitchx/patches.alpha/patch-ae
--- /usr/ports/irc/bitchx/patches.alpha/patch-ae Tue Oct 19 10:37:27 1999
+++ /usr/home/cj/ports/bitchx/patches.alpha/patch-ae Thu Jan 1 01:00:00 1970
@@ -1,38 +0,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);
diff -ruN /usr/ports/irc/bitchx/pkg/COMMENT /usr/home/cj/ports/bitchx/pkg/COMMENT
--- /usr/ports/irc/bitchx/pkg/COMMENT Sat Jun 26 20:55:04 1999
+++ /usr/home/cj/ports/bitchx/pkg/COMMENT Thu Jan 6 22:07:22 2000
@@ -1 +1 @@
-An alternative ircII color client
+BitchX IRC client
diff -ruN /usr/ports/irc/bitchx/pkg/DESCR /usr/home/cj/ports/bitchx/pkg/DESCR
--- /usr/ports/irc/bitchx/pkg/DESCR Sat Apr 18 04:04:44 1998
+++ /usr/home/cj/ports/bitchx/pkg/DESCR Fri Jan 7 15:37:29 2000
@@ -1,3 +1,7 @@
-BitchX is an enhanced ircII client. It includes many built-in features
-normally found only in scripts. Including, full ANSI color, userlists,
-flood protection, and built CDCC (XDCC) file offering.
+BitchX is an IRC (Internet Relay Chat) client by Colten Edwards aka
+panasync@efnet, it is based on it's predecessors ircII and EPIC.
+BitchX was originally started as a script by Trench and HappyCrappy
+for the popular UNIX IRC client ircII. Around Christmas of 1994 the
+script was patched directly into the client by panasync.
+
+WWW: http://www.bitchx.com
diff -ruN /usr/ports/irc/bitchx/pkg/PLIST /usr/home/cj/ports/bitchx/pkg/PLIST
--- /usr/ports/irc/bitchx/pkg/PLIST Mon Apr 12 01:40:04 1999
+++ /usr/home/cj/ports/bitchx/pkg/PLIST Tue Jan 11 16:27:42 2000
@@ -1,5 +1,58 @@
-bin/BitchX
-bin/scr-bx
-bin/wserv
-lib/bx/BitchX.help
-@dirrm lib/bx
+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
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200001111627.RAA14165>