Attachment 153500 Details for Bug 198024 – Patch to Makefile to switch linguist_build to linguisttools_build

[patch] Patch to Makefile to switch linguist_build to linguisttools_build

bitcoin-split-v3.diff (text/plain), 10.36 KB, created by robbak on 2015-02-25 06:37:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: robbak

Created: 2015-02-25 06:37:08 UTC

Size: 10.36 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 379492)
>+++ 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: bitcoin/Makefile
>===================================================================
>--- bitcoin/Makefile	(revision 379492)
>+++ bitcoin/Makefile	(working copy)
>@@ -2,96 +2,85 @@
> # $FreeBSD$
> 
> PORTNAME=	bitcoin
>-PORTVERSION=	0.9.2
>-PORTREVISION=	3
>+PORTVERSION=	0.10.0
> CATEGORIES=	net-p2p finance
>-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
>+COMMENT=	Virtual Peer-to-Peer Currency Client (QT)
> 
> LICENSE=	MIT
> 
>-BUILD_DEPENDS=	protoc:${PORTSDIR}/devel/protobuf \
>-				pkg-config:${PORTSDIR}/devel/pkgconf
>-LIB_DEPENDS=	libboost_date_time.so:${PORTSDIR}/devel/boost-libs
>+BUILD_DEPENDS=	protoc:${PORTSDIR}/devel/protobuf
>+LIB_DEPENDS=	libboost_date_time.so:${PORTSDIR}/devel/boost-libs \
>+		libprotobuf.so:${PORTSDIR}/devel/protobuf
> 
>-OPTIONS_DEFINE=	GUI WALLET UPNP QRCODES
>-OPTIONS_DEFAULT=	GUI WALLET QRCODES
>+USES=		autoreconf compiler:c++0x gmake libtool pkgconfig
>+USE_GITHUB=	yes
>+USE_OPENSSL=	yes
>+GNU_CONFIGURE=	yes
> 
>-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
>+.if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no"
>+USES+=		desktop-file-utils
>+USE_QT4=	corelib network gui qmake_build moc_build uic_build \
>+		rcc_build linguist_build
>+.endif
> 
>-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"
>+OPTIONS_DEFINE?=	DBUS DEBUG QRCODES UPNP WALLET
>+OPTIONS_DEFAULT?=	QRCODES WALLET
> 
>-USE_GITHUB=	yes
>+QRCODES_DESC=	Display QR Codes
>+WALLET_DESC=	Wallet Management Support
>+
>+DBUS_CONFIGURE_WITH=	qtdbus
>+DBUS_USE=		QT4=dbus
>+
>+DEBUG_CONFIGURE_ENABLE=		debug
>+DEBUG_INSTALL_TARGET_OFF=	install-strip
>+
>+UPNP_CONFIGURE_WITH=	miniupnpc
>+UPNP_LIB_DEPENDS=	libminiupnpc.so:${PORTSDIR}/net/miniupnpc
>+
>+QRCODES_CONFIGURE_WITH=	qrencode
>+QRCODES_LIB_DEPENDS=	libqrencode.so:${PORTSDIR}/graphics/libqrencode
>+
>+WALLET_CONFIGURE_ENABLE=	wallet
>+WALLET_CPPFLAGS=		-I${BDB_INCLUDE_DIR}
>+WALLET_LDFLAGS=			-L${BDB_LIB_DIR}
>+WALLET_USE=			BDB=48
>+
> GH_ACCOUNT=	bitcoin
>-GH_PROJECT=	bitcoin
>-GH_COMMIT=		30a7357
>+GH_COMMIT=	58810d2
> GH_TAGNAME=	v${PORTVERSION}
> 
>-USES=			gmake
>-USE_OPENSSL=	yes
>-USE_BDB=		yes
>-WANT_BDB_VER=	48
>+CONFIGURE_ARGS?=	--with-gui \
>+			--without-daemon \
>+			--without-utils \
>+			--disable-libs \
>+			--disable-tests
> 
>-CXXFLAGS+=	-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR}
>-CXXFLAGS+=	-L${LOCALBASE}/lib -L${BDB_LIB_DIR}
>+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 <bsd.port.options.mk>
>+PLIST_FILES?=	bin/bitcoin-qt share/applications/bitcoin-qt.desktop \
>+		share/pixmaps/bitcoin128.png
> 
>-CONFIGURE_ARGS+=--disable-tests
>+.if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no"
> 
>-.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
>+post-install:
>+	${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/
> 
>-.if ${PORT_OPTIONS:MQRCODES}
>-LIB_DEPENDS+=	libqrencode.so:${PORTSDIR}/graphics/libqrencode
>-CONFIGURE_ARGS+=--with-qrencode
>-.else
>-CONFIGURE_ARGS+=--without-qrencode
> .endif
> 
>-.if ${PORT_OPTIONS:MUPNP}
>-LIB_DEPENDS+=	libminiupnpc.so:${PORTSDIR}/net/miniupnpc
>-CONFIGURE_ARGS+=--with-miniupnpc
>-.else
>-CONFIGURE_ARGS+=--without-miniupnpc
>-.endif
>-
>-.if ${PORT_OPTIONS:MWALLET}
>-CONFIGURE_ARGS+=--enable-wallet
>-.else
>-CONFIGURE_ARGS+=--disable-wallet
>-.endif
>-
>-.include <bsd.port.pre.mk>
>-
> post-patch:
> 	${MKDIR} ${WRKSRC}/src/build-aux
> 
>-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/
>-.endif
>-
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>Index: bitcoin/distinfo
>===================================================================
>--- bitcoin/distinfo	(revision 379492)
>+++ bitcoin/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (bitcoin-0.9.2.tar.gz) = bb54f72f53498883ea9c8bdb9ae340c45fea8d4530f12fbaf34225839c439915
>-SIZE (bitcoin-0.9.2.tar.gz) = 5242752
>+SHA256 (bitcoin-0.10.0.tar.gz) = 8723a955fa0f86dc35d5e8bd37484b37fdb3a3977dad50947fa334ac80ee7df7
>+SIZE (bitcoin-0.10.0.tar.gz) = 5018463
>Index: bitcoin/files/patch-Makefile_include_editSedCommands.patch
>===================================================================
>--- bitcoin/files/patch-Makefile_include_editSedCommands.patch	(revision 379492)
>+++ bitcoin/files/patch-Makefile_include_editSedCommands.patch	(working copy)
>@@ -1,29 +0,0 @@
>-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)
>Index: bitcoin/files/patch-memenv.cc_enable_limit_macros
>===================================================================
>--- bitcoin/files/patch-memenv.cc_enable_limit_macros	(revision 0)
>+++ bitcoin/files/patch-memenv.cc_enable_limit_macros	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/leveldb/helpers/memenv/memenv.cc.orig	2014-12-28 23:05:26.000000000 +1000
>++++ src/leveldb/helpers/memenv/memenv.cc	2014-12-29 17:12:58.000000000 +1000
>+@@ -2,6 +2,8 @@
>+ // Use of this source code is governed by a BSD-style license that can be
>+ // found in the LICENSE file. See the AUTHORS file for names of contributors.
>+ 
>++#define __STDC_LIMIT_MACROS
>++
>+ #include "helpers/memenv/memenv.h"
>+ 
>+ #include "leveldb/env.h"
>Index: bitcoin/files/patch-qt_makefile_am_editSedCommands.patch
>===================================================================
>--- bitcoin/files/patch-qt_makefile_am_editSedCommands.patch	(revision 379492)
>+++ bitcoin/files/patch-qt_makefile_am_editSedCommands.patch	(working copy)
>@@ -1,14 +0,0 @@
>-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
>Index: bitcoin-daemon/Makefile
>===================================================================
>--- bitcoin-daemon/Makefile	(revision 379492)
>+++ bitcoin-daemon/Makefile	(working copy)
>@@ -1,9 +1,17 @@
> # $FreeBSD$
> 
> PKGNAMESUFFIX=	-daemon
>-COMMENT=	Virtual Peer-to-Peer Currency Client
>+
> MASTERDIR=	${.CURDIR}/../bitcoin
>-DESCR=		${MASTERDIR}/pkg-descr
>-SLAVE_PORT=	yes
>-OPTIONS_EXCLUDE=	GUI QRCODES
>+
>+OPTIONS_DEFINE=	DEBUG UPNP WALLET
>+
>+CONFIGURE_ARGS=		--with-daemon \
>+			--without-gui \
>+			--without-libs \
>+			--without-utils \
>+			--disable-tests
>+
>+PLIST_FILES=	bin/bitcoind
>+
> .include "${MASTERDIR}/Makefile"
>Index: bitcoin-utils/Makefile
>===================================================================
>--- bitcoin-utils/Makefile	(revision 0)
>+++ bitcoin-utils/Makefile	(working copy)
>@@ -0,0 +1,19 @@
>+# $FreeBSD$
>+
>+PKGNAMESUFFIX=	-utils
>+MASTERDIR=	${.CURDIR}/../bitcoin
>+
>+OPTIONS_DEFINE=	DEBUG
>+
>+CONFIGURE_ARGS=	--with-utils \
>+		--without-daemon \
>+		--without-gui \
>+		--with-gui=no \
>+		--without-libs \
>+                --without-qrencode \
>+		--disable-tests \
>+		--disable-wallet
>+
>+PLIST_FILES=	bin/bitcoin-cli bin/bitcoin-tx
>+
>+.include "${MASTERDIR}/Makefile"

Flags:

robbak: maintainer-approval+

Actions: View | Diff

Attachments on bug 198024: 153500 | 153501 | 153502 | 153503