- Update to 2.4.5

PR:		ports/84541
Submitted by:	delphij (maintainer)

8 files changed, 62 insertions, 46 deletions

diff --git a/textproc/stardict2/Makefile b/textproc/stardict2/Makefile
index b09e174b02f0..a56e63e647a7 100644
--- a/textproc/stardict2/Makefile
+++ b/textproc/stardict2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	stardict
-PORTVERSION=	2.4.4
-PORTREVISION=	1
+PORTVERSION=	2.4.5
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/textproc/stardict2/distinfo b/textproc/stardict2/distinfo
index 13d059d034b4..b2ab3356ead5 100644
--- a/textproc/stardict2/distinfo
+++ b/textproc/stardict2/distinfo
@@ -1,2 +1,2 @@
-MD5 (stardict/stardict-2.4.4.tar.bz2) = e1c2df19fc854f81bdec4b3409eb95e1
-SIZE (stardict/stardict-2.4.4.tar.bz2) = 1051468
+MD5 (stardict/stardict-2.4.5.tar.bz2) = 78543ca107bf7a70a96ba41313de8883
+SIZE (stardict/stardict-2.4.5.tar.bz2) = 1021685
diff --git a/textproc/stardict2/files/patch-src::readword.cpp b/textproc/stardict2/files/patch-src::readword.cpp
index 111abbf783b1..c9ddb8f9cfa4 100644
--- a/textproc/stardict2/files/patch-src::readword.cpp
+++ b/textproc/stardict2/files/patch-src::readword.cpp
@@ -1,29 +1,29 @@
---- src/readword.cpp.orig	Sat Nov 27 22:35:44 2004
-+++ src/readword.cpp	Sat Nov 27 22:36:00 2004
-@@ -18,7 +18,7 @@
- 	have_data_file = g_file_test(filename, G_FILE_TEST_EXISTS);
- 	g_free(filename);
+--- src/readword.cpp.orig	Mon Jul 18 21:06:15 2005
++++ src/readword.cpp	Thu Aug  4 16:42:21 2005
+@@ -17,7 +17,7 @@
+ 	  g_file_test((gStarDictDataDir+G_DIR_SEPARATOR+"WyabdcRealPeopleTTS").c_str(), 
+ 		      G_FILE_TEST_EXISTS);
  #else
 -	have_data_file = g_file_test("/usr/share/WyabdcRealPeopleTTS", G_FILE_TEST_EXISTS);
 +	have_data_file = g_file_test("/usr/local/share/WyabdcRealPeopleTTS", G_FILE_TEST_EXISTS);
  #endif
  }
  
-@@ -34,7 +34,7 @@
- #ifdef _WIN32
- 		gchar *filename = g_strdup_printf("%s/WyabdcRealPeopleTTS/%c/%s.wav", stardict_data_dir, lowerword[0],lowerword);
+@@ -35,7 +35,7 @@
+     filename = gStarDictDataDir+"/WyabdcRealPeopleTTS/"+
+       lowerword[0]+"/"+lowerword+".wav";
  #else
--		gchar *filename = g_strdup_printf("/usr/share/WyabdcRealPeopleTTS/%c/%s.wav", lowerword[0],lowerword);		
-+		gchar *filename = g_strdup_printf("/usr/local/share/WyabdcRealPeopleTTS/%c/%s.wav", lowerword[0],lowerword);		
+-    filename = std::string("/usr/share/WyabdcRealPeopleTTS/")+lowerword[0]+"/"+
++    filename = std::string("/usr/local/share/WyabdcRealPeopleTTS/")+lowerword[0]+"/"+
+       lowerword+".wav";
  #endif
- 		return_val = g_file_test(filename, G_FILE_TEST_EXISTS);
- 		g_free(filename);
-@@ -56,7 +56,7 @@
- 		filename = g_strdup_printf("%s/WyabdcRealPeopleTTS/%c/%s.wav", stardict_data_dir, lowerword[0],lowerword);
- 		PlaySound(filename, 0, SND_ASYNC | SND_FILENAME);
+     return_val = g_file_test(filename.c_str(), G_FILE_TEST_EXISTS);
+@@ -58,7 +58,7 @@
+     filename = gStarDictDataDir+"/WyabdcRealPeopleTTS/"+
+       lowerword[0]+"/"+lowerword+".wav";
  #else
--		filename = g_strdup_printf("/usr/share/WyabdcRealPeopleTTS/%c/%s.wav", lowerword[0],lowerword);		
-+		filename = g_strdup_printf("/usr/local/share/WyabdcRealPeopleTTS/%c/%s.wav", lowerword[0],lowerword);		
- 		gnome_sound_play(filename);
+-    filename = std::string("/usr/share/WyabdcRealPeopleTTS/")+
++    filename = std::string("/usr/local/share/WyabdcRealPeopleTTS/")+
+       lowerword[0]+"/"+lowerword+".wav";
  #endif
