Index: head/net-p2p/eiskaltdcpp-cli/Makefile =================================================================== --- head/net-p2p/eiskaltdcpp-cli/Makefile (revision 525697) +++ head/net-p2p/eiskaltdcpp-cli/Makefile (revision 525698) @@ -1,41 +1,41 @@ # Created by: Maxim Ignatenko # $FreeBSD$ PORTNAME= eiskaltdcpp -PORTREVISION= 0 +PORTREVISION= 20 CATEGORIES= net-p2p PKGNAMESUFFIX= -cli MAINTAINER= ports@FreeBSD.org -COMMENT= EiskaltDC++ Direct Connect command-line interface +COMMENT= EiskaltDC++ client command-line interface LICENSE= GPLv3 RUN_DEPENDS= p5-RPC-XML>=0:net/p5-RPC-XML \ p5-JSON-RPC>=0:devel/p5-JSON-RPC \ p5-Term-ShellUI>=0:shells/p5-Term-ShellUI MASTERDIR= ${.CURDIR}/../eiskaltdcpp-lib NO_BUILD= yes NO_ARCH= yes USES= perl5 shebangfix USE_PERL5= run SHEBANG_FILES= eiskaltdcpp-cli/*.pl do-install: @${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.sample" @${INSTALL_DATA} "${WRKSRC}/eiskaltdcpp-cli/cli-xmlrpc-config.pl" \ "${STAGEDIR}${PREFIX}/etc/eiskaltdcpp/cli-xmlrpc-config.pl.sample" .include "${MASTERDIR}/Makefile" Index: head/net-p2p/eiskaltdcpp-daemon/Makefile =================================================================== --- head/net-p2p/eiskaltdcpp-daemon/Makefile (revision 525697) +++ head/net-p2p/eiskaltdcpp-daemon/Makefile (revision 525698) @@ -1,47 +1,47 @@ # Created by: Stas Timokhin # $FreeBSD$ PORTNAME= eiskaltdcpp PORTREVISION= 15 CATEGORIES= net-p2p PKGNAMESUFFIX= -daemon MAINTAINER= ports@FreeBSD.org -COMMENT= EiskaltDC++ Direct Connect client daemon +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 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" Index: head/net-p2p/eiskaltdcpp-data/Makefile =================================================================== --- head/net-p2p/eiskaltdcpp-data/Makefile (revision 525697) +++ head/net-p2p/eiskaltdcpp-data/Makefile (revision 525698) @@ -1,48 +1,48 @@ # Created by: Stas Timokhin # $FreeBSD$ PORTNAME= eiskaltdcpp CATEGORIES= net-p2p PKGNAMESUFFIX= -data -PORTREVISION= 0 +PORTREVISION= 20 MAINTAINER= ports@FreeBSD.org -COMMENT= Shared data for EiskaltDC++ GUIs +COMMENT= Shared data for EiskaltDC++ client GUIs LICENSE= GPLv3 MASTERDIR= ${.CURDIR}/../eiskaltdcpp-lib USES= cmake gnome shebangfix SHEBANG_FILES= data/examples/commands.ru_RU.UTF-8.php \ data/examples/deadbeef.ru_RU.UTF-8.sh \ data/examples/mod.amarok.sh \ data/examples/mpris_now_playing.en_US.sh \ data/examples/xmms2_audacious2.ru_RU.UTF-8.php \ data/update_geoip php_OLD_CMD= /usr/bin/php5 NO_ARCH= yes NO_BUILD= yes INSTALLS_ICONS= yes CMAKE_SOURCE_PATH= ${WRKSRC}/data OPTIONS_DEFINE= EMOTICONS EXAMPLES LUASCRIPTS SOUNDS OPTIONS_DEFAULT= EMOTICONS SOUNDS OPTIONS_SUB= yes EMOTICONS_DESC= Install emoticons EXAMPLES_DESC= Install script examples LUASCRIPTS_DESC= Install lua script examples SOUNDS_DESC= Install sound files CMAKE_ARGS= -Wno-dev \ -DUSE_GTK:BOOL=ON \ -DCLIENT_DATA_DIR=${DATADIR} \ -DSHARE_DIR=${LOCALBASE}/share EMOTICONS_CMAKE_BOOL= WITH_EMOTICONS EXAMPLES_CMAKE_BOOL= WITH_EXAMPLES LUASCRIPTS_CMAKE_BOOL= WITH_LUASCRIPTS LUA_SCRIPT SOUNDS_CMAKE_BOOL= WITH_SOUNDS .include "${MASTERDIR}/Makefile" Index: head/net-p2p/eiskaltdcpp-gtk/Makefile =================================================================== --- head/net-p2p/eiskaltdcpp-gtk/Makefile (revision 525697) +++ head/net-p2p/eiskaltdcpp-gtk/Makefile (revision 525698) @@ -1,59 +1,59 @@ # Created by: Stas Timokhin # $FreeBSD$ PORTNAME= eiskaltdcpp -PORTREVISION= 15 +PORTREVISION= 20 CATEGORIES= net-p2p PKGNAMESUFFIX= -gtk MAINTAINER= ports@FreeBSD.org -COMMENT= EiskaltDC++ Direct Connect client GTK GUI +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 LIBGNOME2 LIBCANBERRA NOSOUND_DESC= Disable sound notification support LIBGNOME2_DESC= Sound notification support via libgnome 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 LIBGNOME2_USE= gnome=libgnome LIBGNOME2_CMAKE_ON= -DUSE_LIBGNOME2:BOOL=ON -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" Index: head/net-p2p/eiskaltdcpp-lib/Makefile =================================================================== --- head/net-p2p/eiskaltdcpp-lib/Makefile (revision 525697) +++ head/net-p2p/eiskaltdcpp-lib/Makefile (revision 525698) @@ -1,79 +1,79 @@ # Created by: Stas Timokhin # $FreeBSD$ PORTNAME= eiskaltdcpp PORTVERSION= 2.2.10 DISTVERSIONPREFIX= v -PORTREVISION= 20 +PORTREVISION?= 20 CATEGORIES= net-p2p PKGNAMESUFFIX?= -lib -MAINTAINER= fjoe@FreeBSD.org -COMMENT= Direct Connect client shared library +MAINTAINER?= fjoe@FreeBSD.org +COMMENT?= EiskaltDC++ shared library and header files LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE GENTOO_PATCHES_PREFIX= ${FILESDIR}/gentoo/${PORTNAME}-${PORTVERSION} EXTRA_PATCHES= ${GENTOO_PATCHES_PREFIX}-ipv6_upnp.patch:-p1 \ ${GENTOO_PATCHES_PREFIX}-miniupnpc1.patch:-p1 \ ${GENTOO_PATCHES_PREFIX}-miniupnpc2.patch:-p1 \ ${GENTOO_PATCHES_PREFIX}-openssl-1.1.patch:-p1 \ ${GENTOO_PATCHES_PREFIX}-tray-close.patch:-p1 USE_GITHUB= yes .if !defined (MASTERDIR) LIB_DEPENDS= libboost_system.so:devel/boost-libs USES= cmake gettext compiler:c++11-lib ssl USE_LDCONFIG= yes OPTIONS_DEFINE= LUA PCRE IDN DHT MINIUPNP OPTIONS_DEFAULT= IDN DHT DHT_DESC= DHT support MINIUPNP_DESC= UPnP support CMAKE_ARGS+= -DBUILD_LIB:BOOL=ON CMAKE_ARGS+= -DWITH_DEV_FILES:BOOL=ON CMAKE_ARGS+= -DUSE_QT:BOOL=OFF CMAKE_ARGS+= -DUSE_GTK:BOOL=OFF CMAKE_ARGS+= -DUSE_GTK3:BOOL=OFF CMAKE_ARGS+= -DUSE_ASPELL:BOOL=OFF LUA_USES= lua:51 LUA_CMAKE_ON= -DLUA_SCRIPT:BOOL=ON LUA_CMAKE_OFF= -DLUA_SCRIPT:BOOL=OFF PCRE_LIB_DEPENDS= libpcre.so:devel/pcre PCRE_CMAKE_ON= -DPERL_REGEX:BOOL=ON PCRE_CMAKE_OFF= -DPERL_REGEX:BOOL=OFF IDN_LIB_DEPENDS= libidn.so:dns/libidn IDN_CMAKE_ON= -DUSE_IDNA:BOOL=ON IDN_CMAKE_OFF= -DUSE_IDNA:BOOL=OFF DHT_CMAKE_ON= -DWITH_DHT:BOOL=ON DHT_CMAKE_OFF= -DWITH_DHT:BOOL=OFF #MINIUPNP_LIB_DEPENDS= libminiupnpc.so:net/miniupnpc MINIUPNP_CMAKE_ON= -DUSE_MINIUPNP:BOOL=ON -DLOCAL_MINIUPNP:BOOL=ON MINIUPNP_CMAKE_OFF= -DUSE_MINIUPNP:BOOL=OFF .endif USES+= tar:xz PLIST= ${.CURDIR}/pkg-plist .if defined (MASTERDIR) && !defined (NO_BUILD) CMAKE_ARGS+= -DBUILD_LIB:BOOL=OFF CMAKE_ARGS+= -DEISKALTDCPP_INCLUDE_DIR:STRING="${LOCALBASE}/include/eiskaltdcpp" CMAKE_ARGS+= -DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib:${PREFIX}/lib" # these slave ports options have to be in sync with master library CMAKE_ARGS+= -DUSE_IDNA:BOOL=`${PKG_QUERY} '%Ok %Ov' ${PORTNAME}-lib | ${GREP} '^IDN ' | ${CUT} -f 2 -d ' '` CMAKE_ARGS+= -DWITH_DHT:BOOL=`${PKG_QUERY} '%Ok %Ov' ${PORTNAME}-lib | ${GREP} '^DHT ' | ${CUT} -f 2 -d ' '` CMAKE_ARGS+= -DLUA_SCRIPT:BOOL=`${PKG_QUERY} '%Ok %Ov' ${PORTNAME}-lib | ${GREP} '^LUA ' | ${CUT} -f 2 -d ' '` CMAKE_ARGS+= -DUSE_MINIUPNP:BOOL=`${PKG_QUERY} '%Ok %Ov' ${PORTNAME}-lib | ${GREP} '^MINIUPNP ' | ${CUT} -f 2 -d ' '` CMAKE_ARGS+= -DLOCAL_MINIUPNP:BOOL=`${PKG_QUERY} '%Ok %Ov' ${PORTNAME}-lib | ${GREP} '^MINIUPNP ' | ${CUT} -f 2 -d ' '` .endif .include