o Update to 1.0c18

o Correct plist

PR: ports/25830
Submitted by: MAINTAINER
Reviewed by: chroot(8)

10 files changed, 20 insertions, 159 deletions

diff --git a/irc/bitchx/Makefile b/irc/bitchx/Makefile
index 0127929b86a7..6b13cbad08bd 100644
--- a/irc/bitchx/Makefile
+++ b/irc/bitchx/Makefile
@@ -5,18 +5,18 @@
 # $FreeBSD$
 #
 
-PORTNAME=	BitchX
-PORTVERSION=	1.0c17
-PORTREVISION=	3
+PORTNAME=       BitchX
+PORTVERSION=	1.0c18
 CATEGORIES=	irc gnome
 MASTER_SITES=	ftp://ftp.bitchx.com/pub/BitchX/source/ \
 		ftp://ftp.bitchx.org/pub/BitchX/source/
+DISTNAME=	ircii-pana-1.0c18
 
 MAINTAINER=	cj@vallcom.net
 
 WRKSRC=		${WRKDIR}/BitchX
 
-USE_AUTOCONF=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 WANT_ESOUND=	yes
 WANT_GNOME=	yes
@@ -62,7 +62,7 @@ CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include"
 .endif
 
 .if defined(WITH_PLUGINS)
-CONFIGURE_ARGS+=--with-plugins=pkga,possum,encrypt,hint,abot,acro,amp,blowfish,scan,wavplay,qmail,fserv,nap,qbx
+CONFIGURE_ARGS+=--with-plugins
 PLIST_SUB+=	PLUGINS:=""
 .else
 CONFIGURE_ARGS+=--without-plugins
