View | Details | Raw Unified | Return to bug 191357 | Differences between
and this patch

Collapse All | Expand All

(-)./Makefile (-5 / +7 lines)
Lines 1-12 Link Here
1
# Created by: Shaun Amott <shaun@FreeBSD.org>
1
# Created by: Shaun Amott <shaun@FreeBSD.org>
2
# $FreeBSD: head/net-p2p/bitcoin/Makefile 351398 2014-04-16 16:12:04Z swills $
2
# $FreeBSD: net-p2p/bitcoin/Makefile 328082 2013-09-24 01:48:57Z swills $
3
3
4
PORTNAME=	bitcoin
4
PORTNAME=	bitcoin
5
PORTVERSION=	0.9.1
5
PORTVERSION=	0.9.2
6
CATEGORIES=	net-p2p finance
6
CATEGORIES=	net-p2p finance
7
MASTER_SITES=	${MASTER_SITE_LOCAL} \
7
MASTER_SITES=	${MASTER_SITE_LOCAL} \
8
		http://people.freebsd.org/~swills/ \
8
				http://people.freebsd.org/~swills/ \
9
		GH
9
				GH
10
10
11
MAINTAINER=	robbak@robbak.com
11
MAINTAINER=	robbak@robbak.com
12
COMMENT=	Virtual Peer-to-Peer Currency Client
12
COMMENT=	Virtual Peer-to-Peer Currency Client
Lines 33-39 Link Here
33
USE_GITHUB=	yes
33
USE_GITHUB=	yes
34
GH_ACCOUNT=	bitcoin
34
GH_ACCOUNT=	bitcoin
35
GH_PROJECT=	bitcoin
35
GH_PROJECT=	bitcoin
36
GH_COMMIT=	66a2ae9
36
# GH_COMMIT=	71fee8a #rc1
37
# GH_COMMIT=	6d7923c #rc2
38
GH_COMMIT=		30a7357 #release
37
GH_TAGNAME=	v${PORTVERSION}
39
GH_TAGNAME=	v${PORTVERSION}
38
40
39
USES=			gmake
41
USES=			gmake
(-)./distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (bitcoin-0.9.1.tar.gz) = aad8a764c0dbfa716437a6a61ac5bf33ba9d210652d3c08b1eb460e3eb76a08a
1
SHA256 (bitcoin-0.9.2.tar.gz) = bb54f72f53498883ea9c8bdb9ae340c45fea8d4530f12fbaf34225839c439915
2
SIZE (bitcoin-0.9.1.tar.gz) = 4022647
2
SIZE (bitcoin-0.9.2.tar.gz) = 5242752
(-)./files/patch-compat-h.patch (-18 lines)
Lines 1-18 Link Here
1
--- src/compat.h.orig	2014-03-31 19:12:15.000000000 +1000
2
+++ src/compat.h	2014-03-31 19:12:39.000000000 +1000
3
@@ -30,6 +30,7 @@
4
 #else
5
 #include <sys/types.h>
6
 #include <arpa/inet.h>
7
+#include <sys/socket.h>
8
 #include <ifaddrs.h>
9
 #include <limits.h>
10
 #include <net/if.h>
11
@@ -37,7 +38,6 @@
12
 #include <netinet/in.h>
13
 #include <sys/fcntl.h>
14
 #include <sys/mman.h>
15
-#include <sys/socket.h>
16
 #include <unistd.h>
17
 #endif
18
 
(-)./files/patch-sedcommands.patch (+43 lines)
Line 0 Link Here
1
diff --git a/src/Makefile.include b/src/Makefile.include
2
index 2fc6cd7..cdd16f5 100644
3
--- a/src/Makefile.include
4
+++ src/Makefile.include
5
@@ -40,18 +40,18 @@ $(LIBBITCOINQT):
6
 ui_%.h: %.ui
7
 	@test -d $(abs_builddir)/$(@D) || $(MKDIR_P) $(abs_builddir)/$(@D)
8
 	@test -f $(UIC) && QT_SELECT=$(QT_SELECT) $(UIC) -o $(abs_builddir)/$@ $(abs_srcdir)/$< || echo error: could not build $(abs_builddir)/$@
9
-	$(SED) -e '/^\*\*.*Created:/d' $(abs_builddir)/$@ > $(abs_builddir)/$@.n && mv $(abs_builddir)/$@{.n,}
10
-	$(SED) -e '/^\*\*.*by:/d' $(abs_builddir)/$@ > $(abs_builddir)/$@.n && mv $(abs_builddir)/$@{.n,}
11
+	$(SED) -e '/^\*\*.*Created:/d' $(abs_builddir)/$@ > $(abs_builddir)/$@.n && mv $(abs_builddir)/$@.n $(abs_builddir)/$@
12
+	$(SED) -e '/^\*\*.*by:/d' $(abs_builddir)/$@ > $(abs_builddir)/$@.n && mv $(abs_builddir)/$@.n $(abs_builddir)/$@
13
 
14
 %.moc: %.cpp
15
 	QT_SELECT=$(QT_SELECT) $(MOC) $(QT_INCLUDES) $(MOC_DEFS) -o $@ $<
16
-	$(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@{.n,}
17
-	$(SED) -e '/^\*\*.*by:/d' $@ > $@.n && mv $@{.n,}
18
+	$(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@.n $(abs_builddir)/$@
19
+	$(SED) -e '/^\*\*.*by:/d' $@ > $@.n && mv $@.n $(abs_builddir)/$@
20
 
21
 moc_%.cpp: %.h
22
 	QT_SELECT=$(QT_SELECT) $(MOC) $(QT_INCLUDES) $(MOC_DEFS) -o $@ $<
23
-	$(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@{.n,}
24
-	$(SED) -e '/^\*\*.*by:/d' $@ > $@.n && mv $@{.n,}
25
+	$(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@.n $(abs_builddir)/$@
26
+	$(SED) -e '/^\*\*.*by:/d' $@ > $@.n && mv $@.n $(abs_builddir)/$@
27
 
28
 %.qm: %.ts
29
 	@test -d $(abs_builddir)/$(@D) || $(MKDIR_P) $(abs_builddir)/$(@D)
30
diff --git a/src/qt/Makefile.am b/src/qt/Makefile.am
31
index 648971b..97b2ec4 100644
32
--- a/src/qt/Makefile.am
33
+++ src/qt/Makefile.am
34
@@ -373,7 +373,7 @@ translate: bitcoinstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_CPP) $(
35
 $(QT_QRC_CPP): $(QT_QRC) $(QT_QM) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_MOVIES) $(PROTOBUF_H)
36
 	@cd $(abs_srcdir); test -f $(RCC) && QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin -o $(abs_builddir)/$@ $< || \
37
 	  echo error: could not build $@
38
-	$(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@{.n,}
39
-	$(SED) -e '/^\*\*.*by:/d' $@  > $@.n && mv $@{.n,}
40
+	$(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@.n $@
41
+	$(SED) -e '/^\*\*.*by:/d' $@  > $@.n && mv $@.n $@
42
 
43
 CLEANFILES = $(BUILT_SOURCES) $(QT_QM) $(QT_FORMS_H) *.gcda *.gcno

Return to bug 191357