From e8ddced3f0b5b8ee8f104a39bd966d77e2074a8b Mon Sep 17 00:00:00 2001 From: ziggi Date: Sat, 11 Apr 2020 11:34:52 +0000 Subject: [PATCH] add openjdk14 --- devel/gmake/Makefile | 2 +- devel/gmake/distinfo | 6 +++--- devel/gmake/pkg-plist | 3 --- python/py-requests/Makefile | 2 +- python/py-requests/distinfo | 6 +++--- python/py-requests/files/patch-setup.py | 27 +++++++++---------------- xproto/xproto/Makefile | 2 +- xproto/xproto/distinfo | 5 +++-- xproto/xproto/pkg-plist | 12 +++++------ 9 files changed, 27 insertions(+), 38 deletions(-) diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile index 8685b7bb..841c420a 100644 --- a/devel/gmake/Makefile +++ b/devel/gmake/Makefile @@ -2,7 +2,7 @@ # $Id: Makefile 2701 2009-10-31 21:29:43Z root $ # PORTNAME= make -PORTVERSION= 4.3 +PORTVERSION= 4.2.1 PKGNAMEPREFIX= g MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/devel/gmake/distinfo b/devel/gmake/distinfo index f996e2a6..a307bfc5 100644 --- a/devel/gmake/distinfo +++ b/devel/gmake/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1579542296 -SHA256 (gnu/make-4.3.tar.gz) = e05fdde47c5f7ca45cb697e973894ff4f5d79e13b750ed57d7b66d8defc78e19 -SIZE (gnu/make-4.3.tar.gz) = 2317073 +TIMESTAMP = 1586597863 +SHA256 (gnu/make-4.2.1.tar.gz) = e40b8f018c1da64edd1cc9a6fce5fa63b2e707e404e20cad91fbae337c98a5b7 +SIZE (gnu/make-4.2.1.tar.gz) = 1977576 diff --git a/devel/gmake/pkg-plist b/devel/gmake/pkg-plist index 7a7e15df..a7a66f03 100644 --- a/devel/gmake/pkg-plist +++ b/devel/gmake/pkg-plist @@ -1,5 +1,2 @@ bin/gmake man/man1/gmake.1.gz -share/info/make.info -share/info/make.info-1 -share/info/make.info-2 diff --git a/python/py-requests/Makefile b/python/py-requests/Makefile index 63961003..68ac9497 100644 --- a/python/py-requests/Makefile +++ b/python/py-requests/Makefile @@ -2,7 +2,7 @@ # $FreeBSD: head/www/py-requests/Makefile 476584 2018-08-07 09:11:28Z koobs $ PORTNAME= requests -PORTVERSION= 2.18.4 +PORTVERSION= 2.22.0 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/python/py-requests/distinfo b/python/py-requests/distinfo index 31d868f0..ccc8b92e 100644 --- a/python/py-requests/distinfo +++ b/python/py-requests/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1519435351 -SHA256 (requests-2.18.4.tar.gz) = 9c443e7324ba5b85070c4a818ade28bfabedf16ea10206da1132edaa6dda237e -SIZE (requests-2.18.4.tar.gz) = 126224 +TIMESTAMP = 1586602978 +SHA256 (requests-2.22.0.tar.gz) = 11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4 +SIZE (requests-2.22.0.tar.gz) = 113406 diff --git a/python/py-requests/files/patch-setup.py b/python/py-requests/files/patch-setup.py index eee22c70..21e1c6a6 100644 --- a/python/py-requests/files/patch-setup.py +++ b/python/py-requests/files/patch-setup.py @@ -1,21 +1,12 @@ -# 1: Backport bumping idna max version -# https://github.com/requests/requests/commit/991e8b76b7a9d21f698b24fa0058d3d5968721bc -# 2: pytest-cov and its dependencies are not compulsory +# pytest-cov and its dependencies are not compulsory ---- setup.py.orig 2017-08-15 13:19:39 UTC +--- setup.py.orig 2019-01-22 02:52:54 UTC +++ setup.py -@@ -43,12 +43,12 @@ packages = ['requests'] - - requires = [ - 'chardet>=3.0.2,<3.1.0', -- 'idna>=2.5,<2.7', -+ 'idna>=2.5,<2.8', - 'urllib3>=1.21.1,<1.23', - 'certifi>=2017.4.17' - +@@ -50,7 +50,6 @@ requires = [ ] --test_requirements = ['pytest-httpbin==0.0.7', 'pytest-cov', 'pytest-mock', 'pytest-xdist', 'PySocks>=1.5.6, !=1.5.7', 'pytest>=2.8.0'] -+test_requirements = ['pytest-httpbin==0.0.7', 'pytest-mock', 'pytest-xdist', 'PySocks>=1.5.6, !=1.5.7', 'pytest>=2.8.0'] - - about = {} - with open(os.path.join(here, 'requests', '__version__.py'), 'r', 'utf-8') as f: + test_requirements = [ + 'pytest-httpbin==0.0.7', +- 'pytest-cov', + 'pytest-mock', + 'pytest-xdist', + 'PySocks>=1.5.6, !=1.5.7', diff --git a/xproto/xproto/Makefile b/xproto/xproto/Makefile index fbebda67..ce53b3f8 100644 --- a/xproto/xproto/Makefile +++ b/xproto/xproto/Makefile @@ -3,7 +3,7 @@ # $URL: file:///usr2/svn/ports5/x11/xorg-xproto/Makefile $ # PORTNAME= xproto -PORTVERSION= 7.0.28 +PORTVERSION= 7.0.31 X11_CATEGORY= proto MASTER_SITES+= ftp://ftp.x.org/pub/individual/${X11_CATEGORY}/ CATEGORIES= x11 diff --git a/xproto/xproto/distinfo b/xproto/xproto/distinfo index 54a6197f..bd6aaa2c 100644 --- a/xproto/xproto/distinfo +++ b/xproto/xproto/distinfo @@ -1,2 +1,3 @@ -SHA256 (x11/xproto-7.0.28.tar.bz2) = 29e85568d1f68ceef8a2c081dad9bc0e5500a53cfffde24b564dc43d46ddf6ca -SIZE (x11/xproto-7.0.28.tar.bz2) = 300886 +TIMESTAMP = 1586600386 +SHA256 (x11/xproto-7.0.31.tar.bz2) = c6f9747da0bd3a95f86b17fb8dd5e717c8f3ab7f0ece3ba1b247899ec1ef7747 +SIZE (x11/xproto-7.0.31.tar.bz2) = 300356 diff --git a/xproto/xproto/pkg-plist b/xproto/xproto/pkg-plist index b9249c2c..640a18d7 100644 --- a/xproto/xproto/pkg-plist +++ b/xproto/xproto/pkg-plist @@ -1,28 +1,28 @@ +include/X11/ap_keysym.h include/X11/DECkeysym.h include/X11/HPkeysym.h +include/X11/keysym.h +include/X11/keysymdef.h include/X11/Sunkeysym.h include/X11/X.h -include/X11/XF86keysym.h -include/X11/XWDFile.h include/X11/Xalloca.h include/X11/Xarch.h include/X11/Xatom.h include/X11/Xdefs.h +include/X11/XF86keysym.h include/X11/Xfuncproto.h include/X11/Xfuncs.h include/X11/Xmd.h -include/X11/Xos.h include/X11/Xos_r.h +include/X11/Xos.h include/X11/Xosdefs.h include/X11/Xpoll.h include/X11/Xproto.h include/X11/Xprotostr.h include/X11/Xthreads.h include/X11/Xw32defs.h +include/X11/XWDFile.h include/X11/Xwindows.h include/X11/Xwinsock.h -include/X11/ap_keysym.h -include/X11/keysym.h -include/X11/keysymdef.h lib/pkgconfig/xproto.pc @dir include/X11