svn commit: r340997 - in head/lang: python python2 python3

[Marcus von Appen]

Author: mva
Date: Sat Jan 25 09:15:12 2014
New Revision: 340997
URL: http://svnweb.freebsd.org/changeset/ports/340997
QAT: https://qat.redports.org/buildarchive/r340997/

Log:
  - Do not use absolute source paths for the symlinks to the stagedir
  
  Noticed by:	danfe

Modified:
  head/lang/python/Makefile
  head/lang/python2/Makefile
  head/lang/python3/Makefile

Modified: head/lang/python/Makefile
==============================================================================
--- head/lang/python/Makefile	Sat Jan 25 08:46:11 2014	(r340996)
+++ head/lang/python/Makefile	Sat Jan 25 09:15:12 2014	(r340997)
@@ -36,27 +36,23 @@ RUN_DEPENDS+=	python3:${PORTSDIR}/lang/p
 
 do-install:
 .for file in python python-shared
-	${LN} -sf ${PREFIX}/bin/${file}${PYTHON_MAJOR_VER} \
-		${STAGEDIR}${PREFIX}/bin/${file}
+	${LN} -sf ${file}${PYTHON_MAJOR_VER} ${STAGEDIR}${PREFIX}/bin/${file}
 .endfor
-	${LN} -sf ${PREFIX}/bin/2to3-${PYTHON_MAJOR_VER} \
-		${STAGEDIR}${PREFIX}/bin/2to3
+	${LN} -sf 2to3-${PYTHON_MAJOR_VER} ${STAGEDIR}${PREFIX}/bin/2to3
 .if ${PYTHON_MAJOR_VER} == 2
-	${LN} -sf ${PREFIX}/bin/smtpd${PYTHON_MAJOR_VER}.py \
-		${STAGEDIR}${PREFIX}/bin/smtpd.py
+	${LN} -sf smtpd${PYTHON_MAJOR_VER}.py ${STAGEDIR}${PREFIX}/bin/smtpd.py
 .for file in idle pydoc
-	${LN} -sf ${PREFIX}/bin/${file}${PYTHON_MAJOR_VER} \
-		${STAGEDIR}${PREFIX}/bin/${file}
+	${LN} -sf ${file}${PYTHON_MAJOR_VER} ${STAGEDIR}${PREFIX}/bin/${file}
 .endfor
 .elif ${PYTHON_MAJOR_VER} == 3
 .for file in idle pydoc
-	${LN} -sf ${PREFIX}/bin/${file}${PYTHON_MAJOR_VER}-${PYTHON_VER} \
+	${LN} -sf ${file}${PYTHON_MAJOR_VER}-${PYTHON_VER} \
 		${STAGEDIR}${PREFIX}/bin/${file}
 .endfor
 .endif
-	${LN} -sf ${PREFIX}/bin/python${PYTHON_MAJOR_VER}-config \
+	${LN} -sf python${PYTHON_MAJOR_VER}-config \
 		${STAGEDIR}${PREFIX}/bin/python-config
-	${LN} -sf ${PREFIX}/bin/python-shared${PYTHON_MAJOR_VER}-config \
+	${LN} -sf python-shared${PYTHON_MAJOR_VER}-config \
 		${STAGEDIR}${PREFIX}/bin/python-shared-config
 
 # Major upgrade support

Modified: head/lang/python2/Makefile
==============================================================================
--- head/lang/python2/Makefile	Sat Jan 25 08:46:11 2014	(r340996)
+++ head/lang/python2/Makefile	Sat Jan 25 09:15:12 2014	(r340997)
@@ -32,18 +32,18 @@ RUN_DEPENDS+=	${PYTHON_CMD}:${PYTHON_POR
 
 do-install:
 .for file in idle pydoc python python-shared
-	${LN} -sf ${PREFIX}/bin/${file}${PYTHON_VER} \
+	${LN} -sf ${file}${PYTHON_VER} \
 		${STAGEDIR}${PREFIX}/bin/${file}${PYTHON_MAJOR_VER}
 .endfor
-	${LN} -sf ${PREFIX}/bin/2to3-${PYTHON_VER} \
+	${LN} -sf 2to3-${PYTHON_VER} \
 		${STAGEDIR}${PREFIX}/bin/2to3-${PYTHON_MAJOR_VER}
-	${LN} -sf ${PREFIX}/bin/smtpd${PYTHON_VER}.py \
+	${LN} -sf smtpd${PYTHON_VER}.py \
 		${STAGEDIR}${PREFIX}/bin/smtpd${PYTHON_MAJOR_VER}.py
-	${LN} -sf ${PREFIX}/bin/python${PYTHON_VER}-config \
+	${LN} -sf python${PYTHON_VER}-config \
 		${STAGEDIR}${PREFIX}/bin/python${PYTHON_MAJOR_VER}-config
-	${LN} -sf ${PREFIX}/bin/python-shared${PYTHON_VER}-config \
+	${LN} -sf python-shared${PYTHON_VER}-config \
 		${STAGEDIR}${PREFIX}/bin/python-shared${PYTHON_MAJOR_VER}-config
-	${LN} -sf ${PREFIX}/libdata/pkgconfig/python-${PYTHON_VER}.pc \
+	${LN} -sf python-${PYTHON_VER}.pc \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/python${PYTHON_MAJOR_VER}.pc
 
 # Major upgrade support

Modified: head/lang/python3/Makefile
==============================================================================
--- head/lang/python3/Makefile	Sat Jan 25 08:46:11 2014	(r340996)
+++ head/lang/python3/Makefile	Sat Jan 25 09:15:12 2014	(r340997)
@@ -31,20 +31,20 @@ RUN_DEPENDS+=	${PYTHON_CMD}:${PYTHON_POR
 
 do-install:
 .for file in python python-shared
-	${LN} -sf ${PREFIX}/bin/${file}${PYTHON_VER} \
+	${LN} -sf ${file}${PYTHON_VER} \
 		${STAGEDIR}${PREFIX}/bin/${file}${PYTHON_MAJOR_VER}
 .endfor
-	${LN} -sf ${PREFIX}/bin/2to3-${PYTHON_VER} \
+	${LN} -sf 2to3-${PYTHON_VER} \
 		${STAGEDIR}${PREFIX}/bin/2to3-${PYTHON_MAJOR_VER}
 .for file in idle pydoc
-	${LN} -sf ${PREFIX}/bin/${file}${PYTHON_MAJOR_VER}-${PYTHON_VER} \
+	${LN} -sf ${file}${PYTHON_MAJOR_VER}-${PYTHON_VER} \
 		${STAGEDIR}${PREFIX}/bin/${file}${PYTHON_MAJOR_VER}
 .endfor
-	${LN} -sf ${PREFIX}/bin/python${PYTHON_VER}-config \
+	${LN} -sf python${PYTHON_VER}-config \
 		${STAGEDIR}${PREFIX}/bin/python${PYTHON_MAJOR_VER}-config
-	${LN} -sf ${PREFIX}/bin/python-shared${PYTHON_VER}-config \
+	${LN} -sf python-shared${PYTHON_VER}-config \
 		${STAGEDIR}${PREFIX}/bin/python-shared${PYTHON_MAJOR_VER}-config
-	${LN} -sf ${PREFIX}/libdata/pkgconfig/python-${PYTHON_VER}.pc \
+	${LN} -sf python-${PYTHON_VER}.pc \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/python${PYTHON_MAJOR_VER}.pc
 
 # Major upgrade support