net-p2p/eiskaltdcpp-cli

net-p2p/eiskaltdcpp-daemon
net-p2p/eiskaltdcpp-data
net-p2p/eiskaltdcpp-gtk
net-p2p/eiskaltdcpp-lib
net-p2p/eiskaltdcpp-qt

1. Update to 2.2.9
2. Stage
3. Chase for new build options: gtk30, libcanberra, json-rpc
4. Use master/slave relations

PR:		192869
Submitted by:	Vladimir Kondratiev

6 files changed, 22 insertions, 203 deletions

diff --git a/net-p2p/eiskaltdcpp-daemon/Makefile b/net-p2p/eiskaltdcpp-daemon/Makefile
index 301c6904b6ea..7fb8dffd14cf 100644
--- a/net-p2p/eiskaltdcpp-daemon/Makefile
+++ b/net-p2p/eiskaltdcpp-daemon/Makefile
@@ -1,61 +1,44 @@
 # Created by: Stas Timokhin <stast@bsdportal.ru>
 # $FreeBSD$
 
-PORTNAME=	eiskaltdcpp-daemon
-PORTVERSION=	2.2.4
-PORTREVISION=	3
+PORTNAME=	eiskaltdcpp
 CATEGORIES=	net-p2p
-MASTER_SITES=	GOOGLE_CODE
-DISTNAME=	eiskaltdcpp-${DISTVERSION}
+PKGNAMESUFFIX=	-daemon
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	EiskaltDC++ Direct Connect client daemon
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS+=	libeiskaltdcpp.so:${PORTSDIR}/net-p2p/eiskaltdcpp-lib
-BUILD_DEPENDS+=	chrpath:${PORTSDIR}/devel/chrpath
+LIB_DEPENDS=	libeiskaltdcpp.so:${PORTSDIR}/net-p2p/eiskaltdcpp-lib
 
-PROJECTHOST=	eiskaltdc
+MASTERDIR=	${.CURDIR}/../eiskaltdcpp-lib
 
-USE_GCC=	yes
-USES=		cmake gettext tar:xz
+USES=		cmake gettext compiler:c++11-lib
 USE_OPENSSL=	yes
 
-OPTIONS_DEFINE=	XMLRPC
-OPTIONS_DEFAULT=	XMLRPC
-XMLRPC_DESC=	XMLRPC interface support
+OPTIONS_SINGLE=	UI
+OPTIONS_SINGLE_UI=	NOUI XMLRPC JSONRPC
+OPTIONS_DEFAULT=	JSONRPC
+UI_DESC=	Daemon user interface
+NOUI_DESC=	Daemon without anyone ui
+XMLRPC_DESC=	XMLRPC interface support (deprecated)
+JSONRPC_DESC=	JSONRPC interface support
 
-MAN1=		${PORTNAME}.1
-MANCOMPRESSED=	yes
+PLIST_FILES=	bin/${PORTNAME}${PKGNAMESUFFIX} \
+		man/man1/${PORTNAME}${PKGNAMESUFFIX}.1.gz
 
-PLIST_FILES=	bin/${PORTNAME}
-
-CXXFLAGS+=	-I${LOCALBASE}/include
-CMAKE_ARGS+=	-DBUILD_LIB:BOOL=OFF
+CXXFLAGS+=	-I${LOCALBASE}/include -D_GLIBCXX_USE_C99
 CMAKE_ARGS+=	-DUSE_QT:BOOL=OFF
 CMAKE_ARGS+=	-DUSE_GTK:BOOL=OFF
-CMAKE_ARGS+=	-DNO_UI_DAEMON:BOOL=ON
-CMAKE_ARGS+=	-DEISKALTDCPP_INCLUDE_DIR:STRING="${LOCALBASE}/include/eiskaltdcpp"
-CMAKE_ARGS+=	-DUSE_IDNA:BOOL=OFF
 CMAKE_ARGS+=	-DCREATE_MO:BOOL=OFF
