Attachment #128428 for bug #172295

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




@unexec if [ -f %D/share/bx/script/bxglobal.old ]; then rm -f %D/share/bx/script/bxglobal.old; fi
%%NOGNOME%%bin/BitchX
%%NOGNOME%%bin/BitchX-1.1-final
%%GNOME%%bin/gtkBitchX
%%GNOME%%bin/gtkBitchX-1.1-final
%%NOGNOME%%bin/scr-bx
share/bx/BitchX.help
share/bx/BitchX.ircnames

%%PLUGINS%%share/bx/plugins/pkga.so
%%PLUGINS%%share/bx/plugins/possum.so
%%PLUGINS%%share/bx/plugins/qmail.so
%%PLUGINS%%share/bx/plugins/scan.so
%%PLUGINS%%share/bx/plugins/wavplay.so
%%PLUGINS%%share/bx/plugins/qbx.so
%%PLUGINS%%share/bx/plugins/arcfour.so
%%PLUGINS%%share/bx/plugins/autocycle.so
%%PLUGINS%%share/bx/plugins/aim.so
%%PLUGINS%%share/bx/plugins/cavlink.so
%%PLUGINS%%share/bx/plugins/cdrom.so
%%PLUGINS%%share/bx/plugins/nap.so
%%PLUGINS%%share/bx/plugins/nicklist.so
%%XMMS%%share/bx/plugins/xmms.so
share/bx/plugins/.placeholder
share/bx/script/SCRIPTS
share/bx/script/actplug.gmz
share/bx/script/bxglobal

@dirrm share/bx/translation
@dirrm share/bx/script
@dirrm share/bx/plugins
@dirrm share/bx




# Created by: Jimbo Bahooli <griffin@blackhole.iceworld.org>
# $FreeBSD$
#

PORTNAME=	BitchX
PORTVERSION=	1.1.0.1
PORTREVISION=	4
PORTEPOCH=	1
CATEGORIES+=	irc
MASTER_SITES=	SF/bitchx/ircii-pana/ircii-pana-1.1
DISTNAME=	ircii-pana-1.1-final

MAINTAINER?=	c.petrik.sosa@gmail.com
COMMENT?=	Feature-rich scriptable IRC client

WRKSRC=		${WRKDIR}/BitchX
USE_PERL5=	yes
GH_PROJECT=	${PORTNAME}1.2
GH_TAGNAME=	master
GH_COMMIT=	a22b86f

GNU_CONFIGURE=	yes
WANT_GNOME=	yes
CONFIGURE_ARGS=	--libdir="${PREFIX}/share"
USE_GMAKE=	yes
USE_PERL5=	yes
WANT_GNOME=	yes
DOCSDIR=	${PREFIX}/share/bx/help
PORTDOCS=	*
CONFIGURE_ARGS+=--exec-prefix="${PREFIX}/share" \
		--bindir="${PREFIX}/bin" \
		--datadir="${PREFIX}/share" \
		--libdir="${PREFIX}/share"
CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
CPPFLAGS+=	-I${LOCALBASE}/include

MAN1=		BitchX.1

OPTIONS_DEFINE=	ESOUND GNOME IPV6 LATIN PLUGINS SSL XMMS


.endif

.if ${PORT_OPTIONS:MPLUGINS}
PLUGINS=	abot acro arcfour autocycle blowfish cdrom encrypt scan \
		europa fserv hint nicklist pkga possum qbx qmail wavplay
		qmail wavplay
PLIST_SUB+=	PLUGINS=""
.else
PLIST_SUB+=	PLUGINS="@comment "


post-install:
.if ${PORT_OPTIONS:MGNOME}
	${STRIP_CMD} ${PREFIX}/bin/gtkBitchX-1.1-final
.else
	${STRIP_CMD} ${PREFIX}/bin/BitchX-1.1-final
	${STRIP_CMD} ${PREFIX}/bin/scr-bx
.endif
.if ${PORT_OPTIONS:MDOCS}

	cd ${WRKSRC}/bitchx-docs && ${COPYTREE_SHARE} . ${DOCSDIR}
