From e2c38d6eca246ad91055de2bdaebfe5cff447454 Mon Sep 17 00:00:00 2001
From: adamw <adamw@FreeBSD.org>
Date: Thu, 30 Jun 2016 20:02:43 +0000
Subject: Convert a couple ports that use both _CMAKE_ON and _CMAKE_OFF to
 _CMAKE_BOOL.

Use options helpers all the way in math/carve, because I couldn't help myself.
---
 net-p2p/eiskaltdcpp-data/Makefile | 12 ++++--------
 net-p2p/eiskaltdcpp-gtk/Makefile  | 14 ++++++--------
 net-p2p/eiskaltdcpp-qt/Makefile   | 18 ++++++------------
 3 files changed, 16 insertions(+), 28 deletions(-)

(limited to 'net-p2p')

diff --git a/net-p2p/eiskaltdcpp-data/Makefile b/net-p2p/eiskaltdcpp-data/Makefile
index 0688ea5dbf34..78f68906bd2f 100644
--- a/net-p2p/eiskaltdcpp-data/Makefile
+++ b/net-p2p/eiskaltdcpp-data/Makefile
@@ -40,13 +40,9 @@ CMAKE_ARGS=		-Wno-dev \
 			-DCLIENT_DATA_DIR=${DATADIR} \
 			-DSHARE_DIR=${LOCALBASE}/share
 
-EMOTICONS_CMAKE_ON=	-DWITH_EMOTICONS:BOOL=ON
-EMOTICONS_CMAKE_OFF=	-DWITH_EMOTICONS:BOOL=OFF
-EXAMPLES_CMAKE_ON=	-DWITH_EXAMPLES:BOOL=ON
-EXAMPLES_CMAKE_OFF=	-DWITH_EXAMPLES:BOOL=OFF
-LUASCRIPTS_CMAKE_ON=	-DWITH_LUASCRIPTS:BOOL=ON -DLUA_SCRIPT:BOOL=ON
-LUASCRIPTS_CMAKE_OFF=	-DWITH_LUASCRIPTS:BOOL=OFF
-SOUNDS_CMAKE_ON=	-DWITH_SOUNDS:BOOL=ON
-SOUNDS_CMAKE_OFF=	-DWITH_SOUNDS:BOOL=OFF
+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"
diff --git a/net-p2p/eiskaltdcpp-gtk/Makefile b/net-p2p/eiskaltdcpp-gtk/Makefile
index 24f3bf13f046..c9c512538067 100644
--- a/net-p2p/eiskaltdcpp-gtk/Makefile
+++ b/net-p2p/eiskaltdcpp-gtk/Makefile
@@ -45,18 +45,16 @@ 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_ON=	-DUSE_LIBNOTIFY:BOOL=ON
-LIBNOTIFY_CMAKE_OFF=	-DUSE_LIBNOTIFY:BOOL=OFF
+LIBNOTIFY_CMAKE_BOOL=	USE_LIBNOTIFY
 
 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
+GTK2_CMAKE_BOOL=	USE_GTK
+GTK2_CMAKE_BOOL_OFF=	USE_GTK3
 
 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
+GTK3_CMAKE_BOOL=	USE_GTK3
+GTK3_CMAKE_BOOL_OFF=	USE_GTK
 
-FREE_SPACE_CMAKE_ON=    -DFREE_SPACE_BAR_C:BOOL=ON
-FREE_SPACE_CMAKE_OFF=   -DFREE_SPACE_BAR_C:BOOL=OFF
+FREE_SPACE_CMAKE_BOOL=	FREE_SPACE_BAR_C
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net-p2p/eiskaltdcpp-qt/Makefile b/net-p2p/eiskaltdcpp-qt/Makefile
index c0f468f0da96..e04a78915081 100644
--- a/net-p2p/eiskaltdcpp-qt/Makefile
+++ b/net-p2p/eiskaltdcpp-qt/Makefile
@@ -38,27 +38,21 @@ BUILD_WRKSRC=	${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}
 INSTALL_WRKSRC=	${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}
 
 ASPELL_LIB_DEPENDS=	libaspell.so:textproc/aspell
-ASPELL_CMAKE_ON=	-DUSE_ASPELL:BOOL=ON
-ASPELL_CMAKE_OFF=	-DUSE_ASPELL:BOOL=OFF
+ASPELL_CMAKE_BOOL=	USE_ASPELL
 
-FREE_SPACE_CMAKE_ON=	-DFREE_SPACE_BAR_C:BOOL=ON
-FREE_SPACE_CMAKE_OFF=	-DFREE_SPACE_BAR_C:BOOL=OFF
+FREE_SPACE_CMAKE_BOOL=	FREE_SPACE_BAR_C
 
 DBUS_NOTIFY_USE=	QT4=dbus
-DBUS_NOTIFY_CMAKE_ON=	-DDBUS_NOTIFY:BOOL=ON
-DBUS_NOTIFY_CMAKE_OFF=	-DDBUS_NOTIFY:BOOL=OFF
+DBUS_NOTIFY_CMAKE_BOOL=	DBUS_NOTIFY
 
 QTSCRIPT_USE=		QT4=script
 QTSCRIPT_RUN_DEPENDS=	${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so:devel/qtscriptgenerator
-QTSCRIPT_CMAKE_ON=	-DUSE_JS:BOOL=ON
-QTSCRIPT_CMAKE_OFF=	-DUSE_JS:BOOL=OFF
+QTSCRIPT_CMAKE_BOOL=	USE_JS
 
 QML_USE=		QT4=declarative
-QML_CMAKE_ON=		-DUSE_QT_QML:BOOL=ON
-QML_CMAKE_OFF=		-DUSE_QT_QML:BOOL=OFF
+QML_CMAKE_BOOL=		USE_QT_QML
 
 SQLITE_USE=		QT4=sql-sqlite3
-SQLITE_CMAKE_ON=	-DUSE_QT_SQLITE:BOOL=ON
-SQLITE_CMAKE_OFF=	-DUSE_QT_SQLITE:BOOL=OFF
+SQLITE_CMAKE_BOOL=	USE_QT_SQLITE
 
 .include "${MASTERDIR}/Makefile"
-- 
cgit