-CMAKE_ARGS+=	-DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib:${PREFIX}/lib"
-CMAKE_ARGS+=	-DCMAKE_SKIP_RPATH:BOOL=ON
-
-BUILD_WRKSRC=	${WRKSRC}/nasdc
-INSTALL_WRKSRC=	${WRKSRC}/nasdc
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MXMLRPC}
-LIB_DEPENDS+=	libxmlrpc++.so:${PORTSDIR}/net/xmlrpc-c-devel
-CMAKE_ARGS+=	-DXMLRPC_DAEMON:BOOL=ON
-.else
-CMAKE_ARGS+=	-DXMLRPC_DAEMON:BOOL=OFF
-.endif
+BUILD_WRKSRC=	${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}
+INSTALL_WRKSRC=	${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}
 
-post-build:
-	${LOCALBASE}/bin/chrpath -r "${_GCC_RUNTIME}" "${WRKSRC}/nasdc/${PORTNAME}"
+XMLRPC_LIB_DEPENDS=	libxmlrpc++.so:${PORTSDIR}/net/xmlrpc-c-devel
+XMLRPC_CMAKE_ON=	-DXMLRPC_DAEMON:BOOL=ON -DJSONRPC_DAEMON:BOOL=OFF -DNO_UI_DAEMON:BOOL=OFF
+JSONRPC_CMAKE_ON=	-DXMLRPC_DAEMON:BOOL=OFF -DJSONRPC_DAEMON:BOOL=ON -DNO_UI_DAEMON:BOOL=OFF
+NOUI_CMAKE_ON=		-DXMLRPC_DAEMON:BOOL=OFF -DJSONRPC_DAEMON:BOOL=OFF -DNO_UI_DAEMON:BOOL=ON
 
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/net-p2p/eiskaltdcpp-daemon/distinfo b/net-p2p/eiskaltdcpp-daemon/distinfo
deleted file mode 100644
index f94894f67b5f..000000000000
--- a/net-p2p/eiskaltdcpp-daemon/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (eiskaltdcpp-2.2.4.tar.xz) = a14d44ad1c48dc97354e17d3d8d8fc9bdd7be646d275603d092c6d9ebf7061b4
-SIZE (eiskaltdcpp-2.2.4.tar.xz) = 2008920
diff --git a/net-p2p/eiskaltdcpp-daemon/files/patch-CMakeLists.txt b/net-p2p/eiskaltdcpp-daemon/files/patch-CMakeLists.txt
deleted file mode 100644
index 7fa7d5147306..000000000000
--- a/net-p2p/eiskaltdcpp-daemon/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,42 +0,0 @@
---- CMakeLists.txt.orig	2011-10-02 22:12:43.000000000 +0700
-+++ CMakeLists.txt	2013-05-09 17:37:33.000000000 +0700
-@@ -256,7 +256,7 @@
- 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 103900)
-         add_definitions(-DFIX_FOR_OLD_BOOST)
-     endif()
-@@ -370,16 +370,14 @@
-     else (MINGW)
-         set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
-     endif (MINGW)
--    if (NOT APPLE)
--        set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,--as-needed")
--        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--as-needed")
--    endif (NOT APPLE)
-     set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -pipe -DNDEBUG")
-     set (CMAKE_CXX_FLAGS_RELEASE     "${CMAKE_CXX_FLAGS_RELEASE} -DQT_NO_DEBUG -pipe")
-     set (CMAKE_CXX_FLAGS_DEBUG       "${CMAKE_CXX_FLAGS_DEBUG} -UNDEBUG -g3 -pipe")
- endif ()
- 
--include_directories(${eiskaltdcpp_BINARY_DIR}
-+include_directories(
-+   ${EISKALTDCPP_INCLUDE_DIR}
-+   ${eiskaltdcpp_BINARY_DIR}
-    ${eiskaltdcpp_SOURCE_DIR}
-    ${GMP_INCLUDE_DIR}
-    )
-@@ -451,7 +449,9 @@
-   add_subdirectory (dht)
- endif (WITH_DHT)
- 
--add_subdirectory (dcpp)
-+if (BUILD_LIB)
-+	add_subdirectory (dcpp)
-+endif (BUILD_LIB)
- 
- if (USE_QT)
-   add_subdirectory (eiskaltdcpp-qt)
diff --git a/net-p2p/eiskaltdcpp-daemon/files/patch-cmake__CMakeLists.txt b/net-p2p/eiskaltdcpp-daemon/files/patch-cmake__CMakeLists.txt
deleted file mode 100644
index 6780e45dbb26..000000000000
--- a/net-p2p/eiskaltdcpp-daemon/files/patch-cmake__CMakeLists.txt
+++ /dev/null
@@ -1,85 +0,0 @@
---- ./cmake/CMakeLists.txt.orig	2011-10-02 18:12:43.000000000 +0300
-+++ ./cmake/CMakeLists.txt	2011-10-10 11:10:30.000000000 +0300
-@@ -37,12 +37,14 @@
- 
- endmacro(GET_RELATIVE_SOURCES)
- 
-+if (BUILD_LIB)
- get_absolute_sources(abs_dcpp_sources "${DCPP_SRCS};${DCPP_HDRS}")
- get_relative_sources(rel_dcpp_sources "${dcpp_SOURCE_DIR}/po" "${abs_dcpp_sources}")
- file(MAKE_DIRECTORY "${dcpp_BINARY_DIR}/po")
- set(dcpp_files_from "${dcpp_BINARY_DIR}/po/libeiskaltdcpp_srcs.txt")
- string(REGEX REPLACE ";" "\n" dcpp_contents "${rel_dcpp_sources}")
- file(WRITE "${dcpp_files_from}" "${dcpp_contents}")
-+endif (BUILD_LIB)
- 
- if (USE_GTK)
- get_absolute_sources(abs_gtk_cpp_sources "${GTK_SRCS};${GTK_HDRS}")
-@@ -163,6 +165,7 @@
- 			# if the po file doesn't exist. The case where a po file used to
- 			# exist and no longer exists should never occur
- 
-+			if (BUILD_LIB)
- 			if(NOT EXISTS ${dcpp_SOURCE_DIR}/po/${LANG}.po)
- 				add_custom_command(
- 					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."
- 			)
-+			endif (BUILD_LIB)
- 
- 			if (USE_GTK)
- 			if(NOT EXISTS ${eiskaltdcpp-gtk_SOURCE_DIR}/po/${LANG}.po)
-@@ -231,15 +235,19 @@
- 			SET(pot-update-SRC ${pot-update-SRC} ${eiskaltdcpp-gtk_SOURCE_DIR}/po/${LANG}.po.dummy )
- 			endif (USE_GTK)
- 
-+			if (BUILD_LIB)
- 			SET(pot-update-SRC ${pot-update-SRC} ${dcpp_SOURCE_DIR}/po/${LANG}.po.dummy)
-+			endif (BUILD_LIB)
- 		endforeach(LANG ${LANGUAGES})
- 
- 		# Add to target list
-+		if (BUILD_LIB)
- 		SET(pot-update-SRC
- 			${pot-update-SRC}
- 			${dcpp_SOURCE_DIR}/po/libeiskaltdcpp.pot # should depend on languages
- 
- 		)
-+		endif (BUILD_LIB)
- 		if (USE_GTK)
- 		SET(pot-update-SRC
- 			${pot-update-SRC}
-@@ -329,6 +337,7 @@
- 
- 	foreach(LANG ${LANGUAGES})
- 
-+		if (BUILD_LIB)
- 			add_custom_command(
- 				OUTPUT ${dcpp_BINARY_DIR}/locale/${LANG}/LC_MESSAGES
- 				COMMAND ${CMAKE_COMMAND} -E make_directory
-@@ -346,6 +355,7 @@
- 				WORKING_DIRECTORY ${dcpp_SOURCE_DIR}/po
- 				COMMENT "mo-update [dcpp-${LANG}]: Creating mo file."
- 			)
-+			endif (BUILD_LIB)
- 			if (USE_GTK)
- 			add_custom_command(
- 				OUTPUT ${eiskaltdcpp-gtk_BINARY_DIR}/locale/${LANG}/LC_MESSAGES
-@@ -377,6 +387,7 @@
- 			)
- 			endif (USE_GTK)
- 
-+			if (BUILD_LIB)
- 			install(FILES
- 			    ${dcpp_BINARY_DIR}/locale/${LANG}/LC_MESSAGES/libeiskaltdcpp.mo
- 					DESTINATION ${LOCALE_DIR}/${LANG}/LC_MESSAGES)
-@@ -387,6 +398,7 @@
- 			set(mo-update-LANG-SRC ${mo-update-LANG-SRC}
- 			    ${dcpp_BINARY_DIR}/locale/${LANG}/LC_MESSAGES/libeiskaltdcpp.mo
- 			)
-+			endif (BUILD_LIB)
- 
- 		if(UPDATE_PO)
- 			add_custom_target(mo-update-${LANG}
diff --git a/net-p2p/eiskaltdcpp-daemon/files/patch-nasdc__CMakeLists.txt b/net-p2p/eiskaltdcpp-daemon/files/patch-nasdc__CMakeLists.txt
deleted file mode 100644
index 2aa2f72cb7db..000000000000
--- a/net-p2p/eiskaltdcpp-daemon/files/patch-nasdc__CMakeLists.txt
+++ /dev/null
@@ -1,27 +0,0 @@
---- nasdc/CMakeLists.txt.orig	2011-10-02 22:12:43.000000000 +0700
-+++ nasdc/CMakeLists.txt	2013-05-09 17:38:53.000000000 +0700
-@@ -49,7 +49,16 @@
-                 ${nasdc_SRCS}
-                 )
- 
--target_link_libraries (nasdc dcpp ${XMLRPCLIBS})
-+if (BUILD_LIB)
-+      set(DCPP_LIB dcpp)
-+else (BUILD_LIB)
-+      find_library(DCPP_LIB eiskaltdcpp)
-+      if (DCPP_LIB)
-+              message(STATUS "EiskaltDC++ shared library found at ${DCPP_LIB}")
-+      endif (DCPP_LIB)
-+endif (BUILD_LIB)
-+
-+target_link_libraries (nasdc ${DCPP_LIB} ${XMLRPCLIBS} ${Boost_LIBRARIES} ${GETTEXT_LIBRARIES})
- 
- if (UNIX)
-  set (BINDIR bin)
-@@ -81,5 +90,5 @@
- if (APPLE)
-   install (FILES ${PROJECT_BINARY_DIR}/eiskaltdcpp-daemon.1.gz DESTINATION ${PROJECT_NAME_GLOBAL}.app/man/man1)
- elseif (UNIX AND NOT APPLE)
--  install (FILES ${PROJECT_BINARY_DIR}/eiskaltdcpp-daemon.1.gz DESTINATION ${SHARE_DIR}/man/man1)
-+  install (FILES ${PROJECT_BINARY_DIR}/eiskaltdcpp-daemon.1.gz DESTINATION man/man1)
- endif (APPLE)
diff --git a/net-p2p/eiskaltdcpp-daemon/pkg-descr b/net-p2p/eiskaltdcpp-daemon/pkg-descr
deleted file mode 100644
index 12ae17bce783..000000000000
--- a/net-p2p/eiskaltdcpp-daemon/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-EiskaltDC++ is a cross-platform program that uses the Direct Connect
-and ADC protocol. It is compatible with other DC clients, such as the
-original DC from Neomodus, DC++ and derivatives. EiskaltDC++ also
-interoperates with all common DC hub software.
-
-This port is GUI-less daemon that uses eiskaltdcpp-lib.
-
-WWW:	http://code.google.com/p/eiskaltdc/