Index: net-p2p/Makefile =================================================================== --- net-p2p/Makefile (revision 367463) +++ net-p2p/Makefile (working copy) @@ -7,6 +7,7 @@ SUBDIR += amule-devel SUBDIR += bitcoin SUBDIR += bitcoin-daemon + SUBDIR += bitcoin-utils SUBDIR += bitflu SUBDIR += bitmessage SUBDIR += bnbt Index: net-p2p/bitcoin/Makefile =================================================================== --- net-p2p/bitcoin/Makefile (revision 367463) +++ net-p2p/bitcoin/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= bitcoin PORTVERSION= 0.9.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-p2p finance MASTER_SITES= http://vps.robbak.com/distfiles/ \ ${MASTER_SITE_LOCAL} \ @@ -15,83 +15,98 @@ LICENSE= MIT -BUILD_DEPENDS= protoc:${PORTSDIR}/devel/protobuf \ - pkg-config:${PORTSDIR}/devel/pkgconf +BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconf LIB_DEPENDS= libboost_date_time.so:${PORTSDIR}/devel/boost-libs -OPTIONS_DEFINE= GUI WALLET UPNP QRCODES -OPTIONS_DEFAULT= GUI WALLET QRCODES - -GUI_DESC= Build and install the QT4 binary -WALLET_DESC= Build with support to create and manage a wallet -UPNP_DESC= Build with UPNP support -QRCODES_DESC= Build with QR code display - -AUTOMAKE_ARGS+= --add-missing -USE_AUTOTOOLS= aclocal autoheader automake autoconf -#ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal -CONFIGURE_ENV= SSL_LIBS="-lssl" CRYPTO_LIBS="-lcrypto" SSL_CFLAGS="-I/usr/include" CRYPTO_CFLAGS="-I/usr/include" - USE_GITHUB= yes GH_ACCOUNT= bitcoin GH_PROJECT= bitcoin -GH_COMMIT= 30a7357 +GH_COMMIT= 30a7357 GH_TAGNAME= v${PORTVERSION} -USES= gmake +GNU_CONFIGURE= yes +USES= gmake +USE_AUTOTOOLS= aclocal autoheader automake autoconf USE_OPENSSL= yes -USE_BDB= yes -WANT_BDB_VER= 48 -CXXFLAGS+= -I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} -CXXFLAGS+= -L${LOCALBASE}/lib -L${BDB_LIB_DIR} +AUTOMAKE_ARGS+= --add-missing +CONFIGURE_ARGS= --disable-tests +CONFIGURE_ENV= CRYPTO_CFLAGS="-I/usr/include" CRYPTO_LIBS="-lcrypto" \ + SSL_CFLAGS="-I/usr/include" SSL_LIBS="-lssl" + +CPPFLAGS+= -I${LOCALBASE}/include CXXFLAGS+= -Wno-invalid-offsetof +LDFLAGS+= -L${LOCALBASE}/lib -.include +OPTIONS_DEFINE= DEBUG UPNP -CONFIGURE_ARGS+=--disable-tests +DEBUG_CONFIGURE_ENABLE= debug +DEBUG_INSTALL_TARGET_OFF= install-strip -.if ${PORT_OPTIONS:MGUI} && !defined(WITHOUT_X11) -USE_QT4= corelib gui qmake_build linguist uic moc rcc qtestlib_build -USES+= desktop-file-utils -PLIST_FILES= %%QT_BINDIR%%/bitcoin-qt %%QT_BINDIR%%/bitcoind %%QT_BINDIR%%/bitcoin-cli -PLIST_FILES+= share/applications/bitcoin-qt.desktop share/pixmaps/bitcoin128.png -CONFIGURE_ARGS+=--with-gui -.else -PLIST_FILES= bin/bitcoind bin/bitcoin-cli -CONFIGURE_ARGS+=--without-gui -.endif +UPNP_CONFIGURE_WITH= miniupnpc +UPNP_LIB_DEPENDS= libminiupnpc.so:${PORTSDIR}/net/miniupnpc -.if ${PORT_OPTIONS:MQRCODES} -LIB_DEPENDS+= libqrencode.so:${PORTSDIR}/graphics/libqrencode -CONFIGURE_ARGS+=--with-qrencode -.else -CONFIGURE_ARGS+=--without-qrencode -.endif +.if defined(BITCOIN_UTILS) +CONFIGURE_ARGS+= --with-cli \ + --without-daemon \ + --without-gui \ + --disable-wallet -.if ${PORT_OPTIONS:MUPNP} -LIB_DEPENDS+= libminiupnpc.so:${PORTSDIR}/net/miniupnpc -CONFIGURE_ARGS+=--with-miniupnpc +PLIST_FILES= bin/bitcoin-cli .else -CONFIGURE_ARGS+=--without-miniupnpc -.endif +OPTIONS_DEFINE+= WALLET -.if ${PORT_OPTIONS:MWALLET} -CONFIGURE_ARGS+=--enable-wallet -.else -CONFIGURE_ARGS+=--disable-wallet -.endif +WALLET_DESC= Build with support to create and manage a wallet -.include +OPTIONS_DEFAULT= WALLET -post-patch: - ${MKDIR} ${WRKSRC}/src/build-aux +WALLET_CONFIGURE_ENABLE= wallet +WALLET_CPPFLAGS= -I${BDB_INCLUDE_DIR} +WALLET_USE= BDB=48 +WALLET_LDFLAGS= -L${BDB_LIB_DIR} +CONFIGURE_ARGS+= --without-cli +. if defined(BITCOIN_DAEMON) +CONFIGURE_ARGS+= --with-daemon \ + --without-gui + +PLIST_FILES= bin/bitcoind +. else +BUILD_DEPENDS+= protoc:${PORTSDIR}/devel/protobuf +LIB_DEPENDS+= libprotobuf.so:${PORTSDIR}/devel/protobuf + +USES+= desktop-file-utils +USE_QT4= corelib network gui qmake_build moc_build uic_build \ + rcc_build linguist_build +PLIST_FILES= bin/bitcoin-qt share/applications/bitcoin-qt.desktop \ + share/pixmaps/bitcoin128.png + +OPTIONS_DEFINE+= DBUS QRCODES + +QRCODES_DESC= Build with QR code display + +OPTIONS_DEFAULT+= QRCODES + +DBUS_CONFIGURE_WITH= qtdbus +DBUS_USE= QT4=dbus + +QRCODES_CONFIGURE_WITH= qrencode +QRCODES_LIB_DEPENDS= libqrencode.so:${PORTSDIR}/graphics/libqrencode + +CONFIGURE_ARGS+= --with-gui \ + --without-daemon + post-install: -.if ${PORT_OPTIONS:MGUI} && !defined(WITHOUT_X11) - ${REINPLACE_CMD} -e 's,=/usr,=${PREFIX},' ${WRKSRC}/contrib/debian/bitcoin-qt.desktop - ${INSTALL} ${WRKSRC}/contrib/debian/bitcoin-qt.desktop ${STAGEDIR}${PREFIX}/share/applications - ${INSTALL} ${WRKSRC}/share/pixmaps/bitcoin128.png ${STAGEDIR}${PREFIX}/share/pixmaps/ + ${REINPLACE_CMD} -e 's,=/usr,=${PREFIX},' \ + ${WRKSRC}/contrib/debian/bitcoin-qt.desktop + ${INSTALL} ${WRKSRC}/contrib/debian/bitcoin-qt.desktop \ + ${STAGEDIR}${PREFIX}/share/applications + ${INSTALL} ${WRKSRC}/share/pixmaps/bitcoin128.png \ + ${STAGEDIR}${PREFIX}/share/pixmaps/ +. endif .endif -.include +post-patch: + ${MKDIR} ${WRKSRC}/src/build-aux + +.include Index: net-p2p/bitcoin-daemon/Makefile =================================================================== --- net-p2p/bitcoin-daemon/Makefile (revision 367463) +++ net-p2p/bitcoin-daemon/Makefile (working copy) @@ -1,9 +1,10 @@ # $FreeBSD$ PKGNAMESUFFIX= -daemon -COMMENT= Virtual Peer-to-Peer Currency Client + MASTERDIR= ${.CURDIR}/../bitcoin DESCR= ${MASTERDIR}/pkg-descr -SLAVE_PORT= yes -OPTIONS_EXCLUDE= GUI QRCODES + +BITCOIN_DAEMON= yes + .include "${MASTERDIR}/Makefile" Index: net-p2p/bitcoin-utils/Makefile =================================================================== --- net-p2p/bitcoin-utils/Makefile (revision 0) +++ net-p2p/bitcoin-utils/Makefile (working copy) @@ -0,0 +1,10 @@ +# $FreeBSD$ + +PKGNAMESUFFIX= -utils + +MASTERDIR= ${.CURDIR}/../bitcoin +DESCR= ${MASTERDIR}/pkg-descr + +BITCOIN_UTILS= yes + +.include "${MASTERDIR}/Makefile" Property changes on: net-p2p/bitcoin-utils/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property