- Move the symlink magic for the default python version into lang/python

and lang/python2 and lang/python3. This change brings us closer to the goal
  of making Python ports usable with different Python versions at the same
  time.
- Add a new lang/python2 port to handle the symlinks for bin/python2,
  bin/idle2, bin/pydoc2 and so on.
- Add a new lang/python3 port to handle the symlinks for bin/python3,
  bin/idle3, bin/pydoc3 and so on.
- Bump the PORTREVISION on all lang/python* ports.
This commit is contained in:
Marcus von Appen 2013-08-17 19:10:59 +00:00
parent 2f894d2388
commit 7452555915
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=324864
16 changed files with 170 additions and 188 deletions

View file

@ -5,6 +5,23 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
20130817:
AFFECTS: users of lang/python*
AUTHOR: mva@FreeBSD.org
The lang/python* ports do not install links to 2to3, idle, pydoc, python
and other binaries anymore. Those were moved into the lang/python2 and
lang/python3 ports respectively. This change brings us closer to the goal
of making Python ports usable with different Python versions at the same
time.
If you have lang/python2* or lang/python3* installed, please also install
the associated lang/python2 or lang/python3 port.
1. update lang/python2* and/or lang/python3*
2. install lang/python2 and/or lang/python3
3. reinstall lang/python (if installed)
20130816:
AFFECTS: users of graphics/opendx and math/octave-forge-octcdf
AUTHOR: stephen@FreeBSD.org

View file

@ -1,9 +1,5 @@
# New ports collection makefile for: python
# Date created: 08 August 1995
# Whom: jkh
#
# Created by: jkh
# $FreeBSD$
#
PORTNAME= python
PORTVERSION= ${PYTHON_VER}
@ -17,11 +13,42 @@ MAINTAINER= python@FreeBSD.org
COMMENT= The "meta-port" for the default version of Python interpreter
USE_PYTHON_RUN= yes
PYTHON_VERSION= ${PYTHON_DEFAULT_VERSION}
NO_BUILD= yes
PLIST_FILES= bin/2to3 \
bin/idle \
bin/pydoc \
bin/python \
bin/python-config \
bin/python-shared \
bin/python-shared-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:
@${DO_NADA}
.for file in python python-shared
${LN} -sf ${PREFIX}/bin/${file}${PYTHON_MAJOR_VER} ${PREFIX}/bin/${file}
.endfor
${LN} -sf ${PREFIX}/bin/2to3-${PYTHON_MAJOR_VER} ${PREFIX}/bin/2to3
.if ${PYTHON_MAJOR_VER} == 2
${LN} -sf ${PREFIX}/bin/smtpd${PYTHON_MAJOR_VER}.py ${PREFIX}/bin/smtpd.py
.for file in idle pydoc
${LN} -sf ${PREFIX}/bin/${file}${PYTHON_MAJOR_VER} ${PREFIX}/bin/${file}
.endfor
.elif ${PYTHON_MAJOR_VER} == 3
.for file in idle pydoc
${LN} -sf ${PREFIX}/bin/${file}${PYTHON_MAJOR_VER}-${PYTHON_VER} ${PREFIX}/bin/${file}
.endfor
.endif
${LN} -sf ${PREFIX}/bin/python${PYTHON_MAJOR_VER}-config ${PREFIX}/bin/python-config
${LN} -sf ${PREFIX}/bin/python-shared${PYTHON_MAJOR_VER}-config ${PREFIX}/bin/python-shared-config
# Major upgrade support
PORTUPGRADE_CMD= ${LOCALBASE}/sbin/portupgrade
@ -61,4 +88,4 @@ upgrade-site-packages:
fi; \
fi; \
.include <bsd.port.mk>
.include <bsd.port.post.mk>

52
lang/python2/Makefile Normal file
View file

