Update to 4.2.0:

============
Dasher 4.2.0
============
  * Translations
  * Documentation update
  * Bugfixes

============
Dasher 4.1.10
============
  * Minor update to UI
  * Bugfixes
  * Updated translations

============
Dasher 4.1.9
============
  * Bugfixes

============
Dasher 4.1.8
============
  * Improvements to dynamic button modes
  * Many bugfixes

============
Dasher 4.1.7
============
  * One line bugfix repairing build without GNOME a11y support

============
Dasher 4.1.6
============
  * Redesigned preferences dialogue
  * Updated two button dynamic mode
  * Bugfixes

============
Dasher 4.1.5
============
  * Internal release

============
Dasher 4.1.4
============
  * Bugfixes etc.

============
Dasher 4.1.3
============
  * Internal release

============
Dasher 4.1.2
============
  * Various bugfixes
  * Improved interaction with desktop environment

============
Dasher 4.1.1
============
  * Fixes to build system

============
Dasher 4.1.0
============
  * Considerable internal rewriting
  * Introduction of 'application styles' - the aim here is to improve
    integration with the desktop.
  * Improved button control.
  * Improved support for Hiragana to Kanji conversion.
  * Prototype support for the Maemo environment as used on the Nokia N770.
  * Many bug fixes
  * And anything else I've forgotten...

3 files changed, 30 insertions, 27 deletions

diff --git a/editors/dasher/Makefile b/editors/dasher/Makefile
index e78244bce2c..1e21ad41e75 100644
--- a/editors/dasher/Makefile
+++ b/editors/dasher/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2006/08/06 19:08:18 jmmv Exp $
+# $NetBSD: Makefile,v 1.35 2006/09/15 15:20:56 jmmv Exp $
 
-DISTNAME=	dasher-4.0.4
+DISTNAME=	dasher-4.2.0
 CATEGORIES=	editors gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dasher/4.0/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dasher/4.2/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -23,8 +23,12 @@ GNU_CONFIGURE=		yes
 LIBS+=			-lcompat
 .endif
 
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.0
+BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.8.0
+
 .include "../../audio/gnome-speech/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/atk/buildlink3.mk"
 .include "../../devel/at-spi/buildlink3.mk"
 .include "../../devel/GConf2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
@@ -39,6 +43,7 @@ LIBS+=			-lcompat
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
+.include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/dasher/PLIST b/editors/dasher/PLIST
index d9d07253727..33648b794ce 100644
--- a/editors/dasher/PLIST
+++ b/editors/dasher/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2006/08/06 19:08:18 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.13 2006/09/15 15:20:56 jmmv Exp $
 bin/dasher
 man/man1/dasher.1
 share/applications/dasher.desktop
@@ -9,7 +9,6 @@ share/dasher/alphabet.Austen.xml
 share/dasher/alphabet.Azerbaijani.xml
 share/dasher/alphabet.Belarusian.xml
 share/dasher/alphabet.Bulgarian.xml
-share/dasher/alphabet.C.xml
 share/dasher/alphabet.Esperanto.xml
 share/dasher/alphabet.Estonian.xml
 share/dasher/alphabet.Filipino.xml
@@ -44,6 +43,7 @@ share/dasher/alphabet.Tajik.xml
 share/dasher/alphabet.Tamil.xml
 share/dasher/alphabet.Telugu.xml
 share/dasher/alphabet.Thai.xml
+share/dasher/alphabet.Thai2.xml
 share/dasher/alphabet.Tsonga.xml
 share/dasher/alphabet.Tswana.xml
 share/dasher/alphabet.Turkish.xml
@@ -72,12 +72,10 @@ share/dasher/alphabet.corsican.xml
 share/dasher/alphabet.croatian.xml
 share/dasher/alphabet.czech.xml
 share/dasher/alphabet.danish.xml
-share/dasher/alphabet.danish2.xml
 share/dasher/alphabet.dtd
 share/dasher/alphabet.dutch.xml
 share/dasher/alphabet.english.xml
 share/dasher/alphabet.englishC.xml
-share/dasher/alphabet.englishLC.xml
 share/dasher/alphabet.ethiopic.xml
 share/dasher/alphabet.ewe.xml
 share/dasher/alphabet.faroese.xml
@@ -145,13 +143,13 @@ share/dasher/colour.euroasian.xml
 share/dasher/colour.euroasian2.xml
 share/dasher/colour.jamie.xml
 share/dasher/colour.rainbow.xml
+share/dasher/colour.thai.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
@@ -181,23 +179,21 @@ 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/a-z.gif
+share/gnome/help/dasher/C/figures/aa-az.gif
+share/gnome/help/dasher/C/figures/ala-alz.gif
+share/gnome/help/dasher/C/figures/exampleHad2.png
+share/gnome/help/dasher/C/figures/exampleHad2a.png
+share/gnome/help/dasher/C/figures/exampleHad3a.png
+share/gnome/help/dasher/C/figures/exampleHad4.png
 share/gnome/help/dasher/C/figures/figure2.png
 share/gnome/help/dasher/C/figures/main.png
