Index: head/irc/dxirc/Makefile
===================================================================
--- head/irc/dxirc/Makefile	(revision 456110)
+++ head/irc/dxirc/Makefile	(revision 456111)
@@ -1,62 +1,51 @@
 # $FreeBSD$
 
 PORTNAME=	dxirc
 PORTVERSION=	1.30.0
 CATEGORIES=	irc ipv6
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	arch_dvx@users.sourceforge.net
 COMMENT=	Simple IRC client
 
-LICENSE=	GPLv3
+LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_XORG=	ice sm x11 xext
 USES=		cmake pkgconfig
 INSTALLS_ICONS=	yes
 
 OPTIONS_DEFINE=		NLS LUA ENCHANT NOTIFY
 OPTIONS_SINGLE=		GUI
 OPTIONS_SINGLE_GUI=	FOX16 QT4 QT5
 OPTIONS_DEFAULT=	LUA QT5
 OPTIONS_SUB=		yes
 
 ENCHANT_DESC=		Spell checking support via Enchant
 ENCHANT_LIB_DEPENDS=	libenchant.so:textproc/enchant
-ENCHANT_CMAKE_ON=	-DHAVE_ENCHANT:BOOL=ON
-ENCHANT_CMAKE_OFF=	-DHAVE_ENCHANT:BOOL=OFF
+ENCHANT_CMAKE_BOOL=	HAVE_ENCHANT
 
 FOX16_DESC=		FOX 1.6 toolkit support
 FOX16_LIB_DEPENDS=	libFOX-1.6.so:x11-toolkits/fox16
 FOX16_USES=		ssl
-FOX16_CMAKE_ON=		-DFOX_ENABLE_IPV6:BOOL=ON
+FOX16_CMAKE_ON=		-DFOX_ENABLE_IPV6:BOOL=ON \
+			-DBUILD_FOX:BOOL=ON -DBUILD_QT:BOOL=OFF
+FOX16_CMAKE_OFF=	-DBUILD_FOX:BOOL=OFF -DBUILD_QT:BOOL=ON
 
 LUA_USES=		lua
-LUA_CMAKE_ON=		-DWITH_LUA:BOOL=ON
-LUA_CMAKE_OFF=		-DWITH_LUA:BOOL=OFF
+LUA_CMAKE_BOOL=		WITH_LUA
 
 NLS_USES=		gettext
-NLS_CMAKE_ON=		-DWITH_NLS:BOOL=ON
-NLS_CMAKE_OFF=		-DWITH_NLS:BOOL=OFF
+NLS_CMAKE_BOOL=		WITH_NLS
 
 NOTIFY_RUN_DEPENDS=	notify-send:devel/libnotify
 
 QT4_USE=		QT4=corelib,gui,network \
 			QT4=moc_build,rcc_build,uic_build,qmake_build
 QT4_CMAKE_ON=		-DQT5:BOOL=OFF
 
 QT5_USE=		QT5=core,gui,multimedia,network,widgets \
 			QT5=buildtools_build,qmake_build
 QT5_CMAKE_ON=		-DQT5:BOOL=ON
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MFOX16}
-CMAKE_ARGS+=	-DBUILD_FOX:BOOL=ON -DBUILD_QT:BOOL=OFF
-PLIST_SUB+=	FOX="" QT="@comment "
-.else
-CMAKE_ARGS+=	-DBUILD_FOX:BOOL=OFF -DBUILD_QT:BOOL=ON
-PLIST_SUB+=	FOX="@comment " QT=""
-.endif
 
 .include <bsd.port.mk>
Index: head/irc/dxirc/pkg-descr
===================================================================
--- head/irc/dxirc/pkg-descr	(revision 456110)
+++ head/irc/dxirc/pkg-descr	(revision 456111)
@@ -1,10 +1,10 @@
 dxirc is a simple, yet capable, cross-platform IRC client written
 in C++ for the FOX toolkit and the Qt toolkit.
 
 Features:
  - Fully customizable look independent of system-wide settings
  - Automated join to specified channels on selected server
  - Support for multiple simultaneously connected servers
  - Well-arranged and flexible configuration dialog
 
