Update "spruce" package to version 0.5.17 and use "pth" (via "glib") instead

of "ptl2" package for thread support. Changes since version 0.5.12:
- Took out file locks since that seemed to cause more problems than good
- Got printing working (sorta)
- Fixed a bug that corrupted some base64 file attachments (my
  end-boundary check wasn't quite right)
- Added Catalan language support
- Improved pop3io thanks to a small patch
- The "MAIL FROM" and "RCPT TO" SMTP commands now use <>'s around
  the addresses since it is accepted on all known SMTP servers
  (and is stated as acceptable arguments in RFC 821)
- Fixed an annoyance that forced you to restart spruce after creating
  a new mailbox before you could view it's contents
- Added right-click menu in the mime-parts clist at the bottom of the
  preview pane
- Selecting Mime->Display should no longer segfault when
  a message is not selected (or when no messages to select)
- Added regex and shell wildcard support to the mail filters
- Made it auto-guess your name and email address based on user
  account information
- Added a confirmation dialog for deleting mailboxes
- Added IMAP mailbox listing support (so you can hopefully see
  more than just your INBOX)
- Fixed a bug that allowed a user to not specify a From or a To field,
  thus causing a segfault.
- Fixed attachments
- Fixed "sender"
- Fixed it so that spruce should never go beyond the end of the header
  information to obtain fields like "Reply-To:" or "Date:" for example
  (shouldn't have been too much of a problem before but it fumbled for
  me once so that's not good ;-)
- Fixed the filter bug that caused strange things to happen when you
  deleted the last filter rule
- other minor fixes
- Added Reply-To-All functionality
- I believe I have fixed the segfault causing pthread bug
- Added support to save window pane sizes
- Added support to save sorting preferences
- Improved on the date sorting
- Fixed various minor bugs
- Fixed some IMAPv4r1 issues, seems to be working a little better
  now.
- Added most of the support for GNU Privacy Guard by using an alpha
  lib Privacy Guard Glue. For GPG support, you must now use
  the --enable-gpg configure flag (./configure --enable-gpg)
  For reference, I'm currently using Pgg-20000116 and as the author
  of Pgg states, new versions are unlikely to be compatable so
  be warned that you may need to have the same Pgg lib that I have.
  I will be maintaining a file specifying which version of Pgg you
  need to use it with Spruce.
- Fixed the segfault/corruption bug caused when a user deleted a
  message from a mbox spool
- Various code speedups/cleanups

5 files changed, 11 insertions, 20 deletions

diff --git a/mail/spruce/Makefile b/mail/spruce/Makefile
index 08c8f759057..16c67c8ee0a 100644
--- a/mail/spruce/Makefile
+++ b/mail/spruce/Makefile
@@ -1,19 +1,18 @@
-# $NetBSD: Makefile,v 1.3 2000/02/04 00:13:21 tron Exp $
+# $NetBSD: Makefile,v 1.4 2000/03/13 16:25:58 tron Exp $
 #
 
-DISTNAME=       spruce-0.5.14
+DISTNAME=       spruce-0.5.17
 CATEGORIES=	mail
 MASTER_SITES=   http://www.xtorshun.org/spruce/
 
 MAINTAINER=	mellon@isc.org
 HOMEPAGE=	http://www.xtorshun.org/spruce/main.html
 
-DEPENDS+=	gnome-libs-*:../../x11/gnome-libs
-DEPENDS+=	ptl2-*:../../devel/ptl2
+DEPENDS+=	glib>=1.2.7:../../devel/glib
+DEPENDS+=	gnome-libs>=1.0.55:../../x11/gnome-libs
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CC=		${LOCALBASE}/bin/ptlgcc
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/spruce/files/md5 b/mail/spruce/files/md5
index 0fc8525aa0c..d3560a746d9 100644
--- a/mail/spruce/files/md5
+++ b/mail/spruce/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 2000/02/03 23:38:17 tron Exp $
+$NetBSD: md5,v 1.3 2000/03/13 16:25:59 tron Exp $
 
-MD5 (spruce-0.5.14.tar.gz) = 930b3a64a1b92e8b7426021527d7ee50
+MD5 (spruce-0.5.17.tar.gz) = 5adf03b86b9e9246293b28d991a5ace6
diff --git a/mail/spruce/files/patch-sum b/mail/spruce/files/patch-sum
index ebcfb45ad9d..3f2e01bd30b 100644
--- a/mail/spruce/files/patch-sum
+++ b/mail/spruce/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.2 2000/02/04 00:13:21 tron Exp $
+$NetBSD: patch-sum,v 1.3 2000/03/13 16:25:59 tron Exp $
 
-MD5 (patch-aa) = 04b1dcb0b805a5d4fea51ca18f89adc5
+MD5 (patch-aa) = 838194a411ef341ab1b9bd883c8eba3e
diff --git a/mail/spruce/patches/patch-aa b/mail/spruce/patches/patch-aa
index 69f8368c63b..ad9cf028168 100644
--- a/mail/spruce/patches/patch-aa
+++ b/mail/spruce/patches/patch-aa
@@ -1,16 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2000/02/04 00:13:21 tron Exp $
+$NetBSD: patch-aa,v 1.3 2000/03/13 16:25:59 tron Exp $
 
 --- Makefile.in.orig	Sat Jan 29 18:28:37 2000
 +++ Makefile.in	Fri Feb  4 01:05:22 2000
-@@ -98,7 +98,7 @@
- spruce_SOURCES = defines.h 	about.c about.h 	accounts.c accounts.h 	addrbook.c addrbook.h 	composer.c composer.h 	date.c date.h 	filters.h filters.c 	globals.c globals.h 	gti.c gti.h 	gtkmanip.c gtkmanip.h 	gui.c gui.h 	imap.c imap.h 	init.c init.h 	mailbox.c mailbox.h 	mbox.c mbox.h 	mime.c mime.h 	mesgreader.c mesgreader.h 	msgid.c msgid.h 	options.c options.h 	parse.c parse.h 	pop3io.c pop3io.h 	pgp.c pgp.h 	print.c print.h 	rc.c rc.h 	server.c server.h 	smtpio.c smtpio.h 	sockio.c sockio.h 	sort.c sort.h 	status.c status.h 	main.c main.h 	md5.c md5.h 	cram_md5.c cram_md5.h
- 
- 
--spruce_LDADD = @GTK_LIBS@ -lpthread
-+spruce_LDADD = @GTK_LIBS@
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = config.h
 @@ -106,7 +106,7 @@
  PROGRAMS =  $(bin_PROGRAMS)
  
diff --git a/mail/spruce/pkg/PLIST b/mail/spruce/pkg/PLIST
index 69d5648ce82..47578f7282a 100644
--- a/mail/spruce/pkg/PLIST
+++ b/mail/spruce/pkg/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2000/02/04 00:10:32 tron Exp $
+@comment $NetBSD: PLIST,v 1.3 2000/03/13 16:25:59 tron Exp $
 bin/spruce
+share/locale/ca/LC_MESSAGES/spruce.mo
 share/locale/da/LC_MESSAGES/spruce.mo
 share/locale/de/LC_MESSAGES/spruce.mo
 share/locale/es/LC_MESSAGES/spruce.mo