Attachment 191070 Details for Bug 226155 – New updated patch - move OSVERSION check to OUTSIDE of existing If.

[patch] New updated patch - move OSVERSION check to OUTSIDE of existing If.

bitcoin-0.16.0-4.patch (text/plain), 2.41 KB, created by robbak on 2018-02-28 04:57:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: robbak

Created: 2018-02-28 04:57:12 UTC

Size: 2.41 KB

patch

obsolete

>Index: net-p2p/bitcoin/Makefile
>===================================================================
>--- net-p2p/bitcoin/Makefile	(revision 462886)
>+++ net-p2p/bitcoin/Makefile	(working copy)
>@@ -2,15 +2,11 @@
> # $FreeBSD$
> 
> PORTNAME=	bitcoin
>-PORTVERSION=	0.15.1
>+PORTVERSION=	0.16.0
> DISTVERSIONPREFIX=	v
>-PORTREVISION?=	3
> CATEGORIES=	net-p2p finance
> 
>-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
>-PATCHFILES=	1ec0c0a01c31.patch:-p1
>-
>-MAINTAINER=	robbak@robbak.com
>+MAINTAINER=	kbowling@freebsd.org
> COMMENT?=	Virtual Peer-to-Peer Currency Client (QT)
> 
> LICENSE=	MIT
>@@ -87,6 +83,7 @@
> 			--without-daemon \
> 			--without-utils
> 
>+
> CONFIGURE_ENV=	CRYPTO_CFLAGS="-I${OPENSSLINC}" CRYPTO_LIBS="-L${OPENSSLLIB} -lcrypto" \
> 		SSL_CFLAGS="-I${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl" \
> 		OBJCXX="${CXX}" OBJCXXFLAGS="${CXXFLAGS}"
>@@ -95,8 +92,15 @@
> PLIST_FILES?=	bin/bitcoin-qt man/man1/bitcoin-qt.1.gz \
> 		share/applications/bitcoin-qt.desktop share/pixmaps/bitcoin128.png
> 
>+.include <bsd.port.pre.mk>
>+
>+.if ${OSVERSION} < 1100000
>+CONFIGURE_ARGS+=--disable-asm
>+.endif
>+
> .if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no"
> 
>+
> post-install:
> 	${REINPLACE_CMD} -e 's,=/usr,=${PREFIX},' \
> 		${WRKSRC}/contrib/debian/bitcoin-qt.desktop
>@@ -113,4 +117,4 @@
> 
> 	@cd ${WRKSRC} && ${GMAKE} check
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>Index: net-p2p/bitcoin/distinfo
>===================================================================
>--- net-p2p/bitcoin/distinfo	(revision 462886)
>+++ net-p2p/bitcoin/distinfo	(working copy)
>@@ -1,5 +1,3 @@
>-TIMESTAMP = 1510484103
>-SHA256 (bitcoin-bitcoin-v0.15.1_GH0.tar.gz) = 98b3a98a67054123bef6714e4035e18f9250a1b6d63829258ad057906e75d8b1
>-SIZE (bitcoin-bitcoin-v0.15.1_GH0.tar.gz) = 7547736
>-SHA256 (1ec0c0a01c31.patch) = 01a2fe784d7c3d21d2cfd9dc460c059c7ae358e0f5e9e5e7782f10d259db3cd9
>-SIZE (1ec0c0a01c31.patch) = 3535
>+TIMESTAMP = 1519439305
>+SHA256 (bitcoin-bitcoin-v0.16.0_GH0.tar.gz) = 8ade43e420b6aad00645d79239c21947e47f37d1f974b4948b0da0b6999c28d5
>+SIZE (bitcoin-bitcoin-v0.16.0_GH0.tar.gz) = 6627084
>Index: net-p2p/bitcoin-daemon/Makefile
>===================================================================
>--- net-p2p/bitcoin-daemon/Makefile	(revision 462886)
>+++ net-p2p/bitcoin-daemon/Makefile	(working copy)
>@@ -1,7 +1,6 @@
> # $FreeBSD$
> 
> MASTERDIR=	${.CURDIR}/../bitcoin
>-PORTREVISION=	3
> PKGNAMESUFFIX=	-daemon
> 
> COMMENT=	Virtual Peer-to-Peer Currency (Daemon)

Flags:

robbak: maintainer-approval+

Actions: View | Diff

Attachments on bug 226155: 190937 | 191033 | 191049 | 191070