merge two patches from irc/bitchx and disable plugins to fix build on CURRENT

4 files changed, 24 insertions, 18 deletions

diff --git a/korean/bitchx/Makefile b/korean/bitchx/Makefile
index 2d4d17f7c65..d7ddbbaa9b1 100644
--- a/korean/bitchx/Makefile
+++ b/korean/bitchx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	BitchX
 PORTVERSION=	1.0c16
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	korean irc
 MASTER_SITES=	ftp://ftp.holywar.net/pub/FreeBSD/
 
@@ -24,7 +24,7 @@ WRKSRC=		${WRKDIR}/BitchX
 
 USE_AUTOTOOLS=	autoconf:213
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	--with-plugins \
+CONFIGURE_ARGS=	--without-plugins \
 		--exec-prefix="${PREFIX}/share"	\
 		--bindir="${PREFIX}/bin" \
 		--datadir="${PREFIX}/share" \
diff --git a/korean/bitchx/files/patch-source-ctcp.c b/korean/bitchx/files/patch-source-ctcp.c
new file mode 100644
index 00000000000..473f5da18cf
--- /dev/null
+++ b/korean/bitchx/files/patch-source-ctcp.c
@@ -0,0 +1,11 @@
+--- 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/korean/bitchx/files/patch-source-timer.c b/korean/bitchx/files/patch-source-timer.c
new file mode 100644
index 00000000000..1e81800db11
--- /dev/null
+++ b/korean/bitchx/files/patch-source-timer.c
@@ -0,0 +1,11 @@
+--- 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/korean/bitchx/pkg-plist b/korean/bitchx/pkg-plist
index fbe0623ca72..3a22bf53ba6 100644
--- a/korean/bitchx/pkg-plist
+++ b/korean/bitchx/pkg-plist
@@ -902,21 +902,6 @@ share/bx/help/8_Scripts/webster
 share/bx/help/8_Scripts/2.8script
 share/bx/help/8_Scripts/window
 share/bx/help/README_FIRST
-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/plugins/qbx.so
 share/bx/script/actplug.gmz
 share/bx/script/bxglobal
 share/bx/script/bxtcl.tcl
@@ -962,7 +947,6 @@ share/doc/bitchx/bxfaq.html
 @dirrm share/doc/bitchx
 @dirrm share/bx/translation
 @dirrm share/bx/script
-@dirrm share/bx/plugins
 @dirrm share/bx/help/8_Scripts
 @dirrm share/bx/help/7_Docs
 @dirrm share/bx/help/6_Functions