diff options
| author | mva <mva@FreeBSD.org> | 2014-08-04 13:49:35 +0800 |
|---|---|---|
| committer | mva <mva@FreeBSD.org> | 2014-08-04 13:49:35 +0800 |
| commit | 668e0532960d690c703128128590d66b3790a4eb (patch) | |
| tree | 6adeea64720ead72099ea4f443a3d29a703473e4 /lang | |
| parent | 9293fa1b353acf267676097524b4ec49ed0b8021 (diff) | |
| download | freebsd-ports-gnome-668e0532960d690c703128128590d66b3790a4eb.tar.gz freebsd-ports-gnome-668e0532960d690c703128128590d66b3790a4eb.tar.zst freebsd-ports-gnome-668e0532960d690c703128128590d66b3790a4eb.zip | |
- Fix and remove stale symlinks after the lang/python* cleanup
Reported by: Scott Allendorf <scott-allendorf@uiowa.edu>
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/python/Makefile | 14 | ||||
| -rw-r--r-- | lang/python2/Makefile | 11 | ||||
| -rw-r--r-- | lang/python3/Makefile | 14 |
3 files changed, 9 insertions, 30 deletions
diff --git a/lang/python/Makefile b/lang/python/Makefile index 4d5ee3d79e1a..2100e7455d64 100644 --- a/lang/python/Makefile +++ b/lang/python/Makefile @@ -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 diff --git a/lang/python2/Makefile b/lang/python2/Makefile index 7cd14d341c37..7cb83c9fedd4 100644 --- a/lang/python2/Makefile +++ b/lang/python2/Makefile @@ -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 diff --git a/lang/python3/Makefile b/lang/python3/Makefile index 9471bba972c4..652ebce8c5d8 100644 --- a/lang/python3/Makefile +++ b/lang/python3/Makefile @@ -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 |