Index: head/finance/bitcoin-armory/Makefile =================================================================== --- head/finance/bitcoin-armory/Makefile (revision 400097) +++ head/finance/bitcoin-armory/Makefile (revision 400098) @@ -1,47 +1,61 @@ # Created by: Yuri Victorovich # $FreeBSD$ PORTNAME= BitcoinArmory -PORTVERSION= 0.92.3 -PORTREVISION= 1 +PORTVERSION= 0.93.2 DISTVERSIONPREFIX= v CATEGORIES= finance MAINTAINER= yuri@rawbw.com -COMMENT= Implementation of desktop bitcoin management system +COMMENT= Desktop bitcoin management system LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/bin/swig3.0:${PORTSDIR}/devel/swig30 \ ${LOCALBASE}/bin/pyrcc4:${PORTSDIR}/textproc/py-qt4-xml \ ${LOCALBASE}/bin/rsync:${PORTSDIR}/net/rsync RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}qt4-core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core \ ${PYTHON_PKGNAMEPREFIX}qt4-gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui \ ${PYTHON_PKGNAMEPREFIX}twistedCore>=14.0.0:${PORTSDIR}/devel/py-twistedCore \ - ${PYTHON_PKGNAMEPREFIX}psutil>1.2.1:${PORTSDIR}/sysutils/py-psutil + ${PYTHON_PKGNAMEPREFIX}psutil>1.2.1:${PORTSDIR}/sysutils/py-psutil \ + ${LOCALBASE}/bin/bitcoind:${PORTSDIR}/net-p2p/bitcoin-daemon USE_GITHUB= yes GH_ACCOUNT= etotheipi -USES= gmake python shebangfix +USES= compiler:c++11-lang compiler:c++11-lib gmake python:2 shebangfix SHEBANG_FILES= extras/extractKeysFromWallet.py -USE_GCC= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +CXXFLAGS+= -DCRYPTOPP_DISABLE_ASM -fPIC MAKE_ENV+= PYTHON_CONFIG=${PYTHON_CMD}-config -ONLY_FOR_ARCHS= i386 amd64 -ONLY_FOR_ARCHS_REASON= low-level code available only for i386 and amd64 +BROKEN_FreeBSD_9= cannot find atomic header +MAKE_ARGS+= CXXFLAGS="${CXXFLAGS}" +INSTALLS_ICONS= yes +ICON_SIZES= 24x24 32x32 64x64 + +# When CRYPTOPP_DISABLE_ASM isn't needed any more, i386 amd64 should +# be made work through ASM code, and the other archs will still +# have CRYPTOPP_DISABLE_ASM + post-patch: @${REINPLACE_CMD} 's/python-config/$${PYTHON_CONFIG}/' ${WRKSRC}/cppForSwig/Makefile + @${REINPLACE_CMD} 's/O_DSYNC/O_SYNC/' ${WRKSRC}/cppForSwig/mdb/mdb.c post-stage: @${SED} -i.bak -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${STAGEDIR}/${LOCALBASE}/bin/armory && \ ${RM} -f ${STAGEDIR}/${LOCALBASE}/bin/armory.bak + @${REINPLACE_CMD} 's|Exec=/usr/bin/armory|Exec=${LOCALBASE}/bin/armory|' ${STAGEDIR}/${LOCALBASE}/share/applications/*.desktop +.for s in ${ICON_SIZES} + @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/ + ${MV} ${STAGEDIR}/${PREFIX}/share/armory/img/armory_icon_${s}.png \ + ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/armoryicon.png +.endfor post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/armory/_CppBlockUtils.so .include Index: head/finance/bitcoin-armory/distinfo =================================================================== --- head/finance/bitcoin-armory/distinfo (revision 400097) +++ head/finance/bitcoin-armory/distinfo (revision 400098) @@ -1,2 +1,2 @@ -SHA256 (etotheipi-BitcoinArmory-v0.92.3_GH0.tar.gz) = 349a734997527c34f66d53cdeb987aa6345907703a6d62dc48f7e5487933a13a -SIZE (etotheipi-BitcoinArmory-v0.92.3_GH0.tar.gz) = 4698713 +SHA256 (etotheipi-BitcoinArmory-v0.93.2_GH0.tar.gz) = 0efcf179a4ea0c2e8f873378d5f171efefe720cb91ba2208223871bc1b83ac71 +SIZE (etotheipi-BitcoinArmory-v0.93.2_GH0.tar.gz) = 4774815 Index: head/finance/bitcoin-armory/files/patch-cppForSwig-cryptopp-Makefile =================================================================== --- head/finance/bitcoin-armory/files/patch-cppForSwig-cryptopp-Makefile (revision 400097) +++ head/finance/bitcoin-armory/files/patch-cppForSwig-cryptopp-Makefile (nonexistent) @@ -1,22 +0,0 @@ ---- cppForSwig/cryptopp/Makefile -+++ cppForSwig/cryptopp/Makefile -@@ -105,6 +105,19 @@ - M32OR64 = -m$(shell isainfo -b) - endif - -+ifeq ($(UNAME),FreeBSD) -+AR = ar -+ARFLAGS = cr -+CXX ?= c++ -+IS_GCC2 = $(shell $(CXX) -v 2>&1 | $(EGREP) -c gcc-932) -+ifeq ($(IS_GCC2),1) -+CXXFLAGS += -fno-coalesce-templates -fno-coalesce-static-vtables -+LDLIBS += -lstdc++ -+LDFLAGS += -flat_namespace -undefined suppress -m -+endif -+endif -+ -+ - ifneq ($(IS_SUN_CC),0) # override flags for CC Sun C++ compiler - CXXFLAGS = -DNDEBUG -O -g0 -native -template=no%extdef $(M32OR64) - LDFLAGS = Property changes on: head/finance/bitcoin-armory/files/patch-cppForSwig-cryptopp-Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/finance/bitcoin-armory/files/patch-dpkgfiles-armory =================================================================== --- head/finance/bitcoin-armory/files/patch-dpkgfiles-armory (revision 400097) +++ head/finance/bitcoin-armory/files/patch-dpkgfiles-armory (nonexistent) @@ -1,6 +0,0 @@ ---- dpkgfiles/armory -+++ dpkgfiles/armory -@@ -1,2 +1,2 @@ - #!/bin/sh --exec python /usr/lib/armory/ArmoryQt.py "$@" -+exec python %%LOCALBASE%%/lib/armory/ArmoryQt.py "$@" Property changes on: head/finance/bitcoin-armory/files/patch-dpkgfiles-armory ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/finance/bitcoin-armory/files/patch-ArmoryUtils.py =================================================================== --- head/finance/bitcoin-armory/files/patch-ArmoryUtils.py (revision 400097) +++ head/finance/bitcoin-armory/files/patch-ArmoryUtils.py (nonexistent) @@ -1,72 +0,0 @@ ---- armoryengine/ArmoryUtils.py -+++ armoryengine/ArmoryUtils.py -@@ -208,6 +208,7 @@ class P2SHNotSupportedError(Exception): pass - opsys = platform.system() - OS_WINDOWS = 'win32' in opsys.lower() or 'windows' in opsys.lower() - OS_LINUX = 'nix' in opsys.lower() or 'nux' in opsys.lower() -+OS_FREEBSD = 'freebsd' in opsys.lower() - OS_MACOSX = 'darwin' in opsys.lower() or 'osx' in opsys.lower() - - -@@ -276,6 +277,14 @@ elif OS_LINUX: - ARMORY_HOME_DIR = os.path.join(USER_HOME_DIR, '.armory', SUBDIR) - BLKFILE_DIR = os.path.join(BTC_HOME_DIR, 'blocks') - BLKFILE_1stFILE = os.path.join(BLKFILE_DIR, 'blk00000.dat') -+elif OS_FREEBSD: -+ OS_NAME = 'FreeBSD' -+ OS_VARIANT = ('FreeBSD',platform.release(), '') # tuple (platform,version,id) -+ USER_HOME_DIR = os.getenv('HOME') -+ BTC_HOME_DIR = os.path.join(USER_HOME_DIR, '.bitcoin', SUBDIR) -+ ARMORY_HOME_DIR = os.path.join(USER_HOME_DIR, '.armory', SUBDIR) -+ BLKFILE_DIR = os.path.join(BTC_HOME_DIR, 'blocks') -+ BLKFILE_1stFILE = os.path.join(BLKFILE_DIR, 'blk00000.dat') - elif OS_MACOSX: - platform.mac_ver() - OS_NAME = 'MacOSX' -@@ -293,6 +302,7 @@ else: - opsys = platform.system() - OS_WINDOWS = 'win32' in opsys.lower() or 'windows' in opsys.lower() - OS_LINUX = 'nix' in opsys.lower() or 'nux' in opsys.lower() -+OS_FREEBSD = 'freebsd' in opsys.lower() - OS_MACOSX = 'darwin' in opsys.lower() or 'osx' in opsys.lower() - - BLOCKCHAINS = {} -@@ -631,7 +641,7 @@ def killProcessTree(pid): - # call, because have bundled a recent version of psutil. Linux, however, - # does not have that function call in earlier versions. - from subprocess import Popen, PIPE -- if not OS_LINUX: -+ if not OS_LINUX and not OS_FREEBSD: - for child in psutil.Process(pid).get_children(): - killProcess(child.pid) - else: -@@ -1007,7 +1017,7 @@ except: - LOGCRIT(' in the current directory (or added to the PATH)') - LOGCRIT(' Specifically, you need:') - LOGCRIT(' CppBlockUtils.py and') -- if OS_LINUX or OS_MACOSX: -+ if OS_LINUX or OS_FREEBSD or OS_MACOSX: - LOGCRIT(' _CppBlockUtils.so') - elif OS_WINDOWS: - LOGCRIT(' _CppBlockUtils.pyd') -@@ -1041,6 +1051,11 @@ def GetSystemDetails(): - out.CpuStr = line.split(':')[1].strip() - break - -+ elif OS_FREEBSD: -+ # Get total RAM -+ out.Memory = long(subprocess_check_output(['sysctl','-n','hw.physmem'])) -+ ## Get CPU name -+ out.CpuStr = subprocess_check_output(['sysctl','-n','hw.model']) - - elif OS_WINDOWS: - import ctypes -@@ -1542,7 +1557,7 @@ except: - LOGCRIT(' in the current directory (or added to the PATH)') - LOGCRIT(' Specifically, you need:') - LOGCRIT(' CppBlockUtils.py and') -- if OS_LINUX or OS_MACOSX: -+ if OS_LINUX or OS_FREEBSD or OS_MACOSX: - LOGCRIT(' _CppBlockUtils.so') - elif OS_WINDOWS: - LOGCRIT(' _CppBlockUtils.pyd') Property changes on: head/finance/bitcoin-armory/files/patch-ArmoryUtils.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/finance/bitcoin-armory/files/patch-cppForSwig-Makefile =================================================================== --- head/finance/bitcoin-armory/files/patch-cppForSwig-Makefile (revision 400097) +++ head/finance/bitcoin-armory/files/patch-cppForSwig-Makefile (nonexistent) @@ -1,17 +0,0 @@ ---- cppForSwig/Makefile -+++ cppForSwig/Makefile -@@ -1,4 +1,4 @@ --CXX = g++ -+CXX ?= g++ - - ifdef DEBUG - CFLAGS=-g3 -Wall -pipe -fPIC -@@ -68,7 +68,7 @@ - BlockUtils.o: log.h BinaryData.h UniversalTimer.h PartialMerkle.h - EncryptionUtils.o: log.h BtcUtils.h BinaryData.h - CppBlockUtils_wrap.cxx: log.h BlockUtils.h BinaryData.h BlockObj.h UniversalTimer.h BlockUtils.h BlockUtils.cpp CppBlockUtils.i -- swig $(SWIG_OPTS) -outdir ../ -v CppBlockUtils.i -+ swig3.0 $(SWIG_OPTS) -outdir ../ -v CppBlockUtils.i - - CppBlockUtils_wrap.o: log.h BlockUtils.h BinaryData.h UniversalTimer.h CppBlockUtils_wrap.cxx - $(CXX) $(SWIG_INC) $(CXXFLAGS) $(CXXCPP) -c CppBlockUtils_wrap.cxx Property changes on: head/finance/bitcoin-armory/files/patch-cppForSwig-Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/finance/bitcoin-armory/files/patch-ArmoryQt.py =================================================================== --- head/finance/bitcoin-armory/files/patch-ArmoryQt.py (revision 400097) +++ head/finance/bitcoin-armory/files/patch-ArmoryQt.py (revision 400098) @@ -1,55 +1,55 @@ ---- ArmoryQt.py +--- ArmoryQt.py.orig 2015-06-10 21:49:31 UTC +++ ArmoryQt.py @@ -1,4 +1,4 @@ -#! /usr/bin/python +#!/usr/bin/env python + # -*- coding: UTF-8 -*- ################################################################################ # # - # Copyright (C) 2011-2014, Armory Technologies, Inc. # -@@ -1089,6 +1089,9 @@ +@@ -1236,6 +1236,9 @@ class ArmoryMainWindow(QMainWindow): elif OS_LINUX: tempDir = '/var/log' extraFiles = ['/var/log/Xorg.0.log'] + elif OS_FREEBSD: + tempDir = '/var/log' + extraFiles = ['/var/log/Xorg.0.log'] elif OS_MACOSX: tempDir = '/var/log' extraFiles = ['/var/log/system.log'] -@@ -1369,7 +1372,7 @@ +@@ -1516,7 +1519,7 @@ class ArmoryMainWindow(QMainWindow): if USE_TESTNET: return - if OS_LINUX: + if OS_LINUX or OS_FREEBSD: out,err = execAndWait('gconftool-2 --get /desktop/gnome/url-handlers/bitcoin/command') out2,err = execAndWait('xdg-mime query default x-scheme-handler/bitcoin') -@@ -1890,6 +1893,8 @@ +@@ -2104,6 +2107,8 @@ class ArmoryMainWindow(QMainWindow): shortOS = 'windows' elif OS_LINUX: shortOS = 'ubuntu' + elif OS_FREEBSD: + shortOS = 'freebsd' elif OS_MACOSX: shortOS = 'mac' -@@ -4708,6 +4713,8 @@ +@@ -4570,6 +4575,8 @@ class ArmoryMainWindow(QMainWindow): + Download and Install Bitcoin Core for Ubuntu/Debian""")) + self.dashBtns[DASHBTNS.Install][TTIP] = self.createToolTipWidget( tr(""" 'Will download and Bitcoin software and cryptographically verify it""")) - elif OS_MACOSX: - pass + elif OS_FREEBSD: + pass + elif OS_MACOSX: + pass else: - LOGERROR('Unrecognized OS!') - -@@ -5101,8 +5108,7 @@ - ############################################################################# +@@ -4970,8 +4977,7 @@ class ArmoryMainWindow(QMainWindow): def closeExistingBitcoin(self): for proc in psutil.process_iter(): -- if proc.name.lower() in ['bitcoind.exe','bitcoin-qt.exe',\ -- 'bitcoind','bitcoin-qt']: -+ if proc.name() in ['bitcoind','bitcoin-qt']: - killProcess(proc.pid) - time.sleep(2) - return + try: +- if proc.name().lower() in ['bitcoind.exe','bitcoin-qt.exe',\ +- 'bitcoind','bitcoin-qt']: ++ if proc.name() in ['bitcoind','bitcoin-qt']: + killProcess(proc.pid) + time.sleep(2) + return Index: head/finance/bitcoin-armory/files/patch-Makefile =================================================================== --- head/finance/bitcoin-armory/files/patch-Makefile (revision 400097) +++ head/finance/bitcoin-armory/files/patch-Makefile (revision 400098) @@ -1,11 +1,11 @@ ---- Makefile +--- Makefile.orig 2015-06-10 21:49:31 UTC +++ Makefile @@ -1,7 +1,7 @@ # All the actual Makefiles are deeper in the directory tree. # I am just calling them, here. -PREFIX=/usr +PREFIX?=/usr DESTDIR= + UNAME_S := $(shell uname -s) - all : Index: head/finance/bitcoin-armory/files/patch-announcefetch.py =================================================================== --- head/finance/bitcoin-armory/files/patch-announcefetch.py (revision 400097) +++ head/finance/bitcoin-armory/files/patch-announcefetch.py (revision 400098) @@ -1,11 +1,11 @@ ---- announcefetch.py +--- announcefetch.py.orig 2015-06-10 21:49:31 UTC +++ announcefetch.py -@@ -213,6 +213,8 @@ class AnnounceDataFetcher(object): +@@ -235,6 +235,8 @@ class AnnounceDataFetcher(object): argsMap['os'] = 'win' elif OS_LINUX: argsMap['os'] = 'lin' + elif OS_FREEBSD: + argsMap['os'] = 'bsd' elif OS_MACOSX: argsMap['os'] = 'mac' else: Index: head/finance/bitcoin-armory/files/patch-armoryengine_ArmoryUtils.py =================================================================== --- head/finance/bitcoin-armory/files/patch-armoryengine_ArmoryUtils.py (nonexistent) +++ head/finance/bitcoin-armory/files/patch-armoryengine_ArmoryUtils.py (revision 400098) @@ -0,0 +1,72 @@ +--- armoryengine/ArmoryUtils.py.orig 2015-06-10 21:49:31 UTC ++++ armoryengine/ArmoryUtils.py +@@ -234,6 +234,7 @@ class isMSWallet(Exception): pass + opsys = platform.system() + OS_WINDOWS = 'win32' in opsys.lower() or 'windows' in opsys.lower() + OS_LINUX = 'nix' in opsys.lower() or 'nux' in opsys.lower() ++OS_FREEBSD = 'freebsd' in opsys.lower() + OS_MACOSX = 'darwin' in opsys.lower() or 'osx' in opsys.lower() + + +@@ -307,6 +308,14 @@ elif OS_LINUX: + ARMORY_HOME_DIR = os.path.join(USER_HOME_DIR, '.armory', SUBDIR) + BLKFILE_DIR = os.path.join(BTC_HOME_DIR, 'blocks') + BLKFILE_1stFILE = os.path.join(BLKFILE_DIR, 'blk00000.dat') ++elif OS_FREEBSD: ++ OS_NAME = 'FreeBSD' ++ OS_VARIANT = ('FreeBSD',platform.release(), '') # tuple (platform,version,id) ++ USER_HOME_DIR = os.getenv('HOME') ++ BTC_HOME_DIR = os.path.join(USER_HOME_DIR, '.bitcoin', SUBDIR) ++ ARMORY_HOME_DIR = os.path.join(USER_HOME_DIR, '.armory', SUBDIR) ++ BLKFILE_DIR = os.path.join(BTC_HOME_DIR, 'blocks') ++ BLKFILE_1stFILE = os.path.join(BLKFILE_DIR, 'blk00000.dat') + elif OS_MACOSX: + platform.mac_ver() + OS_NAME = 'MacOSX' +@@ -324,6 +333,7 @@ else: + opsys = platform.system() + OS_WINDOWS = 'win32' in opsys.lower() or 'windows' in opsys.lower() + OS_LINUX = 'nix' in opsys.lower() or 'nux' in opsys.lower() ++OS_FREEBSD = 'freebsd' in opsys.lower() + OS_MACOSX = 'darwin' in opsys.lower() or 'osx' in opsys.lower() + + BLOCKCHAINS = {} +@@ -679,7 +689,7 @@ def killProcessTree(pid): + else: + from subprocess_win import Popen, PIPE + +- if not OS_LINUX: ++ if not OS_LINUX and not OS_FREEBSD: + for child in psutil.Process(pid).get_children(): + killProcess(child.pid) + else: +@@ -1080,7 +1090,7 @@ except: + LOGCRIT(' in the current directory (or added to the PATH)') + LOGCRIT(' Specifically, you need:') + LOGCRIT(' CppBlockUtils.py and') +- if OS_LINUX or OS_MACOSX: ++ if OS_LINUX or OS_FREEBSD or OS_MACOSX: + LOGCRIT(' _CppBlockUtils.so') + elif OS_WINDOWS: + LOGCRIT(' _CppBlockUtils.pyd') +@@ -1114,6 +1124,11 @@ def GetSystemDetails(): + out.CpuStr = line.split(':')[1].strip() + break + ++ elif OS_FREEBSD: ++ # Get total RAM ++ out.Memory = long(subprocess_check_output(['sysctl','-n','hw.physmem'])) ++ ## Get CPU name ++ out.CpuStr = subprocess_check_output(['sysctl','-n','hw.model']) + + elif OS_WINDOWS: + import ctypes +@@ -1619,7 +1634,7 @@ except: + LOGCRIT(' in the current directory (or added to the PATH)') + LOGCRIT(' Specifically, you need:') + LOGCRIT(' CppBlockUtils.py and') +- if OS_LINUX or OS_MACOSX: ++ if OS_LINUX or OS_FREEBSD or OS_MACOSX: + LOGCRIT(' _CppBlockUtils.so') + elif OS_WINDOWS: + LOGCRIT(' _CppBlockUtils.pyd') Property changes on: head/finance/bitcoin-armory/files/patch-armoryengine_ArmoryUtils.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/finance/bitcoin-armory/files/patch-armoryengine_Transaction.py =================================================================== --- head/finance/bitcoin-armory/files/patch-armoryengine_Transaction.py (nonexistent) +++ head/finance/bitcoin-armory/files/patch-armoryengine_Transaction.py (revision 400098) @@ -0,0 +1,18 @@ +--- armoryengine/Transaction.py.orig 2015-06-10 21:49:31 UTC ++++ armoryengine/Transaction.py +@@ -15,6 +15,7 @@ from armoryengine.BinaryUnpacker import + + from armoryengine.AsciiSerialize import AsciiSerializable + ++from armoryengine.MultiSigUtils import * + + UNSIGNED_TX_VERSION = 1 + +@@ -2674,7 +2675,6 @@ def PyCreateAndSignTx(ustxiList, dtxoLis + # + def PyCreateAndSignTx_old(srcTxOuts, dstAddrsVals): + # This needs to support multisig. Perhaps the funct should just be moved.... +- from armoryengine.MultiSigUtils import * + + newTx = PyTx() + newTx.version = 1 Property changes on: head/finance/bitcoin-armory/files/patch-armoryengine_Transaction.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/finance/bitcoin-armory/files/patch-cppForSwig_Makefile =================================================================== --- head/finance/bitcoin-armory/files/patch-cppForSwig_Makefile (nonexistent) +++ head/finance/bitcoin-armory/files/patch-cppForSwig_Makefile (revision 400098) @@ -0,0 +1,19 @@ +--- cppForSwig/Makefile.orig 2015-06-10 21:49:31 UTC ++++ cppForSwig/Makefile +@@ -1,5 +1,5 @@ +-CXX = g++ +-CC = gcc ++CXX ?= g++ ++CC ?= gcc + + ifdef DEBUG + CFLAGS=-g3 -Wall -pipe -fPIC +@@ -97,7 +97,7 @@ midl.o: mdb/midl.c mdb/lmdb.h mdb/midl.h + + + CppBlockUtils_wrap.cxx: $(ALL_HEADERS) CppBlockUtils.i +- swig $(SWIG_OPTS) -outdir ../ -v CppBlockUtils.i ++ swig3.0 $(SWIG_OPTS) -outdir ../ -v CppBlockUtils.i + + CppBlockUtils_wrap.o: $(ALL_HEADERS) CppBlockUtils_wrap.cxx + $(CXX) $(SWIG_INC) $(CXXFLAGS) $(CXXCPP) -c CppBlockUtils_wrap.cxx Property changes on: head/finance/bitcoin-armory/files/patch-cppForSwig_Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/finance/bitcoin-armory/files/patch-cppForSwig_cryptopp_Makefile =================================================================== --- head/finance/bitcoin-armory/files/patch-cppForSwig_cryptopp_Makefile (nonexistent) +++ head/finance/bitcoin-armory/files/patch-cppForSwig_cryptopp_Makefile (revision 400098) @@ -0,0 +1,22 @@ +--- cppForSwig/cryptopp/Makefile.orig 2015-06-10 21:49:31 UTC ++++ cppForSwig/cryptopp/Makefile +@@ -117,6 +117,19 @@ LDLIBS += -lnsl -lsocket + M32OR64 = -m$(shell isainfo -b) + endif + ++ifeq ($(UNAME),FreeBSD) ++AR = ar ++ARFLAGS = cr ++CXX ?= c++ ++IS_GCC2 = $(shell $(CXX) -v 2>&1 | $(EGREP) -c gcc-932) ++ifeq ($(IS_GCC2),1) ++CXXFLAGS += -fno-coalesce-templates -fno-coalesce-static-vtables ++LDLIBS += -lstdc++ ++LDFLAGS += -flat_namespace -undefined suppress -m ++endif ++endif ++ ++ + ifneq ($(IS_SUN_CC),0) # override flags for CC Sun C++ compiler + CXXFLAGS = -DNDEBUG -O -g0 -native -template=no%extdef $(M32OR64) + LDFLAGS = Property changes on: head/finance/bitcoin-armory/files/patch-cppForSwig_cryptopp_Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/finance/bitcoin-armory/files/patch-dpkgfiles_armory =================================================================== --- head/finance/bitcoin-armory/files/patch-dpkgfiles_armory (nonexistent) +++ head/finance/bitcoin-armory/files/patch-dpkgfiles_armory (revision 400098) @@ -0,0 +1,6 @@ +--- dpkgfiles/armory.orig 2015-06-10 21:49:31 UTC ++++ dpkgfiles/armory +@@ -1,2 +1,2 @@ + #!/bin/sh +-exec python /usr/lib/armory/ArmoryQt.py "$@" ++exec python %%LOCALBASE%%/lib/armory/ArmoryQt.py "$@" Property changes on: head/finance/bitcoin-armory/files/patch-dpkgfiles_armory ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/finance/bitcoin-armory/pkg-message =================================================================== --- head/finance/bitcoin-armory/pkg-message (revision 400097) +++ head/finance/bitcoin-armory/pkg-message (revision 400098) @@ -1,13 +1,13 @@ - ================================================================ BitcoinArmory consumes significant disk space in ~/.armory and ~/.bitcoin, so you need to provide sufficient available -space there, currently >30 gigabytes. +space there, currently >50 gigabytes. -Please note that BitcoinArmory has an embedded bitcoind, and -doesn't require the running bitcoind, but can optionally use it. +Please note that BitcoinArmory requires bitcoind daemon, so you +need to have either net-p2p/bitcoin-daemon or net-p2p/bitcoin +installed. Please keep your *.wallet files located under the ~/.armory directory secure. Loss of these files is equivalent to the loss of money. ================================================================ Index: head/finance/bitcoin-armory/pkg-plist =================================================================== --- head/finance/bitcoin-armory/pkg-plist (revision 400097) +++ head/finance/bitcoin-armory/pkg-plist (revision 400098) @@ -1,314 +1,318 @@ bin/armory -lib/armory/ArmoryDB.py lib/armory/ArmoryQt.py lib/armory/BitTornado/BT1/Choker.py lib/armory/BitTornado/BT1/Connecter.py lib/armory/BitTornado/BT1/Downloader.py lib/armory/BitTornado/BT1/DownloaderFeedback.py lib/armory/BitTornado/BT1/Encrypter.py lib/armory/BitTornado/BT1/FileSelector.py lib/armory/BitTornado/BT1/Filter.py lib/armory/BitTornado/BT1/HTTPDownloader.py lib/armory/BitTornado/BT1/NatCheck.py lib/armory/BitTornado/BT1/PiecePicker.py lib/armory/BitTornado/BT1/Rerequester.py lib/armory/BitTornado/BT1/Statistics.py lib/armory/BitTornado/BT1/Storage.py lib/armory/BitTornado/BT1/StorageWrapper.py lib/armory/BitTornado/BT1/StreamCheck.py lib/armory/BitTornado/BT1/T2T.py lib/armory/BitTornado/BT1/Uploader.py lib/armory/BitTornado/BT1/__init__.py lib/armory/BitTornado/BT1/btformats.py lib/armory/BitTornado/BT1/fakeopen.py lib/armory/BitTornado/BT1/makemetafile.py lib/armory/BitTornado/BT1/track.py lib/armory/BitTornado/ConfigDir.py lib/armory/BitTornado/ConfigReader.py lib/armory/BitTornado/ConnChoice.py lib/armory/BitTornado/CreateIcons.py lib/armory/BitTornado/CurrentRateMeasure.py lib/armory/BitTornado/HTTPHandler.py lib/armory/BitTornado/PSYCO.py lib/armory/BitTornado/RateLimiter.py lib/armory/BitTornado/RateMeasure.py lib/armory/BitTornado/RawServer.py lib/armory/BitTornado/ServerPortHandler.py lib/armory/BitTornado/SocketHandler.py lib/armory/BitTornado/__init__.py lib/armory/BitTornado/bencode.py lib/armory/BitTornado/bitfield.py lib/armory/BitTornado/clock.py lib/armory/BitTornado/download_bt1.py lib/armory/BitTornado/inifile.py lib/armory/BitTornado/iprangeparse.py lib/armory/BitTornado/launchmanycore.py lib/armory/BitTornado/natpunch.py lib/armory/BitTornado/parseargs.py lib/armory/BitTornado/parsedir.py lib/armory/BitTornado/piecebuffer.py lib/armory/BitTornado/selectpoll.py lib/armory/BitTornado/subnetparse.py lib/armory/BitTornado/torrentlistparse.py lib/armory/BitTornado/zurllib.py lib/armory/CppBlockUtils.py lib/armory/LICENSE.py -lib/armory/README +lib/armory/README.md lib/armory/SDM.py lib/armory/_CppBlockUtils.so lib/armory/announcefetch.py lib/armory/armorycolors.py lib/armory/armoryd.py lib/armory/armoryengine/ALL.py lib/armory/armoryengine/ArmoryUtils.py lib/armory/armoryengine/AsciiSerialize.py lib/armory/armoryengine/BDM.py lib/armory/armoryengine/BinaryPacker.py lib/armory/armoryengine/BinaryUnpacker.py lib/armory/armoryengine/Block.py lib/armory/armoryengine/CoinSelection.py lib/armory/armoryengine/Decorators.py lib/armory/armoryengine/MultiSigUtils.py lib/armory/armoryengine/Networking.py lib/armory/armoryengine/PyBtcAddress.py lib/armory/armoryengine/PyBtcWallet.py lib/armory/armoryengine/PyBtcWalletRecovery.py lib/armory/armoryengine/Script.py lib/armory/armoryengine/Timer.py lib/armory/armoryengine/Transaction.py lib/armory/armoryengine/UserAddressUtils.py lib/armory/armoryengine/__init__.py lib/armory/armoryengine/parseAnnounce.py lib/armory/armoryengine/torrentDL.py lib/armory/armorymodels.py lib/armory/bitcoinrpc_jsonrpc/__init__.py lib/armory/bitcoinrpc_jsonrpc/authproxy.py lib/armory/bitcoinrpc_jsonrpc/json.py lib/armory/bitcoinrpc_jsonrpc/proxy.py lib/armory/default_bootstrap.torrent lib/armory/dynamicImport.py +lib/armory/extras/BDMbasics_listUTXOs.py +lib/armory/extras/BDMbasics_traceTxHistory.py +lib/armory/extras/BDMbasics_watchBalance.py lib/armory/extras/LastBlockHash.py lib/armory/extras/LatestBlocksFinder.py lib/armory/extras/PromoKit.py lib/armory/extras/__init__.py lib/armory/extras/armoryengine_basics.py lib/armory/extras/breakDownWallet.py lib/armory/extras/cli_sign_txdp.py lib/armory/extras/createTestBlocksForReadBlkUpdate.py lib/armory/extras/createTestChain.py lib/armory/extras/createTxFromAddrList.py lib/armory/extras/dlscript.py lib/armory/extras/extractKeysFromWallet.py lib/armory/extras/findpass.py lib/armory/extras/frag_wallet.py lib/armory/extras/lookathex.py lib/armory/extras/manually_import_500k_addr.py lib/armory/extras/mysteryHex.py lib/armory/extras/sample_armory_code.py lib/armory/extras/satoshiDiceStats.py lib/armory/extras/sign_dl_list.py lib/armory/extras/sign_release.py lib/armory/extras/unfrag_wallet.py lib/armory/extras/verify_dl_list.py lib/armory/guardian.py lib/armory/jasvet.py lib/armory/pytest/SendTx.py lib/armory/pytest/Tiab.py lib/armory/pytest/__init__.py lib/armory/pytest/testAnnounce.py lib/armory/pytest/testArmoryD.py lib/armory/pytest/testArmoryDStartup.py lib/armory/pytest/testArmoryDTiab.py lib/armory/pytest/testArmoryEngineUtils.py lib/armory/pytest/testDecorators.py lib/armory/pytest/testFragmentedBackup.py +lib/armory/pytest/testJasvet.py lib/armory/pytest/testMultisig.py lib/armory/pytest/testParseAnnounce.py lib/armory/pytest/testPyBtcAddress.py lib/armory/pytest/testPyBtcWallet.py lib/armory/pytest/testPyBtcWalletRecovery.py lib/armory/pytest/testPyTX.py lib/armory/pytest/testSplitSecret.py lib/armory/pytest/testUserAddress.py +lib/armory/pytest/testUtility.py lib/armory/qrc_img_resources.py lib/armory/qrcodenative.py lib/armory/qt4reactor.py lib/armory/qtdefines.py lib/armory/qtdialogs.py lib/armory/setup.py lib/armory/subprocess_win.py lib/armory/txjsonrpc/__init__.py lib/armory/txjsonrpc/auth.py lib/armory/txjsonrpc/jsonrpc.py lib/armory/txjsonrpc/jsonrpclib.py lib/armory/txjsonrpc/meta.py lib/armory/txjsonrpc/web/__init__.py lib/armory/txjsonrpc/web/jsonrpc.py lib/armory/ui/MultiSigDialogs.py lib/armory/ui/MultiSigModels.py -lib/armory/ui/TxConstruct.py lib/armory/ui/TxFrames.py lib/armory/ui/UpgradeDownloader.py lib/armory/ui/VerifyOfflinePackage.py lib/armory/ui/WalletFrames.py lib/armory/ui/Wizards.py lib/armory/ui/__init__.py lib/armory/ui/toolsDialogs.py +lib/armory/update_version.py lib/armory/urllib3/__init__.py lib/armory/urllib3/_collections.py lib/armory/urllib3/connection.py lib/armory/urllib3/connectionpool.py lib/armory/urllib3/contrib/__init__.py lib/armory/urllib3/contrib/ntlmpool.py lib/armory/urllib3/contrib/pyopenssl.py lib/armory/urllib3/exceptions.py lib/armory/urllib3/fields.py lib/armory/urllib3/filepost.py lib/armory/urllib3/packages/__init__.py lib/armory/urllib3/packages/ordered_dict.py lib/armory/urllib3/packages/six.py lib/armory/urllib3/packages/ssl_match_hostname/__init__.py lib/armory/urllib3/packages/ssl_match_hostname/_implementation.py lib/armory/urllib3/poolmanager.py lib/armory/urllib3/request.py lib/armory/urllib3/response.py lib/armory/urllib3/util.py lib/armory/writeNSISCompilerArgs.py share/applications/armory.desktop share/applications/armoryoffline.desktop share/applications/armorytestnet.desktop share/armory/img/MsgBox_critical24.png share/armory/img/MsgBox_critical64.png share/armory/img/MsgBox_error32.png share/armory/img/MsgBox_error64.png share/armory/img/MsgBox_good48.png share/armory/img/MsgBox_info32.png share/armory/img/MsgBox_info48.png share/armory/img/MsgBox_question32.png share/armory/img/MsgBox_question64.png share/armory/img/MsgBox_warning48.png share/armory/img/addr_book_icon.png share/armory/img/armory16x16.ico share/armory/img/armory24x24.ico share/armory/img/armory256x256.ico share/armory/img/armory32x32.ico share/armory/img/armory48x48.ico share/armory/img/armory64x64.ico -share/armory/img/armory_icon_24x24.png -share/armory/img/armory_icon_32x32.png -share/armory/img/armory_icon_64x64.png share/armory/img/armory_icon_fullres.icns share/armory/img/armory_icon_fullres.png share/armory/img/armory_icon_green_24x24.png share/armory/img/armory_icon_green_32x32.png share/armory/img/armory_icon_green_64x64.png share/armory/img/armory_icon_green_fullres.png share/armory/img/armory_logo_fullres.png share/armory/img/armory_logo_green_h56.png share/armory/img/armory_logo_green_h72.png share/armory/img/armory_logo_h36.png share/armory/img/armory_logo_h44.png share/armory/img/armory_logo_h48.png share/armory/img/armory_logo_h56.png share/armory/img/armory_logo_h72.png share/armory/img/armory_logo_white_text_green_h56.png share/armory/img/armory_logo_white_text_green_h72.png share/armory/img/armory_logo_white_text_h56.png share/armory/img/armory_logo_white_text_h72.png share/armory/img/armory_rightclickcopy.png share/armory/img/arrow_down.png share/armory/img/arrow_down32.png share/armory/img/arrow_left.png share/armory/img/arrow_left32.png share/armory/img/arrow_right.png share/armory/img/arrow_right32.png share/armory/img/arrow_right_24x24.png share/armory/img/arrow_right_blue_24x24.png share/armory/img/arrow_right_green_24x24.png share/armory/img/arrow_right_red_24x24.png share/armory/img/arrow_up.png share/armory/img/arrow_up32.png share/armory/img/asterisk_orange.png share/armory/img/bitcoinlogo.png share/armory/img/busy.gif share/armory/img/button-blue.png share/armory/img/button-green.png share/armory/img/button-purple.png share/armory/img/button-red.png share/armory/img/button-seagreen.png share/armory/img/button-yellow.png share/armory/img/checkmark32.png share/armory/img/checkmark32_blue.png share/armory/img/checkmark32_orange.png share/armory/img/checkmark_okay.png share/armory/img/circle_blue.png share/armory/img/circle_green.png share/armory/img/circle_orange.png share/armory/img/circle_purple.png share/armory/img/circle_red.png share/armory/img/circle_tan.png share/armory/img/circle_yellow.png share/armory/img/conf0t.png share/armory/img/conf0t_nonum.png share/armory/img/conf1t.png share/armory/img/conf1t_nonum.png share/armory/img/conf2t.png share/armory/img/conf2t_nonum.png share/armory/img/conf3t.png share/armory/img/conf3t_nonum.png share/armory/img/conf4t.png share/armory/img/conf4t_nonum.png share/armory/img/conf5t.png share/armory/img/conf5t_nonum.png share/armory/img/conf6t.png share/armory/img/folder-new-5.png share/armory/img/folder.png share/armory/img/folder24.png share/armory/img/frag1f.png share/armory/img/frag2f.png share/armory/img/frag3f.png share/armory/img/frag4f.png share/armory/img/frag5f.png share/armory/img/frag6f.png share/armory/img/frag7f.png share/armory/img/frag8f.png share/armory/img/inkscapeIconFactory.svg share/armory/img/keyhole_blue.png share/armory/img/keyhole_gray.png share/armory/img/keyhole_green.png share/armory/img/keyhole_red.png share/armory/img/keyhole_white.png share/armory/img/loadicon_0.png share/armory/img/loadicon_1.png share/armory/img/loadicon_2.png share/armory/img/loadicon_3.png share/armory/img/loadicon_4.png share/armory/img/loadicon_5.png share/armory/img/lockedIcon.png share/armory/img/logo_vert_black_text.png share/armory/img/logo_vert_black_text_antialiased.png share/armory/img/logo_vert_black_text_green.png share/armory/img/logo_vert_white_text.png share/armory/img/moneyCoinbase.png share/armory/img/moneyIn.png share/armory/img/moneyOut.png share/armory/img/moneySelf.png share/armory/img/plus_orange.png share/armory/img/preferences.png share/armory/img/preferences256.png share/armory/img/printer_icon.png share/armory/img/process-stop-4.png share/armory/img/red_X.png share/armory/img/scroll_down_18.png share/armory/img/scroll_down_24.png share/armory/img/scroll_up_18.png share/armory/img/scroll_up_24.png share/armory/img/sent_to_self.png share/armory/img/splashlogo.png share/armory/img/splashlogo_testnet.png share/armory/img/unlockedIcon.png share/armory/img/view-refresh-4.png share/armory/img/visible.png share/armory/img/visible2.png share/armory/img/wallet_16x12.png share/armory/img/x-office-address-book.png +share/icons/hicolor/24x24/apps/armoryicon.png +share/icons/hicolor/32x32/apps/armoryicon.png +share/icons/hicolor/64x64/apps/armoryicon.png