4 files changed, 85 insertions, 100 deletions

diff --git a/textproc/stardict2/Makefile b/textproc/stardict2/Makefile
index 6227c41717d4..ee657a863754 100644
--- a/textproc/stardict2/Makefile
+++ b/textproc/stardict2/Makefile
@@ -6,20 +6,15 @@
 #
 
 PORTNAME=	stardict
-PORTVERSION=	2.2.1
-PORTREVISION=	2
-CATEGORIES=	chinese textproc
+PORTVERSION=	2.4.2
+CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTFILES=	stardict-${PORTVERSION}.tar.bz2 \
-		stardict-cdict-big5-2.1.0.tar.bz2 \
-		stardict-cedict-big5-2.1.0.tar.bz2 \
-		stardict-oxford-big5-2.1.0.tar.bz2 \
-		stardict-xdict-big5-2.1.0.tar.bz2 \
-		stardict-xdict-ce-big5-2.1.0.tar.bz2
+DISTFILES=	stardict-${PORTVERSION}.tar.bz2
+DIST_SUBDIR=	stardict
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	English-Chinese dictionary
+MAINTAINER=	ld@FreeBSD.org.cn
+COMMENT=	A cross-platform and international dictionary written in Gtk2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -27,16 +22,15 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
-USE_GNOME=	libgnome libgnomeui libbonobo gconf2
+USE_GNOME=	gnomehack gnomeprefix libgnomeui
+USE_REINPLACE=	yes
 
 MAN1=		stardict.1
 