@ -0,0 +1,52 @@
# $FreeBSD$
PORTNAME= python2
PORTVERSION= ${PYTHON_MAJOR_VER}
CATEGORIES= lang python ipv6
MASTER_SITES= # empty
DISTFILES= # empty
EXTRACT_ONLY= # empty
MAINTAINER= python@FreeBSD.org
COMMENT= The "meta-port" for version 2 of the Python interpreter
USE_PYTHON_RUN= yes
PYTHON_VERSION= ${PYTHON_DEFAULT_VERSION}
NO_BUILD= yes
PLIST_FILES= bin/2to3-${PYTHON_MAJOR_VER} \
bin/idle${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
.include <bsd.port.pre.mk>
do-install:
.for file in idle pydoc python python-shared
${LN} -sf ${PREFIX}/bin/${file}${PYTHON_VER} ${PREFIX}/bin/${file}${PYTHON_MAJOR_VER}
.endfor
${LN} -sf ${PREFIX}/bin/2to3-${PYTHON_VER} ${PREFIX}/bin/2to3-${PYTHON_MAJOR_VER}
${LN} -sf ${PREFIX}/bin/smtpd${PYTHON_VER}.py ${PREFIX}/bin/smtpd${PYTHON_MAJOR_VER}.py
${LN} -sf ${PREFIX}/bin/python${PYTHON_VER}-config ${PREFIX}/bin/python${PYTHON_MAJOR_VER}-config
${LN} -sf ${PREFIX}/bin/python-shared${PYTHON_VER}-config ${PREFIX}/bin/python-shared${PYTHON_MAJOR_VER}-config
# Major upgrade support
PORTUPGRADE_CMD= ${LOCALBASE}/sbin/portupgrade
.if defined(USE_PORTMASTER)
PORTUPGRADE_CMD= ${LOCALBASE}/sbin/portmaster
.endif
.if defined(WITH_PKGNG)
PKG_LIST= ${PKG_BIN} query -a '%n-%v'
PKG_LIST_FILES= ${PKG_INFO} -l
.else
PKG_LIST= ${PKG_INFO} -Ea
PKG_LIST_FILES= ${PKG_INFO} -L
.endif
.include <bsd.port.post.mk>

4
lang/python2/pkg-descr Normal file
View file

@ -0,0 +1,4 @@
Python is an interpreted object-oriented programming language, and is
often compared to Tcl, Perl or Scheme.
WWW: http://www.python.org/

View file

@ -3,7 +3,7 @@
PORTNAME= python26
PORTVERSION= 2.6.8
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= lang python ipv6
MASTER_SITES= PYTHON
MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR}
@ -50,7 +50,6 @@ BINLINKS_SUB_TMPL= -e 's,smtpd,smtpd%%VERSION%%,' \
-e 's,2to3,2to3-%%VERSION%%,' \
-e 's,(idle|pydoc|python-shared|python),\1%%VERSION%%,'
BINLINKS_SUB_PYTHON_VER= ${BINLINKS_SUB_TMPL:S/%%VERSION%%/${PYTHON_VER}/g}
BINLINKS_SUB_PYTHON_MAJOR_VER= ${BINLINKS_SUB_TMPL:S/%%VERSION%%/${PYTHON_MAJOR_VER}/g}
OPTIONS_DEFINE= THREADS SEM PTH PYMALLOC IPV6 FPECTL EXAMPLES NLS
OPTIONS_DEFAULT= THREADS UCS4 PYMALLOC IPV6
@ -86,13 +85,6 @@ SEM_MSG= "@comment "
SUB_FILES= pkg-message
SUB_LIST= SEM=${SEM_MSG}
.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
MLINKS= ${PYTHON_VERSION}.1 python.1
PLIST_SUB+= IF_DEFAULT=""
.else
PLIST_SUB+= IF_DEFAULT="@comment "
.endif
.if ${PORT_OPTIONS:MTHREADS}
PLIST_SUB+= THREADS=""
.if ${PORT_OPTIONS:MPTH}
@ -267,15 +259,6 @@ post-install:
${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \
${MANPREFIX}/man/man1/${PYTHON_VERSION}.1
.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
for f in ${BIN_FILES}; do \
TARGET=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB_PYTHON_VER}`; \
TARGET_MAJOR=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB_PYTHON_MAJOR_VER}`; \
cd ${PREFIX}/bin && ${LN} -sf $$TARGET $$TARGET_MAJOR; \
cd ${PREFIX}/bin && ${LN} -sf $$TARGET_MAJOR $$f; \
done
.endif
.if !defined(NOPORTDATA)
@${MKDIR} ${DATADIR}
@cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \

View file

@ -1,26 +1,10 @@
%%IF_DEFAULT%%bin/2to3
%%IF_DEFAULT%%bin/2to3-%%PYMAJOR%%
bin/2to3-%%PYVER%%
%%IF_DEFAULT%%bin/idle
%%IF_DEFAULT%%bin/idle%%PYMAJOR%%
bin/idle%%PYVER%%
%%IF_DEFAULT%%bin/pydoc
%%IF_DEFAULT%%bin/pydoc%%PYMAJOR%%
bin/pydoc%%PYVER%%
%%IF_DEFAULT%%bin/python
%%IF_DEFAULT%%bin/python%%PYMAJOR%%
bin/python%%PYVER%%
%%IF_DEFAULT%%bin/python-config
%%IF_DEFAULT%%bin/python%%PYMAJOR%%-config
bin/python%%PYVER%%-config
%%IF_DEFAULT%%bin/python-shared
%%IF_DEFAULT%%bin/python-shared%%PYMAJOR%%
bin/python-shared%%PYVER%%
%%IF_DEFAULT%%bin/python-shared-config
%%IF_DEFAULT%%bin/python-shared%%PYMAJOR%%-config
bin/python-shared%%PYVER%%-config
%%IF_DEFAULT%%bin/smtpd.py
%%IF_DEFAULT%%bin/smtpd%%PYMAJOR%%.py
bin/smtpd%%PYVER%%.py
%%PYTHON_INCLUDEDIR%%/Python-ast.h
%%PYTHON_INCLUDEDIR%%/Python.h

View file

@ -3,7 +3,7 @@
PORTNAME= python27
PORTVERSION= 2.7.5
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= lang python ipv6
MASTER_SITES= PYTHON
MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR}
@ -48,7 +48,6 @@ BINLINKS_SUB_TMPL= -e 's,smtpd,smtpd%%VERSION%%,' \
-e 's,2to3,2to3-%%VERSION%%,' \
-e 's,(idle|pydoc|python-shared|python),\1%%VERSION%%,'
BINLINKS_SUB_PYTHON_VER= ${BINLINKS_SUB_TMPL:S/%%VERSION%%/${PYTHON_VER}/g}
BINLINKS_SUB_PYTHON_MAJOR_VER= ${BINLINKS_SUB_TMPL:S/%%VERSION%%/${PYTHON_MAJOR_VER}/g}
OPTIONS_DEFINE= THREADS SEM PTH PYMALLOC IPV6 FPECTL EXAMPLES NLS
OPTIONS_DEFAULT= THREADS UCS4 PYMALLOC IPV6
@ -80,13 +79,6 @@ SEM_MSG= "@comment "
SUB_FILES= pkg-message
SUB_LIST= SEM=${SEM_MSG}
.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
MLINKS= ${PYTHON_VERSION}.1 python.1
PLIST_SUB+= IF_DEFAULT=""
.else
PLIST_SUB+= IF_DEFAULT="@comment "
.endif
.if ${PORT_OPTIONS:MTHREADS}
PLIST_SUB+= THREADS=""
.if ${PORT_OPTIONS:MPTH}
@ -274,19 +266,6 @@ post-install:
${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \
${MANPREFIX}/man/man1/${PYTHON_VERSION}.1
.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
for f in ${BIN_FILES}; do \
TARGET=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB_PYTHON_VER}`; \
TARGET_MAJOR=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB_PYTHON_MAJOR_VER}`; \
cd ${PREFIX}/bin && ${LN} -sf $$TARGET $$TARGET_MAJOR; \
cd ${PREFIX}/bin && ${LN} -sf $$TARGET_MAJOR $$f; \
done
.endif
.for file in python python-config
cd ${LOCALBASE}/bin && ${LN} -sf ${file:S/python/${PYTHON_VERSION}/} ${file:S/python/python${PYTHON_MAJOR_VER}/}
.endfor
.if !defined(NOPORTDATA)
@${MKDIR} ${DATADIR}
@cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \

