Changes 0.99f:

* gdomain now has a -K flag
* gsend has the -b flag
* the default gsubrc doesn't escape '+' characters
* the time format of the default gsubrc is adjustable
* sundry WQP bugfixes
* bug fix to stop gsub from dropping messages
* MacOSX compatibility fixes
* gkinfo has a -y flag
* much more verbose diagnostics when things go wrong with keys
* partial fix to the galed spum problem (not a real fix though)
* don't be as verbose about "replaced .. with __" messages
* more mostly unrelated liboop fixes

7 files changed, 130 insertions, 56 deletions

diff --git a/chat/gale/Makefile b/chat/gale/Makefile
index 0d8e15ed308..11e0cf58f57 100644
--- a/chat/gale/Makefile
+++ b/chat/gale/Makefile
@@ -1,26 +1,26 @@
-# $NetBSD: Makefile,v 1.25 2005/08/19 18:12:36 jlam Exp $
-#
+# $NetBSD: Makefile,v 1.26 2005/09/07 13:58:16 adam Exp $
 
-DISTNAME=	gale-0.99a
-PKGREVISION=	5
+DISTNAME=	gale-0.99fruit
+PKGNAME=	gale-0.99f
 CATEGORIES=	chat
-MASTER_SITES=	http://download.gale.org/
+MASTER_SITES=	http://download.ofb.net/gale/
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://gale.org/
 COMMENT=	Secure instant messaging system
 
-USE_PKGINSTALL=		YES
-USE_GNU_READLINE=	# needs rl_named_function()
-USE_LIBTOOL=		YES
+USE_PKGINSTALL=		yes
+USE_GNU_READLINE=	yes	# needs rl_named_function()
+USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig ${WRKSRC}/liboopltconfig
-
-GNU_CONFIGURE= 		YES
+GNU_CONFIGURE= 		yes
 CONFIGURE_ARGS=		--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ENV+=		PROG_GLIB_CONFIG="${GLIB_CONFIG}"
 
 CPPFLAGS+=		-I${BUILDLINK_PREFIX.rsaref}/include/rsaref
 CPPFLAGS+=		-I${BUILDLINK_PREFIX.libwww}/include/w3c-libwww
+CPPFLAGS+=		-I${BUILDLINK_PREFIX.tcl}/include/tcl
 
 PKG_SYSCONFSUBDIR?=	gale
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
@@ -47,8 +47,8 @@ post-install:
 .include "../../devel/boehm-gc/buildlink3.mk"
 .include "../../devel/glib/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
+.include "../../lang/tcl/buildlink3.mk"
 .include "../../net/adns/buildlink3.mk"
 .include "../../security/rsaref/buildlink3.mk"
 .include "../../www/libwww/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/gale/PLIST b/chat/gale/PLIST
index cecac027914..ec572d82acc 100644
--- a/chat/gale/PLIST
+++ b/chat/gale/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:19 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2005/09/07 13:58:16 adam Exp $
 bin/gale-config
 bin/gale-install
 bin/galed
@@ -8,24 +8,29 @@ bin/gkinfo
 bin/gksign
 bin/gsend
 bin/gsub
-bin/gwatch
 include/gale/all.h
-include/gale/auth.h
 include/gale/client.h
 include/gale/compat.h
 include/gale/config.h
 include/gale/core.h
+include/gale/crypto.h
 include/gale/globals.h
 include/gale/gsubrc.h
+include/gale/key.h
 include/gale/misc.h
 include/gale/types.h
 include/oop-adns.h
 include/oop-glib.h
+include/oop-read.h
+include/oop-rl.h
+include/oop-tcl.h
 include/oop-www.h
 include/oop.h
 lib/libgale.la
 lib/liboop-adns.la
 lib/liboop-glib.la
+lib/liboop-rl.la
+lib/liboop-tcl.la
 lib/liboop-www.la
 lib/liboop.la
 sbin/gksign
