Index: head/textproc/stardict3/Makefile =================================================================== --- head/textproc/stardict3/Makefile (revision 329106) +++ head/textproc/stardict3/Makefile (revision 329107) @@ -1,73 +1,66 @@ # Created by: eric # $FreeBSD$ PORTNAME= stardict PORTVERSION= 3.0.4 CATEGORIES= textproc MASTER_SITES= GOOGLE_CODE DIST_SUBDIR= stardict MAINTAINER= makc@FreeBSD.org COMMENT= Dictionary lookup program written in Gtk2 -LIB_DEPENDS= sigc-2.0.0:${PORTSDIR}/devel/libsigc++20 \ - enchant.1:${PORTSDIR}/textproc/enchant +LIB_DEPENDS= libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 \ + libenchant.so:${PORTSDIR}/textproc/enchant RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils GNU_CONFIGURE= yes CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --disable-festival \ --disable-gucharmap \ --disable-espeak \ --disable-updateinfo USE_BZIP2= yes -USE_GNOME= gnomehack -USES= gettext gmake pkgconfig +USES= gettext gmake pathfix pkgconfig CONFIGURE_WRKSRC= ${WRKSRC}/dict BUILD_WRKSRC= ${CONFIGURE_WRKSRC} INSTALL_WRKSRC= ${CONFIGURE_WRKSRC} PROJECTHOST= stardict-3 OPTIONS_DEFINE= GNOME OPTIONS_DEFAULT= ${OPTIONS_DEFINE} CONFLICTS_INSTALL= stardict-2.[0-9]* -NO_STAGE= yes .include .if ${PORT_OPTIONS:MGNOME} USE_GNOME+= gnomeprefix gnomedocutils libgnomeui GCONF_SCHEMAS= stardict.schemas INSTALLS_OMF= yes PLIST_SUB= GNOME="" .else 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 !${PORT_OPTIONS:MGNOME} ${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' \ ${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} .include Index: head/textproc/stardict3/files/patch-lib__src__libcommon.cpp =================================================================== --- head/textproc/stardict3/files/patch-lib__src__libcommon.cpp (revision 329106) +++ head/textproc/stardict3/files/patch-lib__src__libcommon.cpp (revision 329107) @@ -1,11 +1,10 @@ ---- ./lib/src/libcommon.cpp.orig 2011-07-08 12:35:48.000000000 +0000 -+++ ./lib/src/libcommon.cpp 2012-12-11 07:48:00.601016758 +0000 -@@ -599,7 +599,7 @@ - - int unpack_zlib(const char* arch_file_name, const char* out_file_name) - { -- zip::gzFile in(gzopen(arch_file_name, "rb")); -+ zip::gzFileWrapper in(gzopen(arch_file_name, "rb")); - if(!in) { - g_critical("Unable to open archive file: %s.", arch_file_name); - return EXIT_FAILURE; +--- ./lib/src/libcommon.cpp.orig 2012-01-13 06:21:34.000000000 +0000 ++++ ./lib/src/libcommon.cpp 2013-10-02 15:54:43.701934693 +0000 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + #include "libcommon.h" + #ifdef _WIN32 + # include Index: head/textproc/stardict3/files/patch-lib__src__libcommon.h =================================================================== --- head/textproc/stardict3/files/patch-lib__src__libcommon.h (revision 329106) +++ head/textproc/stardict3/files/patch-lib__src__libcommon.h (revision 329107) @@ -1,11 +1,14 @@ ---- ./lib/src/libcommon.h.orig 2011-07-08 12:32:09.000000000 +0000 -+++ ./lib/src/libcommon.h 2012-12-11 07:48:00.604014902 +0000 -@@ -188,7 +188,7 @@ +--- ./lib/src/libcommon.h.orig 2012-01-13 06:21:34.000000000 +0000 ++++ ./lib/src/libcommon.h 2013-10-02 15:13:21.563936478 +0000 +@@ -188,7 +188,11 @@ } namespace zip { --typedef ResourceWrapper gzFile; -+typedef ResourceWrapper gzFileWrapper; ++#if ZLIB_VERNUM > 0x1250 ++typedef ResourceWrapper gzFile; ++#else + typedef ResourceWrapper gzFile; ++#endif } /* Create a new temporary file. Return file name in file name encoding. Index: head/textproc/stardict3/pkg-plist =================================================================== --- head/textproc/stardict3/pkg-plist (revision 329106) +++ head/textproc/stardict3/pkg-plist (revision 329107) @@ -1,216 +1,217 @@ bin/stardict lib/stardict/plugins/stardict_dictdotcn.la lib/stardict/plugins/stardict_dictdotcn.so lib/stardict/plugins/stardict_html_parsedata.la lib/stardict/plugins/stardict_html_parsedata.so lib/stardict/plugins/stardict_man.la lib/stardict/plugins/stardict_man.so lib/stardict/plugins/stardict_powerword_parsedata.la lib/stardict/plugins/stardict_powerword_parsedata.so lib/stardict/plugins/stardict_qqwry.la lib/stardict/plugins/stardict_qqwry.so lib/stardict/plugins/stardict_spell.la lib/stardict/plugins/stardict_spell.so lib/stardict/plugins/stardict_wiki_parsedata.la lib/stardict/plugins/stardict_wiki_parsedata.so lib/stardict/plugins/stardict_wordnet.la lib/stardict/plugins/stardict_wordnet.so lib/stardict/plugins/stardict_wordnet_parsedata.la lib/stardict/plugins/stardict_wordnet_parsedata.so lib/stardict/plugins/stardict_xdxf_parsedata.la lib/stardict/plugins/stardict_xdxf_parsedata.so %%GNOME%%libdata/bonobo/servers/GNOME_Stardict.server +man/man1/stardict.1.gz share/applications/stardict.desktop %%GNOME%%share/gnome/help/stardict/C/figures/acrobat_toolbar.png %%GNOME%%share/gnome/help/stardict/C/figures/portable_apps_menu.png %%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 %%GNOME%%share/gnome/help/stardict/C/stardict.xml %%GNOME%%share/gnome/help/stardict/mk/figures/acrobat_toolbar.png %%GNOME%%share/gnome/help/stardict/mk/figures/portable_apps_menu.png %%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 %%GNOME%%share/gnome/help/stardict/nl/figures/acrobat_toolbar.png %%GNOME%%share/gnome/help/stardict/nl/figures/portable_apps_menu.png %%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 %%GNOME%%share/gnome/help/stardict/ru/figures/acrobat_toolbar.png %%GNOME%%share/gnome/help/stardict/ru/figures/portable_apps_menu.png %%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 %%GNOME%%share/gnome/help/stardict/uk/figures/acrobat_toolbar.png %%GNOME%%share/gnome/help/stardict/uk/figures/portable_apps_menu.png %%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 %%GNOME%%share/gnome/help/stardict/zh_CN/figures/acrobat_toolbar.png %%GNOME%%share/gnome/help/stardict/zh_CN/figures/portable_apps_menu.png %%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 %%GNOME%%share/gnome/help/stardict/zh_TW/figures/acrobat_toolbar.png %%GNOME%%share/gnome/help/stardict/zh_TW/figures/portable_apps_menu.png %%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 %%GNOME%%share/idl/GNOME_Stardict.idl share/locale/ar/LC_MESSAGES/stardict.mo share/locale/be/LC_MESSAGES/stardict.mo share/locale/cs/LC_MESSAGES/stardict.mo share/locale/de/LC_MESSAGES/stardict.mo share/locale/el/LC_MESSAGES/stardict.mo share/locale/es/LC_MESSAGES/stardict.mo share/locale/fr/LC_MESSAGES/stardict.mo share/locale/ga/LC_MESSAGES/stardict.mo share/locale/hr/LC_MESSAGES/stardict.mo share/locale/hu/LC_MESSAGES/stardict.mo share/locale/kk/LC_MESSAGES/stardict.mo share/locale/ku/LC_MESSAGES/stardict.mo share/locale/lt/LC_MESSAGES/stardict.mo share/locale/mk/LC_MESSAGES/stardict.mo share/locale/nl/LC_MESSAGES/stardict.mo share/locale/pt_BR/LC_MESSAGES/stardict.mo share/locale/ru/LC_MESSAGES/stardict.mo share/locale/rw/LC_MESSAGES/stardict.mo share/locale/sk/LC_MESSAGES/stardict.mo share/locale/sv/LC_MESSAGES/stardict.mo share/locale/tr/LC_MESSAGES/stardict.mo share/locale/tt/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 %%GNOME%%share/omf/stardict/stardict-C.omf %%GNOME%%share/omf/stardict/stardict-mk.omf %%GNOME%%share/omf/stardict/stardict-nl.omf %%GNOME%%share/omf/stardict/stardict-ru.omf %%GNOME%%share/omf/stardict/stardict-uk.omf %%GNOME%%share/omf/stardict/stardict-zh_CN.omf %%GNOME%%share/omf/stardict/stardict-zh_TW.omf share/pixmaps/stardict.png share/stardict/dic/stardict-dict/res/huzheng.png share/stardict/dic/stardict-dict/res/huzheng_redhat.png share/stardict/dic/stardict-dict/res/linux_logo.jpg share/stardict/dic/stardict-dict/res/redhat_linux_logo.gif share/stardict/dic/stardict-dict/res/redhat_logo.jpg share/stardict/dic/stardict-dict/res/splash.png share/stardict/dic/stardict-dict/res/wenjing.jpg share/stardict/dic/stardict-dict/res/wenjing2.jpg share/stardict/dic/stardict-dict/stardict-dict.dict.dz share/stardict/dic/stardict-dict/stardict-dict.idx share/stardict/dic/stardict-dict/stardict-dict.ifo share/stardict/dic/stardict-dict/stardict-dict.syn share/stardict/pixmaps/attachment.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_dictlist.png share/stardict/pixmaps/index_translate.png share/stardict/pixmaps/index_wazard.png share/stardict/pixmaps/pronounce.png share/stardict/pixmaps/splash.png share/stardict/pixmaps/video.png share/stardict/sounds/buttonactive.wav share/stardict/sounds/menushow.wav @dirrm share/stardict/sounds @dirrm share/stardict/pixmaps @dirrm share/stardict/dic/stardict-dict/res @dirrm share/stardict/dic/stardict-dict @dirrmtry share/stardict/dic @dirrmtry share/stardict %%GNOME%%@dirrm share/omf/stardict @dirrmtry share/locale/tt/LC_MESSAGES @dirrmtry share/locale/tt @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku @dirrmtry share/locale/kk/LC_MESSAGES @dirrmtry share/locale/kk %%GNOME%%@dirrmtry share/idl %%GNOME%%@dirrm share/gnome/help/stardict/zh_TW/figures %%GNOME%%@dirrm share/gnome/help/stardict/zh_TW %%GNOME%%@dirrm share/gnome/help/stardict/zh_CN/figures %%GNOME%%@dirrm share/gnome/help/stardict/zh_CN %%GNOME%%@dirrm share/gnome/help/stardict/uk/figures %%GNOME%%@dirrm share/gnome/help/stardict/uk %%GNOME%%@dirrm share/gnome/help/stardict/ru/figures %%GNOME%%@dirrm share/gnome/help/stardict/ru %%GNOME%%@dirrm share/gnome/help/stardict/nl/figures %%GNOME%%@dirrm share/gnome/help/stardict/nl %%GNOME%%@dirrm share/gnome/help/stardict/mk/figures %%GNOME%%@dirrm share/gnome/help/stardict/mk %%GNOME%%@dirrm share/gnome/help/stardict/C/figures %%GNOME%%@dirrm share/gnome/help/stardict/C %%GNOME%%@dirrm share/gnome/help/stardict @dirrmtry share/applications @dirrm lib/stardict/plugins @dirrm lib/stardict