.endif

# Ensure that `@dirrm share/bx' will be appended last (after PORTDOCS stuff)
add-plist-post:
	@${ECHO_CMD} "@dirrm share/bx" >> ${TMPPLIST}
.if (${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${LINUXBASE} && ${PREFIX} != "/usr")

.endif

.include <bsd.port.post.mk>


Lines 1-2 Link Here

(-)bitchx/distinfo (-2 / +2 lines)
1	SHA256 (BitchX-BitchX1.2-a22b86f.tar.gz) = 78868bf79960fdb3cb716f38a90a084aaf9dfd76498e0c7df252ef1e43ca9a08	1	SHA256 (ircii-pana-1.1-final.tar.gz) = 7464cd75a10f2d117a10cf0184e5d4b9ece44de03a226402c17bdd3f2c7eca57
2	SIZE (BitchX-BitchX1.2-a22b86f.tar.gz) = 2555622	2	SIZE (ircii-pana-1.1-final.tar.gz) = 2532476




--- configure.orig	2003-04-11 05:09:04.000000000 +0400
+++ configure	2009-11-04 07:09:50.000000000 +0300
@@ -11830,100 +11830,27 @@
 echo $ECHO_N "checking whether to enable IPv6 support... $ECHO_C" >&6
 # Check whether --enable-ipv6 or --disable-ipv6 was given.
 if test "${enable_ipv6+set}" = set; then
-  enableval="$enable_ipv6"
-   case "$enableval" in
+  enableval=$enable_ipv6;  case "$enableval" in
     yes)
-      case "$(uname -s)" in
-        Linux)
-          if test -d "/usr/inet6/include"; then
-            CFLAGS="$CFLAGS -I/usr/inet6/include"
-            LIBS="-L/usr/inet6/lib -linet6 $LIBS"
-            echo "$as_me:$LINENO: result: yes (libinet6)" >&5
-echo "${ECHO_T}yes (libinet6)" >&6
+       { $as_echo "$as_me:$LINENO: result: yes (notchecked)" >&5
+$as_echo "yes (notchecked)" >&6; }
 
 cat >>confdefs.h <<\_ACEOF
 #define IPV6 1
 _ACEOF
 
-          else
-            if test -d "/usr/local/v6/lib"; then
-              LIBS="-L/usr/local/v6/lib -linet6 $LIBS"
-              echo "$as_me:$LINENO: result: yes (freebsd+kame)" >&5
-echo "${ECHO_T}yes (freebsd+kame)" >&6
-
-cat >>confdefs.h <<\_ACEOF
-#define IPV6 1
-_ACEOF
-
-            else
-              if test "$cross_compiling" = yes; then
-  { echo "$as_me:$LINENO: WARNING: cross-compiling: assuming no ipv6" >&5
-echo "$as_me: WARNING: cross-compiling: assuming no ipv6" >&2;}
+       ;;
+    *)
+       { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+       ;;
+    esac
 else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-              int main()
-              {
-                 #if !defined(__GLIBC__) || (__GLIBC__ < 2)
-                 #define NO_GLIBC_2 1
-                 #endif
-
-                 if (NO_GLIBC_2)
-                   exit(0);
-                 else
-                   exit(1);
-              }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-   echo "$as_me:$LINENO: result: yes (glibc2)" >&5
-echo "${ECHO_T}yes (glibc2)" >&6
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 
-cat >>confdefs.h <<\_ACEOF
-#define IPV6 1
-_ACEOF
-
-
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-( exit $ac_status )
-echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-            fi
-          fi
-          ;;
-        *)
-          echo "$as_me:$LINENO: result: no (ipv6 support can currently be enabled on Linux only)" >&5
-echo "${ECHO_T}no (ipv6 support can currently be enabled on Linux only)" >&6
-          ;;
-      esac
-      ;;
-    no)
-      echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-      ;;
-  esac
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
 
