update to 4.7.3

This switches to the gnome-2.22 release tree.

5 files changed, 36 insertions, 37 deletions

diff --git a/editors/dasher/Makefile b/editors/dasher/Makefile
index 0e51549e1ae..bb96ab1d818 100644
--- a/editors/dasher/Makefile
+++ b/editors/dasher/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.46 2008/03/06 14:53:49 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2008/05/29 17:53:36 drochner Exp $
 
-DISTNAME=	dasher-4.6.1
-PKGREVISION=	1
+DISTNAME=	dasher-4.7.3
 CATEGORIES=	editors gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dasher/4.6/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dasher/4.7/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -53,7 +52,7 @@ BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.8.0
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../mk/omf-scrollkeeper.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/dasher/PLIST b/editors/dasher/PLIST
index e69be9f7006..643cf90d159 100644
--- a/editors/dasher/PLIST
+++ b/editors/dasher/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2007/11/21 18:59:23 drochner Exp $
+@comment $NetBSD: PLIST,v 1.19 2008/05/29 17:53:36 drochner Exp $
 bin/dasher
 man/man1/dasher.1
 share/applications/dasher.desktop
@@ -154,6 +154,7 @@ share/dasher/controllabels.xml
 share/dasher/dasher.compose.glade
 share/dasher/dasher.direct.glade
 share/dasher/dasher.fullscreen.glade
+share/dasher/dasher.gameWIP.glade
 share/dasher/dasher.traditional.glade
 share/dasher/dashermaemo.glade
 share/dasher/dashermaemofullscreen.glade
@@ -234,6 +235,22 @@ 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/oc/dasher.xml
+share/gnome/help/dasher/oc/figures/a-z.gif
+share/gnome/help/dasher/oc/figures/aa-az.gif
+share/gnome/help/dasher/oc/figures/ala-alz.gif
+share/gnome/help/dasher/oc/figures/exampleHad2.png
+share/gnome/help/dasher/oc/figures/exampleHad2a.png
+share/gnome/help/dasher/oc/figures/exampleHad3a.png
+share/gnome/help/dasher/oc/figures/exampleHad4.png
+share/gnome/help/dasher/oc/figures/figure2.png
+share/gnome/help/dasher/oc/figures/main.png
+share/gnome/help/dasher/oc/figures/object.gif
+share/gnome/help/dasher/oc/figures/prefs1.png
+share/gnome/help/dasher/oc/figures/prefs2.png
+share/gnome/help/dasher/oc/figures/prefs3.png
+share/gnome/help/dasher/oc/figures/prefs4.png
+share/gnome/help/dasher/oc/figures/prefs5.png
 share/gnome/help/dasher/ru/dasher.xml
 share/gnome/help/dasher/ru/figures/a-z.gif
 share/gnome/help/dasher/ru/figures/aa-az.gif
@@ -269,6 +286,7 @@ 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
+share/locale/as/LC_MESSAGES/dasher.mo
 share/locale/az/LC_MESSAGES/dasher.mo
 share/locale/be/LC_MESSAGES/dasher.mo
 share/locale/be@latin/LC_MESSAGES/dasher.mo
@@ -302,6 +320,7 @@ share/locale/id/LC_MESSAGES/dasher.mo
 share/locale/it/LC_MESSAGES/dasher.mo
 share/locale/ja/LC_MESSAGES/dasher.mo
 share/locale/ka/LC_MESSAGES/dasher.mo
+share/locale/kn/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
@@ -347,10 +366,11 @@ share/locale/zh_TW/LC_MESSAGES/dasher.mo
 share/omf/dasher/dasher-C.omf
 share/omf/dasher/dasher-es.omf
 share/omf/dasher/dasher-fr.omf
+share/omf/dasher/dasher-oc.omf
 share/omf/dasher/dasher-ru.omf
 share/omf/dasher/dasher-sv.omf
 @dirrm share/omf/dasher
-@comment in scrollkeeper: @dirrm share/omf
+@comment in rarian: @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
@@ -358,6 +378,8 @@ share/omf/dasher/dasher-sv.omf
 @dirrm share/gnome/help/dasher/sv
 @dirrm share/gnome/help/dasher/ru/figures
 @dirrm share/gnome/help/dasher/ru
+@dirrm share/gnome/help/dasher/oc/figures
+@dirrm share/gnome/help/dasher/oc
 @dirrm share/gnome/help/dasher/fr/figures
 @dirrm share/gnome/help/dasher/fr
 @dirrm share/gnome/help/dasher/es/figures
