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, 32 insertions, 57 deletions

diff --git a/net-p2p/eiskaltdcpp-cli/Makefile b/net-p2p/eiskaltdcpp-cli/Makefile
index 16157515df8d..646fea524d6b 100644
--- a/net-p2p/eiskaltdcpp-cli/Makefile
+++ b/net-p2p/eiskaltdcpp-cli/Makefile
@@ -1,11 +1,9 @@
 # Created by: Maxim Ignatenko <gelraen.ua@gmail.com>
 # $FreeBSD$
 
-PORTNAME=	eiskaltdcpp-cli
-PORTVERSION=	2.2.4
+PORTNAME=	eiskaltdcpp
 CATEGORIES=	net-p2p
-MASTER_SITES=	GOOGLE_CODE
-DISTNAME=	eiskaltdcpp-${DISTVERSION}
+PKGNAMESUFFIX=	-cli
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	EiskaltDC++ Direct Connect command-line interface
@@ -13,26 +11,30 @@ COMMENT=	EiskaltDC++ Direct Connect command-line interface
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	p5-RPC-XML>=0:${PORTSDIR}/net/p5-RPC-XML \
+		p5-JSON-RPC>=0:${PORTSDIR}/devel/p5-JSON-RPC \
 	    	p5-Term-ShellUI>=0:${PORTSDIR}/shells/p5-Term-ShellUI
 
-PROJECTHOST=	eiskaltdc
+MASTERDIR=	${.CURDIR}/../eiskaltdcpp-lib
 
 NO_BUILD=	yes
-USES=		perl5 tar:xz
+NO_ARCH=	yes
+USES=		perl5 shebangfix
 USE_PERL5=	run
