bitcoin: Make qt4 an option, default off

[Greg Troxel <gdt%ir.bbn.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%ir.bbn.com@localhost>
Pushed By:	gdt
Date:		Tue Nov 29 11:46:35 2016 -0500
Changeset:	f660194e73438a04d7dc06167a6f6c533a537145

Modified Files:
	bitcoin/Makefile
	bitcoin/options.mk

Log Message:
bitcoin: Make qt4 an option, default off

The qt4 build didn't work anyway, because rcc wasn't found.  For now,
disable it, resulting in the same package but with lighter
dependencies.

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

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

diffstat:
 bitcoin/Makefile   |  5 +----
 bitcoin/options.mk | 21 +++++++++++++--------
 2 files changed, 14 insertions(+), 12 deletions(-)

diffs:
diff --git a/bitcoin/Makefile b/bitcoin/Makefile
index 97cbce7..93a68bf 100644
--- a/bitcoin/Makefile
+++ b/bitcoin/Makefile
@@ -2,7 +2,7 @@
 
 # TODO: update to latest release
 DISTNAME=       bitcoin-0.11.2
-PKGREVISION=    3
+PKGREVISION=    4
 CATEGORIES=	finance
 MASTER_SITES=   ${MASTER_SITE_GITHUB:=bitcoin/}
 GITHUB_TAG=     v${PKGVERSION_NOREV}
@@ -79,8 +79,5 @@ do-install:
 .include "../../databases/db4/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
-BUILDLINK_DEPMETHOD.qt4-tools=	full
-.include "../../x11/qt4-tools/buildlink3.mk"
-.include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/bitcoin/options.mk b/bitcoin/options.mk
index 67e2427..4ed7cda 100644
--- a/bitcoin/options.mk
+++ b/bitcoin/options.mk
@@ -4,11 +4,22 @@
 # TODO: create split package for qt gui
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.bitcoin
-PKG_SUPPORTED_OPTIONS+=		miniupnpc dbus qrcode
-PKG_SUGGESTED_OPTIONS+=		dbus qrcode
+PKG_SUPPORTED_OPTIONS+=		qt4 miniupnpc dbus
+PKG_SUGGESTED_OPTIONS+=		dbus
 
 .include "../../mk/bsd.options.mk"
 
+# This fails to work because rcc (/usr/pkg/bin/qt4/rcc) is not found
+# by configure.  Until fixed, leave the option off.
+.if !empty(PKG_OPTIONS:Mqt4)
+BUILDLINK_DEPMETHOD.qt4-tools=	full
+.include "../../x11/qt4-tools/buildlink3.mk"
+.include "../../x11/qt4-libs/buildlink3.mk"
+
+# qrencode is only used by the qt gui, and it is tiny compared to qt.
+.include "../../converters/qrencode/buildlink3.mk"
+.endif
+
 .if !empty(PKG_OPTIONS:Mminiupnpc)
 .include "../../wip/miniupnpc/buildlink3.mk"
 .endif
@@ -18,9 +29,3 @@ PKG_SUGGESTED_OPTIONS+=		dbus qrcode
 .if !empty(PKG_OPTIONS:Mdbus)
 .include "../../x11/qt4-qdbus/buildlink3.mk"
 .endif
-
-# TODO: If this is small, and only useful with qt, just depend
-# on it when qt is enabled.
-.if !empty(PKG_OPTIONS:Mqrcode)
-.include "../../converters/qrencode/buildlink3.mk"
-.endif