svn commit: r408512 - head/devel/bzr

[Olivier Duchateau]

Author: olivierd
Date: Mon Feb  8 19:49:59 2016
New Revision: 408512
URL: https://svnweb.freebsd.org/changeset/ports/408512

Log:
  - Update to 2.7.0 [1]
  - Convert to OPTIONS_* helpers [1]
  - Fix Python version, bzr still uses 'urllib2' module, which is only
  available in Python 2.x
  - Strip some libraries
  
  PR:		207010 [1]
  Submitted by:	<fullermd at over-yonder.net> (maintainer)

Modified:
  head/devel/bzr/Makefile
  head/devel/bzr/distinfo
  head/devel/bzr/pkg-plist

Modified: head/devel/bzr/Makefile
==============================================================================
--- head/devel/bzr/Makefile	Mon Feb  8 19:45:46 2016	(r408511)
+++ head/devel/bzr/Makefile	Mon Feb  8 19:49:59 2016	(r408512)
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	bzr
-PORTVERSION=	2.6.0
+PORTVERSION=	2.7.0
 CATEGORIES=	devel
-MASTER_SITES=	https://launchpadlibrarian.net/145980211/
-DISTNAME=	bzr-${PORTVERSION}
+MASTER_SITES=	https://launchpadlibrarian.net/235965106/ \
+	https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/
 
 MAINTAINER=	fullermd at over-yonder.net
 COMMENT=	Distributed version control system by Canonical
@@ -18,23 +18,17 @@ SFTP_DESC=	Paramiko for SFTP support
 CA_BUNDLE_DESC=	Include CA bundle for SSL cert validation
 OPTIONS_DEFAULT=	SFTP CA_BUNDLE
 
+SFTP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}paramiko>=0:${PORTSDIR}/security/py-paramiko
+CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+
 USE_PYTHON=	distutils
 PYDISTUTILS_PKGNAME=	bzr
-USES=		gettext python
+USES=		gettext python:2
 MAKE_ENV=	BZR_LOG=/dev/null
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MSFTP}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}paramiko>=0:${PORTSDIR}/security/py-paramiko
-.endif
-
-.if ${PORT_OPTIONS:MCA_BUNDLE}
-RUN_DEPENDS+=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
-.endif
-
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/bzr.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/bzrlib/*.so
 
 test:	build
 	cd ${WRKSRC} && ./bzr selftest

Modified: head/devel/bzr/distinfo
==============================================================================
--- head/devel/bzr/distinfo	Mon Feb  8 19:45:46 2016	(r408511)
+++ head/devel/bzr/distinfo	Mon Feb  8 19:49:59 2016	(r408512)
@@ -1,2 +1,2 @@
-SHA256 (bzr-2.6.0.tar.gz) = 0994797182eb828867eee81cccc79480bd2946c99304266bc427b902cf91dab0
-SIZE (bzr-2.6.0.tar.gz) = 11301124
+SHA256 (bzr-2.7.0.tar.gz) = 0d451227b705a0dd21d8408353fe7e44d3a5069e6c4c26e5f146f1314b8fdab3
+SIZE (bzr-2.7.0.tar.gz) = 11586410

Modified: head/devel/bzr/pkg-plist
==============================================================================
--- head/devel/bzr/pkg-plist	Mon Feb  8 19:45:46 2016	(r408511)
+++ head/devel/bzr/pkg-plist	Mon Feb  8 19:49:59 2016	(r408512)
@@ -1007,6 +1007,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_upgrade.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_upgrade.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_upgrade.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_verify_signatures.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_verify_signatures.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_verify_signatures.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_version.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_version.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_version.pyo