View file

@ -1,27 +1,11 @@
libdata/pkgconfig/python-2.7.pc
%%IF_DEFAULT%%bin/2to3
%%IF_DEFAULT%%bin/2to3-%%PYMAJOR%%
bin/2to3-%%PYVER%%
%%IF_DEFAULT%%bin/idle
%%IF_DEFAULT%%bin/idle%%PYMAJOR%%
bin/idle%%PYVER%%
%%IF_DEFAULT%%bin/pydoc
%%IF_DEFAULT%%bin/pydoc%%PYMAJOR%%
bin/pydoc%%PYVER%%
%%IF_DEFAULT%%bin/python
%%IF_DEFAULT%%bin/python%%PYMAJOR%%
bin/python%%PYVER%%
%%IF_DEFAULT%%bin/python-config
%%IF_DEFAULT%%bin/python%%PYMAJOR%%-config
bin/python%%PYVER%%-config
%%IF_DEFAULT%%bin/python-shared
%%IF_DEFAULT%%bin/python-shared%%PYMAJOR%%
bin/python-shared%%PYVER%%
%%IF_DEFAULT%%bin/python-shared-config
%%IF_DEFAULT%%bin/python-shared%%PYMAJOR%%-config
bin/python-shared%%PYVER%%-config
%%IF_DEFAULT%%bin/smtpd.py
%%IF_DEFAULT%%bin/smtpd%%PYMAJOR%%.py
bin/smtpd%%PYVER%%.py
%%PYTHON_INCLUDEDIR%%/Python-ast.h
%%PYTHON_INCLUDEDIR%%/Python.h

53
lang/python3/Makefile Normal file
View file

