*/*: sync with upstream

Taken from: FreeBSD

audio/py-mutagen/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mutagen
-PORTVERSION=	1.36.1
+PORTVERSION=	1.36.2
 CATEGORIES=	audio python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

audio/py-mutagen/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1485208084
-SHA256 (mutagen-1.36.1.tar.gz) = ce2e9c85b06df59737ecd82697cb479d31626a19136a23e9ac91fbe654cd7c5f
-SIZE (mutagen-1.36.1.tar.gz) = 889370
+TIMESTAMP = 1485435557
+SHA256 (mutagen-1.36.2.tar.gz) = 86fe98e941ca305be8ee6bdc6bb0e4e9c473bf9fb69a838fe5bf2fc6124fbcc7
+SIZE (mutagen-1.36.2.tar.gz) = 889928

chinese/telnet/Makefile

@@ -28,6 +28,8 @@ IGNORE=		need to build this port with the source code of telnet
 BROKEN=		does not build
 .endif
 
+BROKEN_DragonFly=	does not build
+
 do-extract:
 	@${MKDIR} ${WRKDIR}
 	@${CP} -R ${SRCDIR} ${WRKSRC}

databases/Makefile

@@ -645,6 +645,7 @@
     SUBDIR += php71-pdo_pgsql
     SUBDIR += php71-pdo_sqlite
     SUBDIR += php71-pgsql
+    SUBDIR += php71-redis
     SUBDIR += php71-sqlite3
     SUBDIR += phpminiadmin
     SUBDIR += phpmyadmin

databases/php70-redis/Makefile

@@ -14,12 +14,10 @@ LICENSE=	PHP301
 USES=		php:ext
 USE_PHP=	session:build
 PHP_VER=	70
-IGNORE_WITH_PHP=	56
+IGNORE_WITH_PHP=	56 71
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	phpredis
 GH_PROJECT=	phpredis
 
-PHP_MODNAME=	redis
-
 .include <bsd.port.mk>

databases/php71-redis/Makefile

@@ -0,0 +1,22 @@
+# $FreeBSD$
+
+PORTNAME=	redis
+PORTVERSION=	3.0.0
+CATEGORIES=	databases
+PKGNAMEPREFIX=	php71-
+
+MAINTAINER=	[email protected]
+COMMENT=	PHP 7.1 extension for Redis
+
+LICENSE=	PHP301
+
+USES=		php:ext
+USE_PHP=	session:build
+PHP_VER=	71
+IGNORE_WITH_PHP=	56 70
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	phpredis
+GH_PROJECT=	phpredis
+
+.include <bsd.port.mk>

databases/php71-redis/distinfo

@@ -0,0 +1,2 @@
+SHA256 (phpredis-phpredis-3.0.0_GH0.tar.gz) = 030997370bb1906793989c89550d9cafd4fa35dccbad7040b2339301aa961dba
+SIZE (phpredis-phpredis-3.0.0_GH0.tar.gz) = 196416

databases/php71-redis/pkg-descr

@@ -0,0 +1,5 @@
+This extension provides an API for communicating with Redis database,
+a persistent key-value database with built-in net interface written
+in ANSI-C for Posix systems.
+
+WWW: https://github.com/phpredis/phpredis

devel/Makefile

@@ -4721,6 +4721,7 @@
     SUBDIR += py-twistedFlow
     SUBDIR += py-twistedRunner
     SUBDIR += py-txaio
+    SUBDIR += py-typed-asp
     SUBDIR += py-typing
     SUBDIR += py-tzlocal
     SUBDIR += py-ua_parser

devel/awscli/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	awscli
-PORTVERSION=	1.11.41
+PORTVERSION=	1.11.43
 CATEGORIES=	devel
 MASTER_SITES=	CHEESESHOP
 
@@ -12,7 +12,7 @@ COMMENT=	Universal Command Line Interface for Amazon Web Services
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}botocore>=1.5.4:devel/py-botocore \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}botocore>=1.5.6:devel/py-botocore \
 		${PYTHON_PKGNAMEPREFIX}colorama>=0.2.5:devel/py-colorama \
 		${PYTHON_PKGNAMEPREFIX}s3transfer>=0.1.9:net/py-s3transfer \
 		${PYTHON_PKGNAMEPREFIX}docutils>=0.10:textproc/py-docutils \

devel/awscli/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1485164833
-SHA256 (awscli-1.11.41.tar.gz) = 0ff92ed1d084e26251f1857684e02eb1cb59354e347290c86d188039cda236cd
-SIZE (awscli-1.11.41.tar.gz) = 511605
+TIMESTAMP = 1485425161
+SHA256 (awscli-1.11.43.tar.gz) = 7edc3c37e098ab95e190090f8bd143bd1138ad6abf0c77c9438d3e8f7c9524f5
+SIZE (awscli-1.11.43.tar.gz) = 511612

devel/catch/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	catch
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.6.0
+DISTVERSION=	1.6.1
 CATEGORIES=	devel
 
 MAINTAINER=	[email protected]

devel/catch/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1484209494
-SHA256 (philsquared-Catch-v1.6.0_GH0.tar.gz) = 83532346983c43963cf89a69c1544be493e6b4cccaf20975e53f5cf2239b73a9
-SIZE (philsquared-Catch-v1.6.0_GH0.tar.gz) = 290987
+TIMESTAMP = 1485437853
+SHA256 (philsquared-Catch-v1.6.1_GH0.tar.gz) = df8519833c07dca37726d2917e88d8a51f692706673256f792836006174f34e6
+SIZE (philsquared-Catch-v1.6.1_GH0.tar.gz) = 300840

devel/p5-Hash-Merge-Simple/Makefile

@@ -3,15 +3,20 @@
 
 PORTNAME=	Hash-Merge-Simple
 PORTVERSION=	0.051
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	[email protected]
 COMMENT=	Recursively merge two or more hashes, simply
 
-TEST_DEPENDS+=	p5-Test-Deep>=0:devel/p5-Test-Deep \
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
+BUILD_DEPENDS=	p5-Clone>=0:devel/p5-Clone
+RUN_DEPENDS:=	${BUILD_DEPENDS}
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep \
 		p5-Test-Most>=0:devel/p5-Test-Most
 
 USES=		perl5

devel/py-botocore/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	botocore
-PORTVERSION=	1.5.4
+PORTVERSION=	1.5.6
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

devel/py-botocore/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1485164767
-SHA256 (botocore-1.5.4.tar.gz) = 2261c2a5801c8232e9dac70dc7279f8119d08bff1916eb77cbd2bb9b8bf19a48
-SIZE (botocore-1.5.4.tar.gz) = 3309886
+TIMESTAMP = 1485425132
+SHA256 (botocore-1.5.6.tar.gz) = 8f88ba37b94454a5c063254f0014cabe3d21c0c4e0571169911c038b9149222e
+SIZE (botocore-1.5.6.tar.gz) = 3313416

devel/py-keystoneauth1/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	keystoneauth1
-PORTVERSION=	2.14.0
+PORTVERSION=	2.17.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +12,7 @@ COMMENT=	Authentication Library for OpenStack Identity
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 \
 		${PYTHON_PKGNAMEPREFIX}positional>=1.0.1:devel/py-positional \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \

devel/py-keystoneauth1/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1477158102
-SHA256 (keystoneauth1-2.14.0.tar.gz) = e4723d8d7faeb7ea12ef3bbd34d9aede8a60011ec7953a15defcd4df7a64cd83
-SIZE (keystoneauth1-2.14.0.tar.gz) = 175295
+TIMESTAMP = 1485279286
+SHA256 (keystoneauth1-2.17.0.tar.gz) = 74838029135c4a3053d392439f756cbc8dac7ee14895e15d50b393c7aea600bc
+SIZE (keystoneauth1-2.17.0.tar.gz) = 184273

devel/py-typed-ast/Makefile

@@ -0,0 +1,20 @@
+# Created by: David Naylor <[email protected]>
+# $FreeBSD$
+
+PORTNAME=	typed-ast
+PORTVERSION=	0.6.3
+CATEGORIES=	devel python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	[email protected]
+COMMENT=	Fast version of Python's ast module with support for PEP484 typed comments
+
+LICENSE=	MIT PSFL
+LICENSE_COMB=	multi
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		python:3.3+
+USE_PYTHON=	autoplist distutils concurrent
+
+.include <bsd.port.mk>

devel/py-typed-ast/distinfo

@@ -0,0 +1,3 @@
+TIMESTAMP = 1485410942
+SHA256 (typed-ast-0.6.3.tar.gz) = d41a1856c882a51e398ad9972c9a7964b2f5e210317088382a419b5183544a29
+SIZE (typed-ast-0.6.3.tar.gz) = 190520

devel/py-typed-ast/pkg-descr

@@ -0,0 +1,5 @@
+Typed AST is a fork of the CPython 2.7 and 3.5 ast modules with the ability to
+parse PEP 484 type comments. The primary goals of Typed ASP are correctness and
+speed.
+
+WWW: https://github.com/python/typed_ast

devel/qbs/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	qbs
-PORTVERSION=	1.7.0
+PORTVERSION=	1.7.1
 DISTVERSIONPREFIX=	src-
 CATEGORIES=	devel
 MASTER_SITES=	QT/official_releases/${PORTNAME}/${PORTVERSION}

devel/qbs/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1481804589
-SHA256 (KDE/Qt/qbs/qbs-src-1.7.0.tar.gz) = a7271e35f35c015f6deda3bf5b614031019018572cebb9904920f251b583c3ef
-SIZE (KDE/Qt/qbs/qbs-src-1.7.0.tar.gz) = 992213
+TIMESTAMP = 1485378730
+SHA256 (KDE/Qt/qbs/qbs-src-1.7.1.tar.gz) = e4f5627ffcdba4d74a432f89215e7df1c1657f5416b61612467a7a9267cd4851
+SIZE (KDE/Qt/qbs/qbs-src-1.7.1.tar.gz) = 994738

devel/rubygem-simplecov/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	simplecov
-PORTVERSION=	0.12.0
+PORTVERSION=	0.13.0
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 

devel/rubygem-simplecov/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1483215749
-SHA256 (rubygem/simplecov-0.12.0.gem) = 7de16175818d86c71b75deb81f141eaf1ce231244a90135815f50b6c5df6d039
-SIZE (rubygem/simplecov-0.12.0.gem) = 54784
+TIMESTAMP = 1485435487
+SHA256 (rubygem/simplecov-0.13.0.gem) = c78227427eb6b40499d657f2996ec6841f5135468693e55e3d2c976c706f86e4
+SIZE (rubygem/simplecov-0.13.0.gem) = 55808

devel/rubygem-warden/Makefile

@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	warden
-PORTVERSION=	1.2.6
-PORTREVISION=	1
+PORTVERSION=	1.2.7
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 

devel/rubygem-warden/distinfo

@@ -1,2 +1,3 @@
-SHA256 (rubygem/warden-1.2.6.gem) = 34e0383f0d97c07731e9841b58e54665291fc94078edad6be7228c3bb7adf711
-SIZE (rubygem/warden-1.2.6.gem) = 32256
+TIMESTAMP = 1485435491
+SHA256 (rubygem/warden-1.2.7.gem) = 22e0a009a556f9deb8e4f51405e053607418e70c25d8b4f0e28cfa0ba931496d
+SIZE (rubygem/warden-1.2.7.gem) = 32256

devel/viewvc/Makefile

@@ -2,16 +2,16 @@
 # $FreeBSD$
 
 PORTNAME=	viewvc
-PORTVERSION=	1.1.25
+DISTVERSION=	1.1.26
 CATEGORIES=	devel python
-MASTER_SITES=	http://www.viewvc.org/ \
-		LOCAL/ohauer
 
 MAINTAINER=	[email protected]
 COMMENT=	Web-based Version Control Repository Browsing
 
 LICENSE=	BSD2CLAUSE
 
+USE_GITHUB=	yes
+
 NO_OPTIONS_SORT=	yes
 OPTIONS_DEFINE=		WEBSRV APMOD SVN MYSQL
 OPTIONS_DEFAULT=	WEBSRV APACHE SVN

devel/viewvc/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1474019899
-SHA256 (viewvc-1.1.25.tar.gz) = b7de005df2325419ecd788eabede5f40e081f0300f3ce962f13692b93484a37c
-SIZE (viewvc-1.1.25.tar.gz) = 616072
+TIMESTAMP = 1485348428
+SHA256 (viewvc-viewvc-1.1.26_GH0.tar.gz) = aa5b911a91d597b211a3c826c2d6eb7f7b7b7d09f27ecb64e22a75e1faf42713
+SIZE (viewvc-viewvc-1.1.26_GH0.tar.gz) = 666278

emulators/py-nova/Makefile

@@ -3,6 +3,7 @@
 
 PORTNAME=	nova
 PORTVERSION=	14.0.3
+PORTREVISION=	1
 CATEGORIES=	emulators python
 MASTER_SITES=	https://fossies.org/linux/misc/openstack/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -80,7 +81,9 @@ EXTRA_PATCHES=	${FILESDIR}/01-firewall-manager.patch:-p1 \
 		${FILESDIR}/04-xen-phy.patch:-p1 \
 		${FILESDIR}/05-online-cpus.patch:-p1 \
 		${FILESDIR}/06-freebsd-net.patch:-p1 \
-		${FILESDIR}/07-fix-xen-xvd.patch:-p1
+		${FILESDIR}/07-fix-xen-xvd.patch:-p1 \
+		${FILESDIR}/08-fix-floating-ips.patch:-p1 \
+		${FILESDIR}/09-fix-xen-console.patch:-p1
 
 ONLY_FOR_ARCHS=	amd64
 

emulators/py-nova/files/08-fix-floating-ips.patch

@@ -0,0 +1,14 @@
+diff --git a/nova/objects/floating_ip.py b/nova/objects/floating_ip.py
+index 9881dfcecf..922a86a31e 100644
+--- a/nova/objects/floating_ip.py
++++ b/nova/objects/floating_ip.py
+@@ -194,7 +194,8 @@ class FloatingIPList(obj_base.ObjectListBase, obj_base.NovaObject):
+     def get_by_project(cls, context, project_id):
+         db_floatingips = db.floating_ip_get_all_by_project(context, project_id)
+         return obj_base.obj_make_list(context, cls(context),
+-                                      objects.FloatingIP, db_floatingips)
++                                      objects.FloatingIP, db_floatingips,
++                                      expected_attrs=['fixed_ip'])
+
+     @obj_base.remotable_classmethod
+     def get_by_fixed_address(cls, context, fixed_address):

emulators/py-nova/files/09-fix-xen-console.patch

@@ -0,0 +1,13 @@
+diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
+index 6d0e41ad2c..ebd1a6fdad 100644
+--- a/nova/virt/libvirt/driver.py
++++ b/nova/virt/libvirt/driver.py
+@@ -4321,7 +4321,7 @@ class LibvirtDriver(driver.ComputeDriver):
+
+     def _create_consoles(self, virt_type, guest, instance, flavor, image_meta,
+                          caps):
+-        if virt_type in ("qemu", "kvm"):
++        if virt_type in ("qemu", "kvm", "xen"):
+             # Create the serial console char devices
+             self._create_serial_console_devices(guest, instance, flavor,
+                                                 image_meta)

ftp/Makefile

@@ -69,6 +69,7 @@
     SUBDIR += php70-fastdfs
     SUBDIR += php70-ftp
     SUBDIR += php71-curl
+    SUBDIR += php71-fastdfs
     SUBDIR += php71-ftp
     SUBDIR += phpwebftp
     SUBDIR += plasma-applet-ftpmonitor

ftp/php70-fastdfs/Makefile

@@ -1,8 +1,9 @@
 # $FreeBSD$
 
-PORTNAME=	php70-fastdfs
+PORTNAME=	fastdfs
 PORTVERSION=	5.0.8
 CATEGORIES=	ftp
+PKGNAMEPREFIX=	php70-
 
 MAINTAINER=	[email protected]
 COMMENT=	PHP 7 module for accessing a FastDFS cluster
@@ -18,7 +19,7 @@ GH_PROJECT=	fastdfs
 GH_TAGNAME=	87659981148a362812912b6d4752d281ac05f0b6
 
 USES=			php:ext
-IGNORE_WITH_PHP=	56
+IGNORE_WITH_PHP=	56 71
 PHP_VER=		70
 
 WRKSRC_SUBDIR=	php_client