5 files changed, 50 insertions, 53 deletions

diff --git a/irc/bitchx/Makefile b/irc/bitchx/Makefile
index 1375e145b96a..53b61942641e 100644
--- a/irc/bitchx/Makefile
+++ b/irc/bitchx/Makefile
@@ -5,12 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=       BitchX
-PORTVERSION=	1.0c18
+PORTNAME=	BitchX
+PORTVERSION=	1.0c19
 CATEGORIES+=	irc gnome
 MASTER_SITES=	ftp://ftp.bitchx.com/pub/BitchX/source/ \
 		ftp://ftp.bitchx.org/pub/BitchX/source/
-DISTNAME=	ircii-pana-1.0c18
+DISTNAME=	ircii-pana-1.0c19
 
 MAINTAINER=	calle.madestrand@norrgarden.se
 
diff --git a/irc/bitchx/distinfo b/irc/bitchx/distinfo
index 5165f8fdf9e6..0fd006f0504d 100644
--- a/irc/bitchx/distinfo
+++ b/irc/bitchx/distinfo
@@ -1 +1 @@
-MD5 (ircii-pana-1.0c18.tar.gz) = 737276281ae911c5e1e17b028ebee045
+MD5 (ircii-pana-1.0c19.tar.gz) = 79431ff0880e7317049045981fac8adc
diff --git a/irc/bitchx/files/patch-ap b/irc/bitchx/files/patch-ap
index ae3adcf497f3..9d64127a3cb2 100644
--- a/irc/bitchx/files/patch-ap
+++ b/irc/bitchx/files/patch-ap
@@ -1,12 +1,11 @@
---- Makefile.in.orig	Tue Mar 13 18:40:31 2001
-+++ Makefile.in	Tue Mar 13 18:42:58 2001
-@@ -114,8 +114,7 @@
- 
+--- Makefile.in.orig	Mon Mar  5 21:30:04 2001
++++ Makefile.in	Fri Apr 19 15:09:40 2002
+@@ -115,7 +115,7 @@
  # 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 = @echo The help files have not been installed.
 -INSTALL_HELP_CMD = @INSTALL_HELP_CMD@
-+INSTALL_HELP_CMD = echo 
++INSTALL_HELP_CMD = echo
  
  # This is where the optional plugins will be copied to.
  PLUGINDIR = @PLUGINDIR@
diff --git a/irc/bitchx/files/patch-az b/irc/bitchx/files/patch-az
index 87bf725790b7..9db957eceb21 100644
--- a/irc/bitchx/files/patch-az
+++ b/irc/bitchx/files/patch-az
@@ -1,16 +1,17 @@
---- configure.orig	Sun Jan  7 23:24:22 2001
-+++ configure	Wed Apr 11 15:18:39 2001
-@@ -701,6 +701,7 @@
+--- configure.orig	Sun Mar 24 11:30:49 2002
++++ configure	Fri Apr 19 15:27:15 2002
+@@ -868,6 +868,8 @@
    --with-ssl              Enable SSL support
    --with-tgetent          Use tgetent (termcap) instead of setupterm (ncurses)
    --with-tcl              Enable Tcl support
 +  --with-tcl-includes=PFX Prefix where tcl.h is installed (optional)
++
    --with-maildir=PATH     Enable QMAIL support
    --with-default-server=SERVERNAME:PORT:PASSWORD:NICK:SERVERNETWORK
                            Connect to SERVERNAME by default
-@@ -9244,6 +9245,18 @@
+@@ -11120,6 +11122,17 @@
  #define WANT_TCL 1
- EOF
+ _ACEOF
  
 +# Check whether --with-tcl-includes was given.
 +if test "${with_tcl_includes+set}" = set; then
@@ -20,63 +21,62 @@
 +  TCL_INCLUDE=-I/usr/local/include
 +fi;
 +
-+cat >>confdefs.h <<\EOF
++cat >>confdefs.h <<\ACEOF
 +#define WANT_TCL 1
-+EOF
-+
- echo "$as_me:9247: checking for dlopen in -ldl" >&5
++ACEOF
+ 
+   echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
  echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-@@ -9524,13 +9537,13 @@
-   TCL_LIBS="-ltcl"
- else
+@@ -11518,13 +11531,13 @@
+ 
  
--echo "$as_me:9527: checking for Tcl_SetVar in -ltcl80" >&5
--echo $ECHO_N "checking for Tcl_SetVar in -ltcl80... $ECHO_C" >&6
--if test "${ac_cv_lib_tcl80_Tcl_SetVar+set}" = set; then
-+echo "$as_me:9527: checking for Tcl_SetVar in -ltcl83" >&5
+ 
+-                  echo "$as_me:$LINENO: checking for Tcl_SetVar in -ltcl" >&5
+-echo $ECHO_N "checking for Tcl_SetVar in -ltcl... $ECHO_C" >&6
+-if test "${ac_cv_lib_tcl_Tcl_SetVar+set}" = set; then
++                  echo "$as_me:$LINENO: checking for Tcl_SetVar in -ltcl83" >&5
 +echo $ECHO_N "checking for Tcl_SetVar in -ltcl83... $ECHO_C" >&6
 +if test "${ac_cv_lib_tcl83_Tcl_SetVar+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--LIBS="-ltcl80  $LIBS"
