Date: Thu, 18 Oct 2012 13:44:39 +1000 (EST) From: Robert Backahus <robbak@robbak.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/172839: Update bitcoin to 0.7.1 Message-ID: <201210180344.q9I3id01028305@boffin.lan> Resent-Message-ID: <201210180350.q9I3o1ui002359@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 172839
>Category: ports
>Synopsis: Update bitcoin to 0.7.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Oct 18 03:50:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Robert Backahus
>Release: FreeBSD 9.1-PRERELEASE amd64
>Organization:
>Environment:
System: FreeBSD boffin 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #3: Sun Sep 16 00:47:20 EST 2012 root@boffin:/usr/obj/usr/src/sys/BOFFIN amd64
>Description:
Update bitcoin to recently released version 0.7.1
>How-To-Repeat:
>Fix:
Patch below. While here:
Update db version to 4.8, for compatability with current windows, linux and OSX client's data files
convert to optionsng
remove no-op sed commands.
pet portlint
Input requested:
Are any of the sed commands requred for other reasons? I have
left the pthread one in, as that is converts -l pthread to
-pthread in the Makefile, but only the -l dl removal is needed
to compile and use the port.
--- bitcoin.diff begins here ---
Index: Makefile
===================================================================
--- Makefile (revision 306050)
+++ Makefile (working copy)
@@ -6,7 +6,7 @@
#
PORTNAME= bitcoin
-PORTVERSION= 0.7.0
+PORTVERSION= 0.7.1
CATEGORIES= net-p2p finance
MAINTAINER= robbak@robbak.com
@@ -14,20 +14,23 @@
LIB_DEPENDS= boost_date_time:${PORTSDIR}/devel/boost-libs
-OPTIONS= GUI "Build with QT3 GUI" on \
- UPNP "Build with UPNP support" off \
- QRCODES "Build with QR code display" on
+OPTIONS_DEFINE= GUI UPNP QRCODES
+OPTIONS_DEFAULT= GUI QRCODES
-USE_GITHUB= yes
-GH_ACCOUNT= bitcoin
+GUI_DESC= Build as a QT3 GUI
+UPNP_DESC= Build with UPNP support
+QRCODES_DESC= Build with QR code display
+
+USE_GITHUB= yes
+GH_ACCOUNT= bitcoin
GH_PROJECT= bitcoin
-GH_COMMIT= a76c22e
+GH_COMMIT= d082365
GH_TAGNAME= v${PORTVERSION}
USE_GMAKE= yes
USE_OPENSSL= yes
USE_BDB= yes
-WANT_BDB_VER= 47
+WANT_BDB_VER= 48
CXXFLAGS+= -I${LOCALBASE}/include -I${BDB_INCLUDE_DIR}
CXXFLAGS+= -L${LOCALBASE}/lib -L${BDB_LIB_DIR}
@@ -35,17 +38,17 @@
.include <bsd.port.options.mk>
-.if defined(WITH_GUI) && !defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MGUI} && !defined(WITHOUT_X11)
USE_QT_VER= 4
USE_QT4= corelib gui qmake_build linguist uic moc rcc
-BINARY= bitcoin-qt
+BINARY= bitcoin-qt test_bitcoin
.else
-BINARY= bitcoind
+BINARY= bitcoind test_bitcoin
ALL_TARGET= ${BINARY}
MAKE_ARGS+= -C ${WRKSRC}/src
.endif
-.if defined(WITH_QRCODES)
+.if ${PORT_OPTIONS:MQRCODES}
LIB_DEPENDS+= qrencode:${PORTSDIR}/graphics/libqrencode
QMAKE_USE_QRCODE=1
.else
@@ -54,7 +57,7 @@
PLIST_FILES= bin/${BINARY}
-.if defined(WITH_UPNP)
+.if ${PORT_OPTIONS:MUPNP}
LIB_DEPENDS+= miniupnpc:${PORTSDIR}/net/miniupnpc
QMAKE_USE_UPNP= 1
.else
@@ -67,19 +70,16 @@
@${CP} ${WRKSRC}/src/protocol.h ${WRKSRC}/src/protocol.h.orig
@${AWK} 'BEGIN { f = 0 } { if ( $$0 ~ /^#include/ && f == 0 ) { f = 1; print "#include <sys/socket.h>"; print "#include <netinet/in.h>" }; print }' \
${WRKSRC}/src/protocol.h.orig > ${WRKSRC}/src/protocol.h
-
+.if !${PORT_OPTIONS:MGUI} || defined(WITHOUT_X11)
@cd ${WRKSRC}/src && ${CP} -p makefile.unix Makefile
@${REINPLACE_CMD} \
- -e 's|wx-config|${WX_CONFIG}|g' \
- -e 's|^CXXFLAGS=.*$$|CXXFLAGS += $$(DEFS)|' \
- -e 's|^USE_UPNP.*$$||' \
-e 's|-l pthread|${PTHREAD_LIBS}|g' \
- -e 's:-O3::' -e 's:-\(march=[A-Za-z0-9]*\)::g' \
-e 's:-l dl::' \
${WRKSRC}/src/Makefile
+.endif
do-configure:
-.if defined(WITH_GUI) && !defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MGUI} && !defined(WITHOUT_X11)
cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
${QMAKE} USE_UPNP=${QMAKE_USE_UPNP} USE_QRCODE=${QMAKE_USE_QRCODE} \
QMAKE_LRELEASE=lrelease-qt4 PREFIX=${PREFIX} INCLUDEPATH=${BDB_INCLUDE_DIR} \
@@ -88,7 +88,7 @@
do-install:
@${MKDIR} ${PREFIX}/bin
-.if defined(WITH_GUI) && !defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MGUI} && !defined(WITHOUT_X11)
${INSTALL_PROGRAM} ${WRKSRC}/${BINARY} ${PREFIX}/bin/
.else
${INSTALL_PROGRAM} ${WRKSRC}/src/${BINARY} ${PREFIX}/bin/
Index: distinfo
===================================================================
--- distinfo (revision 306050)
+++ distinfo (working copy)
@@ -1,2 +1,2 @@
-SHA256 (bitcoin-0.7.0.tar.gz) = d0b5ca34c61e8fbd6dca53f2730fa3d8e3df1f7bb40d5e42f8ea4cd3bf32a221
-SIZE (bitcoin-0.7.0.tar.gz) = 1603153
+SHA256 (bitcoin-0.7.1.tar.gz) = eb1c4bb59a6a6557e59dec5d90ab7c45b660898f535fafaeaed051aeb347b94d
+SIZE (bitcoin-0.7.1.tar.gz) = 1623510
--- bitcoin.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210180344.q9I3id01028305>