Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 12 Dec 2017 09:00:28 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r456111 - head/irc/dxirc
Message-ID:  <201712120900.vBC90SSj054695@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Tue Dec 12 09:00:28 2017
New Revision: 456111
URL: https://svnweb.freebsd.org/changeset/ports/456111

Log:
  - Fix LICENSE
  - Switch to options helpers
  - Switch to CMAKE_BOOL
  - Update WWW
  
  Approved by:	portmgr blanket

Modified:
  head/irc/dxirc/Makefile
  head/irc/dxirc/pkg-descr
  head/irc/dxirc/pkg-plist

Modified: head/irc/dxirc/Makefile
==============================================================================
--- head/irc/dxirc/Makefile	Tue Dec 12 08:11:25 2017	(r456110)
+++ head/irc/dxirc/Makefile	Tue Dec 12 09:00:28 2017	(r456111)
@@ -8,7 +8,7 @@ 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
@@ -23,21 +23,20 @@ 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
 
@@ -48,15 +47,5 @@ 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>

Modified: head/irc/dxirc/pkg-descr
==============================================================================
--- head/irc/dxirc/pkg-descr	Tue Dec 12 08:11:25 2017	(r456110)
+++ head/irc/dxirc/pkg-descr	Tue Dec 12 09:00:28 2017	(r456111)
@@ -7,4 +7,4 @@ Features:
  - Support for multiple simultaneously connected servers
  - Well-arranged and flexible configuration dialog
 
-WWW: http://www.dxirc.org/
+WWW: https://www.dxirc.org/

Modified: head/irc/dxirc/pkg-plist
==============================================================================
--- head/irc/dxirc/pkg-plist	Tue Dec 12 08:11:25 2017	(r456110)
+++ head/irc/dxirc/pkg-plist	Tue Dec 12 09:00:28 2017	(r456111)
@@ -1,7 +1,7 @@
-%%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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712120900.vBC90SSj054695>