Attachment 144143 Details for Bug 191357 – Update on patch - split patch, remove commented

[patch] Update on patch - split patch, remove commented

bitcoin-0.9.2-updated.patch (text/plain), 5.55 KB, created by robbak on 2014-06-26 08:20:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: robbak

Created: 2014-06-26 08:20:20 UTC

Size: 5.55 KB

patch

obsolete

>===> Generating patch
>===> Viewing diff with more
>diff -ruN /usr/ports/net-p2p/bitcoin/Makefile ./Makefile
>--- /usr/ports/net-p2p/bitcoin/Makefile	2014-04-17 02:12:04.000000000 +1000
>+++ ./Makefile	2014-06-26 18:15:53.000000000 +1000
>@@ -1,12 +1,13 @@
> # Created by: Shaun Amott <shaun@FreeBSD.org>
>-# $FreeBSD: head/net-p2p/bitcoin/Makefile 351398 2014-04-16 16:12:04Z swills $
>+# $FreeBSD: net-p2p/bitcoin/Makefile 328082 2013-09-24 01:48:57Z swills $
> 
> PORTNAME=	bitcoin
>-PORTVERSION=	0.9.1
>+PORTVERSION=	0.9.2
> CATEGORIES=	net-p2p finance
>-MASTER_SITES=	${MASTER_SITE_LOCAL} \
>-		http://people.freebsd.org/~swills/ \
>-		GH
>+MASTER_SITES=	http://vps.robbak.com/distfiles/ \
>+				${MASTER_SITE_LOCAL} \
>+				http://people.freebsd.org/~swills/ \
>+				GH
> 
> MAINTAINER=	robbak@robbak.com
> COMMENT=	Virtual Peer-to-Peer Currency Client
>@@ -21,7 +22,7 @@
> OPTIONS_DEFAULT=	GUI WALLET QRCODES
> 
> GUI_DESC=	Build and install the QT4 binary
>-WALLET_DESC=	Build the binaries with support to create and manage a wallet.
>+WALLET_DESC=	Build the with support to create and manage a wallet.
> UPNP_DESC=	Build with UPNP support
> QRCODES_DESC=	Build with QR code display
> 
>@@ -33,7 +34,7 @@
> USE_GITHUB=	yes
> GH_ACCOUNT=	bitcoin
> GH_PROJECT=	bitcoin
>-GH_COMMIT=	66a2ae9
>+GH_COMMIT=		30a7357
> GH_TAGNAME=	v${PORTVERSION}
> 
> USES=			gmake
>diff -ruN /usr/ports/net-p2p/bitcoin/distinfo ./distinfo
>--- /usr/ports/net-p2p/bitcoin/distinfo	2014-04-17 02:12:04.000000000 +1000
>+++ ./distinfo	2014-06-24 22:15:25.000000000 +1000
>@@ -1,2 +1,2 @@
>-SHA256 (bitcoin-0.9.1.tar.gz) = aad8a764c0dbfa716437a6a61ac5bf33ba9d210652d3c08b1eb460e3eb76a08a
>-SIZE (bitcoin-0.9.1.tar.gz) = 4022647
>+SHA256 (bitcoin-0.9.2.tar.gz) = bb54f72f53498883ea9c8bdb9ae340c45fea8d4530f12fbaf34225839c439915
>+SIZE (bitcoin-0.9.2.tar.gz) = 5242752
>diff -ruN /usr/ports/net-p2p/bitcoin/files/patch-Makefile_include_editSedCommands.patch ./files/patch-Makefile_include_editSedCommands.patch
>--- /usr/ports/net-p2p/bitcoin/files/patch-Makefile_include_editSedCommands.patch	1970-01-01 10:00:00.000000000 +1000
>+++ ./files/patch-Makefile_include_editSedCommands.patch	2014-06-26 15:00:59.000000000 +1000
>@@ -0,0 +1,29 @@
>+diff --git a/src/Makefile.include b/src/Makefile.include
>+index 2fc6cd7..cdd16f5 100644
>+--- a/src/Makefile.include
>++++ src/Makefile.include
>+@@ -40,18 +40,18 @@ $(LIBBITCOINQT):
>+ ui_%.h: %.ui
>+ 	@test -d $(abs_builddir)/$(@D) || $(MKDIR_P) $(abs_builddir)/$(@D)
>+ 	@test -f $(UIC) && QT_SELECT=$(QT_SELECT) $(UIC) -o $(abs_builddir)/$@ $(abs_srcdir)/$< || echo error: could not build $(abs_builddir)/$@
>+-	$(SED) -e '/^\*\*.*Created:/d' $(abs_builddir)/$@ > $(abs_builddir)/$@.n && mv $(abs_builddir)/$@{.n,}
>+-	$(SED) -e '/^\*\*.*by:/d' $(abs_builddir)/$@ > $(abs_builddir)/$@.n && mv $(abs_builddir)/$@{.n,}
>++	$(SED) -e '/^\*\*.*Created:/d' $(abs_builddir)/$@ > $(abs_builddir)/$@.n && mv $(abs_builddir)/$@.n $(abs_builddir)/$@
>++	$(SED) -e '/^\*\*.*by:/d' $(abs_builddir)/$@ > $(abs_builddir)/$@.n && mv $(abs_builddir)/$@.n $(abs_builddir)/$@
>+ 
>+ %.moc: %.cpp
>+ 	QT_SELECT=$(QT_SELECT) $(MOC) $(QT_INCLUDES) $(MOC_DEFS) -o $@ $<
>+-	$(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@{.n,}
>+-	$(SED) -e '/^\*\*.*by:/d' $@ > $@.n && mv $@{.n,}
>++	$(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@.n $(abs_builddir)/$@
>++	$(SED) -e '/^\*\*.*by:/d' $@ > $@.n && mv $@.n $(abs_builddir)/$@
>+ 
>+ moc_%.cpp: %.h
>+ 	QT_SELECT=$(QT_SELECT) $(MOC) $(QT_INCLUDES) $(MOC_DEFS) -o $@ $<
>+-	$(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@{.n,}
>+-	$(SED) -e '/^\*\*.*by:/d' $@ > $@.n && mv $@{.n,}
>++	$(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@.n $(abs_builddir)/$@
>++	$(SED) -e '/^\*\*.*by:/d' $@ > $@.n && mv $@.n $(abs_builddir)/$@
>+ 
>+ %.qm: %.ts
>+ 	@test -d $(abs_builddir)/$(@D) || $(MKDIR_P) $(abs_builddir)/$(@D)
>diff -ruN /usr/ports/net-p2p/bitcoin/files/patch-compat-h.patch ./files/patch-compat-h.patch
>--- /usr/ports/net-p2p/bitcoin/files/patch-compat-h.patch	2014-04-17 02:12:04.000000000 +1000
>+++ ./files/patch-compat-h.patch	1970-01-01 10:00:00.000000000 +1000
>@@ -1,18 +0,0 @@
>---- src/compat.h.orig	2014-03-31 19:12:15.000000000 +1000
>-+++ src/compat.h	2014-03-31 19:12:39.000000000 +1000
>-@@ -30,6 +30,7 @@
>- #else
>- #include <sys/types.h>
>- #include <arpa/inet.h>
>-+#include <sys/socket.h>
>- #include <ifaddrs.h>
>- #include <limits.h>
>- #include <net/if.h>
>-@@ -37,7 +38,6 @@
>- #include <netinet/in.h>
>- #include <sys/fcntl.h>
>- #include <sys/mman.h>
>--#include <sys/socket.h>
>- #include <unistd.h>
>- #endif
>- 
>diff -ruN /usr/ports/net-p2p/bitcoin/files/patch-qt_makefile_am_editSedCommands.patch ./files/patch-qt_makefile_am_editSedCommands.patch
>--- /usr/ports/net-p2p/bitcoin/files/patch-qt_makefile_am_editSedCommands.patch	1970-01-01 10:00:00.000000000 +1000
>+++ ./files/patch-qt_makefile_am_editSedCommands.patch	2014-06-26 14:59:42.000000000 +1000
>@@ -0,0 +1,14 @@
>+diff --git a/src/qt/Makefile.am b/src/qt/Makefile.am
>+index 648971b..97b2ec4 100644
>+--- a/src/qt/Makefile.am
>++++ src/qt/Makefile.am
>+@@ -373,7 +373,7 @@ translate: bitcoinstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_CPP) $(
>+ $(QT_QRC_CPP): $(QT_QRC) $(QT_QM) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_MOVIES) $(PROTOBUF_H)
>+ 	@cd $(abs_srcdir); test -f $(RCC) && QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin -o $(abs_builddir)/$@ $< || \
>+ 	  echo error: could not build $@
>+-	$(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@{.n,}
>+-	$(SED) -e '/^\*\*.*by:/d' $@  > $@.n && mv $@{.n,}
>++	$(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@.n $@
>++	$(SED) -e '/^\*\*.*by:/d' $@  > $@.n && mv $@.n $@
>+ 
>+ CLEANFILES = $(BUILT_SOURCES) $(QT_QM) $(QT_FORMS_H) *.gcda *.gcno
>====> Cleaning up
>===> Done

Flags:

robbak: maintainer-approval+

Actions: View | Diff

Attachments on bug 191357: 144113 | 144143