Update to 4.0.4:

Dasher 4.0.4

 * Fixed error introduced in last commit
 * Backported bugfix from HEAD

Dasher 4.0.3

 * Fixed compile error when --without-gnome specified
 * Regenerated configure to match configure.in

4 files changed, 9 insertions, 82 deletions

diff --git a/editors/dasher/Makefile b/editors/dasher/Makefile
index 78d9bd0bb94..e78244bce2c 100644
--- a/editors/dasher/Makefile
+++ b/editors/dasher/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.33 2006/07/22 04:46:15 rillig Exp $
+# $NetBSD: Makefile,v 1.34 2006/08/06 19:08:18 jmmv Exp $
 
-DISTNAME=	dasher-4.0.2
+DISTNAME=	dasher-4.0.4
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dasher/4.0/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/editors/dasher/PLIST b/editors/dasher/PLIST
index 54f429bf0f6..d9d07253727 100644
--- a/editors/dasher/PLIST
+++ b/editors/dasher/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2006/05/29 07:10:23 adam Exp $
+@comment $NetBSD: PLIST,v 1.12 2006/08/06 19:08:18 jmmv Exp $
 bin/dasher
 man/man1/dasher.1
 share/applications/dasher.desktop
@@ -236,12 +236,14 @@ share/locale/ka/LC_MESSAGES/dasher.mo
 share/locale/ko/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/mk/LC_MESSAGES/dasher.mo
 share/locale/mn/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/pa/LC_MESSAGES/dasher.mo
 share/locale/pl/LC_MESSAGES/dasher.mo
diff --git a/editors/dasher/distinfo b/editors/dasher/distinfo
index 96d4fa8be50..990b29a21c1 100644
--- a/editors/dasher/distinfo
+++ b/editors/dasher/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.14 2006/05/29 07:10:23 adam Exp $
+$NetBSD: distinfo,v 1.15 2006/08/06 19:08:18 jmmv Exp $
 
-SHA1 (dasher-4.0.2.tar.bz2) = 28e17d932ce37ec29c3537fc9ae934d0e640cea0
-RMD160 (dasher-4.0.2.tar.bz2) = 90d54eca8474bc46cd2f11d76b56e3d62811b598
-Size (dasher-4.0.2.tar.bz2) = 5802684 bytes
-SHA1 (patch-aa) = f84199bdaa74e7dde54fb5948d7ccd67d26807a8
+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
diff --git a/editors/dasher/patches/patch-aa b/editors/dasher/patches/patch-aa
deleted file mode 100644
index c69b76504eb..00000000000
--- a/editors/dasher/patches/patch-aa
+++ /dev/null
@@ -1,74 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2006/05/19 13:14:06 joerg Exp $
-
---- configure.orig	2006-03-13 19:38:11.000000000 +0000
-+++ configure
-@@ -3999,13 +3999,13 @@ darwin* | rhapsody*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--freebsd* | kfreebsd*-gnu)
-+freebsd* | kfreebsd*-gnu | dragonfly*)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     case $host_cpu in
-     i*86 )
-       # Not sure whether the presence of OpenBSD here was a mistake.
-       # Let's accept both of them until this is cleared up.
--      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
-+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
-       lt_cv_file_magic_cmd=/usr/bin/file
-       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-       ;;
-@@ -7666,7 +7666,7 @@ if test -z "$aix_libpath"; then aix_libp
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu)
-+    freebsd* | kfreebsd*-gnu | dragonfly*)
-       archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec='-R$libdir'
-       hardcode_direct=yes
-@@ -8244,7 +8244,7 @@ kfreebsd*-gnu)
-   dynamic_linker='GNU ld.so'
-   ;;
- 
--freebsd*)
-+freebsd* | dragonfly*)
-   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-   version_type=freebsd-$objformat
-   case $version_type in
-@@ -10627,7 +10627,7 @@ if test -z "$aix_libpath"; then aix_libp
-   freebsd-elf*)
-     archive_cmds_need_lc_CXX=no
-     ;;
--  freebsd* | kfreebsd*-gnu)
-+  freebsd* | kfreebsd*-gnu | dragonfly*)
-     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-     # conventions
-     ld_shlibs_CXX=yes
-@@ -11334,7 +11334,7 @@ echo $ECHO_N "checking for $compiler opt
- 	    ;;
- 	esac
- 	;;
--      freebsd* | kfreebsd*-gnu)
-+      freebsd* | kfreebsd*-gnu | dragonfly*)
- 	# FreeBSD uses GNU C++
- 	;;
-       hpux9* | hpux10* | hpux11*)
-@@ -11948,7 +11948,7 @@ kfreebsd*-gnu)
-   dynamic_linker='GNU ld.so'
-   ;;
- 
--freebsd*)
-+freebsd* | dragonfly*)
-   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-   version_type=freebsd-$objformat
-   case $version_type in
-@@ -24086,7 +24086,7 @@ fi
- 
- 
- GTK2BUILD_CFLAGS="$GTK2_CFLAGS $SETTINGS_CFLAGS $gthread_CFLAGS $gnome_speech_CFLAGS $gnome_a11y_CFLAGS $glade_CFLAGS $gnome_CFLAGS $wnck_CFLAGS $hildon_CFLAGS"
--GTK2BUILD_LIBS="$X_LIBS $GTK2_LIBS $SETTINGS_LIBS $gthread_LIBS $gnome_speech_LIBS $gnome_a11y_LIBS $glade_LIBS $gnome_LIBS $wnck_LIBS $hildon_LIBS  -Wl,--export-dynamic,"
-+GTK2BUILD_LIBS="$X_LIBS $GTK2_LIBS $SETTINGS_LIBS $gthread_LIBS $gnome_speech_LIBS $gnome_a11y_LIBS $glade_LIBS $gnome_LIBS $wnck_LIBS $hildon_LIBS  -Wl,--export-dynamic"
- 
- 
-