Index: head/net-p2p/bitmessage/pkg-plist =================================================================== --- head/net-p2p/bitmessage/pkg-plist (revision 436514) +++ head/net-p2p/bitmessage/pkg-plist (nonexistent) @@ -1,343 +0,0 @@ -bin/pybitmessage -man/man1/pybitmessage.1.gz -share/applications/pybitmessage.desktop -share/icons/hicolor/24x24/apps/pybitmessage.png -share/pybitmessage/addresses.py -share/pybitmessage/addresses.pyc -share/pybitmessage/addresses.pyo -share/pybitmessage/api.py -share/pybitmessage/api.pyc -share/pybitmessage/api.pyo -share/pybitmessage/api_client.py -share/pybitmessage/api_client.pyc -share/pybitmessage/api_client.pyo -share/pybitmessage/bitmessagecli.py -share/pybitmessage/bitmessagecli.pyc -share/pybitmessage/bitmessagecli.pyo -share/pybitmessage/bitmessagecurses/__init__.py -share/pybitmessage/bitmessagecurses/__init__.pyc -share/pybitmessage/bitmessagecurses/__init__.pyo -share/pybitmessage/bitmessagemain.py -share/pybitmessage/bitmessagemain.pyc -share/pybitmessage/bitmessagemain.pyo -share/pybitmessage/bitmessageqt/__init__.py -share/pybitmessage/bitmessageqt/__init__.pyc -share/pybitmessage/bitmessageqt/__init__.pyo -share/pybitmessage/bitmessageqt/about.py -share/pybitmessage/bitmessageqt/about.pyc -share/pybitmessage/bitmessageqt/about.pyo -share/pybitmessage/bitmessageqt/about.ui -share/pybitmessage/bitmessageqt/account.py -share/pybitmessage/bitmessageqt/account.pyc -share/pybitmessage/bitmessageqt/account.pyo -share/pybitmessage/bitmessageqt/addaddressdialog.py -share/pybitmessage/bitmessageqt/addaddressdialog.pyc -share/pybitmessage/bitmessageqt/addaddressdialog.pyo -share/pybitmessage/bitmessageqt/addaddressdialog.ui -share/pybitmessage/bitmessageqt/addpeer.ui -share/pybitmessage/bitmessageqt/bitmessage_icons.qrc -share/pybitmessage/bitmessageqt/bitmessage_icons_rc.py -share/pybitmessage/bitmessageqt/bitmessage_icons_rc.pyc -share/pybitmessage/bitmessageqt/bitmessage_icons_rc.pyo -share/pybitmessage/bitmessageqt/bitmessageui.py -share/pybitmessage/bitmessageqt/bitmessageui.pyc -share/pybitmessage/bitmessageqt/bitmessageui.pyo -share/pybitmessage/bitmessageqt/bitmessageui.ui -share/pybitmessage/bitmessageqt/blacklist.py -share/pybitmessage/bitmessageqt/blacklist.pyc -share/pybitmessage/bitmessageqt/blacklist.pyo -share/pybitmessage/bitmessageqt/blacklist.ui -share/pybitmessage/bitmessageqt/connect.py -share/pybitmessage/bitmessageqt/connect.pyc -share/pybitmessage/bitmessageqt/connect.pyo -share/pybitmessage/bitmessageqt/connect.ui -share/pybitmessage/bitmessageqt/dialogs.py -share/pybitmessage/bitmessageqt/dialogs.pyc -share/pybitmessage/bitmessageqt/dialogs.pyo -share/pybitmessage/bitmessageqt/emailgateway.py -share/pybitmessage/bitmessageqt/emailgateway.pyc -share/pybitmessage/bitmessageqt/emailgateway.pyo -share/pybitmessage/bitmessageqt/emailgateway.ui -share/pybitmessage/bitmessageqt/foldertree.py -share/pybitmessage/bitmessageqt/foldertree.pyc -share/pybitmessage/bitmessageqt/foldertree.pyo -share/pybitmessage/bitmessageqt/help.py -share/pybitmessage/bitmessageqt/help.pyc -share/pybitmessage/bitmessageqt/help.pyo -share/pybitmessage/bitmessageqt/help.ui -share/pybitmessage/bitmessageqt/iconglossary.py -share/pybitmessage/bitmessageqt/iconglossary.pyc -share/pybitmessage/bitmessageqt/iconglossary.pyo -share/pybitmessage/bitmessageqt/iconglossary.ui -share/pybitmessage/bitmessageqt/languagebox.py -share/pybitmessage/bitmessageqt/languagebox.pyc -share/pybitmessage/bitmessageqt/languagebox.pyo -share/pybitmessage/bitmessageqt/messagecompose.py -share/pybitmessage/bitmessageqt/messagecompose.pyc -share/pybitmessage/bitmessageqt/messagecompose.pyo -share/pybitmessage/bitmessageqt/messageview.py -share/pybitmessage/bitmessageqt/messageview.pyc -share/pybitmessage/bitmessageqt/messageview.pyo -share/pybitmessage/bitmessageqt/migrationwizard.py -share/pybitmessage/bitmessageqt/migrationwizard.pyc -share/pybitmessage/bitmessageqt/migrationwizard.pyo -share/pybitmessage/bitmessageqt/networkstatus.py -share/pybitmessage/bitmessageqt/networkstatus.pyc -share/pybitmessage/bitmessageqt/networkstatus.pyo -share/pybitmessage/bitmessageqt/networkstatus.ui -share/pybitmessage/bitmessageqt/newaddressdialog.py -share/pybitmessage/bitmessageqt/newaddressdialog.pyc -share/pybitmessage/bitmessageqt/newaddressdialog.pyo -share/pybitmessage/bitmessageqt/newaddressdialog.ui -share/pybitmessage/bitmessageqt/newaddresswizard.py -share/pybitmessage/bitmessageqt/newaddresswizard.pyc -share/pybitmessage/bitmessageqt/newaddresswizard.pyo -share/pybitmessage/bitmessageqt/newchandialog.py -share/pybitmessage/bitmessageqt/newchandialog.pyc -share/pybitmessage/bitmessageqt/newchandialog.pyo -share/pybitmessage/bitmessageqt/newchandialog.ui -share/pybitmessage/bitmessageqt/newsubscriptiondialog.py -share/pybitmessage/bitmessageqt/newsubscriptiondialog.pyc -share/pybitmessage/bitmessageqt/newsubscriptiondialog.pyo -share/pybitmessage/bitmessageqt/newsubscriptiondialog.ui -share/pybitmessage/bitmessageqt/regenerateaddresses.py -share/pybitmessage/bitmessageqt/regenerateaddresses.pyc -share/pybitmessage/bitmessageqt/regenerateaddresses.pyo -share/pybitmessage/bitmessageqt/regenerateaddresses.ui -share/pybitmessage/bitmessageqt/retranslateui.py -share/pybitmessage/bitmessageqt/retranslateui.pyc -share/pybitmessage/bitmessageqt/retranslateui.pyo -share/pybitmessage/bitmessageqt/safehtmlparser.py -share/pybitmessage/bitmessageqt/safehtmlparser.pyc -share/pybitmessage/bitmessageqt/safehtmlparser.pyo -share/pybitmessage/bitmessageqt/settings.py -share/pybitmessage/bitmessageqt/settings.pyc -share/pybitmessage/bitmessageqt/settings.pyo -share/pybitmessage/bitmessageqt/settings.ui -share/pybitmessage/bitmessageqt/settingsmixin.py -share/pybitmessage/bitmessageqt/settingsmixin.pyc -share/pybitmessage/bitmessageqt/settingsmixin.pyo -share/pybitmessage/bitmessageqt/specialaddressbehavior.py -share/pybitmessage/bitmessageqt/specialaddressbehavior.pyc -share/pybitmessage/bitmessageqt/specialaddressbehavior.pyo -share/pybitmessage/bitmessageqt/specialaddressbehavior.ui -share/pybitmessage/bitmessageqt/support.py -share/pybitmessage/bitmessageqt/support.pyc -share/pybitmessage/bitmessageqt/support.pyo -share/pybitmessage/bitmessageqt/uisignaler.py -share/pybitmessage/bitmessageqt/uisignaler.pyc -share/pybitmessage/bitmessageqt/uisignaler.pyo -share/pybitmessage/bitmessageqt/utils.py -share/pybitmessage/bitmessageqt/utils.pyc -share/pybitmessage/bitmessageqt/utils.pyo -share/pybitmessage/bitmessageqt/wanlan.ui -share/pybitmessage/bitmessageqt/widgets.py -share/pybitmessage/bitmessageqt/widgets.pyc -share/pybitmessage/bitmessageqt/widgets.pyo -share/pybitmessage/build_osx.py -share/pybitmessage/build_osx.pyc -share/pybitmessage/build_osx.pyo -share/pybitmessage/class_addressGenerator.py -share/pybitmessage/class_addressGenerator.pyc -share/pybitmessage/class_addressGenerator.pyo -share/pybitmessage/class_objectHashHolder.py -share/pybitmessage/class_objectHashHolder.pyc -share/pybitmessage/class_objectHashHolder.pyo -share/pybitmessage/class_objectProcessor.py -share/pybitmessage/class_objectProcessor.pyc -share/pybitmessage/class_objectProcessor.pyo -share/pybitmessage/class_objectProcessorQueue.py -share/pybitmessage/class_objectProcessorQueue.pyc -share/pybitmessage/class_objectProcessorQueue.pyo -share/pybitmessage/class_outgoingSynSender.py -share/pybitmessage/class_outgoingSynSender.pyc -share/pybitmessage/class_outgoingSynSender.pyo -share/pybitmessage/class_receiveDataThread.py -share/pybitmessage/class_receiveDataThread.pyc -share/pybitmessage/class_receiveDataThread.pyo -share/pybitmessage/class_sendDataThread.py -share/pybitmessage/class_sendDataThread.pyc -share/pybitmessage/class_sendDataThread.pyo -share/pybitmessage/class_singleCleaner.py -share/pybitmessage/class_singleCleaner.pyc -share/pybitmessage/class_singleCleaner.pyo -share/pybitmessage/class_singleListener.py -share/pybitmessage/class_singleListener.pyc -share/pybitmessage/class_singleListener.pyo -share/pybitmessage/class_singleWorker.py -share/pybitmessage/class_singleWorker.pyc -share/pybitmessage/class_singleWorker.pyo -share/pybitmessage/class_smtpDeliver.py -share/pybitmessage/class_smtpDeliver.pyc -share/pybitmessage/class_smtpDeliver.pyo -share/pybitmessage/class_smtpServer.py -share/pybitmessage/class_smtpServer.pyc -share/pybitmessage/class_smtpServer.pyo -share/pybitmessage/class_sqlThread.py -share/pybitmessage/class_sqlThread.pyc -share/pybitmessage/class_sqlThread.pyo -share/pybitmessage/debug.py -share/pybitmessage/debug.pyc -share/pybitmessage/debug.pyo -share/pybitmessage/defaultKnownNodes.py -share/pybitmessage/defaultKnownNodes.pyc -share/pybitmessage/defaultKnownNodes.pyo -share/pybitmessage/depends.py -share/pybitmessage/depends.pyc -share/pybitmessage/depends.pyo -share/pybitmessage/helper_bitcoin.py -share/pybitmessage/helper_bitcoin.pyc -share/pybitmessage/helper_bitcoin.pyo -share/pybitmessage/helper_bootstrap.py -share/pybitmessage/helper_bootstrap.pyc -share/pybitmessage/helper_bootstrap.pyo -share/pybitmessage/helper_generic.py -share/pybitmessage/helper_generic.pyc -share/pybitmessage/helper_generic.pyo -share/pybitmessage/helper_inbox.py -share/pybitmessage/helper_inbox.pyc -share/pybitmessage/helper_inbox.pyo -share/pybitmessage/helper_msgcoding.py -share/pybitmessage/helper_msgcoding.pyc -share/pybitmessage/helper_msgcoding.pyo -share/pybitmessage/helper_search.py -share/pybitmessage/helper_search.pyc -share/pybitmessage/helper_search.pyo -share/pybitmessage/helper_sent.py -share/pybitmessage/helper_sent.pyc -share/pybitmessage/helper_sent.pyo -share/pybitmessage/helper_sql.py -share/pybitmessage/helper_sql.pyc -share/pybitmessage/helper_sql.pyo -share/pybitmessage/helper_startup.py -share/pybitmessage/helper_startup.pyc -share/pybitmessage/helper_startup.pyo -share/pybitmessage/helper_threading.py -share/pybitmessage/helper_threading.pyc -share/pybitmessage/helper_threading.pyo -share/pybitmessage/highlevelcrypto.py -share/pybitmessage/highlevelcrypto.pyc -share/pybitmessage/highlevelcrypto.pyo -share/pybitmessage/images/addressbook.png -share/pybitmessage/images/bitmessage.icns -share/pybitmessage/images/blacklist.png -share/pybitmessage/images/can-icon-16px.png -share/pybitmessage/images/can-icon-24px-green.png -share/pybitmessage/images/can-icon-24px-red.png -share/pybitmessage/images/can-icon-24px-yellow.png -share/pybitmessage/images/can-icon-24px.png -share/pybitmessage/images/can-icon.ico -share/pybitmessage/images/greenicon.png -share/pybitmessage/images/identities.png -share/pybitmessage/images/inbox.png -share/pybitmessage/images/networkstatus.png -share/pybitmessage/images/no_identicons.png -share/pybitmessage/images/qidenticon.png -share/pybitmessage/images/qidenticon_two.png -share/pybitmessage/images/qidenticon_two_x.png -share/pybitmessage/images/qidenticon_x.png -share/pybitmessage/images/redicon.png -share/pybitmessage/images/send.png -share/pybitmessage/images/sent.png -share/pybitmessage/images/subscriptions.png -share/pybitmessage/images/yellowicon.png -share/pybitmessage/l10n.py -share/pybitmessage/l10n.pyc -share/pybitmessage/l10n.pyo -share/pybitmessage/message_data_reader.py -share/pybitmessage/message_data_reader.pyc -share/pybitmessage/message_data_reader.pyo -share/pybitmessage/namecoin.py -share/pybitmessage/namecoin.pyc -share/pybitmessage/namecoin.pyo -share/pybitmessage/openclpow.py -share/pybitmessage/openclpow.pyc -share/pybitmessage/openclpow.pyo -share/pybitmessage/proofofwork.py -share/pybitmessage/proofofwork.pyc -share/pybitmessage/proofofwork.pyo -share/pybitmessage/protocol.py -share/pybitmessage/protocol.pyc -share/pybitmessage/protocol.pyo -share/pybitmessage/pyelliptic/LICENSE -share/pybitmessage/pyelliptic/README.md -share/pybitmessage/pyelliptic/__init__.py -share/pybitmessage/pyelliptic/__init__.pyc -share/pybitmessage/pyelliptic/__init__.pyo -share/pybitmessage/pyelliptic/arithmetic.py -share/pybitmessage/pyelliptic/arithmetic.pyc -share/pybitmessage/pyelliptic/arithmetic.pyo -share/pybitmessage/pyelliptic/cipher.py -share/pybitmessage/pyelliptic/cipher.pyc -share/pybitmessage/pyelliptic/cipher.pyo -share/pybitmessage/pyelliptic/ecc.py -share/pybitmessage/pyelliptic/ecc.pyc -share/pybitmessage/pyelliptic/ecc.pyo -share/pybitmessage/pyelliptic/hash.py -share/pybitmessage/pyelliptic/hash.pyc -share/pybitmessage/pyelliptic/hash.pyo -share/pybitmessage/pyelliptic/openssl.py -share/pybitmessage/pyelliptic/openssl.pyc -share/pybitmessage/pyelliptic/openssl.pyo -share/pybitmessage/qidenticon.py -share/pybitmessage/qidenticon.pyc -share/pybitmessage/qidenticon.pyo -share/pybitmessage/shared.py -share/pybitmessage/shared.pyc -share/pybitmessage/shared.pyo -share/pybitmessage/singleton.py -share/pybitmessage/singleton.pyc -share/pybitmessage/singleton.pyo -share/pybitmessage/socks/BUGS -share/pybitmessage/socks/LICENSE -share/pybitmessage/socks/README -share/pybitmessage/socks/__init__.py -share/pybitmessage/socks/__init__.pyc -share/pybitmessage/socks/__init__.pyo -share/pybitmessage/sslkeys/cert.pem -share/pybitmessage/sslkeys/key.pem -share/pybitmessage/tr.py -share/pybitmessage/tr.pyc -share/pybitmessage/tr.pyo -share/pybitmessage/translations/bitmessage.pro -share/pybitmessage/translations/bitmessage_ar.qm -share/pybitmessage/translations/bitmessage_ar.ts -share/pybitmessage/translations/bitmessage_cs.qm -share/pybitmessage/translations/bitmessage_cs.ts -share/pybitmessage/translations/bitmessage_da.qm -share/pybitmessage/translations/bitmessage_da.ts -share/pybitmessage/translations/bitmessage_de.qm -share/pybitmessage/translations/bitmessage_de.ts -share/pybitmessage/translations/bitmessage_en.qm -share/pybitmessage/translations/bitmessage_en.ts -share/pybitmessage/translations/bitmessage_en_pirate.qm -share/pybitmessage/translations/bitmessage_en_pirate.ts -share/pybitmessage/translations/bitmessage_eo.qm -share/pybitmessage/translations/bitmessage_eo.ts -share/pybitmessage/translations/bitmessage_fr.qm -share/pybitmessage/translations/bitmessage_fr.ts -share/pybitmessage/translations/bitmessage_it.qm -share/pybitmessage/translations/bitmessage_it.ts -share/pybitmessage/translations/bitmessage_ja.qm -share/pybitmessage/translations/bitmessage_ja.ts -share/pybitmessage/translations/bitmessage_nb.ts -share/pybitmessage/translations/bitmessage_nl.qm -share/pybitmessage/translations/bitmessage_nl.ts -share/pybitmessage/translations/bitmessage_no.qm -share/pybitmessage/translations/bitmessage_no.ts -share/pybitmessage/translations/bitmessage_pl.ts -share/pybitmessage/translations/bitmessage_pl.qm -share/pybitmessage/translations/bitmessage_pt.qm -share/pybitmessage/translations/bitmessage_pt.ts -share/pybitmessage/translations/bitmessage_ru.qm -share/pybitmessage/translations/bitmessage_ru.ts -share/pybitmessage/translations/bitmessage_sk.qm -share/pybitmessage/translations/bitmessage_sk.ts -share/pybitmessage/translations/bitmessage_sv.ts -share/pybitmessage/translations/bitmessage_zh_cn.qm -share/pybitmessage/translations/bitmessage_zh_cn.ts -share/pybitmessage/upnp.py -share/pybitmessage/upnp.pyc -share/pybitmessage/upnp.pyo -%%NATIVE_POW%%share/pybitmessage/bitmsghash/bitmsghash.so -@dir share/icons/hicolor/scalable/apps Property changes on: head/net-p2p/bitmessage/pkg-plist ___________________________________________________________________ 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/net-p2p/bitmessage/Makefile =================================================================== --- head/net-p2p/bitmessage/Makefile (revision 436514) +++ head/net-p2p/bitmessage/Makefile (revision 436515) @@ -1,66 +1,49 @@ # Created by: Yuri Victorovich # $FreeBSD$ PORTNAME= bitmessage -PORTVERSION= 0.6.1 -PORTREVISION= 1 +PORTVERSION= 0.6.2 DISTVERSIONPREFIX= v CATEGORIES= net-p2p MAINTAINER= yuri@rawbw.com COMMENT= Secure P2P communications client LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ + ${PYTHON_PKGNAMEPREFIX}qt4-core>=${PYQT4_VERSION}:devel/py-qt4-core \ + ${PYTHON_PKGNAMEPREFIX}qt4-network>=${PYQT4_VERSION}:net/py-qt4-network \ + ${PYTHON_PKGNAMEPREFIX}qt4-gui>=${PYQT4_VERSION}:x11-toolkits/py-qt4-gui \ + ${PYTHON_PKGNAMEPREFIX}msgpack-python>0:devel/py-msgpack-python \ + ${PYTHON_PKGNAMEPREFIX}pyopencl>0:devel/py-pyopencl USE_GITHUB= yes GH_ACCOUNT= Bitmessage GH_PROJECT= PyBitmessage -USES= python pyqt:4 ssl +USES= gmake python pyqt:4 ssl USE_PYQT= core_run gui_run network_run -NATIVE_POW_USES=gmake +USE_PYTHON= distutils autoplist INSTALLS_ICONS= yes - -OPTIONS_DEFINE= NATIVE_POW -OPTIONS_DEFAULT=NATIVE_POW -NATIVE_POW_DESC=Native POW procedure -OPTIONS_SUB= yes REINPLACE_ARGS= -i '' post-patch: - @${REINPLACE_CMD} -e 's|@PYTHON@|${PYTHON_CMD}|' \ - ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e "s|\((CCFLAGS)\)|\1 -I${OPENSSLINC} |g" \ - -e "s|\(-lcrypto\)|-L${OPENSSLLIB} \1|g" \ - ${WRKSRC}/src/bitmsghash/Makefile @${REINPLACE_CMD} -e 's|^#!.*$$|#!${PYTHON_CMD}|' \ - ${WRKSRC}/compiletest.py ${WRKSRC}/src/bitmessagecli.py ${WRKSRC}/src/bitmessagemain.py \ + ${WRKSRC}/build/compiletest.py ${WRKSRC}/src/bitmessagecli.py ${WRKSRC}/src/bitmessagemain.py \ ${WRKSRC}/src/depends.py \ ${WRKSRC}/src/bitmessageqt/migrationwizard.py ${WRKSRC}/src/bitmessageqt/newaddresswizard.py \ ${WRKSRC}/src/bitmessageqt/settingsmixin.py ${WRKSRC}/src/helper_msgcoding.py ${WRKSRC}/src/openclpow.py do-build: @(cd ${WRKSRC} && \ ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ -d ${WRKSRC} -f ${WRKSRC} && \ ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \ -d ${WRKSRC} -f ${WRKSRC}) -do-build-NATIVE_POW-on: - @(cd ${WRKSRC} && \ - ${ECHO_MSG} "===> Compiling the proof-of-work (POW) routine" && \ - (cd src/bitmsghash && ${MAKE_CMD})) - post-install: - @${RM} ${STAGEDIR}${PREFIX}/share/pybitmessage/bitmsghash/Makefile \ - ${STAGEDIR}${PREFIX}/share/pybitmessage/bitmsghash/bitmsghash.cpp \ - ${STAGEDIR}${PREFIX}/share/pybitmessage/bitmsghash/bitmsghash.cl - -post-install-NATIVE_POW-on: - @${RM} ${STAGEDIR}${PREFIX}/share/pybitmessage/bitmsghash/bitmsghash.o - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/share/pybitmessage/bitmsghash/bitmsghash.so + @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/pybitmessage/bitmsghash/bitmsghash.so .include Index: head/net-p2p/bitmessage/distinfo =================================================================== --- head/net-p2p/bitmessage/distinfo (revision 436514) +++ head/net-p2p/bitmessage/distinfo (revision 436515) @@ -1,3 +1,3 @@ -TIMESTAMP = 1471861326 -SHA256 (Bitmessage-PyBitmessage-v0.6.1_GH0.tar.gz) = ceb6585c816bbcafc63cf3ea55b709ddf1dc1d48012509ef3c47dcdb553ed2b9 -SIZE (Bitmessage-PyBitmessage-v0.6.1_GH0.tar.gz) = 962301 +TIMESTAMP = 1489654811 +SHA256 (Bitmessage-PyBitmessage-v0.6.2_GH0.tar.gz) = bc209725ef7c1b913ec8560557e3e862a11f664bd8c5fd2eea5adcd915acc2c6 +SIZE (Bitmessage-PyBitmessage-v0.6.2_GH0.tar.gz) = 1053815 Index: head/net-p2p/bitmessage/files/patch-Makefile =================================================================== --- head/net-p2p/bitmessage/files/patch-Makefile (revision 436514) +++ head/net-p2p/bitmessage/files/patch-Makefile (nonexistent) @@ -1,36 +0,0 @@ ---- Makefile.orig 2016-08-21 09:56:25 UTC -+++ Makefile -@@ -16,9 +16,9 @@ install: - mkdir -p ${DESTDIR}${PREFIX} - mkdir -p ${DESTDIR}${PREFIX}/bin - mkdir -m 755 -p ${DESTDIR}${PREFIX}/share -- mkdir -m 755 -p ${DESTDIR}${PREFIX}/share/man -- mkdir -m 755 -p ${DESTDIR}${PREFIX}/share/man/man1 -- install -m 644 man/${APP}.1.gz ${DESTDIR}${PREFIX}/share/man/man1 -+ mkdir -m 755 -p ${DESTDIR}${PREFIX}/man -+ mkdir -m 755 -p ${DESTDIR}${PREFIX}/man/man1 -+ install -m 644 man/${APP}.1.gz ${DESTDIR}${PREFIX}/man/man1 - mkdir -m 755 -p ${DESTDIR}${PREFIX}/share/${APP} - mkdir -m 755 -p ${DESTDIR}${PREFIX}/share/applications - mkdir -m 755 -p ${DESTDIR}${PREFIX}/share/pixmaps -@@ -35,16 +35,13 @@ install: - echo "if [ -d ${PREFIX}/share/${APP} ]; then" >> ${DESTDIR}${PREFIX}/bin/${APP} - echo " cd ${PREFIX}/share/${APP}" >> ${DESTDIR}${PREFIX}/bin/${APP} - echo 'else' >> ${DESTDIR}${PREFIX}/bin/${APP} -- echo " cd /usr/share/pybitmessage" >> ${DESTDIR}${PREFIX}/bin/${APP} -- echo 'fi' >> ${DESTDIR}${PREFIX}/bin/${APP} -- echo 'if [ -d /opt/openssl-compat-bitcoin/lib ]; then' >> ${DESTDIR}${PREFIX}/bin/${APP} -- echo ' LD_LIBRARY_PATH="/opt/openssl-compat-bitcoin/lib/" exec python2 bitmessagemain.py' >> ${DESTDIR}${PREFIX}/bin/${APP} -- echo 'else' >> ${DESTDIR}${PREFIX}/bin/${APP} -- echo ' exec python2 bitmessagemain.py' >> ${DESTDIR}${PREFIX}/bin/${APP} -+ echo ' echo "BitMessage directory not found"' >> ${DESTDIR}${PREFIX}/bin/${APP} -+ echo ' exit 1' >> ${DESTDIR}${PREFIX}/bin/${APP} - echo 'fi' >> ${DESTDIR}${PREFIX}/bin/${APP} -+ echo 'exec @PYTHON@ bitmessagemain.py' >> ${DESTDIR}${PREFIX}/bin/${APP} - chmod +x ${DESTDIR}${PREFIX}/bin/${APP} - uninstall: -- rm -f ${PREFIX}/share/man/man1/${APP}.1.gz -+ rm -f ${PREFIX}/man/man1/${APP}.1.gz - rm -rf ${PREFIX}/share/${APP} - rm -f ${PREFIX}/bin/${APP} - rm -f ${PREFIX}/share/applications/${APP}.desktop Property changes on: head/net-p2p/bitmessage/files/patch-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/net-p2p/bitmessage/files/patch-src_bitmsghash_Makefile =================================================================== --- head/net-p2p/bitmessage/files/patch-src_bitmsghash_Makefile (revision 436514) +++ head/net-p2p/bitmessage/files/patch-src_bitmsghash_Makefile (nonexistent) @@ -1,15 +0,0 @@ ---- src/bitmsghash/Makefile.orig 2016-08-21 09:56:25 UTC -+++ src/bitmsghash/Makefile -@@ -10,10 +10,10 @@ powtest: - ./testpow.py - - bitmsghash.so: bitmsghash.o -- g++ bitmsghash.o -shared -fPIC -lpthread -lcrypto $(LDFLAGS) -o bitmsghash.so -+ ${CC} bitmsghash.o -shared -fPIC -lpthread -lcrypto $(LDFLAGS) -o bitmsghash.so - - bitmsghash.o: -- g++ -Wall -O3 -march=native -fPIC $(CCFLAGS) -c bitmsghash.cpp -+ ${CC} -Wall -O3 -march=native -fPIC $(CCFLAGS) -c bitmsghash.cpp - - clean: - rm -f bitmsghash.o bitmsghash.so Property changes on: head/net-p2p/bitmessage/files/patch-src_bitmsghash_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/net-p2p/bitmessage/files/patch-setup.py =================================================================== --- head/net-p2p/bitmessage/files/patch-setup.py (nonexistent) +++ head/net-p2p/bitmessage/files/patch-setup.py (revision 436515) @@ -0,0 +1,35 @@ +--- setup.py.orig 2017-03-01 12:12:31 UTC ++++ setup.py +@@ -117,13 +117,7 @@ def detectOS(): + def detectPrereqs(missing=False): + available = [] + for module in packageName.keys(): +- try: +- import_module(module) +- if not missing: +- available.append(module) +- except ImportError: +- if missing: +- available.append(module) ++ available.append(module) + return available + + +@@ -146,7 +140,7 @@ def compilerToPackages(): + if __name__ == "__main__": + detectOS.result = None + detectPrereqs.result = None +- if detectPrereqs(True) != [] and detectOS() in packageManager: ++ if False and detectPrereqs(True) != [] and detectOS() in packageManager: + if detectOS() is not None: + print "It looks like you're using %s. " \ + "It is highly recommended to use the package manager " \ +@@ -159,7 +153,7 @@ if __name__ == "__main__": + print "It looks like you're missing setuptools." + sys.exit() + +- if detectPrereqs(True) != []: ++ if False and detectPrereqs(True) != []: + print "Press Return to continue" + try: + nothing = raw_input() Property changes on: head/net-p2p/bitmessage/files/patch-setup.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