qt5-dbus is gone, provided by qt5-qtbase

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: qt5-dbus is gone, provided by qt5-qtbase
From: Tobias Nygren <tnn%NetBSD.org@localhost>
Date: Sun, 01 Nov 2015 12:10:31 +0000
Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Sun Nov 1 13:10:31 2015 +0100
Changeset:	41c45bba11ccae881d84f704e94744e4861c4fcc

Modified Files:
	dogecoin/options.mk
	liblxqt-mount/Makefile
	liblxqt-mount/buildlink3.mk
	libqtxdg/Makefile
	libqtxdg/buildlink3.mk
	otter-browser/Makefile
	polkit-qt5/Makefile
	polkit-qt5/buildlink3.mk
	qt5-ibus/Makefile
	qupzilla/options.mk
	zetacoin/options.mk

Log Message:
qt5-dbus is gone, provided by qt5-qtbase

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=41c45bba11ccae881d84f704e94744e4861c4fcc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 dogecoin/options.mk         | 9 +++------
 liblxqt-mount/Makefile      | 1 -
 liblxqt-mount/buildlink3.mk | 1 -
 libqtxdg/Makefile           | 1 -
 libqtxdg/buildlink3.mk      | 1 -
 otter-browser/Makefile      | 1 -
 polkit-qt5/Makefile         | 1 -
 polkit-qt5/buildlink3.mk    | 1 -
 qt5-ibus/Makefile           | 1 -
 qupzilla/options.mk         | 6 +-----
 zetacoin/options.mk         | 9 +++------
 11 files changed, 7 insertions(+), 25 deletions(-)

diffs:
diff --git a/dogecoin/options.mk b/dogecoin/options.mk
index 6d6f2a4..bb38c6b 100644
--- a/dogecoin/options.mk
+++ b/dogecoin/options.mk
@@ -1,7 +1,7 @@
 # $NetBSD: options.mk,v 1.1 2014/09/22 11:18:54 othyro Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.dogecoin
-PKG_SUPPORTED_OPTIONS+=	miniupnpc qrcode qt qtdbus tests
+PKG_SUPPORTED_OPTIONS+=	miniupnpc qrcode qt tests
 PKG_SUGGESTED_OPTIONS=	qt # blank
 PLIST_VARS+=		qt tests
 
@@ -24,13 +24,10 @@ QMAKE_OPTIONS+=	USE_QRCODE=1
 QMAKE_OPTIONS+=	USE_IPV6=0
 .endif
 
-.if !empty(PKG_OPTIONS:Mqt) || !empty(PKG_OPTIONS:Mqtdbus)
+.if !empty(PKG_OPTIONS:Mqt)
 PLIST.qt=	yes
 .include "../../x11/qt5-qtbase/buildlink3.mk"
-.if !empty(PKG_OPTIONS:Mqtdbus)
-QMAKE_OPTIONS+=	USE_DBUS=1
-.include "../../x11/qt5-dbus/buildlink3.mk"
-.endif
+QMAKE_OPTIONS+=	USE_DBUS=1 # XXX still needed?
 .endif
 
 .if empty(PKG_OPTIONS:Mqt)
diff --git a/liblxqt-mount/Makefile b/liblxqt-mount/Makefile
index ac245d6..9ed4dde 100644
--- a/liblxqt-mount/Makefile
+++ b/liblxqt-mount/Makefile
@@ -14,7 +14,6 @@ EXTRACT_USING=	gtar
 USE_CMAKE=	yes
 USE_LANGUAGES=	c c++
 
-.include "../../x11/qt5-dbus/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/qt5-qttools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/liblxqt-mount/buildlink3.mk b/liblxqt-mount/buildlink3.mk
index e272ba2..729bebf 100644
--- a/liblxqt-mount/buildlink3.mk
+++ b/liblxqt-mount/buildlink3.mk
@@ -8,7 +8,6 @@ LIBLXQT_MOUNT_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.liblxqt-mount+=	liblxqt-mount>=0.9.0
 BUILDLINK_PKGSRCDIR.liblxqt-mount?=	../../wip/liblxqt-mount
 
-.include "../../x11/qt5-dbus/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .endif	# LIBLXQT_MOUNT_BUILDLINK3_MK
 
diff --git a/libqtxdg/Makefile b/libqtxdg/Makefile
index b5c8b9a..29acb07 100644
--- a/libqtxdg/Makefile
+++ b/libqtxdg/Makefile
@@ -13,6 +13,5 @@ LICENSE=	gnu-lgpl-v2.1
 USE_CMAKE=	yes
 USE_LANGUAGES=	c c++
 
-.include "../../x11/qt5-dbus/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/libqtxdg/buildlink3.mk b/libqtxdg/buildlink3.mk
index ac67693..8c67d62 100644
--- a/libqtxdg/buildlink3.mk
+++ b/libqtxdg/buildlink3.mk
@@ -8,7 +8,6 @@ LIBQTXDG_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.libqtxdg+=	libqtxdg>=1.2.0
 BUILDLINK_PKGSRCDIR.libqtxdg?=	../../wip/libqtxdg
 