+share/gnome/help/dasher/C/figures/object.gif
 share/gnome/help/dasher/C/figures/prefs1.png
 share/gnome/help/dasher/C/figures/prefs2.png
 share/gnome/help/dasher/C/figures/prefs3.png
 share/gnome/help/dasher/C/figures/prefs4.png
 share/gnome/help/dasher/C/figures/prefs5.png
-share/gnome/help/dasher/C/version.xml
-share/gnome/help/dasher/eu/dasher.xml
-share/gnome/help/dasher/eu/figures/figure2.png
-share/gnome/help/dasher/eu/figures/main.png
-share/gnome/help/dasher/eu/figures/prefs1.png
-share/gnome/help/dasher/eu/figures/prefs2.png
-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/hicolor/48x48/apps/dasher.png
 share/icons/hicolor/scalable/apps/dasher.svg
 share/locale/ar/LC_MESSAGES/dasher.mo
@@ -205,7 +201,7 @@ share/locale/az/LC_MESSAGES/dasher.mo
 share/locale/be/LC_MESSAGES/dasher.mo
 share/locale/bg/LC_MESSAGES/dasher.mo
 share/locale/bn/LC_MESSAGES/dasher.mo
-share/locale/br/LC_MESSAGES/dasher.mo
+share/locale/bn_IN/LC_MESSAGES/dasher.mo
 share/locale/bs/LC_MESSAGES/dasher.mo
 share/locale/ca/LC_MESSAGES/dasher.mo
 share/locale/cs/LC_MESSAGES/dasher.mo
@@ -234,17 +230,21 @@ share/locale/it/LC_MESSAGES/dasher.mo
 share/locale/ja/LC_MESSAGES/dasher.mo
 share/locale/ka/LC_MESSAGES/dasher.mo
 share/locale/ko/LC_MESSAGES/dasher.mo
+share/locale/ku/LC_MESSAGES/dasher.mo
 share/locale/ky/LC_MESSAGES/dasher.mo
 share/locale/lt/LC_MESSAGES/dasher.mo
 share/locale/lv/LC_MESSAGES/dasher.mo
+share/locale/mg/LC_MESSAGES/dasher.mo
 share/locale/mk/LC_MESSAGES/dasher.mo
+share/locale/ml/LC_MESSAGES/dasher.mo
 share/locale/mn/LC_MESSAGES/dasher.mo
+share/locale/mr/LC_MESSAGES/dasher.mo
 share/locale/ms/LC_MESSAGES/dasher.mo
 share/locale/nb/LC_MESSAGES/dasher.mo
 share/locale/ne/LC_MESSAGES/dasher.mo
 share/locale/nl/LC_MESSAGES/dasher.mo
 share/locale/nn/LC_MESSAGES/dasher.mo
-share/locale/no/LC_MESSAGES/dasher.mo
+share/locale/or/LC_MESSAGES/dasher.mo
 share/locale/pa/LC_MESSAGES/dasher.mo
 share/locale/pl/LC_MESSAGES/dasher.mo
 share/locale/pt/LC_MESSAGES/dasher.mo
@@ -253,6 +253,7 @@ share/locale/ro/LC_MESSAGES/dasher.mo
 share/locale/ru/LC_MESSAGES/dasher.mo
 share/locale/rw/LC_MESSAGES/dasher.mo
 share/locale/sk/LC_MESSAGES/dasher.mo
+share/locale/sl/LC_MESSAGES/dasher.mo
 share/locale/sq/LC_MESSAGES/dasher.mo
 share/locale/sr/LC_MESSAGES/dasher.mo
 share/locale/sr@Latn/LC_MESSAGES/dasher.mo
@@ -268,14 +269,11 @@ share/locale/zh_CN/LC_MESSAGES/dasher.mo
 share/locale/zh_HK/LC_MESSAGES/dasher.mo
 share/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 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
 @dirrm share/gnome/help/dasher/C
 @dirrm share/gnome/help/dasher
diff --git a/editors/dasher/distinfo b/editors/dasher/distinfo
index 990b29a21c1..94ef502179b 100644
--- a/editors/dasher/distinfo
+++ b/editors/dasher/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.15 2006/08/06 19:08:18 jmmv Exp $
+$NetBSD: distinfo,v 1.16 2006/09/15 15:20:56 jmmv Exp $
 
-SHA1 (dasher-4.0.4.tar.bz2) = ccd3706e04287fe61a2cec01875e796f7f2ac3a6
-RMD160 (dasher-4.0.4.tar.bz2) = 0ad62ac42baaf11db7a4aeb4c8090f96f7fa43ac
-Size (dasher-4.0.4.tar.bz2) = 5707882 bytes
+SHA1 (dasher-4.2.0.tar.bz2) = 29db12f0e34d200dbc76e11e3dffa8a187487be6
+RMD160 (dasher-4.2.0.tar.bz2) = a557b1041ee3fa34627b916e62b4e705469769d2
+Size (dasher-4.2.0.tar.bz2) = 5632602 bytes