Update kbiff to 3.9

10-05-08 - Kurt Granroth (3.9)
   o Converted KBiff into a full-fledged kdeinit module compatible
     with the latest KDE 3.5 (previous support was outdated)
   o Yet more tweaks to compile under the gcc 4.x running target
     without warnings
   o Cleaned up a bunch of Makefiles, configure files, and automake
     files along with an updated 'admin' directory
   o Got rid of the 'release-kbiff' "meta" version and date tags
   o Updated the .spec file to be more up to date

09-09-08 - Frédéric Brière
   o Replaced complicated date-time calculations with toTime_t()

03-30-08 - Léo Terziman
   o Fix compilation of ASUS led code under gcc 4

03-21-08 - Martin Spirk
   o Added 'stopped' icon state

02-27-08 - Elve
   o Updated Dutch translation (nl.po)

01-21-08 - Kurt Granroth
   o Updated automake admin dir with latest code from KDE 3.8
   o Tweaked the code to compile on gcc 4.2 without warnings with -Wall
   o Status window tweaks to work better on multiple-monitors as well
     as in more positions (side, bottom, top, etc).
   o Removed some 2.x code.  Nobody uses KDE2 anymore so it's high
     time KBiff stops supporting it.
   o Fix display of icons with the icon selector

5 files changed, 42 insertions, 32 deletions

diff --git a/mail/kbiff/Makefile b/mail/kbiff/Makefile
index 23b8346b3b2..ca72df69454 100644
--- a/mail/kbiff/Makefile
+++ b/mail/kbiff/Makefile
@@ -1,27 +1,21 @@
-# $NetBSD: Makefile,v 1.33 2008/01/18 05:08:25 tnn Exp $
+# $NetBSD: Makefile,v 1.34 2008/10/12 11:23:13 markd Exp $
 
-DISTNAME=	kbiff-3.8
-PKGREVISION=	8
+DISTNAME=	kbiff-3.9
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kbiff/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	markd@NetBSD.org
-HOMEPAGE=	http://www.granroth.org/kbiff/index.html
+HOMEPAGE=	http://www.kbiff.org
 COMMENT=	Mail notification utility for KDE
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake perl
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 SHLIBTOOL_OVERRIDE=	# empty
 
-BUILDLINK_DEPMETHOD.libXt?=	build
-
 .include "../../meta-pkgs/kde3/kde3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/kbiff/PLIST b/mail/kbiff/PLIST
index 72a34326d71..94602eeea33 100644
--- a/mail/kbiff/PLIST
+++ b/mail/kbiff/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.6 2007/01/26 04:25:46 markd Exp $
+@comment $NetBSD: PLIST,v 1.7 2008/10/12 11:23:13 markd Exp $
 bin/kbiff
-lib/kbiff.la
+lib/kde3/kbiff.la
+lib/libkdeinit_kbiff.la
 man/man1/kbiff.1
 share/doc/kde/HTML/de/kbiff/common
 share/doc/kde/HTML/de/kbiff/index.cache.bz2
@@ -27,11 +28,13 @@ share/kde/apps/kbiff/pics/mini-newmail.png
 share/kde/apps/kbiff/pics/mini-noconn.png
 share/kde/apps/kbiff/pics/mini-nomail.png
 share/kde/apps/kbiff/pics/mini-oldmail.png
+share/kde/apps/kbiff/pics/mini-stopped.png
 share/kde/apps/kbiff/pics/newmail.png
 share/kde/apps/kbiff/pics/noconn.png
 share/kde/apps/kbiff/pics/nomail.png
 share/kde/apps/kbiff/pics/oldmail.png
 share/kde/apps/kbiff/pics/playsound.png
+share/kde/apps/kbiff/pics/stopped.png
 share/locale/br/LC_MESSAGES/kbiff.mo
 share/locale/cs/LC_MESSAGES/kbiff.mo
 share/locale/da/LC_MESSAGES/kbiff.mo
@@ -47,9 +50,9 @@ share/locale/hu/LC_MESSAGES/kbiff.mo
 share/locale/is/LC_MESSAGES/kbiff.mo
 share/locale/it/LC_MESSAGES/kbiff.mo
 share/locale/ja/LC_MESSAGES/kbiff.mo
+share/locale/nb/LC_MESSAGES/kbiff.mo
 share/locale/nl/LC_MESSAGES/kbiff.mo
-share/locale/no/LC_MESSAGES/kbiff.mo
-share/locale/no_NY/LC_MESSAGES/kbiff.mo
+share/locale/nn/LC_MESSAGES/kbiff.mo
 share/locale/pl/LC_MESSAGES/kbiff.mo
 share/locale/pt/LC_MESSAGES/kbiff.mo
 share/locale/pt_BR/LC_MESSAGES/kbiff.mo
