Update to 4.0.0:

=============
Dasher 4.0.0
=============

 * Promoted to stable release

=============
Dasher 3.99.5
=============

 * New icon
 * Bugfixes in 'enter text into other windows' mode

=============
Dasher 3.99.4
=============

 * Fixed font behaviour in Windows
 * Fixed broken start/stop in dynamic button mode
 * Other minor bugfixes

=============
Dasher 3.99.3
=============

 * Bugfix to tarball

=============
Dasher 3.99.2
=============

 * Improved button mode support
 * Cairo support ported from 3.2 branch
 * Win32 should build from tarball again
 * Bugfixes

=============
Dasher 3.99.1
=============

New 4.0.0 preview, highlights include:

* (Partial) button mode support
* Infinite back off
* Improved symbol grouping in alphabets
* New status bar, with 'favourite' alphabet selection

=============
Dasher 3.99.0
=============

First preview of 4.0.0 - many changes and re-writes

4 files changed, 32 insertions, 27 deletions

diff --git a/editors/dasher/Makefile b/editors/dasher/Makefile
index 24b392592aa..3c65bb97988 100644
--- a/editors/dasher/Makefile
+++ b/editors/dasher/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2006/03/21 06:00:45 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2006/03/30 21:27:42 jmmv Exp $
 #
 
-DISTNAME=	dasher-3.2.18
-PKGREVISION=	5
+DISTNAME=	dasher-4.0.0
 CATEGORIES=	editors gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dasher/3.2/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dasher/4.0/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -17,6 +16,13 @@ USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake pkg-config
 USE_PKGLOCALEDIR=	yes
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD"
+# Needed for ftime(3).
+LIBS+=			-lcompat
+.endif
+
 .include "../../audio/gnome-speech/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/at-spi/buildlink3.mk"
@@ -29,6 +35,7 @@ USE_PKGLOCALEDIR=	yes
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libwnck/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
diff --git a/editors/dasher/PLIST b/editors/dasher/PLIST
index c217dd9176d..0eae75a5318 100644
--- a/editors/dasher/PLIST
+++ b/editors/dasher/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2005/10/14 21:51:19 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.9 2006/03/30 21:27:42 jmmv Exp $
 bin/dasher
 man/man1/dasher.1
 share/applications/dasher.desktop
@@ -93,6 +93,7 @@ share/dasher/alphabet.hiragana2.xml
 share/dasher/alphabet.hungarian.xml
 share/dasher/alphabet.ipa.xml
 share/dasher/alphabet.italian.xml
+share/dasher/alphabet.japanese.canna.xml
 share/dasher/alphabet.kazakh.xml
 share/dasher/alphabet.kirghiz.xml
 share/dasher/alphabet.kirundi.xml
@@ -140,17 +141,20 @@ share/dasher/alphabet.xsl
 share/dasher/colour.blue.xml
 share/dasher/colour.dtd
 share/dasher/colour.euroasian.xml
-share/dasher/colour.euroasian2.xml
 share/dasher/colour.jamie.xml
 share/dasher/colour.rainbow.xml
 share/dasher/colour.vowels.xml
 share/dasher/colour.vowels2.xml
 share/dasher/colour.xml
+share/dasher/controllabels.dtd
+share/dasher/controllabels.xml
 share/dasher/dasher.glade
+share/dasher/dashermaemo.glade
 share/dasher/training_albanian_SQ.txt
 share/dasher/training_basque_EU.txt
 share/dasher/training_bengali_BD.txt
 share/dasher/training_bengali_bn.txt
+share/dasher/training_canna_JP.txt
 share/dasher/training_czech_CS.txt
 share/dasher/training_danish_DK.txt
 share/dasher/training_dutch_NL.txt
@@ -172,6 +176,7 @@ share/dasher/training_russian_RU.txt
 share/dasher/training_spanish_ES.txt
 share/dasher/training_swahili_KE.txt
 share/dasher/training_swedish_SE.txt
+share/dasher/training_turkish_TR.txt
 share/dasher/training_welsh_GB.txt
 share/gnome/help/dasher/C/dasher.xml
 share/gnome/help/dasher/C/figures/figure2.png