@ -0,0 +1,53 @@
# $FreeBSD$
PORTNAME= python3
PORTVERSION= ${PYTHON_MAJOR_VER}
CATEGORIES= lang python ipv6
MASTER_SITES=
DISTFILES=
EXTRACT_ONLY=
MAINTAINER= python@FreeBSD.org
COMMENT= The "meta-port" for version 3 of the Python interpreter
USE_PYTHON_RUN= yes
PYTHON_VERSION= ${PYTHON3_DEFAULT_VERSION}
NO_BUILD= yes
PLIST_FILES= bin/2to3-${PYTHON_MAJOR_VER} \
bin/idle${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
.include <bsd.port.pre.mk>
do-install:
.for file in python python-shared
${LN} -sf ${PREFIX}/bin/${file}${PYTHON_VER} ${PREFIX}/bin/${file}${PYTHON_MAJOR_VER}
.endfor
${LN} -sf ${PREFIX}/bin/2to3-${PYTHON_VER} ${PREFIX}/bin/2to3-${PYTHON_MAJOR_VER}
.for file in idle pydoc
${LN} -sf ${PREFIX}/bin/${file}${PYTHON_MAJOR_VER}-${PYTHON_VER} ${PREFIX}/bin/${file}${PYTHON_MAJOR_VER}
.endfor
${LN} -sf ${PREFIX}/bin/python${PYTHON_VER}-config ${PREFIX}/bin/python${PYTHON_MAJOR_VER}-config
${LN} -sf ${PREFIX}/bin/python-shared${PYTHON_VER}-config ${PREFIX}/bin/python-shared${PYTHON_MAJOR_VER}-config
# Major upgrade support
PORTUPGRADE_CMD= ${LOCALBASE}/sbin/portupgrade
.if defined(USE_PORTMASTER)
PORTUPGRADE_CMD= ${LOCALBASE}/sbin/portmaster
.endif
.if defined(WITH_PKGNG)
PKG_LIST= ${PKG_BIN} query -a '%n-%v'
PKG_LIST_FILES= ${PKG_INFO} -l
.else
PKG_LIST= ${PKG_INFO} -Ea
PKG_LIST_FILES= ${PKG_INFO} -L
.endif
.include <bsd.port.post.mk>

4
lang/python3/pkg-descr Normal file
View file

@ -0,0 +1,4 @@
Python is an interpreted object-oriented programming language, and is
often compared to Tcl, Perl or Scheme.
WWW: http://www.python.org/

View file

@ -2,7 +2,7 @@
PORTNAME= python31
PORTVERSION= 3.1.5
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= lang python ipv6
MASTER_SITES= PYTHON
MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR}
@ -67,19 +67,6 @@ CONFIGURE_ENV+= ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no
.include <bsd.port.pre.mk>
.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
MLINKS= ${PYTHON_VERSION}.1 python.1
PLIST_SUB+= IF_DEFAULT=""
.else
PLIST_SUB+= IF_DEFAULT="@comment "
.endif
.if ${PYTHON_VERSION} == ${PYTHON3_DEFAULT_VERSION}
PLIST_SUB+= IF_DEFAULT_MAJOR=""
.else
PLIST_SUB+= IF_DEFAULT_MAJOR="@comment "
.endif
.if ${PORT_OPTIONS:MTHREADS}
PLIST_SUB+= THREADS=""
CONFIGURE_ARGS+= --with-threads
@ -222,19 +209,6 @@ post-install:
${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \
${MANPREFIX}/man/man1/${PYTHON_VERSION}.1
.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
for f in ${BIN_FILES}; do \
TARGET=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB}`; \
cd ${PREFIX}/bin && ${LN} -sf $$TARGET $$f; \
done
.endif
.if ${PYTHON_VERSION} == ${PYTHON3_DEFAULT_VERSION}
.for file in python python-config
cd ${LOCALBASE}/bin && ${LN} -sf ${file:S/python/${PYTHON_VERSION}/} ${file:S/python/python${PYTHON_MAJOR_VER}/}
.endfor
.endif
.if !defined(NOPORTDATA)
@${MKDIR} ${DATADIR}
@cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \

View file

@ -1,18 +1,9 @@
%%IF_DEFAULT%%bin/2to3
bin/2to3-%%PYVER%%
%%IF_DEFAULT%%bin/idle3
bin/idle3-%%PYVER%%
%%IF_DEFAULT%%bin/pydoc3
bin/pydoc3-%%PYVER%%
%%IF_DEFAULT%%bin/python
%%IF_DEFAULT_MAJOR%%bin/python%%PYMAJOR%%
bin/python%%PYVER%%
%%IF_DEFAULT%%bin/python-config
%%IF_DEFAULT_MAJOR%%bin/python%%PYMAJOR%%-config
bin/python%%PYVER%%-config
%%IF_DEFAULT%%bin/python-shared
bin/python-shared%%PYVER%%
%%IF_DEFAULT%%bin/python-shared-config
bin/python-shared%%PYVER%%-config
lib/lib%%PYTHON_VERSION%%.a
lib/lib%%PYTHON_VERSION%%.so

View file

@ -2,7 +2,7 @@
PORTNAME= python32
PORTVERSION= 3.2.5
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= lang python ipv6
MASTER_SITES= PYTHON
MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR}
@ -65,19 +65,6 @@ CONFIGURE_ENV+= ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no
.include <bsd.port.pre.mk>
.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
MLINKS= ${PYTHON_VERSION}.1 python.1
PLIST_SUB+= IF_DEFAULT=""
.else
PLIST_SUB+= IF_DEFAULT="@comment "
.endif
.if ${PYTHON_VERSION} == ${PYTHON3_DEFAULT_VERSION}
PLIST_SUB+= IF_DEFAULT_MAJOR=""
.else
PLIST_SUB+= IF_DEFAULT_MAJOR="@comment "
.endif
.if ${PORT_OPTIONS:MTHREADS}
PLIST_SUB+= THREADS=""
CONFIGURE_ARGS+= --with-threads
@ -212,19 +199,6 @@ post-install:
${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \
${MANPREFIX}/man/man1/${PYTHON_VERSION}.1
.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
for f in ${BIN_FILES}; do \
TARGET=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB}`; \
cd ${PREFIX}/bin && ${LN} -sf $$TARGET $$f; \
done
.endif
.if ${PYTHON_VERSION} == ${PYTHON3_DEFAULT_VERSION}
.for file in python python-config
cd ${LOCALBASE}/bin && ${LN} -sf ${file:S/python/${PYTHON_VERSION}/} ${file:S/python/python${PYTHON_MAJOR_VER}/}
.endfor
.endif
.if !defined(NOPORTDATA)
@${MKDIR} ${DATADIR}
@cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \

View file

@ -1,18 +1,9 @@
%%IF_DEFAULT%%bin/2to3
bin/2to3-%%PYVER%%
%%IF_DEFAULT%%bin/idle3
bin/idle3-%%PYVER%%
%%IF_DEFAULT%%bin/pydoc3
bin/pydoc3-%%PYVER%%
%%IF_DEFAULT%%bin/python
%%IF_DEFAULT_MAJOR%%bin/python%%PYMAJOR%%
bin/python%%PYVER%%
%%IF_DEFAULT%%bin/python-config
%%IF_DEFAULT_MAJOR%%bin/python%%PYMAJOR%%-config
bin/python%%PYVER%%-config
%%IF_DEFAULT%%bin/python-shared
bin/python-shared%%PYVER%%
%%IF_DEFAULT%%bin/python-shared-config
bin/python-shared%%PYVER%%-config
bin/python%%PYVER%%%%PYABIVER%%
bin/python%%PYVER%%%%PYABIVER%%-config

View file

@ -2,7 +2,7 @@
PORTNAME= python33
PORTVERSION= 3.3.2
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= lang python ipv6
MASTER_SITES= PYTHON
MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR}
@ -66,19 +66,6 @@ CONFIGURE_ENV+= ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no
.include <bsd.port.pre.mk>
.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
MLINKS= ${PYTHON_VERSION}.1 python.1
PLIST_SUB+= IF_DEFAULT=""
.else
PLIST_SUB+= IF_DEFAULT="@comment "
.endif
.if ${PYTHON_VERSION} == ${PYTHON3_DEFAULT_VERSION}
PLIST_SUB+= IF_DEFAULT_MAJOR=""
.else
PLIST_SUB+= IF_DEFAULT_MAJOR="@comment "
.endif
.if ${PORT_OPTIONS:MTHREADS}
PLIST_SUB+= THREADS=""
CONFIGURE_ARGS+= --with-threads
@ -208,19 +195,6 @@ post-install:
${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \
${MANPREFIX}/man/man1/${PYTHON_VERSION}.1
.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
for f in ${BIN_FILES}; do \
TARGET=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB}`; \
cd ${PREFIX}/bin && ${LN} -sf $$TARGET $$f; \
done
.endif
.if ${PYTHON_VERSION} == ${PYTHON3_DEFAULT_VERSION}
.for file in python python-config
cd ${LOCALBASE}/bin && ${LN} -sf ${file:S/python/${PYTHON_VERSION}/} ${file:S/python/python${PYTHON_MAJOR_VER}/}
.endfor
.endif
.if !defined(NOPORTDATA)
@${MKDIR} ${DATADIR}
@cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \

View file

@ -1,18 +1,9 @@
%%IF_DEFAULT%%bin/2to3
bin/2to3-%%PYVER%%
%%IF_DEFAULT%%bin/idle3
bin/idle3-%%PYVER%%
%%IF_DEFAULT%%bin/pydoc3
bin/pydoc3-%%PYVER%%
%%IF_DEFAULT%%bin/python
%%IF_DEFAULT_MAJOR%%bin/python%%PYMAJOR%%
bin/python%%PYVER%%
%%IF_DEFAULT%%bin/python-config
%%IF_DEFAULT_MAJOR%%bin/python%%PYMAJOR%%-config
bin/python%%PYVER%%-config
%%IF_DEFAULT%%bin/python-shared
bin/python-shared%%PYVER%%
%%IF_DEFAULT%%bin/python-shared-config
bin/python-shared%%PYVER%%-config
bin/python%%PYVER%%%%PYABIVER%%
bin/python%%PYVER%%%%PYABIVER%%-config