@@ -63,7 +66,20 @@ share/locale/uk/LC_MESSAGES/kbiff.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/kbiff.mo
 @dirrm share/kde/apps/kbiff/pics
 @dirrm share/kde/apps/kbiff
+@comment in kde: @dirrm share/kde/apps
+@comment in kde: @dirrm share/kde/applnk/Internet
+@comment in kde: @dirrm share/icons/locolor/32x32/apps
+@comment in kde: @dirrm share/icons/locolor/16x16/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor
 @dirrm share/doc/kde/HTML/fr/kbiff
+@comment in kde: @dirrm share/doc/kde/HTML/fr
 @dirrm share/doc/kde/HTML/es/kbiff
+@comment in kde: @dirrm share/doc/kde/HTML/es
 @dirrm share/doc/kde/HTML/en/kbiff
+@comment in kde: @dirrm share/doc/kde/HTML/en
 @dirrm share/doc/kde/HTML/de/kbiff
+@comment in kde: @dirrm share/doc/kde/HTML/de
+@comment in kde: @dirrm lib/kde3
diff --git a/mail/kbiff/distinfo b/mail/kbiff/distinfo
index e9b846e0ea2..3c60f5a4d7c 100644
--- a/mail/kbiff/distinfo
+++ b/mail/kbiff/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2005/12/10 22:07:01 markd Exp $
+$NetBSD: distinfo,v 1.7 2008/10/12 11:23:13 markd Exp $
 
-SHA1 (kbiff-3.8.tar.bz2) = 7ec8d04c26d4e47278fa5fc34bd09a9157d8d28a
-RMD160 (kbiff-3.8.tar.bz2) = c2325f558d0d7926213f420cc40dd02dc36a1c2e
-Size (kbiff-3.8.tar.bz2) = 767864 bytes
-SHA1 (patch-aa) = b477880d9dab4ec023442e9cce416f19a5a0fb4a
-SHA1 (patch-ab) = 53565884f5aed49b8e2d4ad73f3145a95b85895e
+SHA1 (kbiff-3.9.tar.bz2) = de4533a15c2647e741155c364b862025c522b6ce
+RMD160 (kbiff-3.9.tar.bz2) = bb310d7a56043387759312396e3d8013a25eca71
+Size (kbiff-3.9.tar.bz2) = 571829 bytes
+SHA1 (patch-aa) = f35bfba964150abe75673a47e7fed6a19e52e912
+SHA1 (patch-ab) = 40a223a4ec3f46ed7e44764430f7a7f2014c0f19
diff --git a/mail/kbiff/patches/patch-aa b/mail/kbiff/patches/patch-aa
index 3563f7b1cd5..b9265311e73 100644
--- a/mail/kbiff/patches/patch-aa
+++ b/mail/kbiff/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.3 2005/12/10 22:07:01 markd Exp $
+$NetBSD: patch-aa,v 1.4 2008/10/12 11:23:13 markd Exp $
 
---- Makefile.in.orig	2005-09-11 10:09:56.000000000 +1200
+--- Makefile.in.orig	2008-10-06 08:44:52.000000000 +1300
 +++ Makefile.in
-@@ -319,7 +319,7 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefi
+@@ -368,7 +368,7 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefi
  	  $(AUTOMAKE) --foreign  Makefile
- 	cd $(top_srcdir) && perl admin/am_edit Makefile.in
+ 	cd $(top_srcdir) && perl admin/am_edit -padmin Makefile.in
  .PRECIOUS: Makefile
 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +Makefile: $(srcdir)/Makefile.in
diff --git a/mail/kbiff/patches/patch-ab b/mail/kbiff/patches/patch-ab
index 7f458edfe37..1a6e86351be 100644
--- a/mail/kbiff/patches/patch-ab
+++ b/mail/kbiff/patches/patch-ab
@@ -1,19 +1,19 @@
-$NetBSD: patch-ab,v 1.1 2004/10/12 11:08:03 markd Exp $
+$NetBSD: patch-ab,v 1.2 2008/10/12 11:23:13 markd Exp $
 
---- configure.orig	2004-03-26 13:47:42.000000000 +1200
+--- configure.orig	2008-10-06 08:44:11.000000000 +1300
 +++ configure
-@@ -24088,7 +24088,7 @@ else
-   use_ssl=yes
- fi;
+@@ -33086,7 +33086,7 @@ else
+ fi
+ 
  
 -if test "$use_ssl" == "yes"; then
 +if test "$use_ssl" = "yes"; then
  
  cat >>confdefs.h <<\_ACEOF
  #define USE_SSL
-@@ -24105,7 +24105,7 @@ else
-   use_ssl=yes
- fi;
+@@ -33103,7 +33103,7 @@ else
+ fi
+ 
  
 -if test "$use_ssl" == "yes"; then
 +if test "$use_ssl" = "yes"; then