18 files changed, 154 insertions, 62 deletions

diff --git a/textproc/stardict2/Makefile b/textproc/stardict2/Makefile
index 389c80d7cd13..ac1953c39331 100644
--- a/textproc/stardict2/Makefile
+++ b/textproc/stardict2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	stardict
-PORTVERSION=	2.4.3
-PORTREVISION=	3
+PORTVERSION=	2.4.4
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -26,6 +25,9 @@ USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnomeprefix libgnomeui
 USE_REINPLACE=	yes
 
+GCONF_SCHEMAS=	stardict.schemas
+INSTALLS_OMF=	yes
+
 MAN1=		stardict.1
 
 post-patch:
diff --git a/textproc/stardict2/distinfo b/textproc/stardict2/distinfo
index c9c63bdbebfc..13d059d034b4 100644
--- a/textproc/stardict2/distinfo
+++ b/textproc/stardict2/distinfo
@@ -1,2 +1,2 @@
-MD5 (stardict/stardict-2.4.3.tar.bz2) = a578782c9df8e985a32069d19bae0960
-SIZE (stardict/stardict-2.4.3.tar.bz2) = 773769
+MD5 (stardict/stardict-2.4.4.tar.bz2) = e1c2df19fc854f81bdec4b3409eb95e1
+SIZE (stardict/stardict-2.4.4.tar.bz2) = 1051468
diff --git a/textproc/stardict2/files/patch-src::Makefile.in b/textproc/stardict2/files/patch-src::Makefile.in
deleted file mode 100644
index 42a5e57b8f19..000000000000
--- a/textproc/stardict2/files/patch-src::Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/Makefile.in.orig	Thu Feb 19 08:17:29 2004
-+++ src/Makefile.in	Sat May 15 17:09:46 2004
-@@ -193,12 +193,7 @@
- 	-DDATADIR=\""$(datadir)"\"				\
- 	-DGNOME_ICONDIR=\""$(datadir)/pixmaps"\"		\
- 	-DSTARDICT_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"		\
--	-DSTARDICT_DATA_DIR=\""$(datadir)/stardict"\"		\
--	-DG_DISABLE_DEPRECATED					\
--	-DGDK_DISABLE_DEPRECATED				\
--	-DGTK_DISABLE_DEPRECATED				\
--	-DGDK_PIXBUF_DISABLE_DEPRECATED				\
--	-DGNOME_DISABLE_DEPRECATED
-+	-DSTARDICT_DATA_DIR=\""$(datadir)/stardict"\"
- 
- 
- stardict_LDFLAGS = 
diff --git a/textproc/stardict2/files/patch-src::docklet.h b/textproc/stardict2/files/patch-src::docklet.h
new file mode 100644
index 000000000000..b2f7c9634b1b
--- /dev/null
+++ b/textproc/stardict2/files/patch-src::docklet.h
@@ -0,0 +1,11 @@
+--- src/docklet.h.orig	Tue Sep 23 18:19:44 2003
++++ src/docklet.h	Tue Jan 18 02:20:01 2005
+@@ -7,7 +7,7 @@
+ enum DockLetIconType {
+ 	DOCKLET_NORMAL_ICON,
+ 	DOCKLET_SCAN_ICON,
+-	DOCKLET_STOP_ICON,
++	DOCKLET_STOP_ICON
+ };
+ 
+ class DockLet{
diff --git a/textproc/stardict2/files/patch-src::mainwin.h b/textproc/stardict2/files/patch-src::mainwin.h
new file mode 100644
index 000000000000..6f2d4d6a21ea
--- /dev/null
+++ b/textproc/stardict2/files/patch-src::mainwin.h
@@ -0,0 +1,11 @@
+--- src/mainwin.h.orig	Tue Sep 23 18:19:44 2003
++++ src/mainwin.h	Tue Jan 18 02:23:04 2005
+@@ -22,7 +22,7 @@
+ 	TEXT_WIN_PATTERN_NOT_FOUND,
+ 	TEXT_WIN_TIPS, // when the word entry is empty,it will show tip
+ 	TEXT_WIN_INFO,
+-	TEXT_WIN_TREEDICT,
++	TEXT_WIN_TREEDICT
+ };
+ 
+ enum ListWinListWordType
diff --git a/textproc/stardict2/files/patch-src::skin.h b/textproc/stardict2/files/patch-src::skin.h
new file mode 100644
index 000000000000..d32d0e21cbc4
--- /dev/null
+++ b/textproc/stardict2/files/patch-src::skin.h
@@ -0,0 +1,13 @@
+--- src/skin.h.orig	Tue Sep 23 21:53:47 2003
++++ src/skin.h	Tue Jan 18 02:21:27 2005
+@@ -8,8 +8,8 @@
+ {
+ public:
+ 	GdkCursor *cursor;
+-	_Skin_cursor::_Skin_cursor();
+-	_Skin_cursor::~_Skin_cursor();
++	_Skin_cursor();
++	~_Skin_cursor();
+ };
+ 
+ struct _Skin_pixbuf_1
diff --git a/textproc/stardict2/files/patch-src::stardict-application-server.cpp b/textproc/stardict2/files/patch-src::stardict-application-server.cpp
new file mode 100644
index 000000000000..38f2b4416b05
--- /dev/null
+++ b/textproc/stardict2/files/patch-src::stardict-application-server.cpp
@@ -0,0 +1,8 @@
+--- src/stardict-application-server.cpp.orig	Tue Sep 23 18:19:48 2003
++++ src/stardict-application-server.cpp	Tue Jan 18 02:25:54 2005
+@@ -117,4 +117,4 @@
+         StardictApplicationServer,                    
+         GNOME_Stardict_Application, 
+         BONOBO_TYPE_OBJECT,           
+-        stardict_application_server);
++        stardict_application_server)
diff --git a/textproc/stardict2/files/patch-src::tools::ec50.cpp b/textproc/stardict2/files/patch-src::tools::ec50.cpp
new file mode 100644
index 000000000000..25e4f40bbfd5
--- /dev/null
+++ b/textproc/stardict2/files/patch-src::tools::ec50.cpp
@@ -0,0 +1,11 @@
+--- src/tools/ec50.cpp.orig	Fri Oct  3 21:17:32 2003
++++ src/tools/ec50.cpp	Tue Jan 18 02:15:29 2005
+@@ -1115,7 +1115,7 @@
+ 	
+ 	closeVari();
+ 	closeFile();
+-};
++}
+ 
+ int
+ main(int argc,char * argv [])
diff --git a/textproc/stardict2/pkg-plist b/textproc/stardict2/pkg-plist
index 54312bd50c82..adc51de06098 100644
--- a/textproc/stardict2/pkg-plist
+++ b/textproc/stardict2/pkg-plist
@@ -1,7 +1,4 @@
 bin/stardict
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/stardict.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/stardict.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/stardict.schemas > /dev/null || /usr/bin/true
 libdata/bonobo/servers/GNOME_Stardict.server
 share/gnome/applications/stardict.desktop
 share/gnome/help/stardict/C/figures/stardict_float_window.png
