diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile index 6253096f1f860..2c70015f111ab 100644 --- a/editors/poedit/Makefile +++ b/editors/poedit/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.54 2015/04/25 14:20:43 tnn Exp $ +# $NetBSD: Makefile,v 1.55 2016/04/18 13:39:29 ryoon Exp $ -DISTNAME= poedit-1.4.6.1 -PKGREVISION= 23 +DISTNAME= poedit-1.8.7.1 CATEGORIES= editors -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=poedit/} +MASTER_SITES= https://github.com/vslavik/poedit/releases/download/v${PKGVERSION_NOREV}-oss/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.poedit.net/ @@ -18,8 +17,13 @@ GNU_CONFIGURE= yes CONFIGURE_ENV+= BDB_TYPE="${BDB_TYPE}" CONFIGURE_ENV+= WX_CONFIG_NAME=${BUILDLINK_PREFIX.wxGTK28}/bin/wx-config +CONFIGURE_ARGS+= --enable-debug + +.include "../../devel/boost-libs/buildlink3.mk" .include "../../textproc/gtkspell/buildlink3.mk" -.include "../../x11/wxGTK28/buildlink3.mk" +.include "../../textproc/icu/buildlink3.mk" +.include "../../textproc/lucene++/buildlink3.mk" +.include "../../x11/wxGTK30/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../mk/bdb.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/editors/poedit/PLIST b/editors/poedit/PLIST index 752044befab0c..9ac3ab7bb9d68 100644 --- a/editors/poedit/PLIST +++ b/editors/poedit/PLIST @@ -1,58 +1,87 @@ -@comment $NetBSD: PLIST,v 1.6 2010/06/02 12:32:18 adam Exp $ +@comment $NetBSD: PLIST,v 1.7 2016/04/18 13:39:29 ryoon Exp $ bin/poedit +libexec/poedit-dump-legacy-tm man/man1/poedit.1 +share/applications/poedit-uri.desktop share/applications/poedit.desktop share/icons/hicolor/16x16/apps/poedit.png +share/icons/hicolor/16x16/mimetypes/gnome-mime-text-x-gettext-translation.png +share/icons/hicolor/16x16/mimetypes/poedit-translation-generic.png +share/icons/hicolor/16x16/mimetypes/text-x-gettext-translation.png +share/icons/hicolor/22x22/apps/poedit.png +share/icons/hicolor/22x22/mimetypes/gnome-mime-text-x-gettext-translation.png +share/icons/hicolor/22x22/mimetypes/poedit-translation-generic.png +share/icons/hicolor/22x22/mimetypes/text-x-gettext-translation.png +share/icons/hicolor/24x24/apps/poedit.png +share/icons/hicolor/24x24/mimetypes/gnome-mime-text-x-gettext-translation.png +share/icons/hicolor/24x24/mimetypes/poedit-translation-generic.png +share/icons/hicolor/24x24/mimetypes/text-x-gettext-translation.png share/icons/hicolor/32x32/apps/poedit.png +share/icons/hicolor/32x32/mimetypes/gnome-mime-text-x-gettext-translation.png +share/icons/hicolor/32x32/mimetypes/poedit-translation-generic.png +share/icons/hicolor/32x32/mimetypes/text-x-gettext-translation.png share/icons/hicolor/48x48/apps/poedit.png share/icons/hicolor/scalable/apps/poedit.svg -share/locale/af_ZA/LC_MESSAGES/poedit.mo +share/icons/hicolor/scalable/mimetypes/gnome-mime-text-x-gettext-translation.svg +share/icons/hicolor/scalable/mimetypes/poedit-translation-generic.svg +share/icons/hicolor/scalable/mimetypes/text-x-gettext-translation.svg +share/locale/af/LC_MESSAGES/poedit.mo share/locale/am/LC_MESSAGES/poedit.mo +share/locale/an/LC_MESSAGES/poedit.mo share/locale/ar/LC_MESSAGES/poedit.mo share/locale/ast/LC_MESSAGES/poedit.mo +share/locale/az/LC_MESSAGES/poedit.mo share/locale/be/LC_MESSAGES/poedit.mo share/locale/be@latin/LC_MESSAGES/poedit.mo share/locale/bg/LC_MESSAGES/poedit.mo share/locale/bn/LC_MESSAGES/poedit.mo share/locale/br/LC_MESSAGES/poedit.mo +share/locale/bs/LC_MESSAGES/poedit.mo share/locale/ca/LC_MESSAGES/poedit.mo share/locale/ca@valencia/LC_MESSAGES/poedit.mo +share/locale/ckb/LC_MESSAGES/poedit.mo +share/locale/co/LC_MESSAGES/poedit.mo share/locale/cs/LC_MESSAGES/poedit.mo share/locale/da/LC_MESSAGES/poedit.mo share/locale/de/LC_MESSAGES/poedit.mo share/locale/el/LC_MESSAGES/poedit.mo +share/locale/en_GB/LC_MESSAGES/poedit.mo share/locale/eo/LC_MESSAGES/poedit.mo share/locale/es/LC_MESSAGES/poedit.mo -share/locale/es_PR/LC_MESSAGES/poedit.mo share/locale/et/LC_MESSAGES/poedit.mo share/locale/eu/LC_MESSAGES/poedit.mo -share/locale/fa_IR/LC_MESSAGES/poedit.mo +share/locale/fa/LC_MESSAGES/poedit.mo share/locale/fi/LC_MESSAGES/poedit.mo share/locale/fr/LC_MESSAGES/poedit.mo share/locale/fur/LC_MESSAGES/poedit.mo +share/locale/fy_NL/LC_MESSAGES/poedit.mo share/locale/ga/LC_MESSAGES/poedit.mo share/locale/gl/LC_MESSAGES/poedit.mo share/locale/he/LC_MESSAGES/poedit.mo share/locale/hi/LC_MESSAGES/poedit.mo share/locale/hr/LC_MESSAGES/poedit.mo share/locale/hu/LC_MESSAGES/poedit.mo +share/locale/hy/LC_MESSAGES/poedit.mo share/locale/id/LC_MESSAGES/poedit.mo share/locale/is/LC_MESSAGES/poedit.mo share/locale/it/LC_MESSAGES/poedit.mo share/locale/ja/LC_MESSAGES/poedit.mo share/locale/ka/LC_MESSAGES/poedit.mo +share/locale/kab/LC_MESSAGES/poedit.mo share/locale/kk/LC_MESSAGES/poedit.mo share/locale/ko/LC_MESSAGES/poedit.mo -share/locale/ku/LC_MESSAGES/poedit.mo share/locale/ky/LC_MESSAGES/poedit.mo share/locale/lt/LC_MESSAGES/poedit.mo share/locale/lv/LC_MESSAGES/poedit.mo share/locale/mk/LC_MESSAGES/poedit.mo share/locale/mn/LC_MESSAGES/poedit.mo +share/locale/mr/LC_MESSAGES/poedit.mo share/locale/ms/LC_MESSAGES/poedit.mo share/locale/nb/LC_MESSAGES/poedit.mo +share/locale/ne/LC_MESSAGES/poedit.mo share/locale/nl/LC_MESSAGES/poedit.mo share/locale/nn/LC_MESSAGES/poedit.mo +share/locale/oc/LC_MESSAGES/poedit.mo share/locale/pa/LC_MESSAGES/poedit.mo share/locale/pl/LC_MESSAGES/poedit.mo share/locale/pt_BR/LC_MESSAGES/poedit.mo @@ -61,10 +90,11 @@ share/locale/ro/LC_MESSAGES/poedit.mo share/locale/ru/LC_MESSAGES/poedit.mo share/locale/sk/LC_MESSAGES/poedit.mo share/locale/sl/LC_MESSAGES/poedit.mo -share/locale/sq_AL/LC_MESSAGES/poedit.mo +share/locale/sq/LC_MESSAGES/poedit.mo share/locale/sr/LC_MESSAGES/poedit.mo share/locale/sv/LC_MESSAGES/poedit.mo share/locale/ta/LC_MESSAGES/poedit.mo +share/locale/tg/LC_MESSAGES/poedit.mo share/locale/th/LC_MESSAGES/poedit.mo share/locale/tr/LC_MESSAGES/poedit.mo share/locale/tt/LC_MESSAGES/poedit.mo @@ -77,67 +107,25 @@ share/locale/wa/LC_MESSAGES/poedit.mo share/locale/zh_CN/LC_MESSAGES/poedit.mo share/locale/zh_TW/LC_MESSAGES/poedit.mo share/pixmaps/poedit.png -share/poedit/help/common/comment.gif -share/poedit/help/common/fileopen.gif -share/poedit/help/common/filesave.gif -share/poedit/help/common/fullscreen.gif -share/poedit/help/common/fuzzy.gif -share/poedit/help/common/poedit.css -share/poedit/help/common/quotes.gif -share/poedit/help/common/update.gif -share/poedit/help/en/basics.html -share/poedit/help/en/gettext/gettext.hhc -share/poedit/help/en/gettext/gettext.hhp -share/poedit/help/en/gettext/gettext_1.html -share/poedit/help/en/gettext/gettext_10.html -share/poedit/help/en/gettext/gettext_11.html -share/poedit/help/en/gettext/gettext_12.html -share/poedit/help/en/gettext/gettext_2.html -share/poedit/help/en/gettext/gettext_3.html -share/poedit/help/en/gettext/gettext_4.html -share/poedit/help/en/gettext/gettext_5.html -share/poedit/help/en/gettext/gettext_6.html -share/poedit/help/en/gettext/gettext_7.html -share/poedit/help/en/gettext/gettext_8.html -share/poedit/help/en/gettext/gettext_9.html -share/poedit/help/en/gettext/gettext_foot.html -share/poedit/help/en/gettext/gettext_toc.html -share/poedit/help/en/gettext/index.html -share/poedit/help/en/index.html -share/poedit/help/en/manager.html -share/poedit/help/en/menu.html -share/poedit/help/en/poedit.hhc -share/poedit/help/en/poedit.hhp -share/poedit/help/en/settings.html -share/poedit/help/en/tm.html -share/poedit/help/en/ui.html -share/poedit/help/en/update.html -share/poedit/help/hr/basics.html -share/poedit/help/hr/index.html -share/poedit/help/hr/manager.html -share/poedit/help/hr/menu.html -share/poedit/help/hr/poedit.hhc -share/poedit/help/hr/poedit.hhp -share/poedit/help/hr/settings.html -share/poedit/help/hr/tm.html -share/poedit/help/hr/ui.html -share/poedit/help/hr/update.html -share/poedit/icons/README +share/poedit/icons/CrowdinLogo.png +share/poedit/icons/PoeditWelcome.png +share/poedit/icons/SuggestionError.png +share/poedit/icons/SuggestionTM.png share/poedit/icons/document-new.png share/poedit/icons/document-open.png share/poedit/icons/document-properties.png share/poedit/icons/document-save.png share/poedit/icons/edit-delete.png -share/poedit/icons/help-browser.png -share/poedit/icons/poedit-comment.png share/poedit/icons/poedit-fuzzy.png share/poedit/icons/poedit-status-automatic.png +share/poedit/icons/poedit-status-bookmark.png share/poedit/icons/poedit-status-cat-mid.png share/poedit/icons/poedit-status-cat-no.png share/poedit/icons/poedit-status-cat-ok.png -share/poedit/icons/poedit-status-comment-modif.png share/poedit/icons/poedit-status-comment.png -share/poedit/icons/poedit-status-modified.png share/poedit/icons/poedit-status-nothing.png +share/poedit/icons/poedit-sync.png share/poedit/icons/poedit-update.png -share/poedit/icons/view-fullscreen.png +share/poedit/icons/poedit-validate.png +share/poedit/icons/sidebar.png +share/poedit/icons/window-close.png diff --git a/editors/poedit/distinfo b/editors/poedit/distinfo index c89fc8efd788c..e16e6b5d6c0e3 100644 --- a/editors/poedit/distinfo +++ b/editors/poedit/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.8 2015/11/03 03:32:20 agc Exp $ +$NetBSD: distinfo,v 1.9 2016/04/18 13:39:29 ryoon Exp $ -SHA1 (poedit-1.4.6.1.tar.gz) = 8c4d61aef7695aa48607e9367df4c5899ad3bf83 -RMD160 (poedit-1.4.6.1.tar.gz) = 7b4fbb3f4632b53a46382f9f4b875d375c5c54b8 -SHA512 (poedit-1.4.6.1.tar.gz) = c8084c80a75cc8499615d736ee6d1a1fcf5753ab610f2931c151167c5c5b2fccff5892e971a90bc53eae815074d209c9e3b5854cc05bed8d72e8f0c2f00b96ed -Size (poedit-1.4.6.1.tar.gz) = 1585949 bytes -SHA1 (patch-aa) = d0acac229545a35e43c774329c03714fc7affcab +SHA1 (poedit-1.8.7.1.tar.gz) = 1b1be55992985094b10877e749816415b297f52a +RMD160 (poedit-1.8.7.1.tar.gz) = 296d29a22c8352f5ae1afbbcbc0c4d0a447007eb +SHA512 (poedit-1.8.7.1.tar.gz) = 72a91f015248220eff379485ad462cefb17a5ad78854c07f212371a56601319e4f3b28d7c90128e3b8e78113deee3a3d2bb2201fdf8dcc9023b08e885ef9f804 +Size (poedit-1.8.7.1.tar.gz) = 2484117 bytes +SHA1 (patch-aa) = 65c82daafb227196ac64928a029b3507b9016a4f diff --git a/editors/poedit/patches/patch-aa b/editors/poedit/patches/patch-aa index 864b25276b40a..27ae2476c2e77 100644 --- a/editors/poedit/patches/patch-aa +++ b/editors/poedit/patches/patch-aa @@ -1,30 +1,40 @@ -$NetBSD: patch-aa,v 1.3 2010/06/02 12:32:18 adam Exp $ +$NetBSD: patch-aa,v 1.4 2016/04/18 13:39:29 ryoon Exp $ ---- configure.orig 2010-06-01 09:19:56.000000000 +0000 +--- configure.orig 2016-02-23 11:59:22.000000000 +0000 +++ configure -@@ -6057,15 +6057,9 @@ $as_echo_n "checking for Berkeley DB... - $as_echo_n "checking for Berkeley DB >= $minversion... " >&6; } - fi - -- for version in "" 5.0 4.9 4.8 4.7 4.6 4.5 4.4 4.3 4.2 4.1 4.0 3.6 3.5 3.4 3.3 3.2 3.1 ; do +@@ -6196,16 +6196,8 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +- +- for version in "" 5.9 5.8 5.7 5.6 5.5 5.4 5.3 5.2 5.1 5.0 4.8 4.7 4.6 4.5 4.4 4.3 4.2 4.1 ; do +- - if test -z $version ; then -- db_lib="-ldb" -- try_headers="db.h" +- db_lib="-ldb_cxx" +- try_headers="db_cxx.h" - else -- db_lib="-ldb-$version" -- try_headers="db$version/db.h db`echo $version | sed -e 's,\..*,,g'`/db.h" +- db_lib="-ldb_cxx-$version" +- try_headers="db$version/db_cxx.h db`echo $version | sed -e 's,\..*,,g'`/db_cxx.h" - fi -+ db_lib="-l${BDB_TYPE}" -+ try_headers="${BDB_TYPE}/db.h" ++ db_lib="-l${BDB_TYPE}_cxx" ++ try_headers="${BDB_TYPE}/db_cxx.h" LIBS="$old_LIBS $db_lib" -@@ -6140,7 +6134,6 @@ rm -f core conftest.err conftest.$ac_obj - conftest$ac_exeext conftest.$ac_ext +@@ -6248,7 +6240,6 @@ rm -f core conftest.err conftest.$ac_obj + conftest$ac_exeext conftest.$ac_ext fi done - done - LIBS="$old_LIBS" + ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' +@@ -6451,7 +6442,7 @@ fi + + +-if test "x$GXX" == "xyes"; then ++if test "x$GXX" = "xyes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 + $as_echo_n "checking for a sed that does not truncate output... " >&6; } + if ${ac_cv_path_SED+:} false; then :