Bug 186091 - [MAINTAINER UPDATE] net-p2p/bitmessage
Summary: [MAINTAINER UPDATE] net-p2p/bitmessage
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Steve Wills
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-01-25 06:30 UTC by Yuri Victorovich
Modified: 2014-03-13 03:40 UTC (History)
0 users

See Also:


Attachments
file.diff (12.59 KB, patch)
2014-01-25 06:30 UTC, Yuri Victorovich
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Yuri Victorovich freebsd_committer freebsd_triage 2014-01-25 06:30:00 UTC
Please commit this patch, updating version 4.1->4.2
Please note that 'files' directory should be deleted along with the single patch in it.

Fix: Patch attached with submission follows:
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2014-01-25 06:30:09 UTC
Class Changed
From-To: maintainer-update->change-request

Fix category (submitter is not maintainer) (via the GNATS Auto Assign 
Tool)
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2014-01-25 06:30:10 UTC
Maintainer of net-p2p/bitmessage,

Please note that PR ports/186091 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/186091

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 3 Edwin Groothuis freebsd_committer freebsd_triage 2014-01-25 06:30:11 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 4 Steve Wills freebsd_committer freebsd_triage 2014-02-16 15:32:27 UTC
Responsible Changed
From-To: freebsd-ports-bugs->swills

I'll take it.
Comment 5 Johannes Meixner 2014-03-12 16:28:12 UTC
The patch attached makes net-p2p/bitmessage's own Makefile respect
our stagedir when creating ${STAGEDIR}${PREFIX/bin/pybitmessage,
in that it does not echo ${STAGEDIR} paths to it.

Best,
Johannes Meixner

---
xmj@chaot.net
http://chaot.net

Port maintainer (yuri@tsoft.com) is cc'd.

Generated with FreeBSD Port Tools 1.00.2014.03.12 (mode: update, diff: SVN)

--- bitmessage-0.4.2.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 347986)
+++ Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bitmessage
-PORTVERSION=	0.4.1
+PORTVERSION=	0.4.2
 CATEGORIES=	net-p2p
 MASTER_SITES=	GH
 
@@ -9,6 +9,8 @@
 MAINTAINER=	yuri@tsoft.com
 COMMENT=	Secure P2P communications client
 
+LICENSE=	MIT
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
 		${PYTHON_PKGNAMEPREFIX}qt4-core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core \
 		${PYTHON_PKGNAMEPREFIX}qt4-gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui
@@ -16,7 +18,7 @@
 USE_GITHUB=	yes
 GH_ACCOUNT=	Bitmessage
 GH_PROJECT=	PyBitmessage
-GH_COMMIT=	e21fdb4
+GH_COMMIT=	8b189f0
 GH_TAGNAME=	v${PORTVERSION}
 
 USE_OPENSSL=	yes
@@ -23,6 +25,9 @@
 USE_PYTHON=	yes
 INSTALLS_ICONS=	yes
 
