Index: python36/Makefile.version =================================================================== --- python36/Makefile.version (revision 488247) +++ python36/Makefile.version (working copy) @@ -1,4 +1,4 @@ # Mk/Uses/python.mk includes this file, don't remove it! # $FreeBSD$ -PYTHON_PORTVERSION= 3.6.7 +PYTHON_PORTVERSION= 3.6.8 Index: python36/distinfo =================================================================== --- python36/distinfo (revision 488247) +++ python36/distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1540096878 -SHA256 (python/Python-3.6.7.tar.xz) = 81fd1401a9d66533b0a3e9e3f4ea1c7c6702d57d5b90d659f971e6f1b745f77d -SIZE (python/Python-3.6.7.tar.xz) = 17178476 +TIMESTAMP = 1545693407 +SHA256 (python/Python-3.6.8.tar.xz) = 35446241e995773b1bed7d196f4b624dadcadc8429f26282e756b2fb8a351193 +SIZE (python/Python-3.6.8.tar.xz) = 17212420 Index: python36/files/patch-Makefile.pre.in =================================================================== --- python36/files/patch-Makefile.pre.in (revision 488247) +++ python36/files/patch-Makefile.pre.in (working copy) @@ -6,9 +6,9 @@ # Submitted by: antoine@ (r358029) # TODO: Upstream ---- Makefile.pre.in.orig 2016-12-26 00:30:30.873942000 +0800 -+++ Makefile.pre.in 2016-12-26 02:51:45.233175000 +0800 -@@ -80,23 +80,20 @@ +--- Makefile.pre.in.orig 2018-12-25 07:28:06 UTC ++++ Makefile.pre.in +@@ -79,7 +79,6 @@ MAKESETUP= $(srcdir)/Modules/makesetup OPT= @OPT@ BASECFLAGS= @BASECFLAGS@ BASECPPFLAGS= @BASECPPFLAGS@ @@ -16,7 +16,10 @@ # CFLAGS_NODIST is used for building the interpreter and stdlib C extensions. # Use it when a compiler flag should _not_ be part of the distutils CFLAGS # once Python is installed (Issue #21121). - CONFIGURE_CFLAGS_NODIST=@CFLAGS_NODIST@ +@@ -88,18 +87,16 @@ CONFIGURE_CFLAGS_NODIST=@CFLAGS_NODIST@ + # Use it when a linker flag should _not_ be part of the distutils LDFLAGS + # once Python is installed (bpo-35257) + CONFIGURE_LDFLAGS_NODIST=@LDFLAGS_NODIST@ -CONFIGURE_CPPFLAGS= @CPPFLAGS@ -CONFIGURE_LDFLAGS= @LDFLAGS@ # Avoid assigning CFLAGS, LDFLAGS, etc. so users can use them on the @@ -32,23 +35,10 @@ -PY_LDFLAGS= $(CONFIGURE_LDFLAGS) $(LDFLAGS) +PY_CPPFLAGS= $(BASECPPFLAGS) -I. -I$(srcdir)/Include $(CPPFLAGS) +PY_LDFLAGS= $(LDFLAGS) + PY_LDFLAGS_NODIST=$(CONFIGURE_LDFLAGS_NODIST) $(LDFLAGS_NODIST) NO_AS_NEEDED= @NO_AS_NEEDED@ LDLAST= @LDLAST@ - SGI_ABI= @SGI_ABI@ -@@ -1145,12 +1142,6 @@ - else true; \ - fi - (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) python3$(EXE)) -- -if test "$(VERSION)" != "$(LDVERSION)"; then \ -- rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)-config; \ -- (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(LDVERSION)-config python$(VERSION)-config); \ -- rm -f $(DESTDIR)$(LIBPC)/python-$(LDVERSION).pc; \ -- (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python-$(LDVERSION).pc); \ -- fi - -rm -f $(DESTDIR)$(BINDIR)/python3-config - (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python3-config) - -rm -f $(DESTDIR)$(LIBPC)/python3.pc -@@ -1412,6 +1403,12 @@ +@@ -1451,6 +1448,12 @@ libainstall: @DEF_MAKE_RULE@ python-config $(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh $(INSTALL_SCRIPT) python-config.py $(DESTDIR)$(LIBPL)/python-config.py $(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(LDVERSION)-config Index: python36/pkg-plist =================================================================== --- python36/pkg-plist (revision 488247) +++ python36/pkg-plist (working copy) @@ -2112,8 +2112,8 @@ lib/python%%XYDOT%%/ensurepip/__pycache__/_uninstall.cpython-%%XY%%.opt-1.pyc lib/python%%XYDOT%%/ensurepip/__pycache__/_uninstall.cpython-%%XY%%.opt-2.pyc lib/python%%XYDOT%%/ensurepip/__pycache__/_uninstall.cpython-%%XY%%.pyc -lib/python%%XYDOT%%/ensurepip/_bundled/pip-10.0.1-py2.py3-none-any.whl -lib/python%%XYDOT%%/ensurepip/_bundled/setuptools-39.0.1-py2.py3-none-any.whl +lib/python%%XYDOT%%/ensurepip/_bundled/pip-18.1-py2.py3-none-any.whl +lib/python%%XYDOT%%/ensurepip/_bundled/setuptools-40.6.2-py2.py3-none-any.whl lib/python%%XYDOT%%/ensurepip/_uninstall.py lib/python%%XYDOT%%/enum.py lib/python%%XYDOT%%/filecmp.py @@ -5287,10 +5287,6 @@ lib/python%%XYDOT%%/test/test_asyncio/echo.py lib/python%%XYDOT%%/test/test_asyncio/echo2.py lib/python%%XYDOT%%/test/test_asyncio/echo3.py -lib/python%%XYDOT%%/test/test_asyncio/keycert3.pem -lib/python%%XYDOT%%/test/test_asyncio/pycacert.pem -lib/python%%XYDOT%%/test/test_asyncio/ssl_cert.pem -lib/python%%XYDOT%%/test/test_asyncio/ssl_key.pem lib/python%%XYDOT%%/test/test_asyncio/test_base_events.py lib/python%%XYDOT%%/test/test_asyncio/test_events.py lib/python%%XYDOT%%/test/test_asyncio/test_futures.py Index: python-doc-html/distinfo =================================================================== --- python-doc-html/distinfo (revision 488247) +++ python-doc-html/distinfo (working copy) @@ -1,4 +1,4 @@ -TIMESTAMP = 1530893632 +TIMESTAMP = 1545727443 SHA256 (python/python-2.7.15-docs-html.tar.bz2) = 5582aa8f59c2d5457ae87e266000f9ef75ed041a02fa72bd988a5169aae8ebde SIZE (python/python-2.7.15-docs-html.tar.bz2) = 4627519 SHA256 (python/python-2.7.15-docs-pdf-a4.tar.bz2) = f747ca034cae426876017c37dfac0648ae535ad0b95d1e3a27385feee602d956 @@ -15,14 +15,14 @@ SIZE (python/python-3.4.8-docs-pdf-letter.tar.bz2) = 11993776 SHA256 (python/python-3.4.8-docs-text.tar.bz2) = cbf9681c85f37144ffadee5a3e7a3506831c29b7310fa063ad2d4d97a1a33d2e SIZE (python/python-3.4.8-docs-text.tar.bz2) = 1988981 -SHA256 (python/python-3.6.7-docs-html.tar.bz2) = 6b1f4b28e929ab93ebb741f1f8b540e0d379fa51f39d66ceffb476ac8bd47380 -SIZE (python/python-3.6.7-docs-html.tar.bz2) = 6005095 -SHA256 (python/python-3.6.7-docs-pdf-a4.tar.bz2) = e3a0777ed42b25429bff47dbc43cd04dafbdf43ab4ff95dca1461fc64b0ce7f0 -SIZE (python/python-3.6.7-docs-pdf-a4.tar.bz2) = 13775746 -SHA256 (python/python-3.6.7-docs-pdf-letter.tar.bz2) = 1ca66feb104ba3f4fd17ce55e40fa07639fff63c0eee772dc306c188455c555a -SIZE (python/python-3.6.7-docs-pdf-letter.tar.bz2) = 13775543 -SHA256 (python/python-3.6.7-docs-text.tar.bz2) = 43844fedbc9ef8285cd5951dea0c9f044f466b2cb3458cd3e9b660fe883cca41 -SIZE (python/python-3.6.7-docs-text.tar.bz2) = 2154571 +SHA256 (python/python-3.6.8-docs-html.tar.bz2) = d17ebdc57a6590b7c86c98047c4f90723c5a1846343a4640e0596161922cf9eb +SIZE (python/python-3.6.8-docs-html.tar.bz2) = 6010329 +SHA256 (python/python-3.6.8-docs-pdf-a4.tar.bz2) = 4734db2cea99bbd2d3b6523cc3aa969c88cebfce7c705e8918677fce96cdd1c8 +SIZE (python/python-3.6.8-docs-pdf-a4.tar.bz2) = 13672468 +SHA256 (python/python-3.6.8-docs-pdf-letter.tar.bz2) = 76562a113644bc01b1107aab8dafe8680227c8ee384946a07ce67f21b7e31086 +SIZE (python/python-3.6.8-docs-pdf-letter.tar.bz2) = 13673043 +SHA256 (python/python-3.6.8-docs-text.tar.bz2) = 4a48632298ac7ed94aedb2c3093170b739b4c7cd607419cbb5bf3edb8f9d8c0a +SIZE (python/python-3.6.8-docs-text.tar.bz2) = 2163182 SHA256 (python/python-3.7.1-docs-html.tar.bz2) = d298d0074d9a23a2e2721ed0d55f939f40a880a76e8dea0803bcb7460feaf3ce SIZE (python/python-3.7.1-docs-html.tar.bz2) = 6184786 SHA256 (python/python-3.7.1-docs-pdf-a4.tar.bz2) = 357e0c5c4930a0a5755c167b76deddbf9ad1a41d7f4499b4bca40efed0cb8e4d