@@ -19,24 +16,28 @@ share/gnome/help/stardict/ru/figures/stardict_main_window.png
 share/gnome/help/stardict/ru/figures/stardict_notification_area.png
 share/gnome/help/stardict/ru/legal.xml
 share/gnome/help/stardict/ru/stardict.xml
+share/gnome/help/stardict/uk/figures/stardict_float_window.png
+share/gnome/help/stardict/uk/figures/stardict_main_window.png
+share/gnome/help/stardict/uk/figures/stardict_notification_area.png
+share/gnome/help/stardict/uk/legal.xml
+share/gnome/help/stardict/uk/stardict.xml
 share/gnome/help/stardict/zh_CN/figures/stardict_float_window.png
 share/gnome/help/stardict/zh_CN/figures/stardict_main_window.png
 share/gnome/help/stardict/zh_CN/figures/stardict_notification_area.png
 share/gnome/help/stardict/zh_CN/legal.xml
 share/gnome/help/stardict/zh_CN/stardict.xml
+share/gnome/help/stardict/zh_TW/figures/stardict_float_window.png
+share/gnome/help/stardict/zh_TW/figures/stardict_main_window.png
+share/gnome/help/stardict/zh_TW/figures/stardict_notification_area.png
+share/gnome/help/stardict/zh_TW/legal.xml
+share/gnome/help/stardict/zh_TW/stardict.xml
 share/gnome/idl/GNOME_Stardict.idl
 share/gnome/omf/stardict/stardict-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/stardict/stardict-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/stardict/stardict-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/stardict/stardict-mk.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/stardict/stardict-mk.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/stardict/stardict-mk.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/stardict/stardict-ru.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/stardict/stardict-ru.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/stardict/stardict-ru.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/stardict/stardict-uk.omf
 share/gnome/omf/stardict/stardict-zh_CN.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/stardict/stardict-zh_CN.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/stardict/stardict-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/stardict/stardict-zh_TW.omf
 share/gnome/pixmaps/stardict.png
 share/gnome/stardict/pixmaps/docklet_normal.png
 share/gnome/stardict/pixmaps/docklet_scan.png