diff --git a/editors/dasher/distinfo b/editors/dasher/distinfo
index d9c3145dc2d..d0a62c94ab1 100644
--- a/editors/dasher/distinfo
+++ b/editors/dasher/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.24 2007/12/27 14:55:36 joerg Exp $
+$NetBSD: distinfo,v 1.25 2008/05/29 17:53:36 drochner Exp $
 
-SHA1 (dasher-4.6.1.tar.bz2) = 6efeb3fdd160e203b60e5d2b9faca0d243a68ed3
-RMD160 (dasher-4.6.1.tar.bz2) = 77a765ddc623895a2a121732848f00c5a82652d0
-Size (dasher-4.6.1.tar.bz2) = 6473483 bytes
-SHA1 (patch-aa) = 52a3e82bef8595efcf9aab0d5c53931fd9c9f7a7
+SHA1 (dasher-4.7.3.tar.bz2) = 962cec3050e6a0b0f3670971734bd0595076b959
+RMD160 (dasher-4.7.3.tar.bz2) = cef9e14e53cd29244aa5e84de32cffe75cde2c76
+Size (dasher-4.7.3.tar.bz2) = 6773132 bytes
 SHA1 (patch-ab) = a5dac2d9f8a59ee4ea4370fa5b75e8e0f008fdbd
 SHA1 (patch-ac) = 9c21bac777158e564a69b5f2735380c6a2b985e8
 SHA1 (patch-ad) = 8261c0e7de41fd2729413ee24c24e07cb939a1ae
 SHA1 (patch-ae) = 6e16f33e9ae2a75e0a11294af478cf5d0ab08cdc
 SHA1 (patch-af) = 63b6bb074834cc8203cfe2fdaddd838439ac5b60
-SHA1 (patch-ag) = 405fea543020b4e6c0dfdbd4d4499ad0b189154c
+SHA1 (patch-ag) = b8948dc2a0f2c52db3cd697c6b9eaef7abb650f2
diff --git a/editors/dasher/patches/patch-aa b/editors/dasher/patches/patch-aa
deleted file mode 100644
index 49d7d535b6e..00000000000
--- a/editors/dasher/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2007/04/17 20:31:35 joerg Exp $
-
---- Src/Gtk2/dasher_main.cpp.orig	2007-04-17 19:50:29.000000000 +0000
-+++ Src/Gtk2/dasher_main.cpp
-@@ -1,5 +1,7 @@
- #include "config.h"
- 
-+#include <unistd.h>
-+
- #include <gdk/gdk.h>
- #include <gdk/gdkx.h>
- #include <glade/glade.h>
diff --git a/editors/dasher/patches/patch-ag b/editors/dasher/patches/patch-ag
index 011290b93af..011747d9c62 100644
--- a/editors/dasher/patches/patch-ag
+++ b/editors/dasher/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.2 2007/12/27 14:55:36 joerg Exp $
+$NetBSD: patch-ag,v 1.3 2008/05/29 17:53:36 drochner Exp $
 
---- Src/DasherCore/DasherViewSquare.cpp.orig	2007-10-30 17:46:41.000000000 +0100
+--- Src/DasherCore/DasherViewSquare.cpp.orig	2008-04-07 19:25:34.000000000 +0200
 +++ Src/DasherCore/DasherViewSquare.cpp
-@@ -791,7 +791,7 @@ void CDasherViewSquare::GetScaleFactor( 
+@@ -805,7 +805,7 @@ void CDasherViewSquare::GetScaleFactor( 
  inline myint CDasherViewSquare::CustomIDiv(myint iNumerator, myint iDenominator) { 
    // Integer division rounding away from zero
    
@@ -11,12 +11,3 @@ $NetBSD: patch-ag,v 1.2 2007/12/27 14:55:36 joerg Exp $
    myint quot = iNumerator / iDenominator;
    myint rem = (int64)iNumerator % (int64)iDenominator;
  
-@@ -802,7 +802,7 @@ inline myint CDasherViewSquare::CustomID
-   else
-     return quot;
- #else
--  lldiv_t res = __gnu_cxx::lldiv(iNumerator, iDenominator);
-+  lldiv_t res = ::lldiv(iNumerator, iDenominator);
-   
-   if(res.rem < 0)
-     return res.quot - 1;