pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Add support for Qt 5 to wip/bitcoin
Module Name: pkgsrc-wip
Committed By: Pierre Pronchery <khorben%defora.org@localhost>
Pushed By: khorben
Date: Sun May 20 00:22:41 2018 +0200
Changeset: 1f3277c74d7882bb554694a51a87ae41c783292b
Modified Files:
bitcoin/Makefile
bitcoin/PLIST
bitcoin/options.mk
Log Message:
Add support for Qt 5 to wip/bitcoin
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1f3277c74d7882bb554694a51a87ae41c783292b
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 | 6 +++---
bitcoin/options.mk | 16 ++++++++++++----
3 files changed, 16 insertions(+), 8 deletions(-)
diffs:
diff --git a/bitcoin/Makefile b/bitcoin/Makefile
index 4cccb9493e..9e1eb97dfc 100644
--- a/bitcoin/Makefile
+++ b/bitcoin/Makefile
@@ -32,7 +32,7 @@ BUILDLINK_TRANSFORM+= l:db_cxx:db4_cxx
TEST_TARGET= check
-PLIST_VARS+= qt4
+PLIST_VARS+= qt
RCD_SCRIPTS= bitcoind
BUILD_DEFS+= VARBASE
diff --git a/bitcoin/PLIST b/bitcoin/PLIST
index dce3af5cd0..0360bc675f 100644
--- a/bitcoin/PLIST
+++ b/bitcoin/PLIST
@@ -1,11 +1,11 @@
@comment $NetBSD$
bin/bench_bitcoin
bin/bitcoin-cli
-${PLIST.qt4}bin/bitcoin-qt
+${PLIST.qt}bin/bitcoin-qt
bin/bitcoin-tx
bin/bitcoind
bin/test_bitcoin
-${PLIST.qt4}bin/test_bitcoin-qt
+${PLIST.qt}bin/test_bitcoin-qt
include/bitcoinconsensus.h
include/secp256k1.h
include/secp256k1_recovery.h
@@ -17,7 +17,7 @@ lib/pkgconfig/libbitcoinconsensus.pc
lib/pkgconfig/libsecp256k1.pc
lib/pkgconfig/libunivalue.pc
man/man1/bitcoin-cli.1
-${PLIST.qt4}man/man1/bitcoin-qt.1
+${PLIST.qt}man/man1/bitcoin-qt.1
man/man1/bitcoin-tx.1
man/man1/bitcoind.1
share/examples/bitcoin/bitcoin.conf
diff --git a/bitcoin/options.mk b/bitcoin/options.mk
index a271a1500e..c904dcc39c 100644
--- a/bitcoin/options.mk
+++ b/bitcoin/options.mk
@@ -1,9 +1,7 @@
# $NetBSD$
-# TODO: support qt5 also (or perhaps instead)
-
PKG_OPTIONS_VAR= PKG_OPTIONS.bitcoin
-PKG_SUPPORTED_OPTIONS+= qt4 miniupnpc
+PKG_SUPPORTED_OPTIONS+= qt4 qt5 miniupnpc
# qt4 is off because it doubles the footprint of the package.
# Please do not enable it by default; instead, create a split
# package.
@@ -12,7 +10,7 @@ PKG_SUGGESTED_OPTIONS+=
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mqt4)
-PLIST.qt4= yes
+PLIST.qt= yes
.include "../../converters/qrencode/buildlink3.mk"
.include "../../devel/protobuf/buildlink3.mk"
@@ -23,6 +21,16 @@ BUILDLINK_DEPMETHOD.qt4-tools= full
CONFIGURE_ARGS+= --with-qt-bindir=${QTDIR}/bin
.endif
+.if !empty(PKG_OPTIONS:Mqt5)
+PLIST.qt= yes
+
+.include "../../converters/qrencode/buildlink3.mk"
+.include "../../devel/protobuf/buildlink3.mk"
+.include "../../x11/qt5-qttools/buildlink3.mk"
+
+CONFIGURE_ARGS+= --with-qt-bindir=${QTDIR}/bin
+.endif
+
.if !empty(PKG_OPTIONS:Mminiupnpc)
.include "../../net/miniupnpc/buildlink3.mk"
.endif
Home |
Main Index |
Thread Index |
Old Index