Index: head/finance/bitcoin-armory/Makefile =================================================================== --- head/finance/bitcoin-armory/Makefile (revision 442993) +++ head/finance/bitcoin-armory/Makefile (revision 442994) @@ -1,58 +1,58 @@ # Created by: Yuri Victorovich # $FreeBSD$ PORTNAME= BitcoinArmory PORTVERSION= 0.93.3 -PORTREVISION= 1 DISTVERSIONPREFIX= v +PORTREVISION= 2 CATEGORIES= finance MAINTAINER= yuri@rawbw.com COMMENT= Desktop bitcoin management system LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/bin/swig3.0:devel/swig30 \ ${LOCALBASE}/bin/pyrcc4:textproc/py-qt4-xml \ ${LOCALBASE}/bin/rsync:net/rsync RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twistedCore>=14.0.0:devel/py-twistedCore \ ${PYTHON_PKGNAMEPREFIX}psutil>1.2.1:sysutils/py-psutil \ ${LOCALBASE}/bin/bitcoind:net-p2p/bitcoin-daemon USE_GITHUB= yes GH_ACCOUNT= etotheipi USES= compiler:c++11-lang compiler:c++11-lib gmake pyqt:4 python:2 shebangfix USE_PYQT= core_run gui_run -SHEBANG_FILES= extras/extractKeysFromWallet.py +SHEBANG_FILES= ArmoryQt.py extras/extractKeysFromWallet.py CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CXXFLAGS+= -DCRYPTOPP_DISABLE_ASM -fPIC MAKE_ENV+= PYTHON_CONFIG=${PYTHON_CMD}-config 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-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/armory/_CppBlockUtils.so @${SED} -i.bak -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${STAGEDIR}/${LOCALBASE}/bin/armory && \ ${RM} ${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 .include Index: head/finance/bitcoin-armory/files/patch-ArmoryQt.py =================================================================== --- head/finance/bitcoin-armory/files/patch-ArmoryQt.py (revision 442993) +++ head/finance/bitcoin-armory/files/patch-ArmoryQt.py (revision 442994) @@ -1,55 +1,49 @@ --- 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 -*- - ################################################################################ - # # @@ -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'] @@ -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') @@ -2104,6 +2107,8 @@ class ArmoryMainWindow(QMainWindow): shortOS = 'windows' elif OS_LINUX: shortOS = 'ubuntu' + elif OS_FREEBSD: + shortOS = 'freebsd' elif OS_MACOSX: shortOS = 'mac' @@ -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_FREEBSD: + pass elif OS_MACOSX: pass else: @@ -4970,8 +4977,7 @@ class ArmoryMainWindow(QMainWindow): def closeExistingBitcoin(self): for proc in psutil.process_iter(): 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