- Fix bad libpython* symlinks after enabling the lang/python* ports to

  be stagedir-aware

PR:		ports/186284
Submitted by:	marino@
Pointyhat to:	myself

6 files changed, 14 insertions, 13 deletions

diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index 1043a7f510bf..3f404f68b09e 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -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
diff --git a/lang/python31/Makefile b/lang/python31/Makefile
index 82100dc47b91..7d9e5e6ce646 100644
--- a/lang/python31/Makefile
+++ b/lang/python31/Makefile
@@ -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
diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index 909a45082fea..252e22aa6ad0 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@@ -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
diff --git a/lang/python32/pkg-plist b/lang/python32/pkg-plist
index 85949e51a2ce..6f981b82c2ed 100644
--- a/lang/python32/pkg-plist
+++ b/lang/python32/pkg-plist
@@ -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
diff --git a/lang/python33/Makefile b/lang/python33/Makefile
index ac6c5d75c2d9..067cc293bc46 100644
--- a/lang/python33/Makefile
+++ b/lang/python33/Makefile
@@ -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
diff --git a/lang/python33/pkg-plist b/lang/python33/pkg-plist
index 6884ae571f9c..d6719e738212 100644
--- a/lang/python33/pkg-plist
+++ b/lang/python33/pkg-plist
@@ -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