-.include "../../x11/qt5-dbus/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .endif	# LIBQTXDG_BUILDLINK3_MK
 
diff --git a/otter-browser/Makefile b/otter-browser/Makefile
index cce9536..56e4812 100644
--- a/otter-browser/Makefile
+++ b/otter-browser/Makefile
@@ -15,7 +15,6 @@ USE_LANGUAGES=	c c++
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../x11/qt5-dbus/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/qt5-qtmultimedia/buildlink3.mk"
 .include "../../x11/qt5-qtscript/buildlink3.mk"
diff --git a/polkit-qt5/Makefile b/polkit-qt5/Makefile
index 194981a..55ea694 100644
--- a/polkit-qt5/Makefile
+++ b/polkit-qt5/Makefile
@@ -17,7 +17,6 @@ USE_LANGUAGES=	c c++
 USE_CMAKE=	yes
 USE_TOOLS+=	pkg-config
 
-.include "../../x11/qt5-dbus/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../security/policykit/buildlink3.mk"
 .include "../../wip/polkit/buildlink3.mk"
diff --git a/polkit-qt5/buildlink3.mk b/polkit-qt5/buildlink3.mk
index 0281c19..a711232 100644
--- a/polkit-qt5/buildlink3.mk
+++ b/polkit-qt5/buildlink3.mk
@@ -9,7 +9,6 @@ BUILDLINK_API_DEPENDS.polkit-qt5-1+=	polkit-qt5-1>=0.112.0
 BUILDLINK_ABI_DEPENDS.polkit-qt5-1+=	polkit-qt5-1>=0.112.0
 BUILDLINK_PKGSRCDIR.polkit-qt5-1?=	../../wip/polkit-qt5
 
-.include "../../x11/qt5-dbus/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../security/policykit/buildlink3.mk"
 .include "../../wip/polkit/buildlink3.mk"
diff --git a/qt5-ibus/Makefile b/qt5-ibus/Makefile
index a4195b1..b5d2902 100644
--- a/qt5-ibus/Makefile
+++ b/qt5-ibus/Makefile
@@ -17,5 +17,4 @@ pre-configure:
 	${QTDIR}/bin/qmake -o Makefile
 
 .include "../../inputmethod/ibus/buildlink3.mk"
-.include "../../x11/qt5-dbus/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/qupzilla/options.mk b/qupzilla/options.mk
index 9676784..f0154e8 100644
--- a/qupzilla/options.mk
+++ b/qupzilla/options.mk
@@ -10,13 +10,9 @@ PKG_SUGGESTED_OPTIONS=	qt4 dbus
 
 
 .if !empty(PKG_OPTIONS:Mqt5)
+.include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/qt5-qtscript/buildlink3.mk"
 .include "../../x11/qt5-qtwebkit/buildlink3.mk"
-.if !empty(PKG_OPTIONS:Mdbus)
-.include "../../x11/qt5-dbus/buildlink3.mk"
-.else
-MAKE_ENV+= DISABLE_DBUS=${TRUE}
-.endif
 .endif
 
 .if !empty(PKG_OPTIONS:Mqt4)
diff --git a/zetacoin/options.mk b/zetacoin/options.mk
index 7d0300a..e9486da 100644
--- a/zetacoin/options.mk
+++ b/zetacoin/options.mk
@@ -1,7 +1,7 @@
 # $NetBSD: options.mk,v 1.1 2014/09/22 11:23:59 othyro Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.zetacoin
-PKG_SUPPORTED_OPTIONS+=		miniupnpc qtdbus qrcode qt tests
+PKG_SUPPORTED_OPTIONS+=		miniupnpc qrcode qt tests
 PKG_SUGGESTED_OPTIONS=		# blank
 #PKG_SUGGESTED_OPTIONS+=		qtdbus qrcode
 
@@ -24,13 +24,10 @@ QMAKE_OPTIONS+=	USE_QRCODE=1
 QMAKE_OPTIONS+=	USE_IPV6=0
 .endif
 
-.if !empty(PKG_OPTIONS:Mqt) || !empty(PKG_OPTIONS:Mqtdbus)
+.if !empty(PKG_OPTIONS:Mqt)
 PLIST.qt=	yes
 .include "../../x11/qt5-qtbase/buildlink3.mk"
-.if !empty(PKG_OPTIONS:Mqtdbus)
-QMAKE_OPTIONS+=	USE_DBUS=1
-.include "../../x11/qt5-dbus/buildlink3.mk"
-.endif
+QMAKE_OPTIONS+=	USE_DBUS=1 # XXX still needed?
 .endif
 
 .if empty(PKG_OPTIONS:Mqt)
Prev by Date: add new patches, fix configuration problem
Next by Date: treeviewx: switch to the version maintained by Debian Med team
Previous by Thread: add new patches, fix configuration problem
Next by Thread: treeviewx: switch to the version maintained by Debian Med team
Indexes:
Home | Main Index | Thread Index | Old Index