diff --git a/chat/gale/buildlink3.mk b/chat/gale/buildlink3.mk
new file mode 100644
index 00000000000..3b856fd80ce
--- /dev/null
+++ b/chat/gale/buildlink3.mk
@@ -0,0 +1,26 @@
+# $NetBSD: buildlink3.mk,v 1.1 2005/09/07 13:58:16 adam Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+GALE_BUILDLINK3_MK:=	${GALE_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	gale
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngale}
+BUILDLINK_PACKAGES+=	gale
+
+.if !empty(GALE_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.gale+=	gale>=0.99f
+BUILDLINK_PKGSRCDIR.gale?=	../../chat/gale
+.endif	# GALE_BUILDLINK3_MK
+
+.include "../../devel/boehm-gc/buildlink3.mk"
+.include "../../devel/glib/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
+.include "../../lang/tcl/buildlink3.mk"
+.include "../../net/adns/buildlink3.mk"
+.include "../../security/rsaref/buildlink3.mk"
+.include "../../www/libwww/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/chat/gale/distinfo b/chat/gale/distinfo
index 8d2a4344c2a..6efd78945b1 100644
--- a/chat/gale/distinfo
+++ b/chat/gale/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 15:59:11 agc Exp $
+$NetBSD: distinfo,v 1.5 2005/09/07 13:58:16 adam Exp $
 
-SHA1 (gale-0.99a.tar.gz) = c3439917c0e19ce8ccd8dd03367d0a521d6e33fd
-RMD160 (gale-0.99a.tar.gz) = c244857e20d1fc5dddd186abc2e703e8b7068bfb
-Size (gale-0.99a.tar.gz) = 331494 bytes
-SHA1 (patch-aa) = a716a0778ce0360ea910a48218a1975883f56741
-SHA1 (patch-ab) = 44a798e452ad056f3fd920d55c3f29da06572e3f
-SHA1 (patch-ac) = e2824a69dd59d930fec334fdf7cb1b8f5d21ea78
+SHA1 (gale-0.99fruit.tar.bz2) = 1a89f4db45b0fb23e678161199531c1a5a5a3625
+RMD160 (gale-0.99fruit.tar.bz2) = 71e3190c6ff91bd8831cf3f3eac479b928ae89e9
+Size (gale-0.99fruit.tar.bz2) = 384552 bytes
+SHA1 (patch-aa) = 5061914b02f33df1d3845aec34630abdc2ba3882
+SHA1 (patch-ac) = 4da3c0bf6c1788b0d1b8658edb51369a32e35471
diff --git a/chat/gale/patches/patch-aa b/chat/gale/patches/patch-aa
index a5bcfca19c2..855b8b7a3a5 100644
--- a/chat/gale/patches/patch-aa
+++ b/chat/gale/patches/patch-aa
@@ -1,13 +1,15 @@
-$NetBSD: patch-aa,v 1.3 2001/11/19 21:05:56 jlam Exp $
+$NetBSD: patch-aa,v 1.4 2005/09/07 13:58:16 adam Exp $
 
---- Makefile.in.orig	Thu Jul 13 21:18:54 2000
+--- Makefile.in.orig	2003-01-12 15:19:09.000000000 +0000
 +++ Makefile.in
-@@ -424,8 +424,6 @@
- 	mkdir -p "$(sysconfdir)/gale/auth/cache"
- 	chmod 1777 "$(sysconfdir)/gale/auth/local"
- 	chmod 777 "$(sysconfdir)/gale/auth/cache"
--	$(INSTALL_DATA) "$(srcdir)/kutils/ROOT" "$(sysconfdir)/gale/auth/trusted/ROOT"
--	$(INSTALL_DATA) "$(srcdir)/COPYING" "$(sysconfdir)/gale/COPYING"
- 	-chmod -R a+rX "$(sysconfdir)/gale"
+@@ -412,10 +412,6 @@ install-data-local:
+ 	mkdir -p "$(DESTDIR)$(sysconfdir)/gale/auth/cache"
+ 	chmod 1777 "$(DESTDIR)$(sysconfdir)/gale/auth/local"
+ 	chmod 777 "$(DESTDIR)$(sysconfdir)/gale/auth/cache"
+-	$(INSTALL_DATA) "$(srcdir)/kutils/ROOT" \
+-		"$(DESTDIR)$(sysconfdir)/gale/auth/trusted/ROOT"
+-	$(INSTALL_DATA) "$(srcdir)/COPYING" \
+-		"$(DESTDIR)$(sysconfdir)/gale/COPYING"
+ 	-chmod -R a+rX "$(DESTDIR)$(sysconfdir)/gale" 2>/dev/null
  	@echo ""
- 	@echo "*** now run $(bindir)/gale-install ... even for an upgrade ***"
+ 	@echo "*** now run $(DESTDIR)$(bindir)/gale-install ... even for an upgrade ***"
diff --git a/chat/gale/patches/patch-ab b/chat/gale/patches/patch-ab
deleted file mode 100644
index c8232882c7c..00000000000
--- a/chat/gale/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2001/11/19 21:05:56 jlam Exp $
-
---- configure.orig	Thu Jul 13 20:42:44 2000
-+++ configure
-@@ -1835,10 +1835,12 @@
- PROG_LDCONFIG=:
- 
- test yes = "$GCC" && CFLAGS="-Wall $CFLAGS"
-+if false; then
- test NONE != "$exec_prefix" && LDFLAGS="$LDFLAGS -L${exec_prefix}/lib"
- if test NONE != "$prefix" ; then
- 	CPPFLAGS="$CPPFLAGS -I${prefix}/include"
- 	test NONE = "$exec_prefix" && LDFLAGS="$LDFLAGS -L${prefix}/lib"
-+fi
- fi
- 
- case "$host" in
diff --git a/chat/gale/patches/patch-ac b/chat/gale/patches/patch-ac
index 233db8a136f..f41c9b19c2b 100644
--- a/chat/gale/patches/patch-ac
+++ b/chat/gale/patches/patch-ac
@@ -1,15 +1,74 @@
-$NetBSD: patch-ac,v 1.1 2001/11/19 21:05:56 jlam Exp $
+$NetBSD: patch-ac,v 1.2 2005/09/07 13:58:16 adam Exp $
 
---- liboop/configure.orig	Sat Mar 11 17:12:04 2000
+--- liboop/configure.orig	2003-01-12 15:16:01.000000000 +0000
 +++ liboop/configure
-@@ -1991,8 +1991,8 @@
+@@ -7957,7 +7957,7 @@ if test "${ac_cv_lib_readline_rl_callbac
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lreadline  $LIBS"
++LIBS="-lreadline -ltermcap $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ #include "confdefs.h"
+@@ -8111,7 +8111,7 @@ echo "${ECHO_T}$ac_cv_header_readline_re
+ fi
+ if test $ac_cv_header_readline_readline_h = yes; then
+ 
+-  READLINE_LIBS="-lreadline"
++  READLINE_LIBS="-lreadline -ltermcap"
+   cat >>confdefs.h <<\_ACEOF
+ #define HAVE_READLINE 1
+ _ACEOF
+@@ -8161,8 +8161,8 @@ echo "${ECHO_T}no" >&6
  fi
  
  if test -n "$PROG_GLIB_CONFIG" ; then
 -  GLIB_INCLUDES="`glib-config --cflags`"
--  GLIB_LIBS="liboop-glib.la `glib-config --libs`"
+-  GLIB_LIBS="`glib-config --libs`"
 +  GLIB_INCLUDES="`${PROG_GLIB_CONFIG} --cflags`"
-+  GLIB_LIBS="liboop-glib.la `${PROG_GLIB_CONFIG} --libs`"
-   cat >> confdefs.h <<\EOF
- #define HAVE_GLIB 1
- EOF
++  GLIB_LIBS="`${PROG_GLIB_CONFIG} --libs`"
+   LIBS="$save_libs $GLIB_LIBS"
+   CPPFLAGS="$save_cppflags $GLIB_INCLUDES"
+   echo "$as_me:$LINENO: checking for g_main_set_poll_func" >&5
+@@ -8346,7 +8346,7 @@ fi
+ LIBS="$save_libs"
+ CPPFLAGS="$save_cppflags"
+ 
+-for version in 8.4 8.3 8.2 8.1 8.0 ; do
++for version in 84 83 82 81 80 ; do
+   CPPFLAGS="$save_cppflags -I/usr/include/tcl$version"
+   as_ac_Lib=`echo "ac_cv_lib_tcl$version''_Tcl_Main" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for Tcl_Main in -ltcl$version" >&5
+@@ -8355,7 +8355,7 @@ if eval "test \"\${$as_ac_Lib+set}\" = s
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ltcl$version  $LIBS"
++LIBS="-ltcl$version -lm -lpthread $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ #include "confdefs.h"
+@@ -8514,7 +8514,7 @@ if test $ac_cv_header_tcl_h = yes; then
+ _ACEOF
+ 
+     TCL_INCLUDES="-I/usr/include/tcl$version"
+-    TCL_LIBS="-ltcl$version"
++    TCL_LIBS="-ltcl$version -lm -lpthread"
+     break
+ 
+ fi
+@@ -8587,11 +8587,8 @@ if test $ac_cv_lib_wwwcore_HTEvent_setRe
+ _ACEOF
+ 
+   # This is just a little unpleasant.
+-  WWW_LIBS=" \
+-  -lwwwapp -lwwwcache -lwwwcore -lwwwdir -lwwwfile -lwwwftp -lwwwgopher \
+-  -lwwwhtml -lwwwhttp -lwwwinit -lwwwmime -lwwwmux -lwwwnews -lwwwstream \
+-  -lwwwtelnet -lwwwtrans -lwwwutils -lwwwzip -lmd5"
+-  WWW_INCLUDES="-I/usr/include/w3c-libwww" # the libwww RPM puts headers here
++  WWW_LIBS="`libwww-config --libs`"
++  WWW_INCLUDES="`libwww-config --cflags`" # the libwww RPM puts headers here
+ 
+ fi
+