diff options
author | recht <recht> | 2005-01-23 20:41:45 +0000 |
---|---|---|
committer | recht <recht> | 2005-01-23 20:41:45 +0000 |
commit | afb6c634cf36bd0b8ca88bdb63f886e1d081aada (patch) | |
tree | c91b08fba110acac23e0418c231e8fe8945c54ed /lang/python22 | |
parent | 9568d9551aa2d892a0210cdea493eaeabbe1d6ef (diff) | |
download | pkgsrc-afb6c634cf36bd0b8ca88bdb63f886e1d081aada.tar.gz |
Build Python with thread support by default and turn the existing
python*-pth packages into meta-packages which will install the non-pth
packages. Bump PKGREVISIONs on the non-pth versions to propagate the
thread change, but leave the *-pth versions untouched to not affect
existing installations.
Sync all PYTHON_VERSIONS_AFFECTED lines in package Makefiles.
Diffstat (limited to 'lang/python22')
-rw-r--r-- | lang/python22/Makefile | 58 | ||||
-rw-r--r-- | lang/python22/Makefile.common | 51 |
2 files changed, 54 insertions, 55 deletions
diff --git a/lang/python22/Makefile b/lang/python22/Makefile index 678e1ffe4a4..71909a71db1 100644 --- a/lang/python22/Makefile +++ b/lang/python22/Makefile @@ -1,11 +1,61 @@ -# $NetBSD: Makefile,v 1.22 2004/08/29 10:44:19 recht Exp $ +# $NetBSD: Makefile,v 1.23 2005/01/23 20:41:47 recht Exp $ # +DISTNAME= Python-2.2.3 PKGNAME= python22-2.2.3 -PKGREVISION= 2 +PKGREVISION= 3 +CATEGORIES= lang python +MASTER_SITES= ftp://ftp.python.org/pub/python/2.2.3/ +EXTRACT_SUFX= .tgz -CONFIGURE_ARGS+= --without-threads +MAINTAINER= tech-pkg@NetBSD.org +HOMEPAGE= http://www.python.org/ +COMMENT= Interpreted, interactive, object-oriented programming language + +USE_LANGUAGES= c c++ +USE_BUILDLINK3= YES +GNU_CONFIGURE= YES + +PTHREAD_OPTS= require +.include "../../mk/pthread.buildlink3.mk" +.if ${PTHREAD_TYPE} == "pth" +CONFIGURE_ARGS+= --with-pth +.endif PY_VER_SUFFIX= 2.2 -.include "../../lang/python22/Makefile.common" +.include "../../mk/bsd.prefs.mk" + +PLIST_SRC= ${.CURDIR}/../../lang/python22/PLIST.common +.if exists(${.CURDIR}/../../lang/python22/PLIST.${OPSYS}) +PLIST_SRC+= ${.CURDIR}/../../lang/python22/PLIST.${OPSYS} +.endif +PLIST_SRC+= ${.CURDIR}/../../lang/python22/PLIST.common_end + +.if ${OPSYS} == "Darwin" +PLIST_SUBST+= PY_PLATNAME=${LOWER_OPSYS} +.elif ${OPSYS} == "IRIX" +PLIST_SUBST+= PY_PLATNAME=${LOWER_OPSYS:C/\..*//} +.elif ${OPSYS} == "SunOS" +PLIST_SUBST+= PY_PLATNAME=sunos${OS_VERSION:C/\..*//} +.else +PLIST_SUBST+= PY_PLATNAME=${LOWER_OPSYS}${OS_VERSION:C/\..*//} +.endif + +PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX} + +INSTALL_TARGET= altinstall + +post-extract: + ${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX} + +.include "../../devel/zlib/buildlink3.mk" +.include "../../mk/dlopen.buildlink3.mk" +.include "../../mk/bsd.pkg.mk" + +# This comes after bsd.pkg.mk so that the LDFLAGS here overrides the one +# set earlier in the environment (last definition wins). +# +.if ${OBJECT_FMT} == "a.out" +MAKE_ENV+= LDFLAGS="${LDFLAGS:S/-Wl,//}" +.endif diff --git a/lang/python22/Makefile.common b/lang/python22/Makefile.common deleted file mode 100644 index 743af848285..00000000000 --- a/lang/python22/Makefile.common +++ /dev/null @@ -1,51 +0,0 @@ -# $NetBSD: Makefile.common,v 1.8 2004/12/19 05:34:07 grant Exp $ -# - -DISTNAME= Python-2.2.3 -CATEGORIES= lang python -MASTER_SITES= ftp://ftp.python.org/pub/python/2.2.3/ -EXTRACT_SUFX= .tgz - -MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= http://www.python.org/ -COMMENT= Interpreted, interactive, object-oriented programming language - -USE_LANGUAGES= c c++ -USE_BUILDLINK3= YES -GNU_CONFIGURE= YES - -.include "../../mk/bsd.prefs.mk" - -PLIST_SRC= ${.CURDIR}/../../lang/python22/PLIST.common -.if exists(${.CURDIR}/../../lang/python22/PLIST.${OPSYS}) -PLIST_SRC+= ${.CURDIR}/../../lang/python22/PLIST.${OPSYS} -.endif -PLIST_SRC+= ${.CURDIR}/../../lang/python22/PLIST.common_end - -.if ${OPSYS} == "Darwin" -PLIST_SUBST+= PY_PLATNAME=${LOWER_OPSYS} -.elif ${OPSYS} == "IRIX" -PLIST_SUBST+= PY_PLATNAME=${LOWER_OPSYS:C/\..*//} -.elif ${OPSYS} == "SunOS" -PLIST_SUBST+= PY_PLATNAME=sunos${OS_VERSION:C/\..*//} -.else -PLIST_SUBST+= PY_PLATNAME=${LOWER_OPSYS}${OS_VERSION:C/\..*//} -.endif - -PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX} - -INSTALL_TARGET= altinstall - -post-extract: - ${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX} - -.include "../../devel/zlib/buildlink3.mk" -.include "../../mk/dlopen.buildlink3.mk" -.include "../../mk/bsd.pkg.mk" - -# This comes after bsd.pkg.mk so that the LDFLAGS here overrides the one -# set earlier in the environment (last definition wins). -# -.if ${OBJECT_FMT} == "a.out" -MAKE_ENV+= LDFLAGS="${LDFLAGS:S/-Wl,//}" -.endif |