-fi;
 
 echo "$as_me:$LINENO: checking whether to enable SOCKS support" >&5
 echo $ECHO_N "checking whether to enable SOCKS support... $ECHO_C" >&6
@@ -12609,7 +12536,7 @@
             system="unknown"
         else
           if test -r "/etc/.relid" -a x"`uname -n`" = x"`uname -s`"; then
-            system="MP-RAS-`$AWK '{print }' /etc/.relid'`"
+            system="MP-RAS-`$AWK '{print $3}' /etc/.relid`"
           fi
         fi
       fi
@@ -13877,7 +13804,7 @@
             system="unknown"
         else
           if test -r "/etc/.relid" -a x"`uname -n`" = x"`uname -s`"; then
-            system="MP-RAS-`$AWK '{print }' /etc/.relid'`"
+            system="MP-RAS-`$AWK '{print $3}' /etc/.relid`"
           fi
         fi
       fi

Lines 9-14 Link Here

(-)bitchx/files/patch-aq (+9 lines)
9		9
10	/* if you use cidentd the filename is called .authlie instead of .noident.	10	/* if you use cidentd the filename is called .authlie instead of .noident.
11	* as well some modifications to the format of the file were made. So we	11	* as well some modifications to the format of the file were made. So we
		12	@@ -449,7 +449,7 @@
		13	#define DEFAULT_FTP_GRAB OFF
		14	#define DEFAULT_HTTP_GRAB OFF
		15	#define DEFAULT_HELP_WINDOW OFF
		16	-#define DEFAULT_NICK_COMPLETION ON
		17	+#define DEFAULT_NICK_COMPLETION OFF
		18	#define DEFAULT_NICK_COMPLETION_LEN 2
		19	#define DEFAULT_NICK_COMPLETION_TYPE 0 /* 0 1 2 */
		20	#define DEFAULT_NOTIFY ON
12	@@ -480,9 +480,9 @@	21	@@ -480,9 +480,9 @@
13	#define DEFAULT_AINV 0	22	#define DEFAULT_AINV 0
14	#define DEFAULT_ANNOY_KICK OFF	23	#define DEFAULT_ANNOY_KICK OFF




 
 #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




diff -ru source.orig/ctcp.c source/ctcp.c
--- source.orig/ctcp.c	2003-05-26 23:00:22.000000000 -0800
+++ source/ctcp.c	2008-01-28 07:31:56.000000000 -0900
@@ -176,7 +176,7 @@
 
 /* CDE do ops and unban logging */
 