- 		g_free(filename);
+     play_wav_file(filename.c_str());
diff --git a/textproc/stardict2/pkg-plist b/textproc/stardict2/pkg-plist
index adc51de06098..b5ef6ba0bb7d 100644
--- a/textproc/stardict2/pkg-plist
+++ b/textproc/stardict2/pkg-plist
@@ -11,6 +11,11 @@ share/gnome/help/stardict/mk/figures/stardict_main_window.png
 share/gnome/help/stardict/mk/figures/stardict_notification_area.png
 share/gnome/help/stardict/mk/legal.xml
 share/gnome/help/stardict/mk/stardict.xml
+share/gnome/help/stardict/nl/figures/stardict_float_window.png
+share/gnome/help/stardict/nl/figures/stardict_main_window.png
+share/gnome/help/stardict/nl/figures/stardict_notification_area.png
+share/gnome/help/stardict/nl/legal.xml
+share/gnome/help/stardict/nl/stardict.xml
 share/gnome/help/stardict/ru/figures/stardict_float_window.png
 share/gnome/help/stardict/ru/figures/stardict_main_window.png
 share/gnome/help/stardict/ru/figures/stardict_notification_area.png
@@ -34,6 +39,7 @@ share/gnome/help/stardict/zh_TW/stardict.xml
 share/gnome/idl/GNOME_Stardict.idl
 share/gnome/omf/stardict/stardict-C.omf
 share/gnome/omf/stardict/stardict-mk.omf
+share/gnome/omf/stardict/stardict-nl.omf
 share/gnome/omf/stardict/stardict-ru.omf
 share/gnome/omf/stardict/stardict-uk.omf
 share/gnome/omf/stardict/stardict-zh_CN.omf
@@ -51,6 +57,7 @@ share/locale/cs/LC_MESSAGES/stardict.mo
 share/locale/de/LC_MESSAGES/stardict.mo
 share/locale/hu/LC_MESSAGES/stardict.mo
 share/locale/mk/LC_MESSAGES/stardict.mo
+share/locale/nl/LC_MESSAGES/stardict.mo
 share/locale/ru/LC_MESSAGES/stardict.mo
 share/locale/sk/LC_MESSAGES/stardict.mo
 share/locale/uk/LC_MESSAGES/stardict.mo
@@ -69,6 +76,8 @@ share/locale/zh_TW/LC_MESSAGES/stardict.mo
 @dirrm share/gnome/help/stardict/uk
 @dirrm share/gnome/help/stardict/ru/figures
 @dirrm share/gnome/help/stardict/ru
+@dirrm share/gnome/help/stardict/nl/figures
+@dirrm share/gnome/help/stardict/nl
 @dirrm share/gnome/help/stardict/mk/figures
 @dirrm share/gnome/help/stardict/mk
 @dirrm share/gnome/help/stardict/C/figures
diff --git a/textproc/stardict3/Makefile b/textproc/stardict3/Makefile
index b09e174b02f0..a56e63e647a7 100644
--- a/textproc/stardict3/Makefile
+++ b/textproc/stardict3/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	stardict
-PORTVERSION=	2.4.4
-PORTREVISION=	1
+PORTVERSION=	2.4.5
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/textproc/stardict3/distinfo b/textproc/stardict3/distinfo
index 13d059d034b4..b2ab3356ead5 100644
--- a/textproc/stardict3/distinfo
+++ b/textproc/stardict3/distinfo
@@ -1,2 +1,2 @@
-MD5 (stardict/stardict-2.4.4.tar.bz2) = e1c2df19fc854f81bdec4b3409eb95e1
-SIZE (stardict/stardict-2.4.4.tar.bz2) = 1051468
+MD5 (stardict/stardict-2.4.5.tar.bz2) = 78543ca107bf7a70a96ba41313de8883
+SIZE (stardict/stardict-2.4.5.tar.bz2) = 1021685
diff --git a/textproc/stardict3/files/patch-src::readword.cpp b/textproc/stardict3/files/patch-src::readword.cpp
index 111abbf783b1..c9ddb8f9cfa4 100644
--- a/textproc/stardict3/files/patch-src::readword.cpp
+++ b/textproc/stardict3/files/patch-src::readword.cpp
@@ -1,29 +1,29 @@
---- src/readword.cpp.orig	Sat Nov 27 22:35:44 2004
-+++ src/readword.cpp	Sat Nov 27 22:36:00 2004
-@@ -18,7 +18,7 @@
- 	have_data_file = g_file_test(filename, G_FILE_TEST_EXISTS);
- 	g_free(filename);
+--- src/readword.cpp.orig	Mon Jul 18 21:06:15 2005
++++ src/readword.cpp	Thu Aug  4 16:42:21 2005
+@@ -17,7 +17,7 @@
+ 	  g_file_test((gStarDictDataDir+G_DIR_SEPARATOR+"WyabdcRealPeopleTTS").c_str(), 
+ 		      G_FILE_TEST_EXISTS);
  #else
 -	have_data_file = g_file_test("/usr/share/WyabdcRealPeopleTTS", G_FILE_TEST_EXISTS);
 +	have_data_file = g_file_test("/usr/local/share/WyabdcRealPeopleTTS", G_FILE_TEST_EXISTS);
  #endif
  }
  