+-LIBS="-ltcl  $LIBS"
 +LIBS="-ltcl83  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
- #line 9535 "configure"
+ #line $LINENO "configure"
  #include "confdefs.h"
-@@ -9552,19 +9565,19 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo $as_me:9554: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
--  ac_cv_lib_tcl80_Tcl_SetVar=yes
+@@ -11562,19 +11575,19 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_tcl_Tcl_SetVar=yes
 +  ac_cv_lib_tcl83_Tcl_SetVar=yes
  else
    echo "$as_me: failed program was:" >&5
-   cat conftest.$ac_ext >&5
--  ac_cv_lib_tcl80_Tcl_SetVar=no
-+  ac_cv_lib_tcl83_Tcl_SetVar=no
+ cat conftest.$ac_ext >&5
+-ac_cv_lib_tcl_Tcl_SetVar=no
++ac_cv_lib_tcl83_Tcl_SetVar=no
  fi
- rm -f conftest$ac_exeext conftest.$ac_ext
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:9564: result: $ac_cv_lib_tcl80_Tcl_SetVar" >&5
--echo "${ECHO_T}$ac_cv_lib_tcl80_Tcl_SetVar" >&6
--if test $ac_cv_lib_tcl80_Tcl_SetVar = yes; then
--  TCL_LIBS="-ltcl80"
-+echo "$as_me:9564: result: $ac_cv_lib_tcl83_Tcl_SetVar" >&5
+-echo "$as_me:$LINENO: result: $ac_cv_lib_tcl_Tcl_SetVar" >&5
+-echo "${ECHO_T}$ac_cv_lib_tcl_Tcl_SetVar" >&6
+-if test $ac_cv_lib_tcl_Tcl_SetVar = yes; then
+-  TCL_LIBS="-ltcl"
++echo "$as_me:$LINENO: result: $ac_cv_lib_tcl83_Tcl_SetVar" >&5
 +echo "${ECHO_T}$ac_cv_lib_tcl83_Tcl_SetVar" >&6
 +if test $ac_cv_lib_tcl83_Tcl_SetVar = yes; then
 +  TCL_LIBS="-ltcl83"
  else
- 
- echo "$as_me:9570: checking for Tcl_SetVar in -ltcl76" >&5
-@@ -12023,7 +12036,7 @@
-   HINT_FILE="BitchX.hints"
+   echo "$as_me:$LINENO: checking for alternate libtcl" >&5
+ echo $ECHO_N "checking for alternate libtcl... $ECHO_C" >&6
+@@ -14776,7 +14789,7 @@
  fi
  
+ 
 -INCLUDES="-I. -I\$(topdir)/include -I\$(top_srcdir)/include -I\$(srcdir) -I\$(srcdir)/include"
 +INCLUDES="-I. -I\$(topdir)/include -I\$(top_srcdir)/include -I\$(srcdir) -I\$(srcdir)/include $TCL_INCLUDE"
  
- cat >>confdefs.h <<EOF
- #define DEFAULT_CTOOLZ_DIR "$DEFAULT_CTOOLZ_DIR"
+ 
+ 
diff --git a/irc/bitchx/pkg-plist b/irc/bitchx/pkg-plist
index 7831bb0c3e39..034e17881eff 100644
--- a/irc/bitchx/pkg-plist
+++ b/irc/bitchx/pkg-plist
@@ -1,7 +1,7 @@
 %%NOGNOME:%%bin/BitchX
-%%NOGNOME:%%bin/BitchX-1.0c18
+%%NOGNOME:%%bin/BitchX-1.0c19
 %%GNOME:%%bin/gtkBitchX
-%%GNOME:%%bin/gtkBitchX-1.0c18
+%%GNOME:%%bin/gtkBitchX-1.0c19
 %%NOGNOME:%%bin/scr-bx
 share/bx/BitchX.help
 share/bx/BitchX.ircnames
@@ -991,10 +991,8 @@ share/doc/bitchx/bxfaq.html
 @dirrm share/bx/help/6_Functions
 @dirrm share/bx/help/5_Programming/on
 @dirrm share/bx/help/5_Programming
-@dirrm share/bx/help/4_Misc/wset
 @dirrm share/bx/help/4_Misc/window
 @dirrm share/bx/help/4_Misc/set
-@dirrm share/bx/help/4_Misc/fset
 @dirrm share/bx/help/4_Misc/bind
 @dirrm share/bx/help/4_Misc
 @dirrm share/bx/help/3_Operators