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

[Marcus von Appen]

Author: mva
Date: Mon Aug  4 05:49:35 2014
New Revision: 363965
URL: http://svnweb.freebsd.org/changeset/ports/363965
QAT: https://qat.redports.org/buildarchive/r363965/

Log:
  - Fix and remove stale symlinks after the lang/python* cleanup
  
  Reported by:	Scott Allendorf <scott-allendorf at uiowa.edu>

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

Modified: head/lang/python/Makefile
==============================================================================
--- head/lang/python/Makefile	Mon Aug  4 05:44:43 2014	(r363964)
+++ head/lang/python/Makefile	Mon Aug  4 05:49:35 2014	(r363965)
@@ -3,7 +3,7 @@
 
 PORTNAME=	python
 PORTVERSION=	${PYTHON_DEFAULT}
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	# empty
@@ -21,26 +21,20 @@ PLIST_FILES=	bin/2to3 \
 		bin/idle \
 		bin/pydoc \
 		bin/python \
-		bin/python-config \
-		bin/python-shared \
-		bin/python-shared-config
+		bin/python-config
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_MAJOR_VER} == 2
 RUN_DEPENDS+=	python2:${PORTSDIR}/lang/python2
-PLIST_FILES+=	bin/smtpd.py
 .elif ${PYTHON_MAJOR_VER} == 3
 RUN_DEPENDS+=	python3:${PORTSDIR}/lang/python3
 .endif
 
 do-install:
-.for file in python python-shared
-	${LN} -sf ${file}${PYTHON_MAJOR_VER} ${STAGEDIR}${PREFIX}/bin/${file}
-.endfor
+	${LN} -sf python${PYTHON_MAJOR_VER} ${STAGEDIR}${PREFIX}/bin/python
 	${LN} -sf 2to3-${PYTHON_MAJOR_VER} ${STAGEDIR}${PREFIX}/bin/2to3
 .if ${PYTHON_MAJOR_VER} == 2
-	${LN} -sf smtpd${PYTHON_MAJOR_VER}.py ${STAGEDIR}${PREFIX}/bin/smtpd.py
 .for file in idle pydoc
 	${LN} -sf ${file}${PYTHON_MAJOR_VER} ${STAGEDIR}${PREFIX}/bin/${file}
 .endfor
@@ -52,8 +46,6 @@ do-install:
 .endif
 	${LN} -sf python${PYTHON_MAJOR_VER}-config \
 		${STAGEDIR}${PREFIX}/bin/python-config
-	${LN} -sf python-shared${PYTHON_MAJOR_VER}-config \
-		${STAGEDIR}${PREFIX}/bin/python-shared-config
 
 # Major upgrade support
 PORTUPGRADE_CMD=	${LOCALBASE}/sbin/portupgrade

