bitcoin: make qt4 option work

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

diff --git a/bitcoin/Makefile b/bitcoin/Makefile
index 3fc8788cb5bf570699043543f357f5a0f88e3aa9..3e410e99f589aa20b6464aeeb3af922edbfdc9ca 100644 (file)
--- 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 670cbf142f9bef24d8e2ee97ca8362ac7fed289d..d2fcb45d3ae2030902113aa2891636dd8fffb307 100644 (file)
--- 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 4ed7cda4245a4f7859ba98040e6eb599ad6a5a86..5577e5b93f4781da76bb9ed666aba91d47001b4e 100644 (file)
--- 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)