Index: Makefile
===================================================================
--- Makefile	(revision 416797)
+++ Makefile	(working copy)
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	dxirc
-PORTVERSION=	1.10.0
-PORTREVISION=	3
+PORTVERSION=	1.30.0
+PORTREVISION=	1
 CATEGORIES=	irc
-MASTER_SITES=	GOOGLE_CODE
+MASTER_SITES=	SF/dxirc/1.30.0
 
 MAINTAINER=	arch_dvx@users.sourceforge.net
 COMMENT=	Simple IRC client written using the FOX toolkit
@@ -12,65 +12,56 @@
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libFOX-1.6.so:x11-toolkits/fox16
+LIB_DEPENDS=	libFOX-1.6.so:${PORTSDIR}/x11-toolkits/fox16
 
 USE_XORG=	xft
-USES=		gmake pkgconfig
-GNU_CONFIGURE=	yes
+USES=		cmake pkgconfig
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=	NLS TRAY IPV6 SSL LUA ENCHANT NOTIFY DOCS
+USE_QT5=	gui network buildtools
+
+OPTIONS_DEFINE=	NLS TRAY IPV6 SSL LUA ENCHANT DOCS
 OPTIONS_DEFAULT=	TRAY SSL LUA
 
-TRAY_DESC=	Trayicon
+TRAY_DESC=	Trayicon for FOX toolkit
 ENCHANT_DESC=	Spellchecking support
-NOTIFY_DESC=	Libnotify support
+LUA_DESC=	Lua scripting support
 
 PORTDOCS=	README
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MNLS}
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
+NLS_USES=	gettext
+
+.if ${PORT_OPTIONS:MTRAY}
+CMAKE_ARGS+=	-DFOX_HAVE_TRAY=true
 .else
-USES+=		gettext
-PLIST_SUB+=	NLS=""
+CMAKE_ARGS+=	-DFOX_HAVE_TRAY=false
 .endif
 
-.if ! ${PORT_OPTIONS:MTRAY}
-CONFIGURE_ARGS+=	--disable-tray
+.if ${PORT_OPTIONS:MIPV6}
+CMAKE_ARGS+=	-DFOX_ENABLE_IPV6=true
+.else
+CMAKE_ARGS+=	-DFOX_ENABLE_IPV6=false
 .endif
 
-.if ! ${PORT_OPTIONS:MIPV6}
-CONFIGURE_ARGS+=	--disable-ipv6
-.endif
-
 .if ${PORT_OPTIONS:MSSL}
 USE_OPENSSL=	yes
-.else
-CONFIGURE_ARGS+=	--disable-ssl
 .endif
 
 .if ${PORT_OPTIONS:MLUA}
-USES+=		lua:51
+USES+=		lua
 CONFIGURE_ENV+=	LUA_CFLAGS="-I${LUA_INCDIR}" LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}"
-CONFIGURE_ARGS+=	--enable-lua
-.else
-CONFIGURE_ARGS+=	--disable-lua
 .endif
 
 .if ${PORT_OPTIONS:MENCHANT}
-LIB_DEPENDS+=	libenchant.so:textproc/enchant
-CONFIGURE_ARGS+=	--enable-enchant
+LIB_DEPENDS+=	libenchant.so:${PORTSDIR}/textproc/enchant
+CMAKE_ARGS+=	-DHAVE_ENCHANT=true
+.else
+CMAKE_ARGS+=	-DHAVE_ENCHANT=false
 .endif
 
-.if ${PORT_OPTIONS:MNOTIFY}
-LIB_DEPENDS+=	libnotify.so:devel/libnotify
-CONFIGURE_ARGS+=	--enable-libnotify
-.endif
-
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
Index: distinfo
===================================================================
--- distinfo	(revision 416797)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (dxirc-1.10.0.tar.gz) = 92c2827cde8b08cca3b5595d05beab727afce8dc9d30fdbb71face6be567ec65
-SIZE (dxirc-1.10.0.tar.gz) = 1496185
+SHA256 (dxirc-1.30.0.tar.gz) = 8a98441f8e3ce3a77e5af8f783e439690ac08f7672616a03151b9892e9ff948d
+SIZE (dxirc-1.30.0.tar.gz) = 1300576
Index: pkg-descr
===================================================================
--- pkg-descr	(revision 416797)
+++ pkg-descr	(working copy)
@@ -1,4 +1,4 @@
-dxirc is a simple IRC client for various os (Linux, *BSD, Windows), written
-using the FOX toolkit.
+dxirc is a simple IRC client for various os (linux, *bsd, windows), written
+using the FOX toolkit or Qt toolkit.
 
 WWW: http://www.dxirc.org/
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 416797)
+++ pkg-plist	(working copy)
@@ -1,11 +1,16 @@
-bin/dxirc
-share/applications/dxirc.desktop
-share/pixmaps/dxirc.png
+bin/dxirc-fox
+bin/dxirc-qt
+share/applications/dxirc-fox.desktop
+share/applications/dxirc-qt.desktop
+share/icons/hicolor/48x48/apps/dxirc.png
 %%DATADIR%%/COPYING
 %%DATADIR%%/icons/arrow_down.png
 %%DATADIR%%/icons/arrow_refresh.png
 %%DATADIR%%/icons/arrow_up.png
 %%DATADIR%%/icons/big_dxirc.png
+%%DATADIR%%/icons/black_dxirc.png
+%%DATADIR%%/icons/bnewfile.png
+%%DATADIR%%/icons/bnewm.png
 %%DATADIR%%/icons/cancel.png
 %%DATADIR%%/icons/channel.png
 %%DATADIR%%/icons/chnewm.png
@@ -17,10 +22,14 @@
 %%DATADIR%%/icons/dccnewm.png
 %%DATADIR%%/icons/disconnect.png
 %%DATADIR%%/icons/door_out.png
+%%DATADIR%%/icons/dxirc.png
 %%DATADIR%%/icons/file.png
 %%DATADIR%%/icons/find.png
 %%DATADIR%%/icons/folder.png
 %%DATADIR%%/icons/folder_go.png
+%%DATADIR%%/icons/ft.png
+%%DATADIR%%/icons/groupclose.png
+%%DATADIR%%/icons/groupopen.png
 %%DATADIR%%/icons/help.png
 %%DATADIR%%/icons/keyboard.png
 %%DATADIR%%/icons/logs.png
@@ -286,5 +295,5 @@
 %%DATADIR%%/icons/smileys/smile.png
 %%DATADIR%%/icons/smileys/tongue.png
 %%DATADIR%%/icons/smileys/unhappy.png
-%%NLS%%share/locale/cs/LC_MESSAGES/dxirc.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/dxirc.mo
+share/locale/cs/LC_MESSAGES/dxirc.mo
+share/locale/sk/LC_MESSAGES/dxirc.mo