update to 4.4.1

changes:
This moves this pkg to the new stable gnome branch, too much to list here.

5 files changed, 65 insertions, 41 deletions

diff --git a/editors/dasher/Makefile b/editors/dasher/Makefile
index a9d06b0a356..174543fa93f 100644
--- a/editors/dasher/Makefile
+++ b/editors/dasher/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2007/03/21 12:05:44 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2007/04/11 18:19:42 drochner Exp $
 
-DISTNAME=	dasher-4.2.2
-PKGREVISION=	1
+DISTNAME=	dasher-4.4.1
 CATEGORIES=	editors gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dasher/4.2/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dasher/4.4/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -24,6 +23,14 @@ GNU_CONFIGURE=		yes
 LIBS+=			-lcompat
 .endif
 
+GCONF2_SCHEMAS+=	dasher.schemas
+
+post-build:
+	(cd ${WRKSRC}/Data && ../Src/Gtk2/generate-schema >dasher.schemas)
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/Data/dasher.schemas ${GCONF2_SCHEMAS_DIR}
+
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.0
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.8.0
 
@@ -31,7 +38,7 @@ BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.8.0
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/atk/buildlink3.mk"
 .include "../../devel/at-spi/buildlink3.mk"
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf2/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
diff --git a/editors/dasher/PLIST b/editors/dasher/PLIST
index 33648b794ce..b75925d6d54 100644
--- a/editors/dasher/PLIST
+++ b/editors/dasher/PLIST
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.13 2006/09/15 15:20:56 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.14 2007/04/11 18:19:43 drochner Exp $
 bin/dasher
 man/man1/dasher.1
 share/applications/dasher.desktop
 share/dasher/alphabet.AfaanOromo.xml
 share/dasher/alphabet.Armenian.xml
 share/dasher/alphabet.Assamese.xml
-share/dasher/alphabet.Austen.xml
 share/dasher/alphabet.Azerbaijani.xml
 share/dasher/alphabet.Belarusian.xml
 share/dasher/alphabet.Bulgarian.xml
@@ -107,6 +106,7 @@ share/dasher/alphabet.latvian.xml
 share/dasher/alphabet.lithuanian.xml
 share/dasher/alphabet.luxembourgish.xml
 share/dasher/alphabet.macedonian.xml
+share/dasher/alphabet.malagasy.xml
 share/dasher/alphabet.maltese.xml
 share/dasher/alphabet.mongolian.xml
 share/dasher/alphabet.myanmar.xml
@@ -115,7 +115,6 @@ share/dasher/alphabet.norwegian.xml
 share/dasher/alphabet.occitan.xml
 share/dasher/alphabet.ogham.xml
 share/dasher/alphabet.pashto.xml
-share/dasher/alphabet.perl.xml
 share/dasher/alphabet.persian.xml
 share/dasher/alphabet.pinyin.xml
 share/dasher/alphabet.polish.xml
@@ -141,6 +140,7 @@ share/dasher/colour.blue.xml
 share/dasher/colour.dtd
 share/dasher/colour.euroasian.xml
 share/dasher/colour.euroasian2.xml
+share/dasher/colour.euroasian3.xml
 share/dasher/colour.jamie.xml
 share/dasher/colour.rainbow.xml
 share/dasher/colour.thai.xml
@@ -149,11 +149,15 @@ share/dasher/colour.vowels2.xml
 share/dasher/colour.xml
 share/dasher/controllabels.dtd
 share/dasher/controllabels.xml
-share/dasher/dasher.glade
+share/dasher/dasher.compose.glade
+share/dasher/dasher.direct.glade
+share/dasher/dasher.fullscreen.glade
+share/dasher/dasher.traditional.glade
+share/dasher/dashermaemo.glade
+share/dasher/dashermaemofullscreen.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
@@ -178,6 +182,7 @@ 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/gconf/schemas/dasher.schemas
 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