-WWW: http://www.dxirc.org/
+WWW: https://www.dxirc.org/
Index: head/irc/dxirc/pkg-plist
===================================================================
--- head/irc/dxirc/pkg-plist	(revision 456110)
+++ head/irc/dxirc/pkg-plist	(revision 456111)
@@ -1,299 +1,299 @@
-%%FOX%%bin/dxirc-fox
-%%QT%%bin/dxirc-qt
-%%FOX%%share/applications/dxirc-fox.desktop
-%%QT%%share/applications/dxirc-qt.desktop
+%%FOX16%%bin/dxirc-fox
+%%NO_FOX16%%bin/dxirc-qt
+%%FOX16%%share/applications/dxirc-fox.desktop
+%%NO_FOX16%%share/applications/dxirc-qt.desktop
 %%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
 %%DATADIR%%/icons/clear.png
 %%DATADIR%%/icons/connect.png
 %%DATADIR%%/icons/copy.png
 %%DATADIR%%/icons/cross.png
 %%DATADIR%%/icons/dcc.png
 %%DATADIR%%/icons/dccnewm.png
 %%DATADIR%%/icons/default/irc_admin.png
 %%DATADIR%%/icons/default/irc_away.png
 %%DATADIR%%/icons/default/irc_halfop.png
 %%DATADIR%%/icons/default/irc_normal.png
 %%DATADIR%%/icons/default/irc_op.png
 %%DATADIR%%/icons/default/irc_owner.png
 %%DATADIR%%/icons/default/irc_voice.png
 %%DATADIR%%/icons/disconnect.png
 %%DATADIR%%/icons/door_out.png
 %%DATADIR%%/icons/dxirc.png
 %%DATADIR%%/icons/file.png
 %%DATADIR%%/icons/find.png
 %%DATADIR%%/icons/flags/ar.png
 %%DATADIR%%/icons/flags/as.png
 %%DATADIR%%/icons/flags/at.png
 %%DATADIR%%/icons/flags/au.png
 %%DATADIR%%/icons/flags/aw.png
 %%DATADIR%%/icons/flags/ax.png
 %%DATADIR%%/icons/flags/az.png
 %%DATADIR%%/icons/flags/ba.png
 %%DATADIR%%/icons/flags/bb.png
 %%DATADIR%%/icons/flags/bd.png
 %%DATADIR%%/icons/flags/be.png
 %%DATADIR%%/icons/flags/bf.png
 %%DATADIR%%/icons/flags/bg.png
 %%DATADIR%%/icons/flags/bh.png
 %%DATADIR%%/icons/flags/bi.png
 %%DATADIR%%/icons/flags/bj.png
 %%DATADIR%%/icons/flags/bm.png
 %%DATADIR%%/icons/flags/bn.png
 %%DATADIR%%/icons/flags/bo.png
 %%DATADIR%%/icons/flags/br.png
 %%DATADIR%%/icons/flags/bs.png
 %%DATADIR%%/icons/flags/bt.png
 %%DATADIR%%/icons/flags/bv.png
 %%DATADIR%%/icons/flags/bw.png
 %%DATADIR%%/icons/flags/by.png
 %%DATADIR%%/icons/flags/bz.png
 %%DATADIR%%/icons/flags/ca.png
 %%DATADIR%%/icons/flags/cc.png
 %%DATADIR%%/icons/flags/cd.png
 %%DATADIR%%/icons/flags/cf.png
 %%DATADIR%%/icons/flags/cg.png
 %%DATADIR%%/icons/flags/ch.png
 %%DATADIR%%/icons/flags/ci.png
 %%DATADIR%%/icons/flags/ck.png
 %%DATADIR%%/icons/flags/cl.png
 %%DATADIR%%/icons/flags/cm.png
 %%DATADIR%%/icons/flags/cn.png
 %%DATADIR%%/icons/flags/co.png
 %%DATADIR%%/icons/flags/cr.png
 %%DATADIR%%/icons/flags/cs.png
 %%DATADIR%%/icons/flags/cu.png
 %%DATADIR%%/icons/flags/cv.png
 %%DATADIR%%/icons/flags/cx.png
 %%DATADIR%%/icons/flags/cy.png
 %%DATADIR%%/icons/flags/cz.png
 %%DATADIR%%/icons/flags/de.png
 %%DATADIR%%/icons/flags/dj.png
 %%DATADIR%%/icons/flags/dk.png
 %%DATADIR%%/icons/flags/dm.png
 %%DATADIR%%/icons/flags/do.png
 %%DATADIR%%/icons/flags/dz.png
 %%DATADIR%%/icons/flags/ec.png
 %%DATADIR%%/icons/flags/ee.png
 %%DATADIR%%/icons/flags/eg.png
 %%DATADIR%%/icons/flags/eh.png
 %%DATADIR%%/icons/flags/er.png
 %%DATADIR%%/icons/flags/es.png
 %%DATADIR%%/icons/flags/et.png
 %%DATADIR%%/icons/flags/eu.png
 %%DATADIR%%/icons/flags/fi.png
 %%DATADIR%%/icons/flags/fj.png
 %%DATADIR%%/icons/flags/fk.png
 %%DATADIR%%/icons/flags/fm.png
 %%DATADIR%%/icons/flags/fo.png
 %%DATADIR%%/icons/flags/fr.png
 %%DATADIR%%/icons/flags/ga.png
 %%DATADIR%%/icons/flags/gd.png
 %%DATADIR%%/icons/flags/ge.png
 %%DATADIR%%/icons/flags/gf.png
 %%DATADIR%%/icons/flags/gh.png
 %%DATADIR%%/icons/flags/gi.png
 %%DATADIR%%/icons/flags/gl.png
 %%DATADIR%%/icons/flags/gm.png
 %%DATADIR%%/icons/flags/gn.png
 %%DATADIR%%/icons/flags/gp.png
 %%DATADIR%%/icons/flags/gq.png
 %%DATADIR%%/icons/flags/gr.png
 %%DATADIR%%/icons/flags/gs.png
 %%DATADIR%%/icons/flags/gt.png
 %%DATADIR%%/icons/flags/gu.png
 %%DATADIR%%/icons/flags/gw.png
 %%DATADIR%%/icons/flags/gy.png
 %%DATADIR%%/icons/flags/hk.png
 %%DATADIR%%/icons/flags/hm.png
 %%DATADIR%%/icons/flags/hn.png
 %%DATADIR%%/icons/flags/hr.png
 %%DATADIR%%/icons/flags/ht.png
 %%DATADIR%%/icons/flags/hu.png
 %%DATADIR%%/icons/flags/id.png
 %%DATADIR%%/icons/flags/ie.png
 %%DATADIR%%/icons/flags/il.png
 %%DATADIR%%/icons/flags/in.png
 %%DATADIR%%/icons/flags/io.png
 %%DATADIR%%/icons/flags/iq.png
 %%DATADIR%%/icons/flags/ir.png
 %%DATADIR%%/icons/flags/is.png
 %%DATADIR%%/icons/flags/it.png
 %%DATADIR%%/icons/flags/jm.png
 %%DATADIR%%/icons/flags/jo.png
 %%DATADIR%%/icons/flags/jp.png
 %%DATADIR%%/icons/flags/ke.png
 %%DATADIR%%/icons/flags/kg.png
 %%DATADIR%%/icons/flags/kh.png
 %%DATADIR%%/icons/flags/ki.png
 %%DATADIR%%/icons/flags/km.png
 %%DATADIR%%/icons/flags/kn.png
 %%DATADIR%%/icons/flags/kp.png
 %%DATADIR%%/icons/flags/kr.png
 %%DATADIR%%/icons/flags/kw.png
 %%DATADIR%%/icons/flags/ky.png
 %%DATADIR%%/icons/flags/kz.png
 %%DATADIR%%/icons/flags/la.png
 %%DATADIR%%/icons/flags/lb.png
 %%DATADIR%%/icons/flags/lc.png
 %%DATADIR%%/icons/flags/li.png
 %%DATADIR%%/icons/flags/lk.png
 %%DATADIR%%/icons/flags/lr.png
 %%DATADIR%%/icons/flags/ls.png
 %%DATADIR%%/icons/flags/lt.png
 %%DATADIR%%/icons/flags/lu.png
 %%DATADIR%%/icons/flags/lv.png
 %%DATADIR%%/icons/flags/ly.png
 %%DATADIR%%/icons/flags/ma.png
 %%DATADIR%%/icons/flags/mc.png
 %%DATADIR%%/icons/flags/md.png
 %%DATADIR%%/icons/flags/me.png
 %%DATADIR%%/icons/flags/mg.png
 %%DATADIR%%/icons/flags/mh.png
 %%DATADIR%%/icons/flags/mk.png
 %%DATADIR%%/icons/flags/ml.png
 %%DATADIR%%/icons/flags/mm.png
 %%DATADIR%%/icons/flags/mn.png
 %%DATADIR%%/icons/flags/mo.png
 %%DATADIR%%/icons/flags/mp.png
 %%DATADIR%%/icons/flags/mq.png
 %%DATADIR%%/icons/flags/mr.png
 %%DATADIR%%/icons/flags/ms.png
 %%DATADIR%%/icons/flags/mt.png
 %%DATADIR%%/icons/flags/mu.png
 %%DATADIR%%/icons/flags/mv.png
 %%DATADIR%%/icons/flags/mw.png
 %%DATADIR%%/icons/flags/mx.png
 %%DATADIR%%/icons/flags/my.png
 %%DATADIR%%/icons/flags/mz.png
 %%DATADIR%%/icons/flags/na.png
 %%DATADIR%%/icons/flags/nc.png
 %%DATADIR%%/icons/flags/ne.png
 %%DATADIR%%/icons/flags/nf.png
 %%DATADIR%%/icons/flags/ng.png
 %%DATADIR%%/icons/flags/ni.png
 %%DATADIR%%/icons/flags/nl.png
 %%DATADIR%%/icons/flags/no.png
 %%DATADIR%%/icons/flags/np.png
 %%DATADIR%%/icons/flags/nr.png
 %%DATADIR%%/icons/flags/nu.png
 %%DATADIR%%/icons/flags/nz.png
 %%DATADIR%%/icons/flags/om.png
 %%DATADIR%%/icons/flags/pa.png
 %%DATADIR%%/icons/flags/pe.png
 %%DATADIR%%/icons/flags/pf.png
 %%DATADIR%%/icons/flags/pg.png
 %%DATADIR%%/icons/flags/ph.png
 %%DATADIR%%/icons/flags/pk.png
 %%DATADIR%%/icons/flags/pl.png
 %%DATADIR%%/icons/flags/pm.png
 %%DATADIR%%/icons/flags/pn.png
 %%DATADIR%%/icons/flags/pr.png
 %%DATADIR%%/icons/flags/ps.png
 %%DATADIR%%/icons/flags/pt.png
 %%DATADIR%%/icons/flags/pw.png
 %%DATADIR%%/icons/flags/py.png
 %%DATADIR%%/icons/flags/qa.png
 %%DATADIR%%/icons/flags/re.png
 %%DATADIR%%/icons/flags/ro.png
 %%DATADIR%%/icons/flags/rs.png
 %%DATADIR%%/icons/flags/ru.png
 %%DATADIR%%/icons/flags/rw.png
 %%DATADIR%%/icons/flags/sa.png
 %%DATADIR%%/icons/flags/sb.png
 %%DATADIR%%/icons/flags/sc.png
 %%DATADIR%%/icons/flags/sd.png
 %%DATADIR%%/icons/flags/se.png
 %%DATADIR%%/icons/flags/sg.png
 %%DATADIR%%/icons/flags/sh.png
 %%DATADIR%%/icons/flags/si.png
 %%DATADIR%%/icons/flags/sj.png
 %%DATADIR%%/icons/flags/sk.png
 %%DATADIR%%/icons/flags/sl.png
 %%DATADIR%%/icons/flags/sm.png
 %%DATADIR%%/icons/flags/sn.png
 %%DATADIR%%/icons/flags/so.png
 %%DATADIR%%/icons/flags/sr.png
 %%DATADIR%%/icons/flags/st.png
 %%DATADIR%%/icons/flags/sv.png
 %%DATADIR%%/icons/flags/sy.png
 %%DATADIR%%/icons/flags/sz.png
 %%DATADIR%%/icons/flags/tc.png
 %%DATADIR%%/icons/flags/td.png
 %%DATADIR%%/icons/flags/tf.png
 %%DATADIR%%/icons/flags/tg.png
 %%DATADIR%%/icons/flags/th.png
 %%DATADIR%%/icons/flags/tj.png
 %%DATADIR%%/icons/flags/tk.png
 %%DATADIR%%/icons/flags/tl.png
 %%DATADIR%%/icons/flags/tm.png
 %%DATADIR%%/icons/flags/tn.png
 %%DATADIR%%/icons/flags/to.png
 %%DATADIR%%/icons/flags/tr.png
 %%DATADIR%%/icons/flags/tt.png
 %%DATADIR%%/icons/flags/tv.png
 %%DATADIR%%/icons/flags/tw.png
 %%DATADIR%%/icons/flags/tz.png
 %%DATADIR%%/icons/flags/ua.png
 %%DATADIR%%/icons/flags/ug.png
 %%DATADIR%%/icons/flags/uk.png
 %%DATADIR%%/icons/flags/unknown.png
 %%DATADIR%%/icons/flags/us.png
 %%DATADIR%%/icons/flags/uy.png
 %%DATADIR%%/icons/flags/uz.png
 %%DATADIR%%/icons/flags/va.png
 %%DATADIR%%/icons/flags/vc.png
 %%DATADIR%%/icons/flags/ve.png
 %%DATADIR%%/icons/flags/vg.png
 %%DATADIR%%/icons/flags/vi.png
 %%DATADIR%%/icons/flags/vn.png
 %%DATADIR%%/icons/flags/vu.png
 %%DATADIR%%/icons/flags/wf.png
 %%DATADIR%%/icons/flags/ws.png
 %%DATADIR%%/icons/flags/ye.png
 %%DATADIR%%/icons/flags/yt.png
 %%DATADIR%%/icons/flags/za.png
 %%DATADIR%%/icons/flags/zm.png
 %%DATADIR%%/icons/flags/zw.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
 %%DATADIR%%/icons/newfile.png
 %%DATADIR%%/icons/newm.png
 %%DATADIR%%/icons/page.png
 %%DATADIR%%/icons/play.png
 %%DATADIR%%/icons/script.png
 %%DATADIR%%/icons/select_all.png
 %%DATADIR%%/icons/server.png
 %%DATADIR%%/icons/small_dxirc.png
 %%DATADIR%%/icons/smileys/biggrin.png
 %%DATADIR%%/icons/smileys/cry.png
 %%DATADIR%%/icons/smileys/dxirc.smiley
 %%DATADIR%%/icons/smileys/smile.png
 %%DATADIR%%/icons/smileys/tongue.png
 %%DATADIR%%/icons/smileys/unhappy.png
 %%DATADIR%%/icons/tick.png
 %%DATADIR%%/icons/unewm.png
 %%DATADIR%%/icons/user.png
 %%DATADIR%%/icons/world.png
 %%DATADIR%%/icons/wrench.png
 %%DATADIR%%/sounds/connected.wav
 %%DATADIR%%/sounds/disconnected.wav
 %%DATADIR%%/sounds/message.wav
 share/icons/hicolor/48x48/apps/dxirc.png
 %%NLS%%share/locale/cs/LC_MESSAGES/dxirc.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/dxirc.mo