+SHEBANG_FILES=	eiskaltdcpp-cli/*.pl
 
-MAN1=	${PORTNAME}.1
-MANCOMPRESSED=	no
-
-NO_STAGE=	yes
 do-install:
-	@${INSTALL_SCRIPT} "${WRKSRC}/${PORTNAME}/cli.pl" "${PREFIX}/bin/eiskaltdcpp-cli"
-	@${INSTALL_MAN} "${WRKSRC}/${PORTNAME}/eiskaltdcpp-cli.1" "${PREFIX}/man/man1/"
-	@${MKDIR} "${PREFIX}/etc/eiskaltdcpp" || true
-	@${INSTALL_DATA} "${WRKSRC}/${PORTNAME}/config.pl" "${PREFIX}/etc/eiskaltdcpp/config.pl.dist"
-	@if [ ! -f "${PREFIX}/etc/eiskaltdcpp/config.pl" ]; then \
-		${CP} -pv "${PREFIX}/etc/eiskaltdcpp/config.pl.dist" \
-			"${PREFIX}/etc/eiskaltdcpp/config.pl"; \
-	fi
-
-.include <bsd.port.mk>
+	@${INSTALL_SCRIPT} "${WRKSRC}/eiskaltdcpp-cli/cli-jsonrpc.pl" \
+		"${STAGEDIR}${PREFIX}/bin/eiskaltdcpp-cli-jsonrpc"
+	@${INSTALL_SCRIPT} "${WRKSRC}/eiskaltdcpp-cli/cli-xmlrpc.pl" \
+		"${STAGEDIR}${PREFIX}/bin/eiskaltdcpp-cli-xmlrpc"
+	@${INSTALL_MAN} "${WRKSRC}/eiskaltdcpp-cli/eiskaltdcpp-cli-jsonrpc.1" \
+		"${STAGEDIR}${PREFIX}/man/man1/"
+	@${INSTALL_MAN} "${WRKSRC}/eiskaltdcpp-cli/eiskaltdcpp-cli-xmlrpc.1" \
+		"${STAGEDIR}${PREFIX}/man/man1/"
+	@${MKDIR} "${STAGEDIR}${PREFIX}/etc/eiskaltdcpp" || true
+	@${INSTALL_DATA} "${WRKSRC}/eiskaltdcpp-cli/cli-jsonrpc-config.pl" \
+		"${STAGEDIR}${PREFIX}/etc/eiskaltdcpp/cli-jsonrpc-config.pl.dist"
+	@${INSTALL_DATA} "${WRKSRC}/eiskaltdcpp-cli/cli-xmlrpc-config.pl" \
+		"${STAGEDIR}${PREFIX}/etc/eiskaltdcpp/cli-xmlrpc-config.pl.dist"
+
+.include "${MASTERDIR}/Makefile"
diff --git a/net-p2p/eiskaltdcpp-cli/distinfo b/net-p2p/eiskaltdcpp-cli/distinfo
deleted file mode 100644
index f94894f67b5f..000000000000
--- a/net-p2p/eiskaltdcpp-cli/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-cli/files/patch-eiskaltdcpp-cli__cli.pl b/net-p2p/eiskaltdcpp-cli/files/patch-eiskaltdcpp-cli__cli.pl
deleted file mode 100644
index e222defdae59..000000000000
--- a/net-p2p/eiskaltdcpp-cli/files/patch-eiskaltdcpp-cli__cli.pl
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./eiskaltdcpp-cli/cli.pl.orig	2011-10-02 18:12:43.000000000 +0300
-+++ ./eiskaltdcpp-cli/cli.pl	2011-10-06 09:30:39.000000000 +0300
-@@ -36,8 +36,7 @@
-     unshift @INC, 
- 	 "$XDG_CONFIG_HOME/eiskaltdc++",
- 	 "~/.config/eiskaltdc++/",
--	 "/usr/local/share/eiskaltdcpp/cli",
--	 "/usr/share/eiskaltdcpp/cli"
-+	 "/usr/local/etc/eiskaltdcpp"
- }
- 
- # preparing terminal
diff --git a/net-p2p/eiskaltdcpp-cli/files/patch-eiskaltdcpp-cli__eiskaltdcpp-cli.1 b/net-p2p/eiskaltdcpp-cli/files/patch-eiskaltdcpp-cli__eiskaltdcpp-cli.1
deleted file mode 100644
index e0ce6526e96e..000000000000
--- a/net-p2p/eiskaltdcpp-cli/files/patch-eiskaltdcpp-cli__eiskaltdcpp-cli.1
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./eiskaltdcpp-cli/eiskaltdcpp-cli.1.orig	2011-10-06 09:31:09.000000000 +0300
-+++ ./eiskaltdcpp-cli/eiskaltdcpp-cli.1	2011-10-06 09:32:23.000000000 +0300
-@@ -29,7 +29,7 @@
- .B "~/.config/eiskaltdc++/" or "$XDG_CONFIG_HOME/eiskaltdc++/"
- Directory with user configuration files and logs
- .TP
--.B "/usr/local/share/eiskaltdcpp/cli/" or "/usr/share/eiskaltdcpp/cli/"
-+.B "/usr/local/etc/eiskaltdcpp/"
- Directory with default configuration file
- .SH "DOCUMENTATION"
- .TP
diff --git a/net-p2p/eiskaltdcpp-cli/pkg-descr b/net-p2p/eiskaltdcpp-cli/pkg-descr
deleted file mode 100644
index e099bceaca42..000000000000
--- a/net-p2p/eiskaltdcpp-cli/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 contains XMLRPC CLI client for EiskaltDC++ daemon.
-
-WWW:	http://code.google.com/p/eiskaltdc/
diff --git a/net-p2p/eiskaltdcpp-cli/pkg-plist b/net-p2p/eiskaltdcpp-cli/pkg-plist
index 1b662cd04797..ead31137934b 100644
--- a/net-p2p/eiskaltdcpp-cli/pkg-plist
+++ b/net-p2p/eiskaltdcpp-cli/pkg-plist
@@ -1,5 +1,11 @@
-bin/eiskaltdcpp-cli
-@unexec if cmp -s %D/etc/eiskaltdcpp/config.pl.dist %D/etc/eiskaltdcpp/config.pl; then rm -f %D/etc/eiskaltdcpp/config.pl; fi
-etc/eiskaltdcpp/config.pl.dist
-@exec if [ ! -f %D/etc/eiskaltdcpp/config.pl ] ; then cp -p %D/%F %B/config.pl; fi
+bin/eiskaltdcpp-cli-jsonrpc
+bin/eiskaltdcpp-cli-xmlrpc
+man/man1/eiskaltdcpp-cli-jsonrpc.1.gz
+man/man1/eiskaltdcpp-cli-xmlrpc.1.gz
+@unexec if cmp -s %D/etc/eiskaltdcpp/cli-jsonrpc-config.pl.dist %D/etc/eiskaltdcpp/cli-jsonrpc-config.pl; then rm -f %D/etc/eiskaltdcpp/cli-jsonrpc-config.pl; fi
+@unexec if cmp -s %D/etc/eiskaltdcpp/cli-xmlrpc-config.pl.dist %D/etc/eiskaltdcpp/cli-xmlrpc-config.pl; then rm -f %D/etc/eiskaltdcpp/cli-xmlrpc-config.pl; fi
+etc/eiskaltdcpp/cli-jsonrpc-config.pl.dist
+@exec if [ ! -f %D/etc/eiskaltdcpp/cli-jsonrpc-config.pl ] ; then cp -p %D/%F %B/cli-jsonrpc-config.pl; fi
+etc/eiskaltdcpp/cli-xmlrpc-config.pl.dist
+@exec if [ ! -f %D/etc/eiskaltdcpp/cli-xmlrpc-config.pl ] ; then cp -p %D/%F %B/cli-xmlrpc-config.pl; fi
 @dirrmtry etc/eiskaltdcpp