diff --git a/irc/bitchx/distinfo b/irc/bitchx/distinfo
index 2380a7d54b62..5165f8fdf9e6 100644
--- a/irc/bitchx/distinfo
+++ b/irc/bitchx/distinfo
@@ -1 +1 @@
-MD5 (BitchX-1.0c17.tar.gz) = 9cbf6a87d2f3941a57ad10dd5c9cc8ad
+MD5 (ircii-pana-1.0c18.tar.gz) = 737276281ae911c5e1e17b028ebee045
diff --git a/irc/bitchx/files/patch-ag b/irc/bitchx/files/patch-ag
deleted file mode 100644
index 2d65fcf13bfa..000000000000
--- a/irc/bitchx/files/patch-ag
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.in.orig	Sun Jan  9 02:11:01 2000
-+++ Makefile.in	Sat Sep  9 01:24:46 2000
-@@ -43,7 +43,7 @@
- IRCLIB = @IRCLIB@
- 
- CC = @CC@
--DEFS = -I$$(srcdir)/../include -I$(topdir)/include
-+DEFS = -I$$(srcdir)/../include -I$(topdir)/include -I. -I-
- LIBS = @LIBS@
- INCLUDES = @INCLUDES@
- 
-@@ -90,8 +90,8 @@
- 
- # 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 = cp -pr $(srcdir)/bitchx-docs/* $(HELPDIR)
-+INSTALL_HELP_CMD = @echo 
-+# INSTALL_HELP_CMD = cp -pr $(srcdir)/bitchx-docs/* $(HELPDIR)
- 
- # This program allows you to use screen/xterm's to put new BitchX windows
- # on new screen/xterm windows.
diff --git a/irc/bitchx/files/patch-aj b/irc/bitchx/files/patch-aj
deleted file mode 100644
index 68c201f23875..000000000000
--- a/irc/bitchx/files/patch-aj
+++ /dev/null
@@ -1,33 +0,0 @@
---- include/config.h.orig	Tue Jul  4 20:27:01 2000
-+++ include/config.h	Tue Jul  4 20:33:03 2000
-@@ -460,7 +460,7 @@
- 
- #define DEFAULT_HTTP_GRAB OFF
- #define DEFAULT_HELP_WINDOW OFF
--#define DEFAULT_NICK_COMPLETION ON
-+#define DEFAULT_NICK_COMPLETION OFF
- #define DEFAULT_NICK_COMPLETION_LEN 2
- #define DEFAULT_NICK_COMPLETION_TYPE 0  /* 0 1 2 */
- #define DEFAULT_NOTIFY ON
-@@ -495,9 +495,9 @@
- #define DEFAULT_AINV 0
- #define DEFAULT_ANNOY_KICK OFF
- #define DEFAULT_AOP_VAR OFF
--#define DEFAULT_AUTO_AWAY ON
--#define DEFAULT_KICK_OPS ON
--#define DEFAULT_AUTO_REJOIN ON
-+#define DEFAULT_AUTO_AWAY OFF
-+#define DEFAULT_KICK_OPS OFF
-+#define DEFAULT_AUTO_REJOIN OFF
- #define DEFAULT_DEOPFLOOD ON
- #define DEFAULT_CTCP_FLOOD_AFTER 3
- #define DEFAULT_CTCP_FLOOD_RATE 10
-@@ -735,7 +735,7 @@
- #endif
- 
- #undef PARANOID		/* #define this if your paranoid about dcc hijacking */
--#undef WANT_CHAN_NICK_SERV	/* do we want to include some chan/nick/oper server commands */
-+#define WANT_CHAN_NICK_SERV	/* do we want to include some chan/nick/oper server commands */
- 
- /* new epic stuff */
- #define OLD_STATUS_S_EXPANDO_BEHAVIOR
diff --git a/irc/bitchx/files/patch-ak b/irc/bitchx/files/patch-ak
deleted file mode 100644
index 9ec55611914f..000000000000
--- a/irc/bitchx/files/patch-ak
+++ /dev/null
@@ -1,37 +0,0 @@
---- configure.in.orig	Tue Aug 29 09:14:45 2000
-+++ configure.in	Fri Sep 15 11:49:51 2000
-@@ -940,8 +940,8 @@
-     AC_MSG_RESULT(no)
-   else
-     AC_MSG_RESULT(yes)
--    AC_CHECK_LIB(dl, dlopen, LIBS="$LIBS -ldl",
--      AC_CHECK_FUNC(dlopen,,
-+    AC_CHECK_FUNC(dlopen,,
-+      AC_CHECK_LIB(dl, dlopen, LIBS="$LIBS -ldl",
-         AC_CHECK_LIB(dld, dld_link, LIBS="$LIBS -ldld",
-           AC_CHECK_LIB(dld, shl_load, LIBS="$LIBS -ldld", 
-             AC_MSG_ERROR(Cannot find dlopen. Please run ./configure --without-tcl
-@@ -970,7 +970,7 @@
-       else
-         #if test x"$withval" != x"yes"; then
-         if test -d "$withval"; then
--          TCL_LIBS="$LIBS -L$withval -ltcl"
-+          TCL_LIBS="$LIBS -L$withval -ltcl83"
-           search_tcl=0
-           has_tcl=1
-         fi
-@@ -991,10 +991,10 @@
- 
-     AC_DEFUN(AC_SEARCH_TCL,
-     [ AC_MSG_CHECKING("location of tcl.h")
--      AC_CHECK_TCL(/usr/include, tcl.h, -ltcl,, "found in /usr/include")
--      AC_CHECK_TCL(/usr/include/tcl, tcl.h, -ltcl, -I/usr/include/tcl, "found in /usr/include/tcl")
--      AC_CHECK_TCL(/usr/local/include, tcl.h, -L/usr/local/lib -ltcl, -I/usr/local/include, "found in /usr/local")
--      AC_CHECK_TCL(/usr/local/include/tcl, tcl.h, -L/usr/local/lib -L/usr/local/lib/tcl -ltcl, -I/usr/local/include/tcl, "found in /usr/local/include/tcl")
-+      AC_CHECK_TCL(/usr/include, tcl.h, -ltcl83,, "found in /usr/include")
-+      AC_CHECK_TCL(/usr/include/tcl, tcl.h, -ltcl83, -I/usr/include/tcl, "found in /usr/include/tcl")
-+      AC_CHECK_TCL(/usr/local/include, tcl.h, -L/usr/local/lib -ltcl83, -I/usr/local/include, "found in /usr/local")
-+      AC_CHECK_TCL(/usr/local/include/tcl, tcl.h, -L/usr/local/lib -L/usr/local/lib/tcl -ltcl83, -I/usr/local/include/tcl, "found in /usr/local/include/tcl")
-     ])
- 
-     if test x"$search_tcl" != x"0"; then
diff --git a/irc/bitchx/files/patch-al b/irc/bitchx/files/patch-al
deleted file mode 100644
index 40d81cb07614..000000000000
--- a/irc/bitchx/files/patch-al
+++ /dev/null
@@ -1,23 +0,0 @@
-*** source/misc.c~	Fri Sep  1 23:08:52 2000
---- source/misc.c	Fri Dec  8 10:52:56 2000
-***************
-*** 2641,2646 ****
---- 2641,2648 ----
-  		switch(type)
-  		{
-  		case T_A :
-+ 			if (dlen != sizeof(struct in_addr))
-+ 				return 0;
-  			rptr->re_he.h_length = dlen;
-  			if (ans == 1)
-  				rptr->re_he.h_addrtype=(class == C_IN) ?
-***************
-*** 2687,2692 ****
---- 2689,2695 ----
-  			*alias = NULL;
-  			break;
-  		default :
-+ 			cp += dlen;
-  			break;
-  		}
-  	}
diff --git a/irc/bitchx/files/patch-am b/irc/bitchx/files/patch-am
deleted file mode 100644
index 52b9eaa78833..000000000000
--- a/irc/bitchx/files/patch-am
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/ircaux.h.orig	Sun Feb 25 00:03:55 2001
-+++ include/ircaux.h	Sun Feb 25 00:04:27 2001
-@@ -18,7 +18,7 @@
- #include <stdio.h>
- #ifdef WANT_TCL
- #undef USE_TCLALLOC
--#include <tcl.h>
-+#include "tcl.h"
- #endif
- 
- typedef int comp_len_func (char *, char *, int);
diff --git a/irc/bitchx/files/patch-an b/irc/bitchx/files/patch-an
deleted file mode 100644
index 43c0396118db..000000000000
--- a/irc/bitchx/files/patch-an
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/tcl_bx.h.orig	Sun Feb 25 00:05:19 2001
-+++ include/tcl_bx.h	Sun Feb 25 00:05:39 2001
-@@ -27,7 +27,7 @@
- #ifdef WANT_TCL
- 
- 
--#include <tcl.h>
-+#include "tcl.h"
- extern Tcl_Interp *tcl_interp;
- void check_tcl_tand (char *, char *, char *);
- void check_tcl_msgm (char *, char *, char *, char *, char *);
diff --git a/irc/bitchx/files/patch-ao b/irc/bitchx/files/patch-ao
deleted file mode 100644
index 592f01cbdf11..000000000000
--- a/irc/bitchx/files/patch-ao
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/tcl_public.c.orig	Sun Feb 25 00:08:23 2001
-+++ source/tcl_public.c	Sun Feb 25 00:08:35 2001
-@@ -37,7 +37,7 @@
- };
- 
- #ifdef WANT_TCL
--#include <tcl.h>
-+#include "tcl.h"
- 
- /* 
-  * I wish to thank vore!vore@domination.ml.org for pushing me 
diff --git a/irc/bitchx/pkg-plist b/irc/bitchx/pkg-plist
index 4b7b09fa0ef0..7831bb0c3e39 100644
--- a/irc/bitchx/pkg-plist
+++ b/irc/bitchx/pkg-plist
@@ -1,12 +1,12 @@
 %%NOGNOME:%%bin/BitchX
-%%NOGNOME:%%bin/BitchX-1.0c17
+%%NOGNOME:%%bin/BitchX-1.0c18
 %%GNOME:%%bin/gtkBitchX
-%%GNOME:%%bin/gtkBitchX-1.0c17
+%%GNOME:%%bin/gtkBitchX-1.0c18
 %%NOGNOME:%%bin/scr-bx
 share/bx/BitchX.help
 share/bx/BitchX.ircnames
 share/bx/BitchX.quit
-share/bx/BitchX.reasons
+share/bx/BitchX.kick
 share/bx/help/1_General/1_General
 share/bx/help/1_General/4op
 share/bx/help/1_General/about
@@ -57,6 +57,7 @@ share/bx/help/1_General/dcc/activecount
 share/bx/help/1_General/dcc/autoget
 share/bx/help/1_General/dcc/autooverwrite
 share/bx/help/1_General/dcc/autorename
+share/bx/help/1_General/dcc/autoresume
 share/bx/help/1_General/dcc/bot
 share/bx/help/1_General/dcc/chat
 share/bx/help/1_General/dcc/close
@@ -466,7 +467,6 @@ share/bx/help/4_Misc/window/window
 share/bx/help/5_Programming/5_Programming
 share/bx/help/5_Programming/alias
 share/bx/help/5_Programming/assign
-share/bx/help/5_Programming/blah
 share/bx/help/5_Programming/bless
 share/bx/help/5_Programming/break
 share/bx/help/5_Programming/call
@@ -795,6 +795,7 @@ share/bx/help/6_Functions/winvisible
 share/bx/help/6_Functions/word
 share/bx/help/6_Functions/write
 share/bx/help/6_Functions/writeb
+share/bx/help/6_Functions/ovserver
 share/bx/help/7_Docs/7_Docs
 share/bx/help/7_Docs/About_BitchX
 share/bx/help/7_Docs/Arrays
@@ -930,6 +931,11 @@ share/bx/help/out
 %%PLUGINS:%%share/bx/plugins/scan.so
 %%PLUGINS:%%share/bx/plugins/wavplay.so
 %%PLUGINS:%%share/bx/plugins/qbx.so
+%%PLUGINS:%%share/bx/plugins/aim.so
+%%PLUGINS:%%share/bx/plugins/arcfour.so
+%%PLUGINS:%%share/bx/plugins/autocycle.so
+%%PLUGINS:%%share/bx/plugins/cavlink.so
+%%PLUGINS:%%share/bx/plugins/identd.so
 share/bx/script/actplug.gmz
 share/bx/script/bxglobal
 share/bx/script/bxtcl.tcl
@@ -938,6 +944,9 @@ share/bx/script/file.tcl
 share/bx/script/fserve+vfs.tar.gz
 share/bx/script/menu.bx
 share/bx/script/query.bx
+share/bx/script/auto_resume
+share/bx/script/fserve.irc
+share/bx/script/query
 share/bx/translation/ASCII
 share/bx/translation/CP437
 share/bx/translation/CP850
@@ -976,7 +985,7 @@ share/doc/bitchx/bxfaq.html
 @dirrm share/doc/bitchx
 @dirrm share/bx/translation
 @dirrm share/bx/script
-%%PLUGINS:%%@dirrm share/bx/plugins
+@dirrm share/bx/plugins
 @dirrm share/bx/help/8_Scripts
 @dirrm share/bx/help/7_Docs
 @dirrm share/bx/help/6_Functions