diff --git a/net-p2p/eiskaltdcpp-daemon/Makefile b/net-p2p/eiskaltdcpp-daemon/Makefile index 73773d2a2b3c..869180d8c14b 100644 --- a/net-p2p/eiskaltdcpp-daemon/Makefile +++ b/net-p2p/eiskaltdcpp-daemon/Makefile @@ -1,44 +1,44 @@ PORTNAME= eiskaltdcpp -PORTREVISION= 18 +PORTREVISION= 19 CATEGORIES= net-p2p PKGNAMESUFFIX= -daemon MAINTAINER= ports@FreeBSD.org COMMENT= EiskaltDC++ client daemon LICENSE= GPLv3 LIB_DEPENDS= libeiskaltdcpp.so:net-p2p/eiskaltdcpp-lib MASTERDIR= ${.CURDIR}/../eiskaltdcpp-lib USES= cmake:insource gettext compiler:c++11-lib ssl OPTIONS_SINGLE= UI OPTIONS_SINGLE_UI= NOUI XMLRPC JSONRPC OPTIONS_DEFAULT= JSONRPC UI_DESC= Daemon user interface NOUI_DESC= Daemon without any UI XMLRPC_DESC= XMLRPC interface support (deprecated) JSONRPC_DESC= JSONRPC interface support PLIST_FILES= bin/${PORTNAME}${PKGNAMESUFFIX} \ - man/man1/${PORTNAME}${PKGNAMESUFFIX}.1.gz + share/man/man1/${PORTNAME}${PKGNAMESUFFIX}.1.gz CMAKE_ARGS+= -DUSE_QT:BOOL=OFF CMAKE_ARGS+= -DUSE_GTK:BOOL=OFF CMAKE_ARGS+= -DCREATE_MO:BOOL=OFF BUILD_WRKSRC= ${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX} INSTALL_WRKSRC= ${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX} XMLRPC_BROKEN= xmlrpcserver.h:624:38: error: no member named 'getMethodList' in 'ServerThread' XMLRPC_LIB_DEPENDS= libxmlrpc++.so:net/xmlrpc-c XMLRPC_CMAKE_ON= -DXMLRPC_DAEMON:BOOL=ON -DJSONRPC_DAEMON:BOOL=OFF -DNO_UI_DAEMON:BOOL=OFF JSONRPC_LIB_DEPENDS= libjsoncpp.so:devel/jsoncpp JSONRPC_CMAKE_ON= -DXMLRPC_DAEMON:BOOL=OFF -DJSONRPC_DAEMON:BOOL=ON -DNO_UI_DAEMON:BOOL=OFF -DLOCAL_JSONCPP:BOOL=OFF NOUI_CMAKE_ON= -DXMLRPC_DAEMON:BOOL=OFF -DJSONRPC_DAEMON:BOOL=OFF -DNO_UI_DAEMON:BOOL=ON .include "${MASTERDIR}/Makefile" diff --git a/net-p2p/eiskaltdcpp-gtk/Makefile b/net-p2p/eiskaltdcpp-gtk/Makefile index 752d196dd6e8..425cf360c9f1 100644 --- a/net-p2p/eiskaltdcpp-gtk/Makefile +++ b/net-p2p/eiskaltdcpp-gtk/Makefile @@ -1,52 +1,52 @@ PORTNAME= eiskaltdcpp -PORTREVISION= 22 +PORTREVISION= 23 CATEGORIES= net-p2p PKGNAMESUFFIX= -gtk MAINTAINER= ports@FreeBSD.org COMMENT= EiskaltDC++ client GTK graphic interface LICENSE= GPLv3 RUN_DEPENDS= eiskaltdcpp-data>=0:net-p2p/eiskaltdcpp-data LIB_DEPENDS= libeiskaltdcpp.so:net-p2p/eiskaltdcpp-lib MASTERDIR= ${.CURDIR}/../eiskaltdcpp-lib USES= cmake compiler:c++11-lib desktop-file-utils gettext gnome ssl USE_GNOME= pango glib20 OPTIONS_DEFINE= LIBNOTIFY FREE_SPACE OPTIONS_DEFAULT= LIBNOTIFY FREE_SPACE GTK2 NOSOUND OPTIONS_SINGLE= GTK SOUND OPTIONS_SINGLE_GTK= GTK2 GTK3 OPTIONS_SINGLE_SOUND= NOSOUND LIBCANBERRA NOSOUND_DESC= Disable sound notification support LIBCANBERRA_DESC= Sound notification support via libcanberra LIBNOTIFY_DESC= Popup notification support FREE_SPACE_DESC=Free space bar in status panel GTK_DESC= GTK GUI toolkit version CMAKE_ARGS+= -DUSE_QT:BOOL=OFF CMAKE_ARGS+= -DCREATE_MO:BOOL=ON CMAKE_ARGS+= -DINSTALL_DATA:BOOL=OFF NOSOUND_CMAKE_ON= -DUSE_LIBGNOME2:BOOL=OFF -DUSE_LIBCANBERRA:BOOL=OFF LIBCANBERRA_LIB_DEPENDS=libcanberra-gtk.so:audio/libcanberra LIBCANBERRA_CMAKE_ON= -DUSE_LIBGNOME2:BOOL=OFF -DUSE_LIBCANBERRA:BOOL=ON LIBNOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify LIBNOTIFY_CMAKE_BOOL= USE_LIBNOTIFY GTK2_USE= gnome=gtk20 GTK2_CMAKE_BOOL= USE_GTK GTK2_CMAKE_BOOL_OFF= USE_GTK3 GTK3_USE= gnome=gtk30 GTK3_CMAKE_BOOL= USE_GTK3 GTK3_CMAKE_BOOL_OFF= USE_GTK FREE_SPACE_CMAKE_BOOL= FREE_SPACE_BAR_C .include "${MASTERDIR}/Makefile" diff --git a/net-p2p/eiskaltdcpp-gtk/pkg-plist b/net-p2p/eiskaltdcpp-gtk/pkg-plist index 4834c3825d5a..facefdc9db9f 100644 --- a/net-p2p/eiskaltdcpp-gtk/pkg-plist +++ b/net-p2p/eiskaltdcpp-gtk/pkg-plist @@ -1,128 +1,128 @@ bin/eiskaltdcpp-gtk -man/man1/eiskaltdcpp-gtk.1.gz share/applications/eiskaltdcpp-gtk.desktop %%DATADIR%%/gtk/icons/hicolor/128x128/apps/eiskaltdcpp.png %%DATADIR%%/gtk/icons/hicolor/16x16/status/eiskaltdcpp-dc++-fw-op.png %%DATADIR%%/gtk/icons/hicolor/16x16/status/eiskaltdcpp-dc++-fw.png %%DATADIR%%/gtk/icons/hicolor/16x16/status/eiskaltdcpp-dc++-op.png %%DATADIR%%/gtk/icons/hicolor/16x16/status/eiskaltdcpp-dc++.png %%DATADIR%%/gtk/icons/hicolor/16x16/status/eiskaltdcpp-normal-fw-op.png %%DATADIR%%/gtk/icons/hicolor/16x16/status/eiskaltdcpp-normal-fw.png %%DATADIR%%/gtk/icons/hicolor/16x16/status/eiskaltdcpp-normal-op.png %%DATADIR%%/gtk/icons/hicolor/16x16/status/eiskaltdcpp-normal.png %%DATADIR%%/gtk/icons/hicolor/22x22/apps/eiskaltdcpp.png %%DATADIR%%/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-adls.png %%DATADIR%%/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-application-exit.png %%DATADIR%%/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-configure.png %%DATADIR%%/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-download.png %%DATADIR%%/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-edit-find.png %%DATADIR%%/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-favserver.png %%DATADIR%%/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-favusers.png %%DATADIR%%/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-find.png %%DATADIR%%/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-folder-blue.png %%DATADIR%%/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-go-down-search.png %%DATADIR%%/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-go-up-search.png %%DATADIR%%/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-gui.png %%DATADIR%%/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-hashing.png %%DATADIR%%/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-network-connect.png %%DATADIR%%/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-openlist.png %%DATADIR%%/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-own_filelist.png %%DATADIR%%/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-reconnect.png %%DATADIR%%/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-refrlist.png %%DATADIR%%/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-server.png %%DATADIR%%/gtk/icons/hicolor/22x22/categories/eiskaltdcpp-spy.png %%DATADIR%%/gtk/icons/hicolor/22x22/emotes/face-smile.png %%DATADIR%%/gtk/icons/hicolor/22x22/status/eiskaltdcpp-go-down.png %%DATADIR%%/gtk/icons/hicolor/22x22/status/eiskaltdcpp-go-up.png %%DATADIR%%/gtk/icons/hicolor/22x22/status/eiskaltdcpp-server-red.png %%DATADIR%%/gtk/icons/hicolor/22x22/status/eiskaltdcpp-server.png %%DATADIR%%/gtk/icons/hicolor/22x22/status/eiskaltdcpp-users-red.png %%DATADIR%%/gtk/icons/hicolor/22x22/status/eiskaltdcpp-users.png %%DATADIR%%/gtk/icons/hicolor/22x22/status/icon_msg.png %%DATADIR%%/gtk/themes/bw.theme %%DATADIR%%/gtk/themes/gtk-theme.theme %%DATADIR%%/gtk/themes/hicolor/16x16/status/humanity-dc++-fw-op.svg %%DATADIR%%/gtk/themes/hicolor/16x16/status/humanity-dc++-fw.svg %%DATADIR%%/gtk/themes/hicolor/16x16/status/humanity-dc++-op.svg %%DATADIR%%/gtk/themes/hicolor/16x16/status/humanity-dc++.svg %%DATADIR%%/gtk/themes/hicolor/16x16/status/humanity-normal-fw-op.svg %%DATADIR%%/gtk/themes/hicolor/16x16/status/humanity-normal-fw.svg %%DATADIR%%/gtk/themes/hicolor/16x16/status/humanity-normal-op.svg %%DATADIR%%/gtk/themes/hicolor/16x16/status/humanity-normal.svg %%DATADIR%%/gtk/themes/hicolor/22x22/status/linuxdcpp-dc++-fw-op.png %%DATADIR%%/gtk/themes/hicolor/22x22/status/linuxdcpp-dc++-fw.png %%DATADIR%%/gtk/themes/hicolor/22x22/status/linuxdcpp-dc++-op.png %%DATADIR%%/gtk/themes/hicolor/22x22/status/linuxdcpp-dc++.png %%DATADIR%%/gtk/themes/hicolor/22x22/status/linuxdcpp-download.png %%DATADIR%%/gtk/themes/hicolor/22x22/status/linuxdcpp-normal-fw-op.png %%DATADIR%%/gtk/themes/hicolor/22x22/status/linuxdcpp-normal-fw.png %%DATADIR%%/gtk/themes/hicolor/22x22/status/linuxdcpp-normal-op.png %%DATADIR%%/gtk/themes/hicolor/22x22/status/linuxdcpp-normal.png %%DATADIR%%/gtk/themes/hicolor/22x22/status/linuxdcpp-upload.png %%DATADIR%%/gtk/themes/hicolor/32x32/categories/applications.png %%DATADIR%%/gtk/themes/hicolor/32x32/categories/away.png %%DATADIR%%/gtk/themes/hicolor/32x32/categories/bw-connect.png %%DATADIR%%/gtk/themes/hicolor/32x32/categories/bw-favorite-hubs.png %%DATADIR%%/gtk/themes/hicolor/32x32/categories/bw-finished-downloads.png %%DATADIR%%/gtk/themes/hicolor/32x32/categories/bw-finished-uploads.png %%DATADIR%%/gtk/themes/hicolor/32x32/categories/bw-hash.png %%DATADIR%%/gtk/themes/hicolor/32x32/categories/bw-preferences.png %%DATADIR%%/gtk/themes/hicolor/32x32/categories/bw-public-hubs.png %%DATADIR%%/gtk/themes/hicolor/32x32/categories/bw-queue.png %%DATADIR%%/gtk/themes/hicolor/32x32/categories/bw-quit.png %%DATADIR%%/gtk/themes/hicolor/32x32/categories/bw-search.png %%DATADIR%%/gtk/themes/hicolor/32x32/categories/check.png %%DATADIR%%/gtk/themes/hicolor/32x32/categories/close.png %%DATADIR%%/gtk/themes/hicolor/32x32/categories/down1.png %%DATADIR%%/gtk/themes/hicolor/32x32/categories/favorites.png %%DATADIR%%/gtk/themes/hicolor/32x32/categories/go.png %%DATADIR%%/gtk/themes/hicolor/32x32/categories/group.png %%DATADIR%%/gtk/themes/hicolor/32x32/categories/paste.png %%DATADIR%%/gtk/themes/hicolor/32x32/categories/reconect.png %%DATADIR%%/gtk/themes/hicolor/32x32/categories/report.png %%DATADIR%%/gtk/themes/hicolor/32x32/categories/up1.png %%DATADIR%%/gtk/themes/hicolor/32x32/categories/user_black.png %%DATADIR%%/gtk/themes/hicolor/32x32/categories/web.png %%DATADIR%%/gtk/themes/hicolor/32x32/categories/zoom.png %%DATADIR%%/gtk/themes/hicolor/32x32/categories/zoom1.png %%DATADIR%%/gtk/themes/humanity.theme %%DATADIR%%/gtk/themes/linuxdcpp.theme %%DATADIR%%/gtk/themes/mankthemedark.theme %%DATADIR%%/gtk/ui/adlsearch.ui %%DATADIR%%/gtk/ui/cmddebug.ui %%DATADIR%%/gtk/ui/downloadqueue.ui %%DATADIR%%/gtk/ui/favoritehubs.ui %%DATADIR%%/gtk/ui/favoriteusers.ui %%DATADIR%%/gtk/ui/finishedtransfers.ui %%DATADIR%%/gtk/ui/hash.ui %%DATADIR%%/gtk/ui/hub.ui %%DATADIR%%/gtk/ui/mainwindow.ui %%DATADIR%%/gtk/ui/privatemessage.ui %%DATADIR%%/gtk/ui/publichubs.ui %%DATADIR%%/gtk/ui/search.ui %%DATADIR%%/gtk/ui/searchspy.ui %%DATADIR%%/gtk/ui/settingsdialog.ui %%DATADIR%%/gtk/ui/sharebrowser.ui %%DATADIR%%/gtk/ui/transfers.ui %%DATADIR%%/gtk/ui/uploadqueue.ui share/locale/be/LC_MESSAGES/eiskaltdcpp-gtk.mo share/locale/bg/LC_MESSAGES/eiskaltdcpp-gtk.mo share/locale/cs/LC_MESSAGES/eiskaltdcpp-gtk.mo share/locale/de/LC_MESSAGES/eiskaltdcpp-gtk.mo share/locale/el/LC_MESSAGES/eiskaltdcpp-gtk.mo share/locale/en/LC_MESSAGES/eiskaltdcpp-gtk.mo share/locale/es/LC_MESSAGES/eiskaltdcpp-gtk.mo share/locale/eu/LC_MESSAGES/eiskaltdcpp-gtk.mo share/locale/fr/LC_MESSAGES/eiskaltdcpp-gtk.mo share/locale/hu/LC_MESSAGES/eiskaltdcpp-gtk.mo share/locale/it/LC_MESSAGES/eiskaltdcpp-gtk.mo share/locale/pl/LC_MESSAGES/eiskaltdcpp-gtk.mo share/locale/pt_BR/LC_MESSAGES/eiskaltdcpp-gtk.mo share/locale/ru/LC_MESSAGES/eiskaltdcpp-gtk.mo share/locale/sk/LC_MESSAGES/eiskaltdcpp-gtk.mo share/locale/sr/LC_MESSAGES/eiskaltdcpp-gtk.mo share/locale/sr@latin/LC_MESSAGES/eiskaltdcpp-gtk.mo share/locale/sv_SE/LC_MESSAGES/eiskaltdcpp-gtk.mo share/locale/uk/LC_MESSAGES/eiskaltdcpp-gtk.mo share/locale/vi/LC_MESSAGES/eiskaltdcpp-gtk.mo share/locale/zh_CN/LC_MESSAGES/eiskaltdcpp-gtk.mo +share/man/man1/eiskaltdcpp-gtk.1.gz diff --git a/net-p2p/eiskaltdcpp-lib/files/patch-CMakeLists.txt b/net-p2p/eiskaltdcpp-lib/files/patch-CMakeLists.txt index 5e323eee1429..28e75d62dacb 100644 --- a/net-p2p/eiskaltdcpp-lib/files/patch-CMakeLists.txt +++ b/net-p2p/eiskaltdcpp-lib/files/patch-CMakeLists.txt @@ -1,51 +1,42 @@ ---- CMakeLists.txt.orig 2011-10-02 22:12:43.000000000 +0700 -+++ CMakeLists.txt 2013-05-09 17:58:03.000000000 +0700 -@@ -169,7 +169,7 @@ +--- CMakeLists.txt.orig 2015-04-19 21:57:16 UTC ++++ CMakeLists.txt +@@ -171,7 +171,7 @@ else (LOCAL_BOOST) endif() message (STATUS "USED LOCAL BOOST HEADERS") else (LOCAL_BOOST) - find_package (Boost REQUIRED) + find_package (Boost COMPONENTS system REQUIRED) if (Boost_VERSION VERSION_LESS 104200) add_definitions(-DTIMER_OLD_BOOST) endif() -@@ -234,7 +234,7 @@ - if (APPLE) - set (MAN_DIR "${PROJECT_NAME_GLOBAL}.app/man/man1") - else (APPLE) -- set (MAN_DIR "${SHARE_DIR}/man/man1") -+ set (MAN_DIR "${CMAKE_INSTALL_PREFIX}/man/man1") - endif (APPLE) - - message (STATUS "Data directory: ${CLIENT_DATA_DIR}") -@@ -287,7 +287,9 @@ +@@ -284,7 +284,9 @@ endif () endif () endif () -include_directories(${eiskaltdcpp_BINARY_DIR} +include_directories( + ${EISKALTDCPP_INCLUDE_DIR} + ${eiskaltdcpp_BINARY_DIR} ${eiskaltdcpp_SOURCE_DIR} ${GMP_INCLUDE_DIR} ) -@@ -336,13 +338,17 @@ +@@ -338,13 +340,17 @@ add_subdirectory(extra) endif (WIN32 OR HAIKU) add_subdirectory(extra) -add_subdirectory(data) +if (INSTALL_DATA) + add_subdirectory(data) +endif (INSTALL_DATA) if (WITH_DHT) add_subdirectory (dht) endif (WITH_DHT) -add_subdirectory (dcpp) +if (BUILD_LIB) + add_subdirectory (dcpp) +endif (BUILD_LIB) if (HAIKU AND HAIKU_PKG) add_subdirectory (haiku)