Index: branches/2017Q1/net-p2p/bitmessage/Makefile
===================================================================
--- branches/2017Q1/net-p2p/bitmessage/Makefile	(revision 432835)
+++ branches/2017Q1/net-p2p/bitmessage/Makefile	(revision 432836)
@@ -1,68 +1,68 @@
 # Created by: Yuri Victorovich <yuri@rawbw.com>
 # $FreeBSD$
 
 PORTNAME=	bitmessage
 PORTVERSION=	0.6.1
+PORTREVISION=	1
 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 \
 		${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
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Bitmessage
 GH_PROJECT=	PyBitmessage
 
 USES=		python pyqt:4 ssl
 NATIVE_POW_USES=gmake
 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|python2|${PYTHON_CMD}| ; s|share/man|man|' \
+	@${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|python2|${PYTHON_CMD}| ; s|share/man|man|' ${WRKSRC}/Makefile ${WRKSRC}/src/depends.py
 	@${REINPLACE_CMD} -e 's|^#!.*$$|#!${PYTHON_CMD}|' \
 		${WRKSRC}/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
 
 .include <bsd.port.mk>
Index: branches/2017Q1/net-p2p/bitmessage/files/patch-Makefile
===================================================================
--- branches/2017Q1/net-p2p/bitmessage/files/patch-Makefile	(revision 432835)
+++ branches/2017Q1/net-p2p/bitmessage/files/patch-Makefile	(revision 432836)
@@ -1,36 +1,36 @@
 --- 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 /usr/local/bin/python2.7 bitmessagemain.py' >> ${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
Index: branches/2017Q1
===================================================================
--- branches/2017Q1	(revision 432835)
+++ branches/2017Q1	(revision 432836)

Property changes on: branches/2017Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r432835