@@ -53,14 +54,19 @@ share/locale/mk/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
+share/locale/vi/LC_MESSAGES/stardict.mo
 share/locale/zh_CN/LC_MESSAGES/stardict.mo
 share/locale/zh_TW/LC_MESSAGES/stardict.mo
 @dirrm share/gnome/stardict/sounds
 @dirrm share/gnome/stardict/pixmaps
 @dirrm share/gnome/stardict
 @dirrm share/gnome/omf/stardict
+@dirrm share/gnome/help/stardict/zh_TW/figures
+@dirrm share/gnome/help/stardict/zh_TW
 @dirrm share/gnome/help/stardict/zh_CN/figures
 @dirrm share/gnome/help/stardict/zh_CN
+@dirrm share/gnome/help/stardict/uk/figures
+@dirrm share/gnome/help/stardict/uk
 @dirrm share/gnome/help/stardict/ru/figures
 @dirrm share/gnome/help/stardict/ru
 @dirrm share/gnome/help/stardict/mk/figures
diff --git a/textproc/stardict3/Makefile b/textproc/stardict3/Makefile
index 389c80d7cd13..ac1953c39331 100644
--- a/textproc/stardict3/Makefile
+++ b/textproc/stardict3/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	stardict
-PORTVERSION=	2.4.3
-PORTREVISION=	3
+PORTVERSION=	2.4.4
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -26,6 +25,9 @@ USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnomeprefix libgnomeui
 USE_REINPLACE=	yes
 
+GCONF_SCHEMAS=	stardict.schemas
+INSTALLS_OMF=	yes
+
 MAN1=		stardict.1
 
 post-patch:
diff --git a/textproc/stardict3/distinfo b/textproc/stardict3/distinfo
index c9c63bdbebfc..13d059d034b4 100644
--- a/textproc/stardict3/distinfo
+++ b/textproc/stardict3/distinfo
@@ -1,2 +1,2 @@
-MD5 (stardict/stardict-2.4.3.tar.bz2) = a578782c9df8e985a32069d19bae0960
-SIZE (stardict/stardict-2.4.3.tar.bz2) = 773769
+MD5 (stardict/stardict-2.4.4.tar.bz2) = e1c2df19fc854f81bdec4b3409eb95e1
+SIZE (stardict/stardict-2.4.4.tar.bz2) = 1051468
diff --git a/textproc/stardict3/files/patch-src::Makefile.in b/textproc/stardict3/files/patch-src::Makefile.in
deleted file mode 100644
index 42a5e57b8f19..000000000000
--- a/textproc/stardict3/files/patch-src::Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/Makefile.in.orig	Thu Feb 19 08:17:29 2004
-+++ src/Makefile.in	Sat May 15 17:09:46 2004
-@@ -193,12 +193,7 @@
- 	-DDATADIR=\""$(datadir)"\"				\
- 	-DGNOME_ICONDIR=\""$(datadir)/pixmaps"\"		\
- 	-DSTARDICT_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"		\
--	-DSTARDICT_DATA_DIR=\""$(datadir)/stardict"\"		\
--	-DG_DISABLE_DEPRECATED					\
--	-DGDK_DISABLE_DEPRECATED				\
--	-DGTK_DISABLE_DEPRECATED				\
--	-DGDK_PIXBUF_DISABLE_DEPRECATED				\
--	-DGNOME_DISABLE_DEPRECATED
-+	-DSTARDICT_DATA_DIR=\""$(datadir)/stardict"\"
- 
- 
- stardict_LDFLAGS = 
diff --git a/textproc/stardict3/files/patch-src::docklet.h b/textproc/stardict3/files/patch-src::docklet.h
new file mode 100644
index 000000000000..b2f7c9634b1b
--- /dev/null
+++ b/textproc/stardict3/files/patch-src::docklet.h
@@ -0,0 +1,11 @@
+--- src/docklet.h.orig	Tue Sep 23 18:19:44 2003
++++ src/docklet.h	Tue Jan 18 02:20:01 2005
+@@ -7,7 +7,7 @@
+ enum DockLetIconType {
+ 	DOCKLET_NORMAL_ICON,
+ 	DOCKLET_SCAN_ICON,
+-	DOCKLET_STOP_ICON,
++	DOCKLET_STOP_ICON
+ };
+ 
+ class DockLet{
diff --git a/textproc/stardict3/files/patch-src::mainwin.h b/textproc/stardict3/files/patch-src::mainwin.h
new file mode 100644
index 000000000000..6f2d4d6a21ea
--- /dev/null
+++ b/textproc/stardict3/files/patch-src::mainwin.h
@@ -0,0 +1,11 @@
+--- src/mainwin.h.orig	Tue Sep 23 18:19:44 2003
++++ src/mainwin.h	Tue Jan 18 02:23:04 2005
+@@ -22,7 +22,7 @@
+ 	TEXT_WIN_PATTERN_NOT_FOUND,
+ 	TEXT_WIN_TIPS, // when the word entry is empty,it will show tip
+ 	TEXT_WIN_INFO,
+-	TEXT_WIN_TREEDICT,
++	TEXT_WIN_TREEDICT
+ };
+ 
+ enum ListWinListWordType
diff --git a/textproc/stardict3/files/patch-src::skin.h b/textproc/stardict3/files/patch-src::skin.h
new file mode 100644
index 000000000000..d32d0e21cbc4
--- /dev/null
+++ b/textproc/stardict3/files/patch-src::skin.h
@@ -0,0 +1,13 @@
+--- src/skin.h.orig	Tue Sep 23 21:53:47 2003
++++ src/skin.h	Tue Jan 18 02:21:27 2005
+@@ -8,8 +8,8 @@
+ {
+ public:
+ 	GdkCursor *cursor;
+-	_Skin_cursor::_Skin_cursor();
+-	_Skin_cursor::~_Skin_cursor();
++	_Skin_cursor();
++	~_Skin_cursor();
+ };
+ 
+ struct _Skin_pixbuf_1
diff --git a/textproc/stardict3/files/patch-src::stardict-application-server.cpp b/textproc/stardict3/files/patch-src::stardict-application-server.cpp
new file mode 100644
index 000000000000..38f2b4416b05
--- /dev/null
+++ b/textproc/stardict3/files/patch-src::stardict-application-server.cpp
@@ -0,0 +1,8 @@
+--- src/stardict-application-server.cpp.orig	Tue Sep 23 18:19:48 2003
++++ src/stardict-application-server.cpp	Tue Jan 18 02:25:54 2005
+@@ -117,4 +117,4 @@
+         StardictApplicationServer,                    
+         GNOME_Stardict_Application, 
+         BONOBO_TYPE_OBJECT,           
+-        stardict_application_server);
++        stardict_application_server)
diff --git a/textproc/stardict3/files/patch-src::tools::ec50.cpp b/textproc/stardict3/files/patch-src::tools::ec50.cpp
new file mode 100644
index 000000000000..25e4f40bbfd5
--- /dev/null
+++ b/textproc/stardict3/files/patch-src::tools::ec50.cpp
@@ -0,0 +1,11 @@
+--- src/tools/ec50.cpp.orig	Fri Oct  3 21:17:32 2003
++++ src/tools/ec50.cpp	Tue Jan 18 02:15:29 2005
+@@ -1115,7 +1115,7 @@
+ 	
+ 	closeVari();
+ 	closeFile();
+-};
++}
+ 
+ int
+ main(int argc,char * argv [])
diff --git a/textproc/stardict3/pkg-plist b/textproc/stardict3/pkg-plist
index 54312bd50c82..adc51de06098 100644
--- a/textproc/stardict3/pkg-plist
+++ b/textproc/stardict3/pkg-plist
@@ -1,7 +1,4 @@
 bin/stardict
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/stardict.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/stardict.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/stardict.schemas > /dev/null || /usr/bin/true
 libdata/bonobo/servers/GNOME_Stardict.server
 share/gnome/applications/stardict.desktop
 share/gnome/help/stardict/C/figures/stardict_float_window.png