-static char	*ctcp_type[] =
+char	*ctcp_type[] =
 {
 	"PRIVMSG",
 	"NOTICE"
diff -ru source.orig/term.c source/term.c
--- source.orig/term.c	2003-04-10 17:09:07.000000000 -0800
+++ source/term.c	2008-01-28 07:58:45.000000000 -0900
@@ -92,7 +92,7 @@
 #endif
 
 extern  char    *getenv();
-extern	char	*tparm();
+
 
 /*
  * The old code assumed termcap. termcap is almost always present, but on
diff -ru source.orig/timer.c source/timer.c
--- source.orig/timer.c	2003-04-10 17:09:07.000000000 -0800
+++ source/timer.c	2008-01-28 08:00:29.000000000 -0900
@@ -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;




$OpenBSD: patch-source_server_c,v 1.1 2003/04/16 09:04:24 avsm Exp $
--- source/server.c.orig	Mon Apr 14 23:56:28 2003
+++ source/server.c	Mon Apr 14 23:56:59 2003
@@ -144,7 +144,7 @@ void	close_server (int cs_index, char *m
 			if (x_debug & DEBUG_OUTBOUND)
 				yell("Closing server %d because [%s]",
 					   cs_index, message ? message : empty_string);
-			snprintf(buffer, BIG_BUFFER_SIZE, "QUIT :%s\n", message);
+			snprintf(buffer, sizeof buffer, "QUIT :%s\n", message);
 #ifdef HAVE_SSL
 			if (get_server_ssl(cs_index))
 				SSL_write(server_list[cs_index].ssl_fd, buffer, strlen(buffer));

Line 0 Link Here

(-)bitchx/files/patch-ap (+11 lines)
	1	--- Makefile.in.orig Mon Mar 5 21:30:04 2001
	2	+++ Makefile.in Fri Apr 19 15:09:40 2002
	3	@@ -115,7 +115,7 @@
	4	# This command will be used to install the BitchX help files. If you don't
	5	# want to install them, replace with the following:
	6	# INSTALL_HELP_CMD = @echo The help files have not been installed.
	7	-INSTALL_HELP_CMD = @INSTALL_HELP_CMD@
	8	+INSTALL_HELP_CMD = echo
	9
	10	# This is where the optional plugins will be copied to.
	11	PLUGINDIR = @PLUGINDIR@

Return to bug 172295

Lines 1-8 Link Here

(-)bitchx/pkg-plist (-6 / +5 lines)
1	@unexec if [ -f %D/share/bx/script/bxglobal.old ]; then rm -f %D/share/bx/script/bxglobal.old; fi	1	@unexec if [ -f %D/share/bx/script/bxglobal.old ]; then rm -f %D/share/bx/script/bxglobal.old; fi
2	%%NOGNOME%%bin/BitchX	2	%%NOGNOME%%bin/BitchX
3	%%NOGNOME%%bin/BitchX-1.2c01-svn	3	%%NOGNOME%%bin/BitchX-1.1-final
4	%%GNOME%%bin/gtkBitchX	4	%%GNOME%%bin/gtkBitchX
5	%%GNOME%%bin/gtkBitchX-1.2c01-svn	5	%%GNOME%%bin/gtkBitchX-1.1-final
6	%%NOGNOME%%bin/scr-bx	6	%%NOGNOME%%bin/scr-bx
7	share/bx/BitchX.help	7	share/bx/BitchX.help
8	share/bx/BitchX.ircnames	8	share/bx/BitchX.ircnames
Lines 18-33 Link Here
18	%%PLUGINS%%share/bx/plugins/pkga.so	18	%%PLUGINS%%share/bx/plugins/pkga.so
19	%%PLUGINS%%share/bx/plugins/possum.so	19	%%PLUGINS%%share/bx/plugins/possum.so
20	%%PLUGINS%%share/bx/plugins/qmail.so	20	%%PLUGINS%%share/bx/plugins/qmail.so
		21	%%PLUGINS%%share/bx/plugins/scan.so
21	%%PLUGINS%%share/bx/plugins/wavplay.so	22	%%PLUGINS%%share/bx/plugins/wavplay.so
22	%%PLUGINS%%share/bx/plugins/qbx.so	23	%%PLUGINS%%share/bx/plugins/qbx.so
23	%%PLUGINS%%share/bx/plugins/arcfour.so	24	%%PLUGINS%%share/bx/plugins/arcfour.so
24	%%PLUGINS%%share/bx/plugins/autocycle.so	25	%%PLUGINS%%share/bx/plugins/autocycle.so
25	%%PLUGINS%%share/bx/plugins/aim.so
26	%%PLUGINS%%share/bx/plugins/cavlink.so
27	%%PLUGINS%%share/bx/plugins/cdrom.so	26	%%PLUGINS%%share/bx/plugins/cdrom.so
28	%%PLUGINS%%share/bx/plugins/nap.so
29	%%PLUGINS%%share/bx/plugins/nicklist.so	27	%%PLUGINS%%share/bx/plugins/nicklist.so
30	%%XMMS%%share/bx/plugins/xmms.so	28	%%XMMS%%share/bx/plugins/xmms.so
		29	share/bx/plugins/.placeholder
31	share/bx/script/SCRIPTS	30	share/bx/script/SCRIPTS
32	share/bx/script/actplug.gmz	31	share/bx/script/actplug.gmz
33	share/bx/script/bxglobal	32	share/bx/script/bxglobal
Lines 81-84 Link Here
81	@dirrm share/bx/translation	80	@dirrm share/bx/translation
82	@dirrm share/bx/script	81	@dirrm share/bx/script
83	@dirrm share/bx/plugins	82	@dirrm share/bx/plugins
84	@comment "@dirrm share/bx" must be appended after PORTDOCS stuff, see Makefile	83	@dirrm share/bx

Lines 1-30 Link Here

(-)bitchx/Makefile (-19 / +21 lines)
1	# Created by: Jimbo Bahooli <griffin@blackhole.iceworld.org>	1	# Created by: Jimbo Bahooli <griffin@blackhole.iceworld.org>
2	# $FreeBSD$	2	# $FreeBSD$
		3	#
3		4
4	PORTNAME= BitchX	5	PORTNAME= BitchX
5	PORTVERSION= 1.2	6	PORTVERSION= 1.1.0.1
		7	PORTREVISION= 4
		8	PORTEPOCH= 1
6	CATEGORIES+= irc	9	CATEGORIES+= irc
7	DISTNAME= ${PORTNAME}-${PORTNAME}${PORTVERSION}-${GH_COMMIT}	10	MASTER_SITES= SF/bitchx/ircii-pana/ircii-pana-1.1
		11	DISTNAME= ircii-pana-1.1-final
8		12
9	MAINTAINER?= c.petrik.sosa@gmail.com	13	MAINTAINER?= c.petrik.sosa@gmail.com
10	COMMENT?= Feature-rich scriptable IRC client	14	COMMENT?= Feature-rich scriptable IRC client
11		15
12	USE_GITHUB= yes	16	WRKSRC= ${WRKDIR}/BitchX
13	GH_ACCOUNT= ${PORTNAME}	17	USE_PERL5= yes
14	GH_PROJECT= ${PORTNAME}1.2
15	GH_TAGNAME= master
16	GH_COMMIT= a22b86f
17
18	GNU_CONFIGURE= yes	18	GNU_CONFIGURE= yes
19	CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"	19	WANT_GNOME= yes
20	CONFIGURE_ARGS= --libdir="${PREFIX}/share"
21	USE_GMAKE= yes	20	USE_GMAKE= yes
22	USE_PERL5= yes
23	WANT_GNOME= yes
24	DOCSDIR= ${PREFIX}/share/bx/help	21	DOCSDIR= ${PREFIX}/share/bx/help
25	PORTDOCS= *	22	PORTDOCS= *
		23	CONFIGURE_ARGS+=--exec-prefix="${PREFIX}/share" \
		24	--bindir="${PREFIX}/bin" \
		25	--datadir="${PREFIX}/share" \
		26	--libdir="${PREFIX}/share"
		27	CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
		28	CPPFLAGS+= -I${LOCALBASE}/include
26		29
27	MAN1= ${PORTNAME}.1	30	MAN1= BitchX.1
28		31
29	OPTIONS_DEFINE= ESOUND GNOME IPV6 LATIN PLUGINS SSL XMMS	32	OPTIONS_DEFINE= ESOUND GNOME IPV6 LATIN PLUGINS SSL XMMS
30		33
Lines 64-72 Link Here
64	.endif	67	.endif
65		68
66	.if ${PORT_OPTIONS:MPLUGINS}	69	.if ${PORT_OPTIONS:MPLUGINS}
67	PLUGINS= abot acro aim arcfour autocycle blowfish cavlink cdrom \	70	PLUGINS= abot acro arcfour autocycle blowfish cdrom encrypt scan \
68	encrypt europa fserv hint nap nicklist pkga possum qbx \	71	europa fserv hint nicklist pkga possum qbx qmail wavplay
69	qmail wavplay
70	PLIST_SUB+= PLUGINS=""	72	PLIST_SUB+= PLUGINS=""
71	.else	73	.else
72	PLIST_SUB+= PLUGINS="@comment "	74	PLIST_SUB+= PLUGINS="@comment "
Lines 95-103 Link Here
95		97
96	post-install:	98	post-install:
97	.if ${PORT_OPTIONS:MGNOME}	99	.if ${PORT_OPTIONS:MGNOME}
98	${STRIP_CMD} ${PREFIX}/bin/gtkBitchX	100	${STRIP_CMD} ${PREFIX}/bin/gtkBitchX-1.1-final
99	.else	101	.else
100	${STRIP_CMD} ${PREFIX}/bin/BitchX	102	${STRIP_CMD} ${PREFIX}/bin/BitchX-1.1-final
101	${STRIP_CMD} ${PREFIX}/bin/scr-bx	103	${STRIP_CMD} ${PREFIX}/bin/scr-bx
102	.endif	104	.endif
103	.if ${PORT_OPTIONS:MDOCS}	105	.if ${PORT_OPTIONS:MDOCS}
Lines 105-111 Link Here
105	cd ${WRKSRC}/bitchx-docs && ${COPYTREE_SHARE} . ${DOCSDIR}	107	cd ${WRKSRC}/bitchx-docs && ${COPYTREE_SHARE} . ${DOCSDIR}
106	.endif	108	.endif
107		109
108	# Ensure that `@dirrm share/bx' will be appended last (after PORTDOCS stuff)
109	add-plist-post:	110	add-plist-post:
110	@${ECHO_CMD} "@dirrm share/bx" >> ${TMPPLIST}	111	@${ECHO_CMD} "@dirrm share/bx" >> ${TMPPLIST}
111	.if (${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${LINUXBASE} && ${PREFIX} != "/usr")	112	.if (${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${LINUXBASE} && ${PREFIX} != "/usr")
Lines 115-117 Link Here
115	.endif	116	.endif
116		117
117	.include <bsd.port.post.mk>	118	.include <bsd.port.post.mk>
		119

Line 0 Link Here

(-)bitchx/files/patch-configure (+132 lines)
		1	--- configure.orig 2003-04-11 05:09:04.000000000 +0400
		2	+++ configure 2009-11-04 07:09:50.000000000 +0300
		3	@@ -11830,100 +11830,27 @@
		4	echo $ECHO_N "checking whether to enable IPv6 support... $ECHO_C" >&6
		5	# Check whether --enable-ipv6 or --disable-ipv6 was given.
		6	if test "${enable_ipv6+set}" = set; then
		7	- enableval="$enable_ipv6"
		8	- case "$enableval" in
		9	+ enableval=$enable_ipv6; case "$enableval" in
		10	yes)
		11	- case "$(uname -s)" in
		12	- Linux)
		13	- if test -d "/usr/inet6/include"; then
		14	- CFLAGS="$CFLAGS -I/usr/inet6/include"
		15	- LIBS="-L/usr/inet6/lib -linet6 $LIBS"
		16	- echo "$as_me:$LINENO: result: yes (libinet6)" >&5
		17	-echo "${ECHO_T}yes (libinet6)" >&6
		18	+ { $as_echo "$as_me:$LINENO: result: yes (notchecked)" >&5
		19	+$as_echo "yes (notchecked)" >&6; }
		20
		21	cat >>confdefs.h <<\_ACEOF
		22	#define IPV6 1
		23	_ACEOF
		24
		25	- else
		26	- if test -d "/usr/local/v6/lib"; then
		27	- LIBS="-L/usr/local/v6/lib -linet6 $LIBS"
		28	- echo "$as_me:$LINENO: result: yes (freebsd+kame)" >&5
		29	-echo "${ECHO_T}yes (freebsd+kame)" >&6
		30	-
		31	-cat >>confdefs.h <<\_ACEOF
		32	-#define IPV6 1
		33	-_ACEOF
		34	-
		35	- else
		36	- if test "$cross_compiling" = yes; then
		37	- { echo "$as_me:$LINENO: WARNING: cross-compiling: assuming no ipv6" >&5
		38	-echo "$as_me: WARNING: cross-compiling: assuming no ipv6" >&2;}
		39	+ ;;
		40	+ *)
		41	+ { $as_echo "$as_me:$LINENO: result: no" >&5
		42	+$as_echo "no" >&6; }
		43	+ ;;
		44	+ esac
		45	else
		46	- cat >conftest.$ac_ext <<_ACEOF
		47	-#line $LINENO "configure"
		48	-#include "confdefs.h"
		49	-
		50	- int main()
		51	- {
		52	- #if !defined(__GLIBC__) \|\| (__GLIBC__ < 2)
		53	- #define NO_GLIBC_2 1
		54	- #endif
		55	-
		56	- if (NO_GLIBC_2)
		57	- exit(0);
		58	- else
		59	- exit(1);
		60	- }
		61	-_ACEOF
		62	-rm -f conftest$ac_exeext
		63	-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
		64	- (eval $ac_link) 2>&5
65	- ac_status=$?
66	- echo "$as_me:$LINENO: \$? = $ac_status" >&5
67	- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
68	- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
69	- (eval $ac_try) 2>&5
70	- ac_status=$?
71	- echo "$as_me:$LINENO: \$? = $ac_status" >&5
72	- (exit $ac_status); }; }; then
73	- echo "$as_me:$LINENO: result: yes (glibc2)" >&5
74	-echo "${ECHO_T}yes (glibc2)" >&6
75	+ { $as_echo "$as_me:$LINENO: result: no" >&5
76	+$as_echo "no" >&6; }
77
78	-cat >>confdefs.h <<\_ACEOF
79	-#define IPV6 1
80	-_ACEOF
81	-
82	-
83	-else
84	- echo "$as_me: program exited with status $ac_status" >&5
85	-echo "$as_me: failed program was:" >&5
86	-cat conftest.$ac_ext >&5
87	-( exit $ac_status )
88	-echo "$as_me:$LINENO: result: no" >&5
89	-echo "${ECHO_T}no" >&6
90	-fi
91	-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
92	fi
93	- fi
94	- fi
95	- ;;
96	- *)
97	- echo "$as_me:$LINENO: result: no (ipv6 support can currently be enabled on Linux only)" >&5
98	-echo "${ECHO_T}no (ipv6 support can currently be enabled on Linux only)" >&6
99	- ;;
100	- esac
101	- ;;
102	- no)
103	- echo "$as_me:$LINENO: result: no" >&5
104	-echo "${ECHO_T}no" >&6
105	- ;;
106	- esac
107	-else
108	- echo "$as_me:$LINENO: result: no" >&5
109	-echo "${ECHO_T}no" >&6
110
111	-fi;
112
113	echo "$as_me:$LINENO: checking whether to enable SOCKS support" >&5
114	echo $ECHO_N "checking whether to enable SOCKS support... $ECHO_C" >&6
115	@@ -12609,7 +12536,7 @@
116	system="unknown"
117	else
118	if test -r "/etc/.relid" -a x"`uname -n`" = x"`uname -s`"; then
119	- system="MP-RAS-`$AWK '{print }' /etc/.relid'`"
120	+ system="MP-RAS-`$AWK '{print $3}' /etc/.relid`"
121	fi
122	fi
123	fi
124	@@ -13877,7 +13804,7 @@
125	system="unknown"
126	else
127	if test -r "/etc/.relid" -a x"`uname -n`" = x"`uname -s`"; then
128	- system="MP-RAS-`$AWK '{print }' /etc/.relid'`"
129	+ system="MP-RAS-`$AWK '{print $3}' /etc/.relid`"
130	fi
131	fi
132	fi

Lines 14-19 Link Here

(-)bitchx/files/patch-amd64_fix (+12 lines)
14		14
15	#ifdef WANT_DLL	15	#ifdef WANT_DLL
16	#ifdef HPUX	16	#ifdef HPUX
		17	diff -ur BitchX.orig/include/modval.h BitchX/include/modval.h
		18	--- BitchX.orig/include/modval.h Fri Apr 11 03:09:07 2003
		19	+++ include/modval.h Sun Jan 8 17:18:15 2006
		20	@@ -318,7 +318,7 @@
		21	#define show_window(x) ((void) (global[SHOW_WINDOW]((Window *)x)))
		22	#define get_status_by_refnum(x, y) ((char *) (global[GET_STATUS_BY_REFNUM]((unsigned int)x, (unsigned int)y)))
		23	#define get_visible_by_refnum(x) ((int) (global[GET_VISIBLE_BY_REFNUM]((char *)x)))
		24	-#define get_window_by_desc(x) ((Window *) (global[GET_WINDOW_BY_DESC]((unsigned int)x)))
		25	+#define get_window_by_desc(x) ((Window *) (global[GET_WINDOW_BY_DESC]((unsigned long)x)))
		26	#define get_window_by_refnum(x) ((Window *) (global[GET_WINDOW_BY_REFNUM]((unsigned int)x)))
		27	#define get_window_by_name(x) ((Window ) (global[GET_WINDOW_BY_NAME]((char )x)))
		28	#define next_window(x, y) ((void) (global[FUNC_NEXT_WINDOW]((char)x, (char *)y)))
17	diff -ur BitchX.orig/source/screen.c BitchX/source/screen.c	29	diff -ur BitchX.orig/source/screen.c BitchX/source/screen.c
18	--- BitchX.orig/source/screen.c Thu Jul 31 09:01:08 2003	30	--- BitchX.orig/source/screen.c Thu Jul 31 09:01:08 2003
19	+++ source/screen.c Sun Jan 8 17:18:18 2006	31	+++ source/screen.c Sun Jan 8 17:18:18 2006

Line 0 Link Here

(-)bitchx/files/patch-source_gcc_fix (+36 lines)
	1	diff -ru source.orig/ctcp.c source/ctcp.c
	2	--- source.orig/ctcp.c 2003-05-26 23:00:22.000000000 -0800
	3	+++ source/ctcp.c 2008-01-28 07:31:56.000000000 -0900
	4	@@ -176,7 +176,7 @@
	5
	6	/* CDE do ops and unban logging */
	7
	8	-static char *ctcp_type[] =
	9	+char *ctcp_type[] =
	10	{
	11	"PRIVMSG",
	12	"NOTICE"
	13	diff -ru source.orig/term.c source/term.c
	14	--- source.orig/term.c 2003-04-10 17:09:07.000000000 -0800
	15	+++ source/term.c 2008-01-28 07:58:45.000000000 -0900
	16	@@ -92,7 +92,7 @@
	17	#endif
	18
	19	extern char *getenv();
	20	-extern char *tparm();
	21	+
	22
	23	/*
	24	* The old code assumed termcap. termcap is almost always present, but on
	25	diff -ru source.orig/timer.c source/timer.c
	26	--- source.orig/timer.c 2003-04-10 17:09:07.000000000 -0800
	27	+++ source/timer.c 2008-01-28 08:00:29.000000000 -0900
	28	@@ -148,7 +148,7 @@
	29	* This is put here on purpose -- we dont want any of the above functions
	30	* to have any knowledge of this struct.
	31	*/
	32	-static TimerList *PendingTimers;
	33	+TimerList *PendingTimers;
	34	static char schedule_timer (TimerList ntimer);
	35
	36	static char *current_exec_timer = empty_string;

Line 0 Link Here

(-)bitchx/files/patch-source_server_c (+12 lines)
	1	$OpenBSD: patch-source_server_c,v 1.1 2003/04/16 09:04:24 avsm Exp $
	2	--- source/server.c.orig Mon Apr 14 23:56:28 2003
	3	+++ source/server.c Mon Apr 14 23:56:59 2003
	4	@@ -144,7 +144,7 @@ void close_server (int cs_index, char *m
	5	if (x_debug & DEBUG_OUTBOUND)
	6	yell("Closing server %d because [%s]",
	7	cs_index, message ? message : empty_string);
	8	- snprintf(buffer, BIG_BUFFER_SIZE, "QUIT :%s\n", message);
	9	+ snprintf(buffer, sizeof buffer, "QUIT :%s\n", message);
	10	#ifdef HAVE_SSL
	11	if (get_server_ssl(cs_index))
	12	SSL_write(server_list[cs_index].ssl_fd, buffer, strlen(buffer));