From owner-svn-ports-all@freebsd.org  Mon Jan 30 11:37:17 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id AEC0ACC8F6D;
 Mon, 30 Jan 2017 11:37:17 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 64353E6C;
 Mon, 30 Jan 2017 11:37:17 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0UBbGTu033296;
 Mon, 30 Jan 2017 11:37:16 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0UBbGdN033294;
 Mon, 30 Jan 2017 11:37:16 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201701301137.v0UBbGdN033294@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Mon, 30 Jan 2017 11:37:16 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r432836 - in branches/2017Q1/net-p2p/bitmessage: . files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Jan 2017 11:37:17 -0000

Author: amdmi3
Date: Mon Jan 30 11:37:16 2017
New Revision: 432836
URL: https://svnweb.freebsd.org/changeset/ports/432836

Log:
  MFH: r432835
  
  - Fix python paths
  
  PR:		213717
  Submitted by:	yuri@rawbw.com (maintainer)
  Approved by:	ports-secteam (with hat)

Modified:
  branches/2017Q1/net-p2p/bitmessage/Makefile
  branches/2017Q1/net-p2p/bitmessage/files/patch-Makefile
Directory Properties:
  branches/2017Q1/   (props changed)

Modified: branches/2017Q1/net-p2p/bitmessage/Makefile
==============================================================================
--- branches/2017Q1/net-p2p/bitmessage/Makefile	Mon Jan 30 11:35:18 2017	(r432835)
+++ branches/2017Q1/net-p2p/bitmessage/Makefile	Mon Jan 30 11:37:16 2017	(r432836)
@@ -3,6 +3,7 @@
 
 PORTNAME=	bitmessage
 PORTVERSION=	0.6.1
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net-p2p
 
@@ -32,12 +33,11 @@ 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 \

Modified: branches/2017Q1/net-p2p/bitmessage/files/patch-Makefile
==============================================================================
--- branches/2017Q1/net-p2p/bitmessage/files/patch-Makefile	Mon Jan 30 11:35:18 2017	(r432835)
+++ branches/2017Q1/net-p2p/bitmessage/files/patch-Makefile	Mon Jan 30 11:37:16 2017	(r432836)
@@ -26,7 +26,7 @@
 +	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