Index: head/textproc/sdcv/Makefile =================================================================== --- head/textproc/sdcv/Makefile (revision 450000) +++ head/textproc/sdcv/Makefile (revision 450001) @@ -1,39 +1,38 @@ # Created by: chinsan # $FreeBSD$ PORTNAME= sdcv -PORTVERSION= 0.5.1 +PORTVERSION= 0.5.2 DISTVERSIONPREFIX= v -PORTREVISION= 1 CATEGORIES= textproc MAINTAINER= citrin@citrin.ru COMMENT= Text-based utility for work with dictionaries in StarDict's format #' LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE USES= cmake:outsource pkgconfig readline USE_GNOME= glib20 SUB_FILES= pkg-message USE_GITHUB= yes GH_ACCOUNT= Dushistov OPTIONS_DEFINE= NLS OPTIONS_SUB= yes NLS_USES= gettext NLS_CMAKE_OFF= -DENABLE_NLS:BOOL=OFF post-patch: .for i in doc/sdcv.1 src/sdcv.cpp @${REINPLACE_CMD} -e \ 's|/usr/share|${PREFIX}/share|' ${WRKSRC}/${i} .endfor post-build-NLS-on: cd ${BUILD_WRKSRC} && ${MAKE_CMD} lang .include Index: head/textproc/sdcv/distinfo =================================================================== --- head/textproc/sdcv/distinfo (revision 450000) +++ head/textproc/sdcv/distinfo (revision 450001) @@ -1,3 +1,3 @@ -TIMESTAMP = 1499366673 -SHA256 (Dushistov-sdcv-v0.5.1_GH0.tar.gz) = d0c64429547adb127d5ff9f0f0db8c4bc663bc413dfb5b5d32c924a67171c247 -SIZE (Dushistov-sdcv-v0.5.1_GH0.tar.gz) = 58941 +TIMESTAMP = 1505656097 +SHA256 (Dushistov-sdcv-v0.5.2_GH0.tar.gz) = ec08dc084a0748d5a89df01a20bbf294f09b0366295cd418000f15d2e043c4f7 +SIZE (Dushistov-sdcv-v0.5.2_GH0.tar.gz) = 61541 Index: head/textproc/sdcv/files/patch-bug19 =================================================================== --- head/textproc/sdcv/files/patch-bug19 (revision 450000) +++ head/textproc/sdcv/files/patch-bug19 (nonexistent) @@ -1,60 +0,0 @@ ---- src/sdcv.cpp.orig -+++ src/sdcv.cpp -@@ -157,7 +157,7 @@ int main(int argc, char *argv[]) try { - }); - - std::list order_list; -- if (use_dict_list) { -+ if (use_dict_list != nullptr) { - for (auto &&x : bookname_to_ifo) { - gchar **p = get_impl(use_dict_list); - for (; *p != nullptr; ++p) ---- src/stardict_lib.cpp.orig -+++ src/stardict_lib.cpp -@@ -89,7 +89,6 @@ bool DictInfo::load_from_ifo_file(const std::string& ifofilename, - if (!g_str_has_prefix( - g_str_has_prefix(get_impl(buffer), (const gchar *)(utf8_bom)) ? get_impl(buffer) + 3 : get_impl(buffer), - magic_data)) { -- g_free(buffer); - return false; - } - ---- src/utils.hpp.orig -+++ src/utils.hpp -@@ -27,6 +27,14 @@ class ResourceWrapper { - } - } - -+ friend inline bool operator==(const ResourceWrapper& lhs, std::nullptr_t) noexcept { -+ return !lhs.p_; -+ } -+ -+ friend inline bool operator!=(const ResourceWrapper& lhs, std::nullptr_t) noexcept { -+ return !!lhs.p_; -+ } -+ - friend inline T *get_impl(const ResourceWrapper& rw) { - return rw.p_; - } -@@ -39,21 +47,6 @@ class ResourceWrapper { - T *p_; - - void free_resource() { if (p_) unref_res(p_); } -- --// Helper for enabling 'if (sp)' -- struct Tester { -- Tester() {} -- private: -- void operator delete(void*); -- }; --public: -- // enable 'if (sp)' -- operator Tester*() const { -- if (!*this) -- return 0; -- static Tester t; -- return &t; -- } - }; - - namespace glib { Property changes on: head/textproc/sdcv/files/patch-bug19 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property