bitcoin: make qt4 option work

[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 20:19:26 2016 -0500
Changeset:	d624f1522e41b216c40c446885ac66394ba46f88

Modified Files:
	bitcoin/Makefile
	bitcoin/PLIST
	bitcoin/options.mk

Log Message:
bitcoin: make qt4 option work

Explicitly pass the qt4 bin directory.  Depend on devel/protobuf.  Add
qt programs to PLIST.

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

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

diffstat:
 bitcoin/Makefile   | 2 ++
 bitcoin/PLIST      | 2 ++
 bitcoin/options.mk | 5 +++++
 3 files changed, 9 insertions(+)

diffs:
diff --git a/bitcoin/Makefile b/bitcoin/Makefile
index 3fc8788..3e410e9 100644
--- a/bitcoin/Makefile
+++ b/bitcoin/Makefile
@@ -33,6 +33,8 @@ BUILDLINK_TRANSFORM+=   l:db_cxx:db4_cxx
 
 TEST_TARGET=	check
 
+PLIST_VARS+=	qt4
+
 RCD_SCRIPTS=	bitcoind
 BUILD_DEFS+=	VARBASE
 OWN_DIRS=	${VARBASE}/bitcoin
diff --git a/bitcoin/PLIST b/bitcoin/PLIST
index 670cbf1..d2fcb45 100644
--- a/bitcoin/PLIST
+++ b/bitcoin/PLIST
@@ -1,9 +1,11 @@
 @comment $NetBSD$
 bin/bench_bitcoin
 bin/bitcoin-cli
+${PLIST.qt4}bin/bitcoin-qt
 bin/bitcoin-tx
 bin/bitcoind
 bin/test_bitcoin
+${PLIST.qt4}bin/test_bitcoin-qt
 include/bitcoinconsensus.h
 include/secp256k1.h
 include/secp256k1_recovery.h
diff --git a/bitcoin/options.mk b/bitcoin/options.mk
index 4ed7cda..5577e5b 100644
--- a/bitcoin/options.mk
+++ b/bitcoin/options.mk
@@ -13,11 +13,16 @@ PKG_SUGGESTED_OPTIONS+=		dbus
 # by configure.  Until fixed, leave the option off.
 .if !empty(PKG_OPTIONS:Mqt4)
 BUILDLINK_DEPMETHOD.qt4-tools=	full
+.include "../../devel/protobuf/buildlink3.mk"
 .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"
+
+CONFIGURE_ARGS+=	--with-qt-bindir=${QTDIR}/bin
+
+PLIST.qt4=	yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mminiupnpc)