Update to 4.5.2, but disable speech as the build is currently broken.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9170 df743ca5-7f9a-e211-a948-0013205c9059

9 files changed, 59 insertions, 96 deletions

diff --git a/accessibility/dasher/Makefile b/accessibility/dasher/Makefile
index c49d34017..733f5b4f9 100644
--- a/accessibility/dasher/Makefile
+++ b/accessibility/dasher/Makefile
@@ -3,12 +3,11 @@
 # Whom:					lewiz <purple@lewiz.net>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/dasher/Makefile,v 1.53 2007/05/15 21:36:19 marcus Exp $
+#   $MCom: ports/accessibility/dasher/Makefile,v 1.54 2007/05/19 21:35:52 marcus Exp $
 #
 
 PORTNAME=	dasher
-PORTVERSION=	4.5.0
-PORTREVISION=	1
+PORTVERSION=	4.5.2
 PORTEPOCH=	1
 CATEGORIES=	accessibility editors x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -40,10 +39,11 @@ MAN1=		dasher.1
 
 .include <bsd.port.pre.mk>
 
-.if ${HAVE_GNOME:Mgnomespeech}!=""
-USE_GNOME+=	gnomespeech
-CONFIGURE_ARGS+=--enable-speech
-.endif
+#.if ${HAVE_GNOME:Mgnomespeech}!=""
+#USE_GNOME+=	gnomespeech
+#CONFIGURE_ARGS+=--enable-speech
+#.endif
+CONFIGURE_ARGS+=	--disable-speech
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/configure
diff --git a/accessibility/dasher/distinfo b/accessibility/dasher/distinfo
index 79d4bfa51..7ded2c9c4 100644
--- a/accessibility/dasher/distinfo
+++ b/accessibility/dasher/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/dasher-4.5.0.tar.bz2) = 3fc2e5e06ef9be038629448fc15c98ef
-SHA256 (gnome2/dasher-4.5.0.tar.bz2) = e5bd80ee98453f4fafc4a46f3c35016c0cbf3652e138bf81e67320c1374c7d29
-SIZE (gnome2/dasher-4.5.0.tar.bz2) = 6315718
+MD5 (gnome2/dasher-4.5.2.tar.bz2) = 59317850c12064ced3eb76c753be7c71
+SHA256 (gnome2/dasher-4.5.2.tar.bz2) = b57c884eea81be1ff721a546d40f406d375608eb41e31220b31bfff59e6b15ce
+SIZE (gnome2/dasher-4.5.2.tar.bz2) = 6566828
diff --git a/accessibility/dasher/files/patch-Src_DasherCore_BasicLog.cpp b/accessibility/dasher/files/patch-Src_DasherCore_BasicLog.cpp
deleted file mode 100644
index baf470649..000000000
--- a/accessibility/dasher/files/patch-Src_DasherCore_BasicLog.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- Src/DasherCore/BasicLog.cpp.orig	Tue Dec  5 22:01:38 2006
-+++ Src/DasherCore/BasicLog.cpp	Tue Dec  5 22:02:14 2006
-@@ -87,7 +87,7 @@ std::string CBasicLog::GetDateStamp() {
-     szTimeLine = ctime(&(sTimeBuffer.time));
- #else
-     gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
--    szTimeLine = ctime(&(sTimeBuffer.tv_sec));
-+    szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
- #endif
- 
-     return std::string(szTimeLine).substr(0, 24);
diff --git a/accessibility/dasher/files/patch-Src_DasherCore_DasherViewSquare.cpp b/accessibility/dasher/files/patch-Src_DasherCore_DasherViewSquare.cpp
new file mode 100644
index 000000000..13bcc487e
--- /dev/null
+++ b/accessibility/dasher/files/patch-Src_DasherCore_DasherViewSquare.cpp
@@ -0,0 +1,11 @@
+--- Src/DasherCore/DasherViewSquare.cpp.orig	2007-07-09 23:30:03.000000000 -0400
++++ Src/DasherCore/DasherViewSquare.cpp	2007-07-09 23:30:36.000000000 -0400
+@@ -781,7 +781,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;
diff --git a/accessibility/dasher/files/patch-Src_DasherCore_FileLogger.cpp b/accessibility/dasher/files/patch-Src_DasherCore_FileLogger.cpp
deleted file mode 100644
index ec7187560..000000000
--- a/accessibility/dasher/files/patch-Src_DasherCore_FileLogger.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- Src/DasherCore/FileLogger.cpp.orig	Sun Dec  3 09:50:34 2006
-+++ Src/DasherCore/FileLogger.cpp	Sun Dec  3 18:45:55 2006
-@@ -511,7 +511,7 @@ std::string CFileLogger::GetTimeDateStam
-     szTimeLine = ctime(&(sTimeBuffer.time));
- #else
-     gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
--    szTimeLine = ctime(&(sTimeBuffer.tv_sec));
-+    szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
- #endif
-  
-     // Format is:
diff --git a/accessibility/dasher/files/patch-Src_DasherCore_SimpleTimer.cpp b/accessibility/dasher/files/patch-Src_DasherCore_SimpleTimer.cpp
deleted file mode 100644
index 745c41f85..000000000
--- a/accessibility/dasher/files/patch-Src_DasherCore_SimpleTimer.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
---- Src/DasherCore/SimpleTimer.cpp.orig	Wed May 31 00:14:12 2006
-+++ Src/DasherCore/SimpleTimer.cpp	Wed May 31 00:14:23 2006
-@@ -34,8 +34,8 @@ CSimpleTimer::CSimpleTimer()
-     m_iStartSecond   = sTimeBuffer.time;
- #else
-     gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
--    m_iStartMs       = sTimeBuffer.tv_usec / 1000;
--    m_iStartSecond   = sTimeBuffer.tv_sec;
-+    m_iStartMs       = (int) sTimeBuffer.tv_usec / 1000;
-+    m_iStartSecond   = (int) sTimeBuffer.tv_sec;
- #endif
- 
- }
-@@ -59,8 +59,8 @@ double CSimpleTimer::GetElapsed()
-   int     iEndSecond   = sTimeBuffer.time;
- #else
-   gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
--  int     iEndMs       = sTimeBuffer.tv_usec / 1000;
--  int     iEndSecond   = sTimeBuffer.tv_sec;
-+  int     iEndMs       = (int) sTimeBuffer.tv_usec / 1000;
-+  int     iEndSecond   = (int) sTimeBuffer.tv_sec;
- #endif
- 
- 
diff --git a/accessibility/dasher/files/patch-Src_DasherCore_TimeSpan.cpp b/accessibility/dasher/files/patch-Src_DasherCore_TimeSpan.cpp
deleted file mode 100644
index c10219ff4..000000000
--- a/accessibility/dasher/files/patch-Src_DasherCore_TimeSpan.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- Src/DasherCore/TimeSpan.cpp.orig	Sun Dec  3 09:50:34 2006
-+++ Src/DasherCore/TimeSpan.cpp	Sun Dec  3 18:47:02 2006
-@@ -122,7 +122,7 @@ string CTimeSpan::GetTimeStamp()
-     szTimeLine = ctime(&(sTimeBuffer.time));
- #else
-     gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
--    szTimeLine = ctime(&(sTimeBuffer.tv_sec));
-+    szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
- #endif
-   
-   if ((szTimeLine != NULL) && (strlen(szTimeLine) > 18))
-@@ -196,7 +196,7 @@ string CTimeSpan::GetDateStamp()
-     szTimeLine = ctime(&(sTimeBuffer.time));
- #else
-     gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
--    szTimeLine = ctime(&(sTimeBuffer.tv_sec));
-+    szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
- #endif
- 
-  
diff --git a/accessibility/dasher/files/patch-Src_DasherCore_UserLog.cpp b/accessibility/dasher/files/patch-Src_DasherCore_UserLog.cpp
deleted file mode 100644
index 663e5426e..000000000
--- a/accessibility/dasher/files/patch-Src_DasherCore_UserLog.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- Src/DasherCore/UserLog.cpp.orig	Fri Apr 21 17:41:02 2006
-+++ Src/DasherCore/UserLog.cpp	Sun Jun 11 10:43:33 2006
-@@ -668,7 +668,7 @@
-     szTimeLine = ctime(&(sTimeBuffer.time));
- #else
-     gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
--    szTimeLine = ctime(&(sTimeBuffer.tv_sec));
-+    szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
- #endif
- 
-     if ((szTimeLine != NULL) && (strlen(szTimeLine) > 18))
-@@ -881,7 +881,7 @@
-   double dTime = (sTimeBuffer.time * 1000.0) + sTimeBuffer.millitm;
- #else
-   gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
--  double dTime = (sTimeBuffer.tv_sec * 1000.0) + sTimeBuffer.tv_usec / 1000;
-+  double dTime = (sTimeBuffer.tv_sec * 1000.0) + (int) (sTimeBuffer.tv_usec / 1000);
- #endif
- 
-   
diff --git a/accessibility/dasher/pkg-plist b/accessibility/dasher/pkg-plist
index c2d1a5169..615025c4b 100644
--- a/accessibility/dasher/pkg-plist
+++ b/accessibility/dasher/pkg-plist
@@ -199,6 +199,22 @@ 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/es/dasher.xml
+share/gnome/help/dasher/es/figures/a-z.gif
+share/gnome/help/dasher/es/figures/aa-az.gif
+share/gnome/help/dasher/es/figures/ala-alz.gif
+share/gnome/help/dasher/es/figures/exampleHad2.png
+share/gnome/help/dasher/es/figures/exampleHad2a.png
+share/gnome/help/dasher/es/figures/exampleHad3a.png
+share/gnome/help/dasher/es/figures/exampleHad4.png
+share/gnome/help/dasher/es/figures/figure2.png
+share/gnome/help/dasher/es/figures/main.png
+share/gnome/help/dasher/es/figures/object.gif
+share/gnome/help/dasher/es/figures/prefs1.png
+share/gnome/help/dasher/es/figures/prefs2.png
+share/gnome/help/dasher/es/figures/prefs3.png
+share/gnome/help/dasher/es/figures/prefs4.png
+share/gnome/help/dasher/es/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
@@ -215,6 +231,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/ru/dasher.xml
+share/gnome/help/dasher/ru/figures/a-z.gif
+share/gnome/help/dasher/ru/figures/aa-az.gif
+share/gnome/help/dasher/ru/figures/ala-alz.gif
+share/gnome/help/dasher/ru/figures/exampleHad2.png
+share/gnome/help/dasher/ru/figures/exampleHad2a.png
+share/gnome/help/dasher/ru/figures/exampleHad3a.png
+share/gnome/help/dasher/ru/figures/exampleHad4.png
+share/gnome/help/dasher/ru/figures/figure2.png
+share/gnome/help/dasher/ru/figures/main.png
+share/gnome/help/dasher/ru/figures/object.gif
+share/gnome/help/dasher/ru/figures/prefs1.png
+share/gnome/help/dasher/ru/figures/prefs2.png
+share/gnome/help/dasher/ru/figures/prefs3.png
+share/gnome/help/dasher/ru/figures/prefs4.png
+share/gnome/help/dasher/ru/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
@@ -232,7 +264,9 @@ 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/omf/dasher/dasher-C.omf
+share/omf/dasher/dasher-es.omf
 share/omf/dasher/dasher-fr.omf
+share/omf/dasher/dasher-ru.omf
 share/omf/dasher/dasher-sv.omf
 share/icons/hicolor/48x48/apps/dasher.png
 share/icons/hicolor/scalable/apps/dasher.svg
@@ -312,8 +346,12 @@ share/locale/zh_TW/LC_MESSAGES/dasher.mo
 @dirrm share/omf/dasher
 @dirrm share/gnome/help/dasher/sv/figures
 @dirrm share/gnome/help/dasher/sv
+@dirrm share/gnome/help/dasher/ru/figures
+@dirrm share/gnome/help/dasher/ru
 @dirrm share/gnome/help/dasher/fr/figures
 @dirrm share/gnome/help/dasher/fr
+@dirrm share/gnome/help/dasher/es/figures
+@dirrm share/gnome/help/dasher/es
 @dirrm share/gnome/help/dasher/C/figures
 @dirrm share/gnome/help/dasher/C
 @dirrm share/gnome/help/dasher