-post-install:
-		${MKDIR} ${PREFIX}/share/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-cdict-big5-2.1.0/* ${PREFIX}/share/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-cedict-big5-2.1.0/* ${PREFIX}/share/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-oxford-big5-2.1.0/* ${PREFIX}/share/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-xdict-big5-2.1.0/* ${PREFIX}/share/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-xdict-ce-big5-2.1.0/* ${PREFIX}/share/stardict/dic/
+post-patch:
+# gcc 2.95 does not know std::string::clear()
+	@${REINPLACE_CMD} -e 's|.clear()|.erase()|' \
+		${WRKSRC}/src/docklet.cpp ${WRKSRC}/src/floatwin.cpp \
+		${WRKSRC}/src/selection.cpp
 
 .include <bsd.port.mk>
diff --git a/textproc/stardict2/distinfo b/textproc/stardict2/distinfo
index 2a7466234052..e4da99414d0f 100644
--- a/textproc/stardict2/distinfo
+++ b/textproc/stardict2/distinfo
@@ -1,12 +1,2 @@
-MD5 (stardict-2.2.1.tar.bz2) = fd9a7b46a0bdf0b2a5a9920ab1ccd2fa
-SIZE (stardict-2.2.1.tar.bz2) = 608829
-MD5 (stardict-cdict-big5-2.1.0.tar.bz2) = 2dc9784e735e43516fc2bf6f382923be
-SIZE (stardict-cdict-big5-2.1.0.tar.bz2) = 4482485
-MD5 (stardict-cedict-big5-2.1.0.tar.bz2) = d0743c765b789dc66d0a6a533fcd851e
-SIZE (stardict-cedict-big5-2.1.0.tar.bz2) = 542006
-MD5 (stardict-oxford-big5-2.1.0.tar.bz2) = e5e429d6355470114f80014d9ee1d4cb
-SIZE (stardict-oxford-big5-2.1.0.tar.bz2) = 7663495
-MD5 (stardict-xdict-big5-2.1.0.tar.bz2) = 5b2de427b9af5f4b5baaf5d80dad63a3
-SIZE (stardict-xdict-big5-2.1.0.tar.bz2) = 3658067
-MD5 (stardict-xdict-ce-big5-2.1.0.tar.bz2) = 7ca866de79faeea494c5e6e1cce8aa80
-SIZE (stardict-xdict-ce-big5-2.1.0.tar.bz2) = 2540912
+MD5 (stardict/stardict-2.4.2.tar.bz2) = ed4b56fe446564dd377b577287048c6a
+SIZE (stardict/stardict-2.4.2.tar.bz2) = 702901
diff --git a/textproc/stardict2/pkg-descr b/textproc/stardict2/pkg-descr
index 553ba71b5418..ec73b921057d 100644
--- a/textproc/stardict2/pkg-descr
+++ b/textproc/stardict2/pkg-descr
@@ -1,5 +1,5 @@
-StarDict is a international dictionary that run in Gnome envornment.
-It have powerful features such as "Glob-style pattern matching",
-"Scan seletion word","Fuzzy search" and etc.
+StarDict is a Cross-Platform and international dictionary written in Gtk2.
+It has powerful features such as "Glob-style pattern matching," "Scan
+selection word," "Fuzzy query," etc.
 
-WWW: http://stardict.cosoft.org.cn/
+WWW: http://stardict.sourceforge.net/
diff --git a/textproc/stardict2/pkg-plist b/textproc/stardict2/pkg-plist
index f013ffa196cd..be0143a637d6 100644
--- a/textproc/stardict2/pkg-plist
+++ b/textproc/stardict2/pkg-plist
@@ -1,75 +1,68 @@
 bin/stardict
-share/idl/GNOME_Stardict.idl
-share/pixmaps/stardict.png
-share/stardict/dic/cdict-big5.dict.dz
-share/stardict/dic/cdict-big5.idx.gz
-share/stardict/dic/cedict-big5.dict.dz
-share/stardict/dic/cedict-big5.idx.gz
-share/stardict/dic/oxford-big5.dict.dz
-share/stardict/dic/oxford-big5.idx.gz
-share/stardict/dic/xdict-big5.dict.dz
-share/stardict/dic/xdict-big5.idx.gz
-share/stardict/dic/xdict-ce-big5.dict.dz
-share/stardict/dic/xdict-ce-big5.idx.gz
-share/stardict/pixmaps/about_menu.png
-share/stardict/pixmaps/docklet_normal.png
-share/stardict/pixmaps/docklet_scan.png
-share/stardict/pixmaps/docklet_stop.png
-share/stardict/pixmaps/index_appendix.png
-share/stardict/pixmaps/index_wazard.png
-share/stardict/pixmaps/splash.png
-share/stardict/sounds/menushow.wav
-share/stardict/sounds/buttonactive.wav
-share/gnome/help/stardict/C/legal.xml
-share/gnome/help/stardict/C/stardict.xml
-share/gnome/help/stardict/C/figures/stardict_float_window.png
-share/gnome/help/stardict/C/figures/stardict_main_window.png
-share/gnome/help/stardict/C/figures/stardict_notification_area.png
-share/gnome/help/stardict/ru/legal.xml
-share/gnome/help/stardict/ru/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
-share/gnome/help/stardict/zh_CN/legal.xml
-share/gnome/help/stardict/zh_CN/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/omf/stardict/stardict-C.omf
-@exec scrollkeeper-install -q %D/share/omf/stardict/stardict-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/omf/stardict/stardict-C.omf 2>/dev/null || /usr/bin/true
-share/omf/stardict/stardict-ru.omf
-@exec scrollkeeper-install -q %D/share/omf/stardict/stardict-ru.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/omf/stardict/stardict-ru.omf 2>/dev/null || /usr/bin/true
-share/omf/stardict/stardict-zh_CN.omf
-@exec scrollkeeper-install -q %D/share/omf/stardict/stardict-zh_CN.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/omf/stardict/stardict-zh_CN.omf 2>/dev/null || /usr/bin/true
-share/applications/stardict.desktop
 etc/gconf/schemas/stardict.schemas
-lib/bonobo/servers/GNOME_Stardict.server
-lib/locale/ru/LC_MESSAGES/stardict.mo
-lib/locale/zh_CN/LC_MESSAGES/stardict.mo
-etc/gconf/gconf.xml.defaults/apps/stardict/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/stardict/manage_dictionaries/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/stardict/preferences/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/stardict/preferences/dictionary/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/stardict/preferences/floating_window/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/stardict/preferences/main_window/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/stardict/preferences/notification_area_icon/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/stardict/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/stardict/preferences/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/stardict/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/stardict/manage_dictionaries/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/stardict/preferences/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/stardict/preferences/dictionary/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/stardict/preferences/floating_window/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/stardict/preferences/main_window/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/stardict/preferences/notification_area_icon/%gconf.xml
-@dirrm share/gnome/help/stardict/zh_CN/figures
-@dirrm share/gnome/help/stardict/zh_CN
-@dirrm share/gnome/help/stardict/ru/figures
-@dirrm share/gnome/help/stardict/ru
-@dirrm share/gnome/help/stardict/C/figures
-@dirrm share/gnome/help/stardict/C
-@dirrm share/gnome/help/stardict
+etc/gconf/gconf.xml.defaults/schemas/apps/stardict/preferences/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/stardict/%gconf.xml
+libdata/bonobo/servers/GNOME_Stardict.server
+share/gnome/applications/stardict.desktop
+share/gnome/help/stardict/C/figures/stardict_float_window.png
+share/gnome/help/stardict/C/figures/stardict_main_window.png
+share/gnome/help/stardict/C/figures/stardict_notification_area.png
+share/gnome/help/stardict/C/legal.xml
+share/gnome/help/stardict/C/stardict.xml
+share/gnome/help/stardict/mk/figures/stardict_float_window.png
+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/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
+share/gnome/help/stardict/ru/legal.xml
+share/gnome/help/stardict/ru/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/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-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/pixmaps/stardict.png
+share/gnome/stardict/pixmaps/docklet_normal.png
+share/gnome/stardict/pixmaps/docklet_scan.png
+share/gnome/stardict/pixmaps/docklet_stop.png
+share/gnome/stardict/pixmaps/index_appendix.png
+share/gnome/stardict/pixmaps/index_wazard.png
+share/gnome/stardict/pixmaps/splash.png
+share/gnome/stardict/sounds/buttonactive.wav
+share/gnome/stardict/sounds/menushow.wav
+share/locale/cs/LC_MESSAGES/stardict.mo
+share/locale/de/LC_MESSAGES/stardict.mo
+share/locale/mk/LC_MESSAGES/stardict.mo
+share/locale/ru/LC_MESSAGES/stardict.mo
+share/locale/zh_CN/LC_MESSAGES/stardict.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stardict/preferences/notification_area_icon
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stardict/preferences/main_window
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stardict/preferences/floating_window
@@ -84,8 +77,16 @@ etc/gconf/gconf.xml.defaults/schemas/apps/stardict/preferences/notification_area
 @dirrm etc/gconf/gconf.xml.defaults/apps/stardict/preferences
 @dirrm etc/gconf/gconf.xml.defaults/apps/stardict/manage_dictionaries
 @dirrm etc/gconf/gconf.xml.defaults/apps/stardict
-@dirrm share/omf/stardict
-@dirrm share/stardict/dic
-@dirrm share/stardict/pixmaps
-@dirrm share/stardict/sounds
-@dirrm share/stardict
+@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_CN/figures
+@dirrm share/gnome/help/stardict/zh_CN
+@dirrm share/gnome/help/stardict/ru/figures
+@dirrm share/gnome/help/stardict/ru
+@dirrm share/gnome/help/stardict/mk/figures
+@dirrm share/gnome/help/stardict/mk
+@dirrm share/gnome/help/stardict/C/figures
+@dirrm share/gnome/help/stardict/C
+@dirrm share/gnome/help/stardict