Update to 3.0.3

Update WWW
Remove dead link from pkg-message

9 files changed, 89 insertions, 38 deletions

diff --git a/textproc/stardict3/Makefile b/textproc/stardict3/Makefile
index 42915faf3f2d..38d5c478e644 100644
--- a/textproc/stardict3/Makefile
+++ b/textproc/stardict3/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	stardict
-PORTVERSION=	3.0.2
-PORTREVISION=	1
+PORTVERSION=	3.0.3
 CATEGORIES=	textproc
-MASTER_SITES=	SF
+MASTER_SITES=	GOOGLE_CODE
 DIST_SUBDIR=	stardict
 
 MAINTAINER=	makc@FreeBSD.org
@@ -29,8 +28,13 @@ USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack
 USE_GETTEXT=	yes
+CONFIGURE_WRKSRC=	${WRKSRC}/dict
+BUILD_WRKSRC=	${CONFIGURE_WRKSRC}
+INSTALL_WRKSRC=	${CONFIGURE_WRKSRC}
 
-OPTIONS=	GNOME "GNOME support" Off
+PROJECTHOST=	stardict-3
+
+OPTIONS=	GNOME "GNOME support" On
 
 CONFLICTS_RUN=	stardict-2.[0-9]*
 
@@ -46,19 +50,25 @@ USE_AUTOTOOLS=	autoconf
 USE_GNOME+=	gtk20
 CONFIGURE_ARGS+=--disable-gnome-support --disable-schemas-install
 PLIST_SUB=	GNOME="@comment "
+MAKE_ARGS+=     AUTOMAKE="${TRUE}" ACLOCAL="${TRUE}"
 .endif
 
 MAN1=		stardict.1
 
 post-patch:
 .if defined(WITHOUT_GNOME)
-	${REINPLACE_CMD} -e '/DATADIRNAME=lib/s,lib,share,' ${WRKSRC}/m4/intltool.m4
-	${REINPLACE_CMD} -e '/^SUBDIRS/s,help,,' ${WRKSRC}/Makefile.in
-	${REINPLACE_CMD} -e '/^GNOME_DOC_INIT/d' ${WRKSRC}/configure.ac
+	${REINPLACE_CMD} -e '/DATADIRNAME=lib/s,lib,share,' ${WRKSRC}/dict/m4/intltool.m4
+	${REINPLACE_CMD} -e '/^SUBDIRS/s,help,,' ${WRKSRC}/dict/Makefile.in
+	${REINPLACE_CMD} -e '/^GNOME_DOC_INIT/d' \
+		-e '/^help\/Makefile/d' ${WRKSRC}/dict/configure.ac
 .endif
 	${REINPLACE_CMD} -e 's,/usr/share,${PREFIX}/share,g' \
