1 files changed, 41 insertions, 53 deletions

diff --git a/net-p2p/eiskaltdcpp-gtk/Makefile b/net-p2p/eiskaltdcpp-gtk/Makefile
index fd2df3db3ec2..233bca63d4cf 100644
--- a/net-p2p/eiskaltdcpp-gtk/Makefile
+++ b/net-p2p/eiskaltdcpp-gtk/Makefile
@@ -1,73 +1,61 @@
 # Created by: Stas Timokhin <stast@bsdportal.ru>
 # $FreeBSD$
 
-PORTNAME=	eiskaltdcpp-gtk
-PORTVERSION=	2.2.4
-PORTREVISION=	4
+PORTNAME=	eiskaltdcpp
 CATEGORIES=	net-p2p
-MASTER_SITES=	GOOGLE_CODE
-DISTNAME=	eiskaltdcpp-${DISTVERSION}
+PKGNAMESUFFIX=	-gtk
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	EiskaltDC++ Direct Connect client GTK GUI
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${LOCALBASE}/share/eiskaltdcpp/keep_me:${PORTSDIR}/net-p2p/eiskaltdcpp-data
+RUN_DEPENDS=	eiskaltdcpp-data>=0:${PORTSDIR}/net-p2p/eiskaltdcpp-data
 LIB_DEPENDS=	libeiskaltdcpp.so:${PORTSDIR}/net-p2p/eiskaltdcpp-lib
-BUILD_DEPENDS+=	chrpath:${PORTSDIR}/devel/chrpath
 
-CMAKE_ARGS+=	-DBUILD_LIB:BOOL=OFF
-PROJECTHOST=	eiskaltdc
+MASTERDIR=	${.CURDIR}/../eiskaltdcpp-lib
 
-USE_GCC=	yes
-USES=		cmake gettext tar:xz
+USES=		cmake gettext compiler:c++11-lib desktop-file-utils
 USE_OPENSSL=	yes
-
-MAN1=		${PORTNAME}.1
-MANCOMPRESSED=	yes
-
-OPTIONS_DEFINE=	MINIUPNP LIBGNOME2 LIBNOTIFY
-OPTIONS_DEFAULT=	MINIUPNP LIBNOTIFY
-MINIUPNP_DESC=	UPnP support
-LIBGNOME2_DESC=	Sound notification support
+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
-
-USE_GNOME=	pango gtk20 glib20
+FREE_SPACE_DESC=Free space bar in status panel
+GTK_DESC=	GTK GUI toolkit version
 
 CMAKE_ARGS+=	-DUSE_QT:BOOL=OFF
-CMAKE_ARGS+=	-DUSE_GTK:BOOL=ON
-CMAKE_ARGS+=	-DEISKALTDCPP_INCLUDE_DIR:STRING="${LOCALBASE}/include/eiskaltdcpp"
 CMAKE_ARGS+=	-DCREATE_MO:BOOL=ON
-CMAKE_ARGS+=	-DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib:${PREFIX}/lib"
-CMAKE_ARGS+=	-DCMAKE_SKIP_RPATH:BOOL=ON
 CMAKE_ARGS+=	-DINSTALL_DATA:BOOL=OFF
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MMINIUPNP}
-LIB_DEPENDS+=	libminiupnpc.so:${PORTSDIR}/net/miniupnpc
-CMAKE_ARGS+=	-DUSE_MINIUPNP:BOOL=ON -DLOCAL_MINIUPNP:BOOL=OFF
-.else
-CMAKE_ARGS+=	-DUSE_MINIUPNP:BOOL=OFF
-.endif
-
-.if ${PORT_OPTIONS:MLIBGNOME2}
-USE_GNOME+=	libgnome
-CMAKE_ARGS+=	-DUSE_LIBGNOME2:BOOL=ON
-.else
-CMAKE_ARGS+=	-DUSE_LIBGNOME2:BOOL=OFF
-.endif
-
-.if ${PORT_OPTIONS:MLIBNOTIFY}
-LIB_DEPENDS+=	libnotify.so:${PORTSDIR}/devel/libnotify
-CMAKE_ARGS+=	-DUSE_LIBNOTIFY:BOOL=ON
-.else
-CMAKE_ARGS+=	-DUSE_LIBNOTIFY:BOOL=OFF
-.endif
-
-post-build:
-	${LOCALBASE}/bin/chrpath -r "${_GCC_RUNTIME}" "${WRKSRC}/${PORTNAME}/${PORTNAME}"
-
-.include <bsd.port.mk>
+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:${PORTSDIR}/audio/libcanberra
+LIBCANBERRA_CMAKE_ON=	-DUSE_LIBGNOME2:BOOL=OFF -DUSE_LIBCANBERRA:BOOL=ON
+
+LIBNOTIFY_LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
+LIBNOTIFY_CMAKE_ON=	-DUSE_LIBNOTIFY:BOOL=ON
+LIBNOTIFY_CMAKE_OFF=	-DUSE_LIBNOTIFY:BOOL=OFF
+
+GTK2_USE=		gnome=gtk20
+GTK2_CMAKE_ON=		-DUSE_GTK:BOOL=ON -DUSE_GTK3:BOOL=OFF
+GTK2_CMAKE_OFF=		-DUSE_GTK:BOOL=OFF -DUSE_GTK3:BOOL=ON
+
+GTK3_USE=		gnome=gtk30
+GTK3_CMAKE_ON=		-DUSE_GTK:BOOL=OFF -DUSE_GTK3:BOOL=ON
+GTK3_CMAKE_OFF=		-DUSE_GTK:BOOL=ON -DUSE_GTK3:BOOL=OFF
+
+FREE_SPACE_CMAKE_ON=    -DFREE_SPACE_BAR_C:BOOL=ON
+FREE_SPACE_CMAKE_OFF=   -DFREE_SPACE_BAR_C:BOOL=OFF
+
+.include "${MASTERDIR}/Makefile"