-@@ -34,7 +34,7 @@
- #ifdef _WIN32
- 		gchar *filename = g_strdup_printf("%s/WyabdcRealPeopleTTS/%c/%s.wav", stardict_data_dir, lowerword[0],lowerword);
+@@ -35,7 +35,7 @@
+     filename = gStarDictDataDir+"/WyabdcRealPeopleTTS/"+
+       lowerword[0]+"/"+lowerword+".wav";
  #else
--		gchar *filename = g_strdup_printf("/usr/share/WyabdcRealPeopleTTS/%c/%s.wav", lowerword[0],lowerword);		
-+		gchar *filename = g_strdup_printf("/usr/local/share/WyabdcRealPeopleTTS/%c/%s.wav", lowerword[0],lowerword);		
+-    filename = std::string("/usr/share/WyabdcRealPeopleTTS/")+lowerword[0]+"/"+
++    filename = std::string("/usr/local/share/WyabdcRealPeopleTTS/")+lowerword[0]+"/"+
+       lowerword+".wav";
  #endif
- 		return_val = g_file_test(filename, G_FILE_TEST_EXISTS);
- 		g_free(filename);
-@@ -56,7 +56,7 @@
- 		filename = g_strdup_printf("%s/WyabdcRealPeopleTTS/%c/%s.wav", stardict_data_dir, lowerword[0],lowerword);
- 		PlaySound(filename, 0, SND_ASYNC | SND_FILENAME);
+     return_val = g_file_test(filename.c_str(), G_FILE_TEST_EXISTS);
+@@ -58,7 +58,7 @@
+     filename = gStarDictDataDir+"/WyabdcRealPeopleTTS/"+
+       lowerword[0]+"/"+lowerword+".wav";
  #else
--		filename = g_strdup_printf("/usr/share/WyabdcRealPeopleTTS/%c/%s.wav", lowerword[0],lowerword);		
-+		filename = g_strdup_printf("/usr/local/share/WyabdcRealPeopleTTS/%c/%s.wav", lowerword[0],lowerword);		
- 		gnome_sound_play(filename);
+-    filename = std::string("/usr/share/WyabdcRealPeopleTTS/")+
++    filename = std::string("/usr/local/share/WyabdcRealPeopleTTS/")+
+       lowerword[0]+"/"+lowerword+".wav";
  #endif
- 		g_free(filename);
+     play_wav_file(filename.c_str());
diff --git a/textproc/stardict3/pkg-plist b/textproc/stardict3/pkg-plist
index adc51de06098..b5ef6ba0bb7d 100644
--- a/textproc/stardict3/pkg-plist
+++ b/textproc/stardict3/pkg-plist
@@ -11,6 +11,11 @@ share/gnome/help/stardict/mk/figures/stardict_main_window.png
 share/gnome/help/stardict/mk/figures/stardict_notification_area.png
 share/gnome/help/stardict/mk/legal.xml
 share/gnome/help/stardict/mk/stardict.xml
+share/gnome/help/stardict/nl/figures/stardict_float_window.png
+share/gnome/help/stardict/nl/figures/stardict_main_window.png
+share/gnome/help/stardict/nl/figures/stardict_notification_area.png
+share/gnome/help/stardict/nl/legal.xml
+share/gnome/help/stardict/nl/stardict.xml
 share/gnome/help/stardict/ru/figures/stardict_float_window.png
 share/gnome/help/stardict/ru/figures/stardict_main_window.png
 share/gnome/help/stardict/ru/figures/stardict_notification_area.png
@@ -34,6 +39,7 @@ share/gnome/help/stardict/zh_TW/stardict.xml
 share/gnome/idl/GNOME_Stardict.idl
 share/gnome/omf/stardict/stardict-C.omf
 share/gnome/omf/stardict/stardict-mk.omf
+share/gnome/omf/stardict/stardict-nl.omf
 share/gnome/omf/stardict/stardict-ru.omf
 share/gnome/omf/stardict/stardict-uk.omf
 share/gnome/omf/stardict/stardict-zh_CN.omf
@@ -51,6 +57,7 @@ share/locale/cs/LC_MESSAGES/stardict.mo
 share/locale/de/LC_MESSAGES/stardict.mo
 share/locale/hu/LC_MESSAGES/stardict.mo
 share/locale/mk/LC_MESSAGES/stardict.mo
+share/locale/nl/LC_MESSAGES/stardict.mo
 share/locale/ru/LC_MESSAGES/stardict.mo
 share/locale/sk/LC_MESSAGES/stardict.mo
 share/locale/uk/LC_MESSAGES/stardict.mo
@@ -69,6 +76,8 @@ share/locale/zh_TW/LC_MESSAGES/stardict.mo
 @dirrm share/gnome/help/stardict/uk
 @dirrm share/gnome/help/stardict/ru/figures
 @dirrm share/gnome/help/stardict/ru
+@dirrm share/gnome/help/stardict/nl/figures
+@dirrm share/gnome/help/stardict/nl
 @dirrm share/gnome/help/stardict/mk/figures
 @dirrm share/gnome/help/stardict/mk
 @dirrm share/gnome/help/stardict/C/figures