diff options
Diffstat (limited to 'lang/python27')
| -rw-r--r-- | lang/python27/Makefile | 13 | ||||
| -rw-r--r-- | lang/python27/files/pkg-message.in | 2 | ||||
| -rw-r--r-- | lang/python27/pkg-plist | 6 |
3 files changed, 8 insertions, 13 deletions
diff --git a/lang/python27/Makefile b/lang/python27/Makefile index 5f8fb7e25a5b..d583f2b12142 100644 --- a/lang/python27/Makefile +++ b/lang/python27/Makefile @@ -5,12 +5,12 @@ PORTNAME= python27 PORTVERSION= 2.7.3 PORTREVISION= 6 CATEGORIES= lang python ipv6 -MASTER_SITES= ${PYTHON_MASTER_SITES} +MASTER_SITES= PYTHON MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= python@FreeBSD.org -COMMENT= An interpreted object-oriented programming language +COMMENT= Interpreted object-oriented programming language DIST_SUBDIR= python WRKSRC= ${PYTHON_WRKSRC}/portbld.static @@ -34,7 +34,8 @@ PLIST= ${WRKDIR}/PLIST PLIST_TEMPLATE?=${PKGDIR}/pkg-plist PLIST_SUB= PYVER=${PYTHON_VERSION:S/python//} \ PYMAJOR=${PYTHON_MAJOR_VER} \ - PYVER_WITHPAT=${PORTVERSION:S/.c/c/} + PYVER_WITHPAT=${PORTVERSION:S/.c/c/} \ + PORTVERSION=${PORTVERSION} EXAMPLESDIR= ${PREFIX}/share/examples/${PYTHON_VERSION} DATADIR= ${PREFIX}/share/${PYTHON_VERSION} @@ -72,12 +73,8 @@ CONFIGURE_ENV+= ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no .include <bsd.port.pre.mk> .if ${PORT_OPTIONS:MSEM} -.if ${OSVERSION} >= 701106 SEM_MSG= "" .else -IGNORE= POSIX semaphore support only works in FreeBSD 7-STABLE and later -.endif # ${OSVERSION} >= 701106 -.else SEM_MSG= "@comment " .endif @@ -208,10 +205,8 @@ pre-patch: post-patch: .if ${PORT_OPTIONS:MSEM} -.if ${OSVERSION} >= 701106 @cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-setup.py .endif -.endif .if defined(WITHOUT_NIS) ${REINPLACE_CMD} -e \ 's/disabled_module_list =[^]]*/&, "nis"/' \ diff --git a/lang/python27/files/pkg-message.in b/lang/python27/files/pkg-message.in index 7f65e4d4ea80..26e6dfa5b1ec 100644 --- a/lang/python27/files/pkg-message.in +++ b/lang/python27/files/pkg-message.in @@ -4,7 +4,7 @@ ports since they require extra dependencies: bsddb databases/py-bsddb gdbm databases/py-gdbm -sqlite3 databases/py-sqlite3 +sqlite3 databases/py-sqlite3 tkinter x11-toolkits/py-tkinter Install them as needed. diff --git a/lang/python27/pkg-plist b/lang/python27/pkg-plist index a5bcfbb33235..85291430e77c 100644 --- a/lang/python27/pkg-plist +++ b/lang/python27/pkg-plist @@ -744,9 +744,9 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/json/tool.py %%PYTHON_LIBDIR%%/keyword.py %%PYTHON_LIBDIR%%/lib2to3/Grammar.txt -%%PYTHON_LIBDIR%%/lib2to3/Grammar2.7.3.final.0.pickle +%%PYTHON_LIBDIR%%/lib2to3/Grammar%%PORTVERSION%%.final.0.pickle %%PYTHON_LIBDIR%%/lib2to3/PatternGrammar.txt -%%PYTHON_LIBDIR%%/lib2to3/PatternGrammar2.7.3.final.0.pickle +%%PYTHON_LIBDIR%%/lib2to3/PatternGrammar%%PORTVERSION%%.final.0.pickle %%PYTHON_LIBDIR%%/lib2to3/__init__.py %%PYTHON_LIBDIR%%/lib2to3/__main__.py %%PYTHON_LIBDIR%%/lib2to3/btm_matcher.py @@ -845,7 +845,7 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/lib2to3/tests/test_pytree.py %%PYTHON_LIBDIR%%/lib2to3/tests/test_refactor.py %%PYTHON_LIBDIR%%/lib2to3/tests/test_util.py -%%PYTHON_LIBDIR%%/lib-dynload/Python-2.7.3-py%%PYVER%%.egg-info +%%PYTHON_LIBDIR%%/lib-dynload/Python-%%PORTVERSION%%-py%%PYVER%%.egg-info %%PYTHON_LIBDIR%%/lib-dynload/_bisect.so %%PYTHON_LIBDIR%%/lib-dynload/_codecs_cn.so %%PYTHON_LIBDIR%%/lib-dynload/_codecs_hk.so |