Modified: head/lang/python2/Makefile
==============================================================================
--- head/lang/python2/Makefile	Mon Aug  4 05:44:43 2014	(r363964)
+++ head/lang/python2/Makefile	Mon Aug  4 05:49:35 2014	(r363965)
@@ -2,7 +2,7 @@
 
 PORTNAME=	python2
 PORTVERSION=	${PYTHON_MAJOR_VER}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -21,9 +21,6 @@ PLIST_FILES=	bin/2to3-${PYTHON_MAJOR_VER
 		bin/pydoc${PYTHON_MAJOR_VER} \
 		bin/python${PYTHON_MAJOR_VER} \
 		bin/python${PYTHON_MAJOR_VER}-config \
-		bin/python-shared${PYTHON_MAJOR_VER} \
-		bin/python-shared${PYTHON_MAJOR_VER}-config \
-		bin/smtpd${PYTHON_MAJOR_VER}.py \
 		libdata/pkgconfig/python${PYTHON_MAJOR_VER}.pc
 
 .include <bsd.port.pre.mk>
@@ -31,18 +28,14 @@ PLIST_FILES=	bin/2to3-${PYTHON_MAJOR_VER
 RUN_DEPENDS+=	${PYTHON_CMD}:${PYTHON_PORTSDIR}
 
 do-install:
-.for file in idle pydoc python python-shared
+.for file in idle pydoc python
 	${LN} -sf ${file}${PYTHON_VER} \
 		${STAGEDIR}${PREFIX}/bin/${file}${PYTHON_MAJOR_VER}
 .endfor
 	${LN} -sf 2to3-${PYTHON_VER} \
 		${STAGEDIR}${PREFIX}/bin/2to3-${PYTHON_MAJOR_VER}
-	${LN} -sf smtpd${PYTHON_VER}.py \
-		${STAGEDIR}${PREFIX}/bin/smtpd${PYTHON_MAJOR_VER}.py
 	${LN} -sf python${PYTHON_VER}-config \
 		${STAGEDIR}${PREFIX}/bin/python${PYTHON_MAJOR_VER}-config
-	${LN} -sf python-shared${PYTHON_VER}-config \
-		${STAGEDIR}${PREFIX}/bin/python-shared${PYTHON_MAJOR_VER}-config
 	${LN} -sf python-${PYTHON_VER}.pc \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/python${PYTHON_MAJOR_VER}.pc
 

Modified: head/lang/python3/Makefile
==============================================================================
--- head/lang/python3/Makefile	Mon Aug  4 05:44:43 2014	(r363964)
+++ head/lang/python3/Makefile	Mon Aug  4 05:49:35 2014	(r363965)
@@ -2,7 +2,7 @@
 
 PORTNAME=	python3
 PORTVERSION=	${PYTHON_MAJOR_VER}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang python ipv6
 MASTER_SITES=
 DISTFILES=
@@ -21,8 +21,6 @@ PLIST_FILES=	bin/2to3-${PYTHON_MAJOR_VER
 		bin/pydoc${PYTHON_MAJOR_VER} \
 		bin/python${PYTHON_MAJOR_VER} \
 		bin/python${PYTHON_MAJOR_VER}-config \
-		bin/python-shared${PYTHON_MAJOR_VER} \
-		bin/python-shared${PYTHON_MAJOR_VER}-config \
 		libdata/pkgconfig/python${PYTHON_MAJOR_VER}.pc
 
 .include <bsd.port.pre.mk>
@@ -30,20 +28,16 @@ PLIST_FILES=	bin/2to3-${PYTHON_MAJOR_VER
 RUN_DEPENDS+=	${PYTHON_CMD}:${PYTHON_PORTSDIR}
 
 do-install:
-.for file in python python-shared
-	${LN} -sf ${file}${PYTHON_VER} \
-		${STAGEDIR}${PREFIX}/bin/${file}${PYTHON_MAJOR_VER}
-.endfor
+	${LN} -sf python${PYTHON_VER} \
+		${STAGEDIR}${PREFIX}/bin/python${PYTHON_MAJOR_VER}
 	${LN} -sf 2to3-${PYTHON_VER} \
 		${STAGEDIR}${PREFIX}/bin/2to3-${PYTHON_MAJOR_VER}
 .for file in idle pydoc
-	${LN} -sf ${file}${PYTHON_MAJOR_VER}-${PYTHON_VER} \
+	${LN} -sf ${file}${PYTHON_VER} \
 		${STAGEDIR}${PREFIX}/bin/${file}${PYTHON_MAJOR_VER}
 .endfor
 	${LN} -sf python${PYTHON_VER}-config \
 		${STAGEDIR}${PREFIX}/bin/python${PYTHON_MAJOR_VER}-config
-	${LN} -sf python-shared${PYTHON_VER}-config \
-		${STAGEDIR}${PREFIX}/bin/python-shared${PYTHON_MAJOR_VER}-config
 	${LN} -sf python-${PYTHON_VER}.pc \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/python${PYTHON_MAJOR_VER}.pc