+post-patch:
+	${REINPLACE_CMD} -e 's|python2|${PYTHON_CMD}|' ${WRKSRC}/Makefile
+
 do-build:
 	@(cd ${WRKSRC} && \
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
Index: distinfo
===================================================================
--- distinfo	(revision 347986)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (bitmessage-0.4.1.tar.gz) = 76dfb7512404de05cad83cb06209a550daf2b960a1a8f739b4f2059d3ecb47df
-SIZE (bitmessage-0.4.1.tar.gz) = 408989
+SHA256 (bitmessage-0.4.2.tar.gz) = a0192fc980a627fdd325fc0c67e872d689ee072a05a02518135a6fd8a4c8d73f
+SIZE (bitmessage-0.4.2.tar.gz) = 547670
Index: files/patch-Makefile
===================================================================
--- files/patch-Makefile	(revision 0)
+++ files/patch-Makefile	(working copy)
@@ -0,0 +1,20 @@
+--- ./Makefile.orig	2014-01-21 08:17:36.000000000 +0200
++++ ./Makefile	2014-03-12 18:18:00.000000000 +0200
+@@ -31,12 +31,13 @@
+ 	install -m 644 desktop/can-icon.svg ${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/${APP}.svg
+ 	cp -rf src/* ${DESTDIR}${PREFIX}/share/${APP}
+ 	echo '#!/bin/sh' > ${DESTDIR}${PREFIX}/bin/${APP}
+-	echo 'if [ -d ${DESTDIR}/usr/local/share/${APP} ]; then' >> ${DESTDIR}${PREFIX}/bin/${APP}
+-	echo '  cd ${DESTDIR}/usr/local/share/${APP}' >> ${DESTDIR}${PREFIX}/bin/${APP}
++	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 ${DESTDIR}/usr/share/pybitmessage' >> ${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 'LD_LIBRARY_PATH="/opt/openssl-compat-bitcoin/lib/" exec python2 bitmessagemain.py' >> ${DESTDIR}${PREFIX}/bin/${APP}
++	echo 'python2 bitmessagemain.py' >> ${DESTDIR}${PREFIX}/bin/${APP}
+ 	chmod +x ${DESTDIR}${PREFIX}/bin/${APP}
+ uninstall:
+ 	rm -f ${PREFIX}/share/man/man1/${APP}.1.gz

Property changes on: files/patch-Makefile
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
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
Index: files/patch-shared.py
===================================================================
--- files/patch-shared.py	(revision 347986)
+++ files/patch-shared.py	(working copy)
@@ -1,14 +0,0 @@
---- src/shared.py.orig
-+++ src/shared.py
-@@ -347,6 +347,11 @@ def checkSensitiveFilePermissions(filename):
-         # TODO: This might deserve extra checks by someone familiar with
-         # Windows systems.
-         return True
-+    elif sys.platform[:7] == 'freebsd':
-+        # FreeBSD file systems are the same as major Linux file systems
-+        present_permissions = os.stat(filename)[0]
-+        disallowed_permissions = stat.S_IRWXG | stat.S_IRWXO
-+        return present_permissions & disallowed_permissions == 0
-     else:
-         try:
-             # Skip known problems for non-Win32 filesystems without POSIX permissions.
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 347986)
+++ pkg-plist	(working copy)
@@ -1,10 +1,14 @@
 bin/pybitmessage
 share/applications/pybitmessage.desktop
 share/icons/hicolor/24x24/apps/pybitmessage.png
+share/icons/hicolor/scalable/apps/pybitmessage.svg
 share/man/man1/pybitmessage.1.gz
 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
@@ -11,6 +15,63 @@
 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/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/connect.py
+share/pybitmessage/bitmessageqt/connect.pyc
+share/pybitmessage/bitmessageqt/connect.pyo
+share/pybitmessage/bitmessageqt/connect.ui
+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/newaddressdialog.py
+share/pybitmessage/bitmessageqt/newaddressdialog.pyc
+share/pybitmessage/bitmessageqt/newaddressdialog.pyo
+share/pybitmessage/bitmessageqt/newaddressdialog.ui
+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/settings.py
+share/pybitmessage/bitmessageqt/settings.pyc
+share/pybitmessage/bitmessageqt/settings.pyo
+share/pybitmessage/bitmessageqt/settings.ui
+share/pybitmessage/bitmessageqt/specialaddressbehavior.py
+share/pybitmessage/bitmessageqt/specialaddressbehavior.pyc
+share/pybitmessage/bitmessageqt/specialaddressbehavior.pyo
+share/pybitmessage/bitmessageqt/specialaddressbehavior.ui
+share/pybitmessage/bitmessageqt/wanlan.ui
 share/pybitmessage/build_osx.py
 share/pybitmessage/build_osx.pyc
 share/pybitmessage/build_osx.pyo
@@ -20,6 +81,9 @@
 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_outgoingSynSender.py
 share/pybitmessage/class_outgoingSynSender.pyc
 share/pybitmessage/class_outgoingSynSender.pyo
@@ -71,77 +135,6 @@
 share/pybitmessage/highlevelcrypto.py
 share/pybitmessage/highlevelcrypto.pyc
 share/pybitmessage/highlevelcrypto.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/proofofwork.py
-share/pybitmessage/proofofwork.pyc
-share/pybitmessage/proofofwork.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/tr.py
-share/pybitmessage/tr.pyc
-share/pybitmessage/tr.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/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/connect.py
-share/pybitmessage/bitmessageqt/connect.pyc
-share/pybitmessage/bitmessageqt/connect.pyo
-share/pybitmessage/bitmessageqt/connect.ui
-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/newaddressdialog.py
-share/pybitmessage/bitmessageqt/newaddressdialog.pyc
-share/pybitmessage/bitmessageqt/newaddressdialog.pyo
-share/pybitmessage/bitmessageqt/newaddressdialog.ui
-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/settings.py
-share/pybitmessage/bitmessageqt/settings.pyc
-share/pybitmessage/bitmessageqt/settings.pyo
-share/pybitmessage/bitmessageqt/settings.ui
-share/pybitmessage/bitmessageqt/specialaddressbehavior.py
-share/pybitmessage/bitmessageqt/specialaddressbehavior.pyc
-share/pybitmessage/bitmessageqt/specialaddressbehavior.pyo
-share/pybitmessage/bitmessageqt/specialaddressbehavior.ui
-share/pybitmessage/bitmessageqt/wanlan.ui
 share/pybitmessage/images/addressbook.png
 share/pybitmessage/images/bitmessage.icns
 share/pybitmessage/images/blacklist.png
@@ -155,11 +148,25 @@
 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/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/proofofwork.py
+share/pybitmessage/proofofwork.pyc
+share/pybitmessage/proofofwork.pyo
 share/pybitmessage/pyelliptic/LICENSE
 share/pybitmessage/pyelliptic/README.md
 share/pybitmessage/pyelliptic/__init__.py
@@ -180,6 +187,15 @@
 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
@@ -186,6 +202,12 @@
 share/pybitmessage/socks/__init__.py
 share/pybitmessage/socks/__init__.pyc
 share/pybitmessage/socks/__init__.pyo
+share/pybitmessage/tr.py
+share/pybitmessage/tr.pyc
+share/pybitmessage/tr.pyo
+share/pybitmessage/translations/bitmessage_ar.pro
+share/pybitmessage/translations/bitmessage_ar.qm
+share/pybitmessage/translations/bitmessage_ar.ts
 share/pybitmessage/translations/bitmessage_de.pro
 share/pybitmessage/translations/bitmessage_de.qm
 share/pybitmessage/translations/bitmessage_de.ts
@@ -198,9 +220,15 @@
 share/pybitmessage/translations/bitmessage_fr.pro
 share/pybitmessage/translations/bitmessage_fr.qm
 share/pybitmessage/translations/bitmessage_fr.ts
+share/pybitmessage/translations/bitmessage_no.pro
+share/pybitmessage/translations/bitmessage_no.qm
+share/pybitmessage/translations/bitmessage_no.ts
 share/pybitmessage/translations/bitmessage_ru.pro
 share/pybitmessage/translations/bitmessage_ru.qm
 share/pybitmessage/translations/bitmessage_ru.ts
+share/pybitmessage/translations/bitmessage_zh_cn.pro
+share/pybitmessage/translations/bitmessage_zh_cn.qm
+share/pybitmessage/translations/bitmessage_zh_cn.ts
 @dirrmtry share/pybitmessage/translations
 @dirrmtry share/pybitmessage/socks
 @dirrmtry share/pybitmessage/pyelliptic
--- bitmessage-0.4.2.patch ends here ---
Comment 6 dfilter service freebsd_committer freebsd_triage 2014-03-13 02:59:05 UTC
Author: swills
Date: Thu Mar 13 02:58:56 2014
New Revision: 348023
URL: http://svnweb.freebsd.org/changeset/ports/348023
QAT: https://qat.redports.org/buildarchive/r348023/

Log:
  - Update to 0.4.2
  
  PR:		ports/186091
  Submitted by:	Yuri <yuri@rawbw.com> (maintainer) (slightly modified with help from Johannes Jost Meixner <xmj@chaot.net>)

Added:
  head/net-p2p/bitmessage/files/patch-Makefile   (contents, props changed)
Deleted:
  head/net-p2p/bitmessage/files/patch-shared.py
Modified:
  head/net-p2p/bitmessage/Makefile
  head/net-p2p/bitmessage/distinfo
  head/net-p2p/bitmessage/pkg-plist

Modified: head/net-p2p/bitmessage/Makefile
==============================================================================
--- head/net-p2p/bitmessage/Makefile	Thu Mar 13 02:12:35 2014	(r348022)
+++ head/net-p2p/bitmessage/Makefile	Thu Mar 13 02:58:56 2014	(r348023)
@@ -2,13 +2,15 @@
 # $FreeBSD$
 
 PORTNAME=	bitmessage
-PORTVERSION=	0.4.1
+PORTVERSION=	0.4.2
 CATEGORIES=	net-p2p
 MASTER_SITES=	GH
 
 MAINTAINER=	yuri@tsoft.com
 COMMENT=	Secure P2P communications client
 
+LICENSE=	MIT
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
 		${PYTHON_PKGNAMEPREFIX}qt4-core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core \
 		${PYTHON_PKGNAMEPREFIX}qt4-gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui
@@ -16,13 +18,16 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqli
 USE_GITHUB=	yes
 GH_ACCOUNT=	Bitmessage
 GH_PROJECT=	PyBitmessage
-GH_COMMIT=	e21fdb4
+GH_COMMIT=	8b189f0
 GH_TAGNAME=	v${PORTVERSION}
 
 USE_OPENSSL=	yes
 USE_PYTHON=	yes
 INSTALLS_ICONS=	yes
 
+post-patch:
+	${REINPLACE_CMD} -e 's|python2|${PYTHON_CMD}|' ${WRKSRC}/Makefile
+
 do-build:
 	@(cd ${WRKSRC} && \
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \

Modified: head/net-p2p/bitmessage/distinfo
==============================================================================
--- head/net-p2p/bitmessage/distinfo	Thu Mar 13 02:12:35 2014	(r348022)
+++ head/net-p2p/bitmessage/distinfo	Thu Mar 13 02:58:56 2014	(r348023)
@@ -1,2 +1,2 @@
-SHA256 (bitmessage-0.4.1.tar.gz) = 76dfb7512404de05cad83cb06209a550daf2b960a1a8f739b4f2059d3ecb47df
-SIZE (bitmessage-0.4.1.tar.gz) = 408989
+SHA256 (bitmessage-0.4.2.tar.gz) = a0192fc980a627fdd325fc0c67e872d689ee072a05a02518135a6fd8a4c8d73f
+SIZE (bitmessage-0.4.2.tar.gz) = 547670

Added: head/net-p2p/bitmessage/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-p2p/bitmessage/files/patch-Makefile	Thu Mar 13 02:58:56 2014	(r348023)
@@ -0,0 +1,20 @@
+--- ./Makefile.orig	2014-01-21 08:17:36.000000000 +0200
++++ ./Makefile	2014-03-12 18:18:00.000000000 +0200
+@@ -31,12 +31,13 @@
+ 	install -m 644 desktop/can-icon.svg ${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/${APP}.svg
+ 	cp -rf src/* ${DESTDIR}${PREFIX}/share/${APP}
+ 	echo '#!/bin/sh' > ${DESTDIR}${PREFIX}/bin/${APP}
+-	echo 'if [ -d ${DESTDIR}/usr/local/share/${APP} ]; then' >> ${DESTDIR}${PREFIX}/bin/${APP}
+-	echo '  cd ${DESTDIR}/usr/local/share/${APP}' >> ${DESTDIR}${PREFIX}/bin/${APP}
++	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 ${DESTDIR}/usr/share/pybitmessage' >> ${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 'LD_LIBRARY_PATH="/opt/openssl-compat-bitcoin/lib/" exec python2 bitmessagemain.py' >> ${DESTDIR}${PREFIX}/bin/${APP}
++	echo 'python2 bitmessagemain.py' >> ${DESTDIR}${PREFIX}/bin/${APP}
+ 	chmod +x ${DESTDIR}${PREFIX}/bin/${APP}
+ uninstall:
+ 	rm -f ${PREFIX}/share/man/man1/${APP}.1.gz

Modified: head/net-p2p/bitmessage/pkg-plist
==============================================================================
--- head/net-p2p/bitmessage/pkg-plist	Thu Mar 13 02:12:35 2014	(r348022)
+++ head/net-p2p/bitmessage/pkg-plist	Thu Mar 13 02:58:56 2014	(r348023)
@@ -1,16 +1,77 @@
 bin/pybitmessage
 share/applications/pybitmessage.desktop
 share/icons/hicolor/24x24/apps/pybitmessage.png
+share/icons/hicolor/scalable/apps/pybitmessage.svg
 share/man/man1/pybitmessage.1.gz
 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/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/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/connect.py
+share/pybitmessage/bitmessageqt/connect.pyc
+share/pybitmessage/bitmessageqt/connect.pyo
+share/pybitmessage/bitmessageqt/connect.ui
+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/newaddressdialog.py
+share/pybitmessage/bitmessageqt/newaddressdialog.pyc
+share/pybitmessage/bitmessageqt/newaddressdialog.pyo
+share/pybitmessage/bitmessageqt/newaddressdialog.ui
+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/settings.py
+share/pybitmessage/bitmessageqt/settings.pyc
+share/pybitmessage/bitmessageqt/settings.pyo
+share/pybitmessage/bitmessageqt/settings.ui
+share/pybitmessage/bitmessageqt/specialaddressbehavior.py
+share/pybitmessage/bitmessageqt/specialaddressbehavior.pyc
+share/pybitmessage/bitmessageqt/specialaddressbehavior.pyo
+share/pybitmessage/bitmessageqt/specialaddressbehavior.ui
+share/pybitmessage/bitmessageqt/wanlan.ui
 share/pybitmessage/build_osx.py
 share/pybitmessage/build_osx.pyc
 share/pybitmessage/build_osx.pyo
@@ -20,6 +81,9 @@ share/pybitmessage/class_addressGenerato
 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_outgoingSynSender.py
 share/pybitmessage/class_outgoingSynSender.pyc
 share/pybitmessage/class_outgoingSynSender.pyo
@@ -71,77 +135,6 @@ share/pybitmessage/helper_startup.pyo
 share/pybitmessage/highlevelcrypto.py
 share/pybitmessage/highlevelcrypto.pyc
 share/pybitmessage/highlevelcrypto.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/proofofwork.py
-share/pybitmessage/proofofwork.pyc
-share/pybitmessage/proofofwork.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/tr.py
-share/pybitmessage/tr.pyc
-share/pybitmessage/tr.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/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/connect.py
-share/pybitmessage/bitmessageqt/connect.pyc
-share/pybitmessage/bitmessageqt/connect.pyo
-share/pybitmessage/bitmessageqt/connect.ui
-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/newaddressdialog.py
-share/pybitmessage/bitmessageqt/newaddressdialog.pyc
-share/pybitmessage/bitmessageqt/newaddressdialog.pyo
-share/pybitmessage/bitmessageqt/newaddressdialog.ui
-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/settings.py
-share/pybitmessage/bitmessageqt/settings.pyc
-share/pybitmessage/bitmessageqt/settings.pyo
-share/pybitmessage/bitmessageqt/settings.ui
-share/pybitmessage/bitmessageqt/specialaddressbehavior.py
-share/pybitmessage/bitmessageqt/specialaddressbehavior.pyc
-share/pybitmessage/bitmessageqt/specialaddressbehavior.pyo
-share/pybitmessage/bitmessageqt/specialaddressbehavior.ui
-share/pybitmessage/bitmessageqt/wanlan.ui
 share/pybitmessage/images/addressbook.png
 share/pybitmessage/images/bitmessage.icns
 share/pybitmessage/images/blacklist.png
@@ -155,11 +148,25 @@ 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/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/proofofwork.py
+share/pybitmessage/proofofwork.pyc
+share/pybitmessage/proofofwork.pyo
 share/pybitmessage/pyelliptic/LICENSE
 share/pybitmessage/pyelliptic/README.md
 share/pybitmessage/pyelliptic/__init__.py
@@ -180,12 +187,27 @@ 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/tr.py
+share/pybitmessage/tr.pyc
+share/pybitmessage/tr.pyo
+share/pybitmessage/translations/bitmessage_ar.pro
+share/pybitmessage/translations/bitmessage_ar.qm
+share/pybitmessage/translations/bitmessage_ar.ts
 share/pybitmessage/translations/bitmessage_de.pro
 share/pybitmessage/translations/bitmessage_de.qm
 share/pybitmessage/translations/bitmessage_de.ts
@@ -198,9 +220,15 @@ share/pybitmessage/translations/bitmessa
 share/pybitmessage/translations/bitmessage_fr.pro
 share/pybitmessage/translations/bitmessage_fr.qm
 share/pybitmessage/translations/bitmessage_fr.ts
+share/pybitmessage/translations/bitmessage_no.pro
+share/pybitmessage/translations/bitmessage_no.qm
+share/pybitmessage/translations/bitmessage_no.ts
 share/pybitmessage/translations/bitmessage_ru.pro
 share/pybitmessage/translations/bitmessage_ru.qm
 share/pybitmessage/translations/bitmessage_ru.ts
+share/pybitmessage/translations/bitmessage_zh_cn.pro
+share/pybitmessage/translations/bitmessage_zh_cn.qm
+share/pybitmessage/translations/bitmessage_zh_cn.ts
 @dirrmtry share/pybitmessage/translations
 @dirrmtry share/pybitmessage/socks
 @dirrmtry share/pybitmessage/pyelliptic
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 7 Steve Wills freebsd_committer freebsd_triage 2014-03-13 02:59:17 UTC
State Changed
From-To: feedback->closed

Committed, with minor changes. Thanks!
Comment 8 Yuri Victorovich freebsd_committer freebsd_triage 2014-03-13 03:32:21 UTC
Hey,

I am the maintainer. I didn't even have a chance to review the patch 
submitted by Johannes Jost Meixner today, and you already checked it in?

Yuri



On 03/12/2014 19:59, swills@FreeBSD.org wrote:
> Synopsis: [MAINTAINER UPDATE] net-p2p/bitmessage
>
> State-Changed-From-To: feedback->closed
> State-Changed-By: swills
> State-Changed-When: Thu Mar 13 02:59:17 UTC 2014
> State-Changed-Why:
> Committed, with minor changes. Thanks!
>
> http://www.freebsd.org/cgi/query-pr.cgi?pr=186091