@@ -19,24 +16,28 @@ share/gnome/help/stardict/ru/figures/stardict_main_window.png
 share/gnome/help/stardict/ru/figures/stardict_notification_area.png
 share/gnome/help/stardict/ru/legal.xml
 share/gnome/help/stardict/ru/stardict.xml
+share/gnome/help/stardict/uk/figures/stardict_float_window.png
+share/gnome/help/stardict/uk/figures/stardict_main_window.png
+share/gnome/help/stardict/uk/figures/stardict_notification_area.png
+share/gnome/help/stardict/uk/legal.xml
+share/gnome/help/stardict/uk/stardict.xml
 share/gnome/help/stardict/zh_CN/figures/stardict_float_window.png
 share/gnome/help/stardict/zh_CN/figures/stardict_main_window.png
 share/gnome/help/stardict/zh_CN/figures/stardict_notification_area.png
 share/gnome/help/stardict/zh_CN/legal.xml
 share/gnome/help/stardict/zh_CN/stardict.xml
+share/gnome/help/stardict/zh_TW/figures/stardict_float_window.png
+share/gnome/help/stardict/zh_TW/figures/stardict_main_window.png
+share/gnome/help/stardict/zh_TW/figures/stardict_notification_area.png
+share/gnome/help/stardict/zh_TW/legal.xml
+share/gnome/help/stardict/zh_TW/stardict.xml
 share/gnome/idl/GNOME_Stardict.idl
 share/gnome/omf/stardict/stardict-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/stardict/stardict-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/stardict/stardict-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/stardict/stardict-mk.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/stardict/stardict-mk.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/stardict/stardict-mk.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/stardict/stardict-ru.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/stardict/stardict-ru.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/stardict/stardict-ru.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/stardict/stardict-uk.omf
 share/gnome/omf/stardict/stardict-zh_CN.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/stardict/stardict-zh_CN.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/stardict/stardict-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/stardict/stardict-zh_TW.omf
 share/gnome/pixmaps/stardict.png
 share/gnome/stardict/pixmaps/docklet_normal.png
 share/gnome/stardict/pixmaps/docklet_scan.png
@@ -53,14 +54,19 @@ share/locale/mk/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
+share/locale/vi/LC_MESSAGES/stardict.mo
 share/locale/zh_CN/LC_MESSAGES/stardict.mo
 share/locale/zh_TW/LC_MESSAGES/stardict.mo
 @dirrm share/gnome/stardict/sounds
 @dirrm share/gnome/stardict/pixmaps
 @dirrm share/gnome/stardict
 @dirrm share/gnome/omf/stardict
+@dirrm share/gnome/help/stardict/zh_TW/figures
+@dirrm share/gnome/help/stardict/zh_TW
 @dirrm share/gnome/help/stardict/zh_CN/figures
 @dirrm share/gnome/help/stardict/zh_CN
+@dirrm share/gnome/help/stardict/uk/figures
+@dirrm share/gnome/help/stardict/uk
 @dirrm share/gnome/help/stardict/ru/figures
 @dirrm share/gnome/help/stardict/ru
 @dirrm share/gnome/help/stardict/mk/figures