@@ -194,6 +199,38 @@ 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/fr/dasher.xml
+share/gnome/help/dasher/fr/figures/a-z.gif
+share/gnome/help/dasher/fr/figures/aa-az.gif
+share/gnome/help/dasher/fr/figures/ala-alz.gif
+share/gnome/help/dasher/fr/figures/exampleHad2.png
+share/gnome/help/dasher/fr/figures/exampleHad2a.png
+share/gnome/help/dasher/fr/figures/exampleHad3a.png
+share/gnome/help/dasher/fr/figures/exampleHad4.png
+share/gnome/help/dasher/fr/figures/figure2.png
+share/gnome/help/dasher/fr/figures/main.png
+share/gnome/help/dasher/fr/figures/object.gif
+share/gnome/help/dasher/fr/figures/prefs1.png
+share/gnome/help/dasher/fr/figures/prefs2.png
+share/gnome/help/dasher/fr/figures/prefs3.png
+share/gnome/help/dasher/fr/figures/prefs4.png
+share/gnome/help/dasher/fr/figures/prefs5.png
+share/gnome/help/dasher/sv/dasher.xml
+share/gnome/help/dasher/sv/figures/a-z.gif
+share/gnome/help/dasher/sv/figures/aa-az.gif
+share/gnome/help/dasher/sv/figures/ala-alz.gif
+share/gnome/help/dasher/sv/figures/exampleHad2.png
+share/gnome/help/dasher/sv/figures/exampleHad2a.png
+share/gnome/help/dasher/sv/figures/exampleHad3a.png
+share/gnome/help/dasher/sv/figures/exampleHad4.png
+share/gnome/help/dasher/sv/figures/figure2.png
+share/gnome/help/dasher/sv/figures/main.png
+share/gnome/help/dasher/sv/figures/object.gif
+share/gnome/help/dasher/sv/figures/prefs1.png
+share/gnome/help/dasher/sv/figures/prefs2.png
+share/gnome/help/dasher/sv/figures/prefs3.png
+share/gnome/help/dasher/sv/figures/prefs4.png
+share/gnome/help/dasher/sv/figures/prefs5.png
 share/icons/hicolor/48x48/apps/dasher.png
 share/icons/hicolor/scalable/apps/dasher.svg
 share/locale/ar/LC_MESSAGES/dasher.mo
@@ -269,14 +306,21 @@ 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-fr.omf
+share/omf/dasher/dasher-sv.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/sv/figures
+@dirrm share/gnome/help/dasher/sv
+@dirrm share/gnome/help/dasher/fr/figures
+@dirrm share/gnome/help/dasher/fr
 @dirrm share/gnome/help/dasher/C/figures
 @dirrm share/gnome/help/dasher/C
 @dirrm share/gnome/help/dasher
 @comment in gnome2-dirs: @dirrm share/gnome/help
+@comment in GConf2: @dirrm share/gconf/schemas
 @dirrm share/dasher
 @comment in xdg-dirs: @dirrm share/applications
diff --git a/editors/dasher/distinfo b/editors/dasher/distinfo
index 6541664b8f0..9edef2a0635 100644
--- a/editors/dasher/distinfo
+++ b/editors/dasher/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.18 2006/12/15 20:02:34 drochner Exp $
+$NetBSD: distinfo,v 1.19 2007/04/11 18:19:44 drochner Exp $
 
-SHA1 (dasher-4.2.2.tar.bz2) = b2258080cc6480c2173148e09013e7efd0307914
-RMD160 (dasher-4.2.2.tar.bz2) = 33fccd70dbe9d977a1c6efd7037e939d28acbdcf
-Size (dasher-4.2.2.tar.bz2) = 5625199 bytes
-SHA1 (patch-aa) = db0a200c22bd8ac44178e4b0f9c6e80ee9967a6e
+SHA1 (dasher-4.4.1.tar.bz2) = ecf3864e246e09e938c8b8c87518965a43a0695c
+RMD160 (dasher-4.4.1.tar.bz2) = 182793011215bb9bfb515fc4d60c829d1372c705
+Size (dasher-4.4.1.tar.bz2) = 6779949 bytes
 SHA1 (patch-ab) = a5dac2d9f8a59ee4ea4370fa5b75e8e0f008fdbd
-SHA1 (patch-ac) = 476ea57fab03159685f3597bc46fb8ee79879c99
diff --git a/editors/dasher/patches/patch-aa b/editors/dasher/patches/patch-aa
deleted file mode 100644
index 2e0fb8f6cc3..00000000000
--- a/editors/dasher/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2006/11/29 13:11:49 joerg Exp $
-
---- Src/DasherCore/SocketInputBase.cpp.orig	2006-11-29 09:23:07.000000000 +0000
-+++ Src/DasherCore/SocketInputBase.cpp
-@@ -11,6 +11,7 @@
- #include <string.h>
- #include <errno.h>
- #include <stdarg.h>
-+#include <unistd.h>
- #ifdef WIN32
-  #include <winsock2.h>
-  #define DASHER_SOCKET_CLOSE_FUNCTION closesocket
diff --git a/editors/dasher/patches/patch-ac b/editors/dasher/patches/patch-ac
deleted file mode 100644
index 3da5cdc76b8..00000000000
--- a/editors/dasher/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/11/29 13:11:49 joerg Exp $
-
---- configure.orig	2006-11-29 12:49:02.000000000 +0000
-+++ configure
-@@ -23758,7 +23758,7 @@ GTK2BUILD_CFLAGS="$GTK2_CFLAGS $SETTINGS
- if [ x"$WITHDARWIN" = xtrue ]; then
-       GTK2BUILD_LIBS="$X_LIBS $GTK2_LIBS $SETTINGS_LIBS $gthread_LIBS $gnome_speech_LIBS $gnome_a11y_LIBS $glade_LIBS $gnome_LIBS $wnck_LIBS $hildon_LIBS"
- else
--      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"
- fi
- 
-