diff options
author | Max Khon <fjoe@FreeBSD.org> | 2016-10-04 16:06:57 +0000 |
---|---|---|
committer | Max Khon <fjoe@FreeBSD.org> | 2016-10-04 16:06:57 +0000 |
commit | f34b26b3ff7f29da7399b97e20f747cc89f8f6f8 (patch) | |
tree | 887332daa3631caf83fa578833a2e476a0cdf946 /net-p2p/eiskaltdcpp-lib | |
parent | eefb1af10079433203be9dbb79b68d1f5652a95e (diff) | |
download | ports-f34b26b3ff7f29da7399b97e20f747cc89f8f6f8.tar.gz ports-f34b26b3ff7f29da7399b97e20f747cc89f8f6f8.zip |
- Update to 2.2.10 and unbreak (USE_GITHUB=yes)
Notes
Notes:
svn path=/head/; revision=423278
Diffstat (limited to 'net-p2p/eiskaltdcpp-lib')
12 files changed, 55 insertions, 81 deletions
diff --git a/net-p2p/eiskaltdcpp-lib/Makefile b/net-p2p/eiskaltdcpp-lib/Makefile index c407723e3a0b..a2387eb0b159 100644 --- a/net-p2p/eiskaltdcpp-lib/Makefile +++ b/net-p2p/eiskaltdcpp-lib/Makefile @@ -2,11 +2,10 @@ # $FreeBSD$ PORTNAME= eiskaltdcpp -PORTVERSION= 2.2.9 -PORTREVISION= 3 +PORTVERSION= 2.2.10 +DISTVERSIONPREFIX= v +PORTREVISION= 0 CATEGORIES= net-p2p -MASTER_SITES= GOOGLE_CODE -PROJECTHOST= eiskaltdc PKGNAMESUFFIX?= -lib MAINTAINER= fjoe@FreeBSD.org @@ -14,7 +13,8 @@ COMMENT= Direct Connect client shared library LICENSE= GPLv3 -BROKEN= Unfetchable (google code has gone away) +USE_GITHUB= yes +GH_ACCOUNT= eiskaltdcpp .if !defined (MASTERDIR) LIB_DEPENDS= libboost_system.so:devel/boost-libs diff --git a/net-p2p/eiskaltdcpp-lib/distinfo b/net-p2p/eiskaltdcpp-lib/distinfo index 8d61c080f2df..fd4e4ba7717b 100644 --- a/net-p2p/eiskaltdcpp-lib/distinfo +++ b/net-p2p/eiskaltdcpp-lib/distinfo @@ -1,2 +1,3 @@ -SHA256 (eiskaltdcpp-2.2.9.tar.xz) = 3d9170645450f9cb0a605278b8646fec2110b9637910d86fd27cf245cbe24eaf -SIZE (eiskaltdcpp-2.2.9.tar.xz) = 2327732 +TIMESTAMP = 1475570528 +SHA256 (eiskaltdcpp-eiskaltdcpp-v2.2.10_GH0.tar.gz) = e461c8c499e459651d6382a6ded6788e5ac9a9c4ff26386c3cf073d94d606127 +SIZE (eiskaltdcpp-eiskaltdcpp-v2.2.10_GH0.tar.gz) = 3843143 diff --git a/net-p2p/eiskaltdcpp-lib/files/patch-cmake__CMakeLists.txt b/net-p2p/eiskaltdcpp-lib/files/patch-cmake__CMakeLists.txt index 0958fddc1810..77116a0d291e 100644 --- a/net-p2p/eiskaltdcpp-lib/files/patch-cmake__CMakeLists.txt +++ b/net-p2p/eiskaltdcpp-lib/files/patch-cmake__CMakeLists.txt @@ -1,5 +1,5 @@ ---- ./cmake/CMakeLists.txt.orig 2011-10-02 18:12:43.000000000 +0300 -+++ ./cmake/CMakeLists.txt 2011-10-10 11:10:30.000000000 +0300 +--- cmake/CMakeLists.txt.orig 2015-04-19 21:57:16.000000000 +0000 ++++ cmake/CMakeLists.txt 2016-10-04 14:43:18.859197000 +0000 @@ -37,12 +37,14 @@ endmacro(GET_RELATIVE_SOURCES) @@ -25,7 +25,7 @@ OUTPUT ${dcpp_SOURCE_DIR}/po/${LANG}.po @@ -194,6 +197,7 @@ WORKING_DIRECTORY ${dcpp_SOURCE_DIR}/po - COMMENT "pot-update [dcpp-${LANG}]: Updated po file." + COMMENT "pot-update {dcpp-${LANG}}: Updated po file." ) + endif (BUILD_LIB) @@ -57,26 +57,26 @@ + if (BUILD_LIB) add_custom_command( - OUTPUT ${dcpp_BINARY_DIR}/locale/${LANG}/LC_MESSAGES - COMMAND ${CMAKE_COMMAND} -E make_directory -@@ -346,6 +355,7 @@ + OUTPUT ${dcpp_BINARY_DIR}/${LANG}_libeiskaltdcpp.mo + COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} +@@ -339,6 +348,7 @@ WORKING_DIRECTORY ${dcpp_SOURCE_DIR}/po - COMMENT "mo-update [dcpp-${LANG}]: Creating mo file." + COMMENT "Creating mo file ${dcpp_BINARY_DIR}/${LANG}_libeiskaltdcpp.mo" ) + endif (BUILD_LIB) if (USE_GTK OR USE_GTK3) + add_custom_command( - OUTPUT ${eiskaltdcpp-gtk_BINARY_DIR}/locale/${LANG}/LC_MESSAGES -@@ -374,12 +384,14 @@ +@@ -360,12 +370,14 @@ ) endif (USE_GTK OR USE_GTK3) + if (BUILD_LIB) - set(mo-update-SRC ${mo-update-SRC} - ${dcpp_BINARY_DIR}/locale/${LANG}/LC_MESSAGES/libeiskaltdcpp.mo + list(APPEND mo-update-SRC + ${dcpp_BINARY_DIR}/${LANG}_libeiskaltdcpp.mo ) - set(mo-update-LANG-SRC ${mo-update-LANG-SRC} - ${dcpp_BINARY_DIR}/locale/${LANG}/LC_MESSAGES/libeiskaltdcpp.mo + list(APPEND mo-update-LANG-SRC + ${dcpp_BINARY_DIR}/${LANG}_libeiskaltdcpp.mo ) + endif (BUILD_LIB) diff --git a/net-p2p/eiskaltdcpp-lib/files/patch-dcpp__CMakeLists.txt b/net-p2p/eiskaltdcpp-lib/files/patch-dcpp__CMakeLists.txt index 6d75f6280ce8..9cb256cf94ed 100644 --- a/net-p2p/eiskaltdcpp-lib/files/patch-dcpp__CMakeLists.txt +++ b/net-p2p/eiskaltdcpp-lib/files/patch-dcpp__CMakeLists.txt @@ -1,15 +1,15 @@ ---- dcpp/CMakeLists.txt.orig 2011-10-02 18:12:43.000000000 +0300 -+++ dcpp/CMakeLists.txt 2011-10-03 10:14:13.000000000 +0300 -@@ -82,7 +82,7 @@ +--- dcpp/CMakeLists.txt.orig 2015-04-19 21:57:16.000000000 +0000 ++++ dcpp/CMakeLists.txt 2016-10-04 14:37:43.721262000 +0000 +@@ -85,7 +85,7 @@ target_link_libraries (dcpp ${DHT_LIB} ${PTHREADS} ${BZIP2_LIBRARIES} ${ZLIB_LIBRARIES} - ${OPENSSL_LIBRARIES} ${GETTEXT_LIBRARIES} ${ICONV_LIBRARIES} ${WIN32_LIBS} ${APPLE_LIBS} ${LUA_LIBRARIES} ${UPNP} ${PCRE} ${IDNA_LIBRARIES} ${XATTR_LIBRARIES} ${HAIKU_LIB} ${Boost_LIBRARIES}) + ${OPENSSL_LIBRARIES} ${GETTEXT_LIBRARIES} ${ICONV_LIBRARIES} ${APPLE_LIBS} ${LUA_LIBRARIES} ${UPNP} ${PCRE} ${IDNA_LIBRARIES} ${XATTR_LIBRARIES} ${HAIKU_LIB} ${Boost_LIBRARIES}) -set_target_properties(dcpp PROPERTIES VERSION ${SOVERSION} OUTPUT_NAME "eiskaltdcpp") +set_target_properties(dcpp PROPERTIES SOVERSION 2 VERSION ${SOVERSION} OUTPUT_NAME "eiskaltdcpp") if (APPLE) set (LIBDIR1 .) -@@ -91,7 +91,7 @@ +@@ -94,7 +94,7 @@ if (LINK STREQUAL SHARED) install (TARGETS dcpp diff --git a/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-cli__cli-jsonrpc.pl b/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-cli__cli-jsonrpc.pl index f5d5f5d30be3..727473f23dea 100644 --- a/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-cli__cli-jsonrpc.pl +++ b/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-cli__cli-jsonrpc.pl @@ -10,23 +10,3 @@ } # preparing terminal -@@ -87,15 +86,16 @@ - my $res; - - # creating and configuring jsonrpc client --my $client = eval -+my $client; -+eval - { - require JSON::RPC::Client; -- JSON::RPC::Client->new(); -+ $client = JSON::RPC::Client->new(); - } - or do - { - require JSON::RPC::Legacy::Client; -- JSON::RPC::Legacy::Client->new(); -+ $client=JSON::RPC::Legacy::Client->new(); - }; - $client->version("2.0"); - $client->ua->timeout(10); diff --git a/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-daemon__CMakeLists.txt b/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-daemon__CMakeLists.txt index 1ca83baf3c7b..7b86ea87f623 100644 --- a/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-daemon__CMakeLists.txt +++ b/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-daemon__CMakeLists.txt @@ -14,7 +14,7 @@ + endif (DCPP_LIB) +endif (BUILD_LIB) + -+target_link_libraries (${PROJECT_NAME} ${DCPP_LIB} ${LIBS} ${Boost_LIBRARIES} ${GETTEXT_LIBRARIES} extra) ++target_link_libraries (${PROJECT_NAME} ${DCPP_LIB} ${LIBS} ${GETTEXT_LIBRARIES} extra) if (CMAKE_BUILD_TYPE STREQUAL Debug) add_definitions(-D_DEBUG) diff --git a/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-gtk__CMakeLists.txt b/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-gtk__CMakeLists.txt index 09c063aa782e..164480f1a12c 100644 --- a/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-gtk__CMakeLists.txt +++ b/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-gtk__CMakeLists.txt @@ -1,5 +1,5 @@ ---- ./eiskaltdcpp-gtk/CMakeLists.txt.orig 2011-10-02 18:12:43.000000000 +0300 -+++ ./eiskaltdcpp-gtk/CMakeLists.txt 2011-10-10 11:10:30.000000000 +0300 +--- eiskaltdcpp-gtk/CMakeLists.txt.orig 2015-04-19 21:57:16.000000000 +0000 ++++ eiskaltdcpp-gtk/CMakeLists.txt 2016-10-04 14:44:37.733266000 +0000 @@ -12,7 +12,7 @@ if (USE_LIBGNOME2) @@ -19,9 +19,9 @@ message (STATUS "Building without libnotify support") endif (USE_LIBNOTIFY) @@ -39,7 +39,7 @@ - set (GTK_SRCS @gtk_srcs@ PARENT_SCOPE) - set (GTK_HDRS @gtk_hdrs@ PARENT_SCOPE) - set (GTK_UI @gtk_ui@ PARENT_SCOPE) + set (GTK_SRCS ${gtk_srcs} PARENT_SCOPE) + set (GTK_HDRS ${gtk_hdrs} PARENT_SCOPE) + set (GTK_UI ${gtk_ui} PARENT_SCOPE) -set (GTHREAD "-lgthread-2.0") +find_library (GTHREAD "gthread-2.0") diff --git a/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-qt__src__HubFrame.cpp b/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-qt__src__HubFrame.cpp deleted file mode 100644 index 6a4935d2552c..000000000000 --- a/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-qt__src__HubFrame.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- eiskaltdcpp-qt/src/HubFrame.cpp.orig 2013-08-29 21:25:02.000000000 +0400 -+++ eiskaltdcpp-qt/src/HubFrame.cpp 2014-08-17 02:00:34.000000000 +0400 -@@ -772,7 +772,7 @@ - } - } - --HubFrame::HubFrame(QWidget *parent=NULL, QString hub="", QString encoding=""): -+HubFrame::HubFrame(QWidget *parent, QString hub, QString encoding): - QWidget(parent), - d_ptr(new HubFramePrivate()) - { diff --git a/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-qt__src__HubFrame.h b/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-qt__src__HubFrame.h deleted file mode 100644 index 1d69ec0b7b36..000000000000 --- a/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-qt__src__HubFrame.h +++ /dev/null @@ -1,11 +0,0 @@ ---- eiskaltdcpp-qt/src/HubFrame.h.orig 2014-08-17 01:57:00.000000000 +0400 -+++ eiskaltdcpp-qt/src/HubFrame.h 2014-08-17 01:57:33.000000000 +0400 -@@ -128,7 +128,7 @@ - typedef QMap<QString, QVariant> VarMap; - typedef QList<ShellCommandRunner*> ShellList; - -- HubFrame(QWidget *parent, QString, QString); -+ HubFrame(QWidget *parent=NULL, QString hub="", QString encoding=""); - ~HubFrame(); - - bool parseForCmd(QString, QWidget *); diff --git a/net-p2p/eiskaltdcpp-lib/files/patch-json-jsoncpp-src-json_reader.cpp b/net-p2p/eiskaltdcpp-lib/files/patch-json-jsoncpp-src-json_reader.cpp new file mode 100644 index 000000000000..0c3803b8af59 --- /dev/null +++ b/net-p2p/eiskaltdcpp-lib/files/patch-json-jsoncpp-src-json_reader.cpp @@ -0,0 +1,10 @@ +--- json/jsoncpp/src/json_reader.cpp.orig 2016-10-04 15:50:44.453094000 +0000 ++++ json/jsoncpp/src/json_reader.cpp 2016-10-04 15:48:27.416705000 +0000 +@@ -14,6 +14,7 @@ + #include <cassert> + #include <cstring> ++#include <istream> + #include <stdexcept> + + #if defined(_MSC_VER) && _MSC_VER >= 1400 // VC++ 8.0 + #pragma warning( disable : 4996 ) // disable warning about strdup being deprecated. diff --git a/net-p2p/eiskaltdcpp-lib/files/patch-json__CMakeLists.txt b/net-p2p/eiskaltdcpp-lib/files/patch-json__CMakeLists.txt index e044b7c47a40..f79a628e7d68 100644 --- a/net-p2p/eiskaltdcpp-lib/files/patch-json__CMakeLists.txt +++ b/net-p2p/eiskaltdcpp-lib/files/patch-json__CMakeLists.txt @@ -1,11 +1,11 @@ ---- json/CMakeLists.txt.orig 2013-08-29 21:25:02.000000000 +0400 -+++ json/CMakeLists.txt 2014-08-14 09:48:27.364617149 +0400 +--- json/CMakeLists.txt.orig 2015-04-19 21:57:16.000000000 +0000 ++++ json/CMakeLists.txt 2016-10-04 14:36:02.121665000 +0000 @@ -12,7 +12,7 @@ + ${PROJECT_SOURCE_DIR}/jsonrpc-cpp/networking.cpp) set_source_files_properties(${PROJECT_SOURCE_DIR}/jsonrpc-cpp/mongoose.c PROPERTIES COMPILE_FLAGS "-DNDEBUG -DNO_CGI -DNO_SSL") - #option (LOCAL_JSONCPP "Use local JsonCpp" ON) - #if (LOCAL_JSONCPP) + if (LOCAL_JSONCPP) - set (JSONCPP_LIBRARY jsoncpp) + set (JSONCPP_LIBRARY jsoncpp ${CMAKE_THREAD_LIBS_INIT}) set (JSONCPP_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/jsoncpp/) - include_directories(${JSONCPP_INCLUDE_DIR}) - aux_source_directory(${PROJECT_SOURCE_DIR}/jsoncpp/ jsoncpp_SRCS) + aux_source_directory(${PROJECT_SOURCE_DIR}/jsoncpp/src jsoncpp_SRCS) + add_library (jsoncpp STATIC ${jsoncpp_SRCS}) diff --git a/net-p2p/eiskaltdcpp-lib/pkg-plist b/net-p2p/eiskaltdcpp-lib/pkg-plist index 37cac99596eb..8f3fcda1f247 100644 --- a/net-p2p/eiskaltdcpp-lib/pkg-plist +++ b/net-p2p/eiskaltdcpp-lib/pkg-plist @@ -103,9 +103,9 @@ include/eiskaltdcpp/dcpp/stdinc.h include/eiskaltdcpp/dcpp/typedefs.h include/eiskaltdcpp/dcpp/version.h include/eiskaltdcpp/dcpp/w.h -lib/libeiskaltdcpp.so.2.2 -lib/libeiskaltdcpp.so.2 lib/libeiskaltdcpp.so +lib/libeiskaltdcpp.so.2 +lib/libeiskaltdcpp.so.2.2.10 share/locale/be/LC_MESSAGES/libeiskaltdcpp.mo share/locale/bg/LC_MESSAGES/libeiskaltdcpp.mo share/locale/cs/LC_MESSAGES/libeiskaltdcpp.mo @@ -113,6 +113,7 @@ share/locale/de/LC_MESSAGES/libeiskaltdcpp.mo share/locale/el/LC_MESSAGES/libeiskaltdcpp.mo share/locale/en/LC_MESSAGES/libeiskaltdcpp.mo share/locale/es/LC_MESSAGES/libeiskaltdcpp.mo +share/locale/eu/LC_MESSAGES/libeiskaltdcpp.mo share/locale/fr/LC_MESSAGES/libeiskaltdcpp.mo share/locale/hu/LC_MESSAGES/libeiskaltdcpp.mo share/locale/it/LC_MESSAGES/libeiskaltdcpp.mo @@ -120,5 +121,9 @@ share/locale/pl/LC_MESSAGES/libeiskaltdcpp.mo share/locale/pt_BR/LC_MESSAGES/libeiskaltdcpp.mo share/locale/ru/LC_MESSAGES/libeiskaltdcpp.mo share/locale/sk/LC_MESSAGES/libeiskaltdcpp.mo +share/locale/sr/LC_MESSAGES/libeiskaltdcpp.mo share/locale/sr@latin/LC_MESSAGES/libeiskaltdcpp.mo +share/locale/sv_SE/LC_MESSAGES/libeiskaltdcpp.mo share/locale/uk/LC_MESSAGES/libeiskaltdcpp.mo +share/locale/vi/LC_MESSAGES/libeiskaltdcpp.mo +share/locale/zh_CN/LC_MESSAGES/libeiskaltdcpp.mo |