From owner-svn-ports-all@freebsd.org Sun Feb 11 14:36:17 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5AFF6F1D3D9; Sun, 11 Feb 2018 14:36:17 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0C7027AA63; Sun, 11 Feb 2018 14:36:17 +0000 (UTC) (envelope-from sunpoet@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 074F4242B7; Sun, 11 Feb 2018 14:36:17 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1BEaGR4055557; Sun, 11 Feb 2018 14:36:16 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1BEaGkH055555; Sun, 11 Feb 2018 14:36:16 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201802111436.w1BEaGkH055555@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sun, 11 Feb 2018 14:36:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r461500 - in head/lang/python36: . files X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: in head/lang/python36: . files X-SVN-Commit-Revision: 461500 X-SVN-Commit-Repository: ports 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.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Feb 2018 14:36:17 -0000 Author: sunpoet Date: Sun Feb 11 14:36:16 2018 New Revision: 461500 URL: https://svnweb.freebsd.org/changeset/ports/461500 Log: Clean up Makefile - Move BROKEN_SSL upward - Sort USES - Remove CPE_*: all of them are default values - Update PLIST_FILES: do not use %% - Update http:// links in Makefile comments and patch files Modified: head/lang/python36/Makefile head/lang/python36/files/patch-issue20210 Modified: head/lang/python36/Makefile ============================================================================== --- head/lang/python36/Makefile Sun Feb 11 13:44:38 2018 (r461499) +++ head/lang/python36/Makefile Sun Feb 11 14:36:16 2018 (r461500) @@ -4,9 +4,9 @@ PORTNAME= python PORTVERSION= ${PYTHON_PORTVERSION} CATEGORIES= lang python ipv6 -MASTER_SITES= PYTHON/ftp/python/${PYTHON_PORTVERSION} +MASTER_SITES= PYTHON/ftp/python/${PORTVERSION} PKGNAMESUFFIX= ${PYTHON_SUFFIX} -DISTNAME= Python-${DISTVERSION} +DISTNAME= Python-${PORTVERSION} DIST_SUBDIR= python MAINTAINER= python@FreeBSD.org @@ -14,18 +14,15 @@ COMMENT= Interpreted object-oriented programming langu LICENSE= PSFL -USES= cpe ncurses pathfix pkgconfig readline:port ssl tar:xz shebangfix +BROKEN_SSL= openssl-devel + +USES= cpe ncurses pathfix pkgconfig readline:port shebangfix ssl tar:xz PATHFIX_MAKEFILEIN= Makefile.pre.in USE_LDCONFIG= yes GNU_CONFIGURE= yes python_CMD= ${PREFIX}/bin/python${PYTHON_PORTVERSION:R} SHEBANG_FILES= Lib/*.py Lib/*/*.py Lib/*/*/*.py Lib/*/*/*/*.py -BROKEN_SSL= openssl-devel - -CPE_VENDOR= python -CPE_PRODUCT= ${CPE_VENDOR} - # Duplicate python.mk variables. TODO: Let lang/python?? ports use python.mk bits. PYTHON_VER= ${PYTHON_PORTVERSION:R} PYTHON_VERSION= python${PYTHON_VER} @@ -46,9 +43,11 @@ MAKE_JOBS_UNSAFE= yes # Parser/pgen build bug. S SUB_FILES= pkg-message SUB_LIST= PYTHON_SUFFIX=${PYTHON_SUFFIX} -PLIST_SUB= XYDOT=${PYTHON_VER} XY=${PYTHON_SUFFIX} \ - XYZDOT=${PYTHON_PORTVERSION} ABI=${ABIFLAGS} \ - OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} # For plat-freebsd* in pkg-plist. http://bugs.python.org/issue19554 +PLIST_SUB= ABI=${ABIFLAGS} \ + XY=${PYTHON_SUFFIX} \ + XYDOT=${PYTHON_VER} \ + XYZDOT=${PORTVERSION} \ + OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} # For plat-freebsd* in pkg-plist. https://bugs.python.org/issue19554 OPTIONS_DEFINE= DEBUG IPV6 LIBFFI NLS PYMALLOC THREADS OPTIONS_DEFAULT= LIBFFI PYMALLOC THREADS @@ -75,7 +74,7 @@ LIBFFI_LIB_DEPENDS= libffi.so:devel/libffi # Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and pyexpat # to break in Python 2.7, or preprocessor complaints in Python >= 3.3 -# Upstream Issue: http://bugs.python.org/issue6299 +# Upstream Issue: https://bugs.python.org/issue6299 NLS_USES= gettext NLS_CPPFLAGS= -I${LOCALBASE}/include NLS_LIBS= -L${LOCALBASE}/lib -lintl @@ -98,13 +97,13 @@ ABIFLAGS:= d${ABIFLAGS} .endif .if !empty(ABIFLAGS) -PLIST_FILES+= bin/python%%XYDOT%%%%ABI%% -PLIST_FILES+= bin/python%%XYDOT%%%%ABI%%-config -PLIST_FILES+= libdata/pkgconfig/python-%%XYDOT%%%%ABI%%.pc +PLIST_FILES+= bin/python${PYTHON_VER}${ABIFLAGS} \ + bin/python${PYTHON_VER}${ABIFLAGS}-config \ + libdata/pkgconfig/python-${PYTHON_VER}${ABIFLAGS}.pc .endif -# http://bugs.python.org/issue22521 -# http://bugs.python.org/issue23042 +# https://bugs.python.org/issue22521 +# https://bugs.python.org/issue23042 .if ${ARCH} == i386 && !${PORT_OPTIONS:MLIBFFI} BROKEN= You must use libffi from ports on i386. Enable the LIBFFI option .endif @@ -113,7 +112,7 @@ BROKEN= You must use libffi from ports on i386. Enabl CFLAGS+= -DPYTHON_DEFAULT_RECURSION_LIMIT=900 .endif -# See http://bugs.freebsd.org/115940 and http://bugs.freebsd.org/193650 +# See https://bugs.freebsd.org/115940 and https://bugs.freebsd.org/193650 .if !exists(/usr/bin/ypcat) || defined(WITHOUT_NIS) PLIST_SUB+= NO_NIS="@comment " DISABLED_EXTENSIONS+= nis @@ -134,7 +133,7 @@ post-patch: post-install: .if ! ${PORT_OPTIONS:MDEBUG} - ${RM} ${STAGEDIR}${PREFIX}/lib/libpython3.so # Upstream Issue: http://bugs.python.org/issue17975 + ${RM} ${STAGEDIR}${PREFIX}/lib/libpython3.so # Upstream Issue: https://bugs.python.org/issue17975 .endif # This code block exists for the qemu-user enabled cross build environment. # When using this environment in poudriere, CC is not set to the default Modified: head/lang/python36/files/patch-issue20210 ============================================================================== --- head/lang/python36/files/patch-issue20210 Sun Feb 11 13:44:38 2018 (r461499) +++ head/lang/python36/files/patch-issue20210 Sun Feb 11 14:36:16 2018 (r461500) @@ -1,5 +1,5 @@ # Backport patch 0001 from Issue #20210 -# Issue: http://bugs.python.org/issue20210 +# Issue: https://bugs.python.org/issue20210 # By: Thomas Petazzoni --- ./Makefile.pre.in.orig 2014-03-24 22:45:17.908886504 +1100