From owner-svn-ports-all@freebsd.org Sun Feb 11 16:52:39 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 8C031F04B7B; Sun, 11 Feb 2018 16:52:39 +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 9C5E7802DC; Sun, 11 Feb 2018 16:52:37 +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 385BA2597C; Sun, 11 Feb 2018 16:52:37 +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 w1BGqaxB025449; Sun, 11 Feb 2018 16:52:36 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1BGqaWl025447; Sun, 11 Feb 2018 16:52:36 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201802111652.w1BGqaWl025447@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 16:52:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r461512 - in head/lang/python27: . files X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: in head/lang/python27: . files X-SVN-Commit-Revision: 461512 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 16:52:39 -0000 Author: sunpoet Date: Sun Feb 11 16:52:36 2018 New Revision: 461512 URL: https://svnweb.freebsd.org/changeset/ports/461512 Log: Set PORTNAME to python and add PKGNAMESUFFIX - Sort USES - Remove CPE_*: all of them are default values - Update http:// links in Makefile comments and patch files Modified: head/lang/python27/Makefile head/lang/python27/files/patch-setup.py Modified: head/lang/python27/Makefile ============================================================================== --- head/lang/python27/Makefile Sun Feb 11 16:52:31 2018 (r461511) +++ head/lang/python27/Makefile Sun Feb 11 16:52:36 2018 (r461512) @@ -1,10 +1,11 @@ # $FreeBSD$ -PORTNAME= python27 +PORTNAME= python PORTVERSION= ${PYTHON_PORTVERSION} PORTREVISION= 1 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON/ftp/python/${PORTVERSION} +PKGNAMESUFFIX= 27 DISTNAME= Python-${PORTVERSION} DIST_SUBDIR= python @@ -15,7 +16,7 @@ LICENSE= PSFL BROKEN_SSL= openssl-devel -USES= cpe ncurses pathfix pkgconfig readline:port ssl tar:xz shebangfix +USES= cpe ncurses pathfix pkgconfig readline:port shebangfix ssl tar:xz PATHFIX_MAKEFILEIN= Makefile.pre.in USE_LDCONFIG= yes GNU_CONFIGURE= yes @@ -27,9 +28,6 @@ SHEBANG_FILES= Lib/lib2to3/pgen2/*.py Lib/lib2to3/test Lib/smtplib.py Lib/symbol.py Lib/tabnanny.py Lib/timeit.py Lib/trace.py \ Lib/uu.py Lib/webbrowser.py -CPE_VENDOR= python -CPE_PRODUCT= ${CPE_VENDOR} - CONFIGURE_ARGS+= --enable-shared CONFIGURE_ENV+= ac_cv_opt_olimit_ok=no OPT="" # Null out OPT to respect user CFLAGS and remove optimizations @@ -43,7 +41,7 @@ MAKE_JOBS_UNSAFE= yes # Parser/pgen build bug. S PLIST_SUB= ABI=${ABIFLAGS} \ PORTVERSION=${PORTVERSION} \ - OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} # For plat-freebsd* in pkg-plist. http://bugs.python.org/issue19554 + 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 UCS4 @@ -64,7 +62,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 @@ -81,8 +79,8 @@ UCS4_CONFIGURE_ON= --enable-unicode=ucs4 .include "${.CURDIR}/Makefile.version" .include -# http://bugs.python.org/issue22521 -# http://bugs.python.org/issue23042 +# https://bugs.python.org/issue22521 +# https://bugs.python.org/issue23042 .if !${PORT_OPTIONS:MLIBFFI} && ${ARCH} == i386 BROKEN= You must use libffi from ports on i386. Enable the LIBFFI option .endif @@ -107,7 +105,7 @@ MAKE_ENV+= UNAME_m="powerpc64" 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 " .else Modified: head/lang/python27/files/patch-setup.py ============================================================================== --- head/lang/python27/files/patch-setup.py Sun Feb 11 16:52:31 2018 (r461511) +++ head/lang/python27/files/patch-setup.py Sun Feb 11 16:52:36 2018 (r461512) @@ -40,7 +40,7 @@ - if (host_platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6', - 'freebsd7', 'freebsd8') - or host_platform.startswith("gnukfreebsd")): -+# Initial backport of http://hg.python.org/cpython/rev/50f1922bc1d5 ++# Initial backport of https://hg.python.org/cpython/rev/50f1922bc1d5 + + if any(sys.platform.startswith(prefix) + for prefix in ("linux", "freebsd", "gnukfreebsd")):