From owner-svn-ports-head@FreeBSD.ORG Sat Feb 1 09:21:25 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9BB52424; Sat, 1 Feb 2014 09:21:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 86AAA1E3D; Sat, 1 Feb 2014 09:21:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s119LP3W085150; Sat, 1 Feb 2014 09:21:25 GMT (envelope-from mva@svn.freebsd.org) Received: (from mva@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s119LOO4085141; Sat, 1 Feb 2014 09:21:24 GMT (envelope-from mva@svn.freebsd.org) Message-Id: <201402010921.s119LOO4085141@svn.freebsd.org> From: Marcus von Appen Date: Sat, 1 Feb 2014 09:21:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r342104 - in head/lang: python27 python31 python32 python33 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Feb 2014 09:21:25 -0000 Author: mva Date: Sat Feb 1 09:21:23 2014 New Revision: 342104 URL: http://svnweb.freebsd.org/changeset/ports/342104 QAT: https://qat.redports.org/buildarchive/r342104/ Log: - Fix bad libpython* symlinks after enabling the lang/python* ports to be stagedir-aware PR: ports/186284 Submitted by: marino@ Pointyhat to: myself Modified: head/lang/python27/Makefile head/lang/python31/Makefile head/lang/python32/Makefile head/lang/python32/pkg-plist head/lang/python33/Makefile head/lang/python33/pkg-plist Modified: head/lang/python27/Makefile ============================================================================== --- head/lang/python27/Makefile Sat Feb 1 09:13:51 2014 (r342103) +++ head/lang/python27/Makefile Sat Feb 1 09:21:23 2014 (r342104) @@ -3,7 +3,7 @@ PORTNAME= python27 PORTVERSION= 2.7.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -262,8 +262,8 @@ post-install: ${STAGEDIR}${PREFIX}/lib (cd ${STAGEDIR}${PREFIX}/lib; ${LN} -sf lib${PYTHON_VERSION}.so.1 \ lib${PYTHON_VERSION}.so) - ${LN} -sf lib${PYTHON_VERSION}.so \ - ${STAGEDIR}${PYTHONPREFIX_LIBDIR}/config + (cd ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}/config; \ + ${LN} -sf ../../lib${PYTHON_VERSION}.so) ${INSTALL_PROGRAM} \ ${SHARED_WRKSRC}/${PYTHON_VERSION:S/thon/thon-shared/} \ ${STAGEDIR}${PREFIX}/bin Modified: head/lang/python31/Makefile ============================================================================== --- head/lang/python31/Makefile Sat Feb 1 09:13:51 2014 (r342103) +++ head/lang/python31/Makefile Sat Feb 1 09:21:23 2014 (r342104) @@ -2,7 +2,7 @@ PORTNAME= python31 PORTVERSION= 3.1.5 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -207,7 +207,8 @@ post-install: ${STAGEDIR}${PREFIX}/lib (cd ${STAGEDIR}${PREFIX}/lib; ${LN} -sf lib${PYTHON_VERSION}.so.1 \ lib${PYTHON_VERSION}.so) - ${LN} -sf lib${PYTHON_VERSION}.so ${STAGEDIR}${PYTHONPREFIX_LIBDIR}/config + (cd ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}/config; \ + ${LN} -sf ../../lib${PYTHON_VERSION}.so) ${INSTALL_PROGRAM} \ ${SHARED_WRKSRC}/${PYTHON_VERSION:S/thon/thon-shared/} \ ${STAGEDIR}${PREFIX}/bin Modified: head/lang/python32/Makefile ============================================================================== --- head/lang/python32/Makefile Sat Feb 1 09:13:51 2014 (r342103) +++ head/lang/python32/Makefile Sat Feb 1 09:21:23 2014 (r342104) @@ -2,7 +2,7 @@ PORTNAME= python32 PORTVERSION= 3.2.5 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -198,8 +198,8 @@ post-install: ${STAGEDIR}${PREFIX}/lib (cd ${STAGEDIR}${PREFIX}/lib; ${LN} -sf lib${PYTHON_VERSION}${PYABIVER}.so.1 \ lib${PYTHON_VERSION}${PYABIVER}.so) - ${LN} -sf lib${PYTHON_VERSION}${PYABIVER}.so \ - ${STAGEDIR}${PYTHONPREFIX_LIBDIR}/config + (cd ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}/config-${PYTHON_VER}${PYABIVER}; \ + ${LN} -sf ../../lib${PYTHON_VERSION}${PYABIVER}.so) ${INSTALL_PROGRAM} \ ${SHARED_WRKSRC}/${PYTHON_VERSION:S/thon/thon-shared/} \ ${STAGEDIR}${PREFIX}/bin Modified: head/lang/python32/pkg-plist ============================================================================== --- head/lang/python32/pkg-plist Sat Feb 1 09:13:51 2014 (r342103) +++ head/lang/python32/pkg-plist Sat Feb 1 09:21:23 2014 (r342104) @@ -459,7 +459,6 @@ man/man1/python3.2.1.gz %%PYTHON_LIBDIR%%/concurrent/futures/_base.py %%PYTHON_LIBDIR%%/concurrent/futures/process.py %%PYTHON_LIBDIR%%/concurrent/futures/thread.py -%%PYTHON_LIBDIR%%/config %%PYTHON_LIBDIR%%/config-%%PYVER%%%%PYABIVER%%/Makefile %%PYTHON_LIBDIR%%/config-%%PYVER%%%%PYABIVER%%/Setup %%PYTHON_LIBDIR%%/config-%%PYVER%%%%PYABIVER%%/Setup.config @@ -468,6 +467,7 @@ man/man1/python3.2.1.gz %%PYTHON_LIBDIR%%/config-%%PYVER%%%%PYABIVER%%/config.c.in %%PYTHON_LIBDIR%%/config-%%PYVER%%%%PYABIVER%%/install-sh %%PYTHON_LIBDIR%%/config-%%PYVER%%%%PYABIVER%%/lib%%PYTHON_VERSION%%%%PYABIVER%%.a +%%PYTHON_LIBDIR%%/config-%%PYVER%%%%PYABIVER%%/lib%%PYTHON_VERSION%%%%PYABIVER%%.so %%PYTHON_LIBDIR%%/config-%%PYVER%%%%PYABIVER%%/makesetup %%PYTHON_LIBDIR%%/config-%%PYVER%%%%PYABIVER%%/python.o %%PYTHON_LIBDIR%%/configparser.py Modified: head/lang/python33/Makefile ============================================================================== --- head/lang/python33/Makefile Sat Feb 1 09:13:51 2014 (r342103) +++ head/lang/python33/Makefile Sat Feb 1 09:21:23 2014 (r342104) @@ -2,7 +2,7 @@ PORTNAME= python33 PORTVERSION= 3.3.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -190,8 +190,8 @@ post-install: ${STAGEDIR}${PREFIX}/lib (cd ${STAGEDIR}${PREFIX}/lib; ${LN} -sf lib${PYTHON_VERSION}${PYABIVER}.so.1 \ lib${PYTHON_VERSION}${PYABIVER}.so) - ${LN} -sf lib${PYTHON_VERSION}${PYABIVER}.so \ - ${STAGEDIR}${PYTHONPREFIX_LIBDIR}/config + (cd ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}/config-${PYTHON_VER}${PYABIVER}; \ + ${LN} -sf ../../lib${PYTHON_VERSION}${PYABIVER}.so) ${INSTALL_PROGRAM} \ ${SHARED_WRKSRC}/${PYTHON_VERSION:S/thon/thon-shared/} \ ${STAGEDIR}${PREFIX}/bin Modified: head/lang/python33/pkg-plist ============================================================================== --- head/lang/python33/pkg-plist Sat Feb 1 09:13:51 2014 (r342103) +++ head/lang/python33/pkg-plist Sat Feb 1 09:21:23 2014 (r342104) @@ -477,7 +477,6 @@ man/man1/python3.3.1.gz %%PYTHON_LIBDIR%%/concurrent/futures/_base.py %%PYTHON_LIBDIR%%/concurrent/futures/process.py %%PYTHON_LIBDIR%%/concurrent/futures/thread.py -%%PYTHON_LIBDIR%%/config %%PYTHON_LIBDIR%%/config-%%PYVER%%%%PYABIVER%%/Makefile %%PYTHON_LIBDIR%%/config-%%PYVER%%%%PYABIVER%%/Setup %%PYTHON_LIBDIR%%/config-%%PYVER%%%%PYABIVER%%/Setup.config @@ -486,6 +485,7 @@ man/man1/python3.3.1.gz %%PYTHON_LIBDIR%%/config-%%PYVER%%%%PYABIVER%%/config.c.in %%PYTHON_LIBDIR%%/config-%%PYVER%%%%PYABIVER%%/install-sh %%PYTHON_LIBDIR%%/config-%%PYVER%%%%PYABIVER%%/lib%%PYTHON_VERSION%%%%PYABIVER%%.a +%%PYTHON_LIBDIR%%/config-%%PYVER%%%%PYABIVER%%/lib%%PYTHON_VERSION%%%%PYABIVER%%.so %%PYTHON_LIBDIR%%/config-%%PYVER%%%%PYABIVER%%/makesetup %%PYTHON_LIBDIR%%/config-%%PYVER%%%%PYABIVER%%/python.o %%PYTHON_LIBDIR%%/configparser.py