-		-e 's,firefox,xdg-open,' \
-		${WRKSRC}/src/conf.cpp
+		${WRKSRC}/dict/src/conf.cpp
+
+pre-configure:
+	cd ${WRKSRC}/lib && \
+	${SETENV} ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} && \
+	${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/textproc/stardict3/distinfo b/textproc/stardict3/distinfo
index a6d8738533a8..c3fcb7830a09 100644
--- a/textproc/stardict3/distinfo
+++ b/textproc/stardict3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (stardict/stardict-3.0.2.tar.bz2) = dcd1950d41362b0fbf3df10140a54d74c2c1948c376ff7387c2d28c8185a1ff6
-SIZE (stardict/stardict-3.0.2.tar.bz2) = 4332613
+SHA256 (stardict/stardict-3.0.3.tar.bz2) = 9ba10a5b3dcdd02b81c7a138dac15903a6bc2355856f60338f3775e371472b73
+SIZE (stardict/stardict-3.0.3.tar.bz2) = 9147947
diff --git a/textproc/stardict3/files/patch-dict__src__conf.cpp b/textproc/stardict3/files/patch-dict__src__conf.cpp
new file mode 100644
index 000000000000..31e521cc8e1d
--- /dev/null
+++ b/textproc/stardict3/files/patch-dict__src__conf.cpp
@@ -0,0 +1,11 @@
+--- ./dict/src/conf.cpp.orig	2011-07-03 06:58:40.000000000 +0000
++++ ./dict/src/conf.cpp	2011-10-20 21:40:21.491156419 +0000
+@@ -181,7 +181,7 @@
+ #if defined(CONFIG_GPE)
+ 	add_entry("/apps/stardict/preferences/dictionary/url_open_command", std::string("gpe-mini-browser"));
+ #else
+-	add_entry("/apps/stardict/preferences/dictionary/url_open_command", std::string("firefox")); // absolute command
++	add_entry("/apps/stardict/preferences/dictionary/url_open_command", std::string("xdg-open")); // absolute command
+ #endif
+ #if defined(_WIN32) || defined(CONFIG_GNOME)
+ 	add_entry("/apps/stardict/preferences/dictionary/always_use_open_url_command", false);
diff --git a/textproc/stardict3/files/patch-lib__configure b/textproc/stardict3/files/patch-lib__configure
new file mode 100644
index 000000000000..51f15f6e099e
--- /dev/null
+++ b/textproc/stardict3/files/patch-lib__configure
@@ -0,0 +1,11 @@
+--- ./lib/configure.orig	2011-07-09 10:12:02.000000000 +0000
++++ ./lib/configure	2011-10-23 14:15:34.560609051 +0000
+@@ -15135,7 +15135,7 @@
+ # Checks for typedefs, structures, and compiler characteristics.
+ 
+ # Checks for library functions.
+-DEP_MODULES="gtk+-2.0 >= 2.6 glib-2.0 >= 2.8 zlib libxml-2.0 >= 2.5"
++DEP_MODULES="gtk+-2.0 >= 2.6 glib-2.0 >= 2.8 libxml-2.0 >= 2.5"
+ 
+ 
+ 
diff --git a/textproc/stardict3/files/patch-src::stardict-application-server.cpp b/textproc/stardict3/files/patch-src::stardict-application-server.cpp
index bc2f8507827e..9554dffcfe09 100644
--- a/textproc/stardict3/files/patch-src::stardict-application-server.cpp
+++ b/textproc/stardict3/files/patch-src::stardict-application-server.cpp
@@ -1,6 +1,6 @@
---- 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
-@@ -119,4 +119,4 @@
+--- ./dict/src/stardict-application-server.cpp.orig	2011-07-03 06:58:40.000000000 +0000
++++ ./dict/src/stardict-application-server.cpp	2011-10-20 21:26:45.868162214 +0000
+@@ -138,4 +138,4 @@
          StardictApplicationServer,                    
          GNOME_Stardict_Application, 
          BONOBO_TYPE_OBJECT,           
diff --git a/textproc/stardict3/files/patch-src__readword.cpp b/textproc/stardict3/files/patch-src__readword.cpp
deleted file mode 100644
index ac24d09f8dfe..000000000000
--- a/textproc/stardict3/files/patch-src__readword.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./src/readword.cpp.orig	2010-12-17 19:58:59.000000000 +0300
-+++ ./src/readword.cpp	2011-06-18 00:38:15.560473773 +0400
-@@ -78,7 +78,7 @@
- 		std::string filename;
- 		std::list<std::string>::const_iterator it;
- 		for (it=ttspath.begin(); it!=ttspath.end(); ++it) {
--			filename = build_path(*it, lowerword[0] + G_DIR_SEPARATOR_S + lowerword + ".wav");
-+			filename = build_path(*it, std::string(1,lowerword[0]) + G_DIR_SEPARATOR_S + lowerword + ".wav");
- 			return_val = g_file_test(filename.c_str(), G_FILE_TEST_EXISTS);
- 			if (return_val)
- 				break;
-@@ -109,7 +109,7 @@
- 		std::string filename;
- 		std::list<std::string>::const_iterator it;
- 		for (it=ttspath.begin(); it!=ttspath.end(); ++it) {
--			filename = build_path(*it, lowerword[0] + G_DIR_SEPARATOR_S + lowerword + ".wav");
-+			filename = build_path(*it, std::string(1,lowerword[0]) + G_DIR_SEPARATOR_S + lowerword + ".wav");
- 			if (g_file_test(filename.c_str(), G_FILE_TEST_EXISTS)) {
- 				play_sound_file(filename);
- 				break;
diff --git a/textproc/stardict3/pkg-descr b/textproc/stardict3/pkg-descr
index ec73b921057d..dad9e1f84e6b 100644
--- a/textproc/stardict3/pkg-descr
+++ b/textproc/stardict3/pkg-descr
@@ -2,4 +2,4 @@ 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.sourceforge.net/
+WWW: http://www.stardict.org
diff --git a/textproc/stardict3/pkg-message b/textproc/stardict3/pkg-message
index b268a934458f..952e3c3cf695 100644
--- a/textproc/stardict3/pkg-message
+++ b/textproc/stardict3/pkg-message
@@ -4,7 +4,4 @@ A set of dictionary ports is available for StarDict:
  japanese/stardict-dict-ja
  textproc/stardict-*
  russian/stardict-*
-
-More dictionaries can be downloaded from StarDict website:
-http://stardict.sourceforge.net/Dictionaries.php
 =====================================================================
diff --git a/textproc/stardict3/pkg-plist b/textproc/stardict3/pkg-plist
index df34919df369..644b49ff27dd 100644
--- a/textproc/stardict3/pkg-plist
+++ b/textproc/stardict3/pkg-plist
@@ -26,6 +26,12 @@ share/applications/stardict.desktop
 %%GNOME%%share/gnome/help/stardict/C/figures/stardict_float_window.png
 %%GNOME%%share/gnome/help/stardict/C/figures/stardict_full_text_translation.png
 %%GNOME%%share/gnome/help/stardict/C/figures/stardict_main_window.png
+%%GNOME%%share/gnome/help/stardict/C/figures/stardict_manage_dicts_add_dict.png
+%%GNOME%%share/gnome/help/stardict/C/figures/stardict_manage_dicts_dict_list.png
+%%GNOME%%share/gnome/help/stardict/C/figures/stardict_manage_dicts_manage_dict.png
+%%GNOME%%share/gnome/help/stardict/C/figures/stardict_manage_dicts_network_dicts.png
+%%GNOME%%share/gnome/help/stardict/C/figures/stardict_manage_dicts_network_dicts_browse.png
+%%GNOME%%share/gnome/help/stardict/C/figures/stardict_manage_dicts_tree_dict.png
 %%GNOME%%share/gnome/help/stardict/C/figures/stardict_notification_area.png
 %%GNOME%%share/gnome/help/stardict/C/figures/stardict_windows_console.png
 %%GNOME%%share/gnome/help/stardict/C/legal.xml
@@ -35,6 +41,12 @@ share/applications/stardict.desktop
 %%GNOME%%share/gnome/help/stardict/mk/figures/stardict_float_window.png
 %%GNOME%%share/gnome/help/stardict/mk/figures/stardict_full_text_translation.png
 %%GNOME%%share/gnome/help/stardict/mk/figures/stardict_main_window.png
+%%GNOME%%share/gnome/help/stardict/mk/figures/stardict_manage_dicts_add_dict.png
+%%GNOME%%share/gnome/help/stardict/mk/figures/stardict_manage_dicts_dict_list.png
+%%GNOME%%share/gnome/help/stardict/mk/figures/stardict_manage_dicts_manage_dict.png
+%%GNOME%%share/gnome/help/stardict/mk/figures/stardict_manage_dicts_network_dicts.png
+%%GNOME%%share/gnome/help/stardict/mk/figures/stardict_manage_dicts_network_dicts_browse.png
+%%GNOME%%share/gnome/help/stardict/mk/figures/stardict_manage_dicts_tree_dict.png
 %%GNOME%%share/gnome/help/stardict/mk/figures/stardict_notification_area.png
 %%GNOME%%share/gnome/help/stardict/mk/figures/stardict_windows_console.png
 %%GNOME%%share/gnome/help/stardict/mk/stardict.xml
@@ -43,6 +55,12 @@ share/applications/stardict.desktop
 %%GNOME%%share/gnome/help/stardict/nl/figures/stardict_float_window.png
 %%GNOME%%share/gnome/help/stardict/nl/figures/stardict_full_text_translation.png
 %%GNOME%%share/gnome/help/stardict/nl/figures/stardict_main_window.png
+%%GNOME%%share/gnome/help/stardict/nl/figures/stardict_manage_dicts_add_dict.png
+%%GNOME%%share/gnome/help/stardict/nl/figures/stardict_manage_dicts_dict_list.png
+%%GNOME%%share/gnome/help/stardict/nl/figures/stardict_manage_dicts_manage_dict.png
+%%GNOME%%share/gnome/help/stardict/nl/figures/stardict_manage_dicts_network_dicts.png
+%%GNOME%%share/gnome/help/stardict/nl/figures/stardict_manage_dicts_network_dicts_browse.png
+%%GNOME%%share/gnome/help/stardict/nl/figures/stardict_manage_dicts_tree_dict.png
 %%GNOME%%share/gnome/help/stardict/nl/figures/stardict_notification_area.png
 %%GNOME%%share/gnome/help/stardict/nl/figures/stardict_windows_console.png
 %%GNOME%%share/gnome/help/stardict/nl/stardict.xml
@@ -51,6 +69,12 @@ share/applications/stardict.desktop
 %%GNOME%%share/gnome/help/stardict/ru/figures/stardict_float_window.png
 %%GNOME%%share/gnome/help/stardict/ru/figures/stardict_full_text_translation.png
 %%GNOME%%share/gnome/help/stardict/ru/figures/stardict_main_window.png
+%%GNOME%%share/gnome/help/stardict/ru/figures/stardict_manage_dicts_add_dict.png
+%%GNOME%%share/gnome/help/stardict/ru/figures/stardict_manage_dicts_dict_list.png
+%%GNOME%%share/gnome/help/stardict/ru/figures/stardict_manage_dicts_manage_dict.png
+%%GNOME%%share/gnome/help/stardict/ru/figures/stardict_manage_dicts_network_dicts.png
+%%GNOME%%share/gnome/help/stardict/ru/figures/stardict_manage_dicts_network_dicts_browse.png
+%%GNOME%%share/gnome/help/stardict/ru/figures/stardict_manage_dicts_tree_dict.png
 %%GNOME%%share/gnome/help/stardict/ru/figures/stardict_notification_area.png
 %%GNOME%%share/gnome/help/stardict/ru/figures/stardict_windows_console.png
 %%GNOME%%share/gnome/help/stardict/ru/stardict.xml
@@ -59,6 +83,12 @@ share/applications/stardict.desktop
 %%GNOME%%share/gnome/help/stardict/uk/figures/stardict_float_window.png
 %%GNOME%%share/gnome/help/stardict/uk/figures/stardict_full_text_translation.png
 %%GNOME%%share/gnome/help/stardict/uk/figures/stardict_main_window.png
+%%GNOME%%share/gnome/help/stardict/uk/figures/stardict_manage_dicts_add_dict.png
+%%GNOME%%share/gnome/help/stardict/uk/figures/stardict_manage_dicts_dict_list.png
+%%GNOME%%share/gnome/help/stardict/uk/figures/stardict_manage_dicts_manage_dict.png
+%%GNOME%%share/gnome/help/stardict/uk/figures/stardict_manage_dicts_network_dicts.png
+%%GNOME%%share/gnome/help/stardict/uk/figures/stardict_manage_dicts_network_dicts_browse.png
+%%GNOME%%share/gnome/help/stardict/uk/figures/stardict_manage_dicts_tree_dict.png
 %%GNOME%%share/gnome/help/stardict/uk/figures/stardict_notification_area.png
 %%GNOME%%share/gnome/help/stardict/uk/figures/stardict_windows_console.png
 %%GNOME%%share/gnome/help/stardict/uk/stardict.xml
@@ -67,6 +97,12 @@ share/applications/stardict.desktop
 %%GNOME%%share/gnome/help/stardict/zh_CN/figures/stardict_float_window.png
 %%GNOME%%share/gnome/help/stardict/zh_CN/figures/stardict_full_text_translation.png
 %%GNOME%%share/gnome/help/stardict/zh_CN/figures/stardict_main_window.png
+%%GNOME%%share/gnome/help/stardict/zh_CN/figures/stardict_manage_dicts_add_dict.png
+%%GNOME%%share/gnome/help/stardict/zh_CN/figures/stardict_manage_dicts_dict_list.png
+%%GNOME%%share/gnome/help/stardict/zh_CN/figures/stardict_manage_dicts_manage_dict.png
+%%GNOME%%share/gnome/help/stardict/zh_CN/figures/stardict_manage_dicts_network_dicts.png
+%%GNOME%%share/gnome/help/stardict/zh_CN/figures/stardict_manage_dicts_network_dicts_browse.png
+%%GNOME%%share/gnome/help/stardict/zh_CN/figures/stardict_manage_dicts_tree_dict.png
 %%GNOME%%share/gnome/help/stardict/zh_CN/figures/stardict_notification_area.png
 %%GNOME%%share/gnome/help/stardict/zh_CN/figures/stardict_windows_console.png
 %%GNOME%%share/gnome/help/stardict/zh_CN/stardict.xml
@@ -75,6 +111,12 @@ share/applications/stardict.desktop
 %%GNOME%%share/gnome/help/stardict/zh_TW/figures/stardict_float_window.png
 %%GNOME%%share/gnome/help/stardict/zh_TW/figures/stardict_full_text_translation.png
 %%GNOME%%share/gnome/help/stardict/zh_TW/figures/stardict_main_window.png
+%%GNOME%%share/gnome/help/stardict/zh_TW/figures/stardict_manage_dicts_add_dict.png
+%%GNOME%%share/gnome/help/stardict/zh_TW/figures/stardict_manage_dicts_dict_list.png
+%%GNOME%%share/gnome/help/stardict/zh_TW/figures/stardict_manage_dicts_manage_dict.png
+%%GNOME%%share/gnome/help/stardict/zh_TW/figures/stardict_manage_dicts_network_dicts.png
+%%GNOME%%share/gnome/help/stardict/zh_TW/figures/stardict_manage_dicts_network_dicts_browse.png
+%%GNOME%%share/gnome/help/stardict/zh_TW/figures/stardict_manage_dicts_tree_dict.png
 %%GNOME%%share/gnome/help/stardict/zh_TW/figures/stardict_notification_area.png
 %%GNOME%%share/gnome/help/stardict/zh_TW/figures/stardict_windows_console.png
 %%GNOME%%share/gnome/help/stardict/zh_TW/stardict.xml