@@ -191,7 +196,8 @@ share/gnome/help/dasher/eu/figures/prefs3.png
 share/gnome/help/dasher/eu/figures/prefs4.png
 share/gnome/help/dasher/eu/figures/prefs5.png
 share/gnome/help/dasher/eu/version.xml
-share/icons/dasher.png
+share/icons/hicolor/48x48/apps/dasher.png
+share/icons/hicolor/scalable/apps/dasher.svg
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/dasher.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/dasher.mo
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/dasher.mo
@@ -222,7 +228,9 @@ ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/dasher.mo
 ${PKGLOCALEDIR}/locale/id/LC_MESSAGES/dasher.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/dasher.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/dasher.mo
+${PKGLOCALEDIR}/locale/ka/LC_MESSAGES/dasher.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/dasher.mo
+${PKGLOCALEDIR}/locale/ky/LC_MESSAGES/dasher.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/dasher.mo
 ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/dasher.mo
 ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/dasher.mo
@@ -244,17 +252,22 @@ ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/dasher.mo
 ${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/dasher.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/dasher.mo
 ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/dasher.mo
+${PKGLOCALEDIR}/locale/th/LC_MESSAGES/dasher.mo
 ${PKGLOCALEDIR}/locale/tk/LC_MESSAGES/dasher.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/dasher.mo
 ${PKGLOCALEDIR}/locale/ug/LC_MESSAGES/dasher.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/dasher.mo
+${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/dasher.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/dasher.mo
+${PKGLOCALEDIR}/locale/zh_HK/LC_MESSAGES/dasher.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/dasher.mo
 share/omf/dasher/dasher-C.omf
 share/omf/dasher/dasher-eu.omf
 @dirrm share/omf/dasher
 @comment in scrollkeeper: @dirrm share/omf
-@comment in xdg-dirs: @dirrm share/icons
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor
 @dirrm share/gnome/help/dasher/eu/figures
 @dirrm share/gnome/help/dasher/eu
 @dirrm share/gnome/help/dasher/C/figures
diff --git a/editors/dasher/distinfo b/editors/dasher/distinfo
index caef5fae987..acf81ba2cfc 100644
--- a/editors/dasher/distinfo
+++ b/editors/dasher/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.11 2005/12/18 22:01:33 rillig Exp $
+$NetBSD: distinfo,v 1.12 2006/03/30 21:27:42 jmmv Exp $
 
-SHA1 (dasher-3.2.18.tar.bz2) = bfa23eac087197d4ff231bbe59a4ed7d4e39f839
-RMD160 (dasher-3.2.18.tar.bz2) = 49a7ed5c5123d33ea042ee112f885e1582bd4132
-Size (dasher-3.2.18.tar.bz2) = 4758337 bytes
+SHA1 (dasher-4.0.0.tar.bz2) = 3a1e613e5b2157b2fea9da9877e600212b2b01b2
+RMD160 (dasher-4.0.0.tar.bz2) = 53bb75233ca684129de47b1761b998f7e094ed7a
+Size (dasher-4.0.0.tar.bz2) = 5810860 bytes
 SHA1 (patch-aa) = af87128e30cff75d12e491a0ee0b49cefddc0674
-SHA1 (patch-ab) = e10f10cd3a88299c02d20083786aacace2938408
diff --git a/editors/dasher/patches/patch-ab b/editors/dasher/patches/patch-ab
deleted file mode 100644
index c659f01ac95..00000000000
--- a/editors/dasher/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2005/12/18 22:01:33 rillig Exp $
-
-std::auto_ptr needs <memory>.
-
---- Src/DasherCore/DasherInterface.cpp.orig	Fri Aug 19 15:41:53 2005
-+++ Src/DasherCore/DasherInterface.cpp	Sun Dec 18 22:50:11 2005
-@@ -11,6 +11,7 @@
- #include "CustomColours.h"
- #include "DasherViewSquare.h"
- 
-+#include <memory>
- #include <iostream>
- 
- #include "DasherInterface.h"