diff options
| -rw-r--r-- | lang/python21-pth/Makefile | 10 | ||||
| -rw-r--r-- | lang/python22-pth/Makefile | 9 |
2 files changed, 12 insertions, 7 deletions
diff --git a/lang/python21-pth/Makefile b/lang/python21-pth/Makefile index e0466ea2d08..e8cb5f74018 100644 --- a/lang/python21-pth/Makefile +++ b/lang/python21-pth/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.4 2003/05/02 11:55:35 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2003/05/07 19:36:01 drochner Exp $ # DISTNAME= Python-2.1.3 PKGNAME= python21-pth-2.1.3 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= lang MASTER_SITES= ftp://ftp.python.org/pub/python/2.1.3/ EXTRACT_SUFX= .tgz @@ -14,7 +14,12 @@ COMMENT= Interpreted, interactive, object-oriented programming language USE_BUILDLINK2= yes GNU_CONFIGURE= YES + +PTHREAD_OPTS= require +.include "../../mk/pthread.buildlink2.mk" +.if ${PTHREAD_TYPE} == "pth" CONFIGURE_ARGS+= --with-pth +.endif INSTALL_TARGET= altinstall @@ -22,7 +27,6 @@ post-extract: ${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc2p1 .include "../../devel/zlib/buildlink2.mk" -.include "../../devel/pth/buildlink2.mk" .include "../../mk/bsd.pkg.mk" # This comes after bsd.pkg.mk so that the LDFLAGS here overrides the one diff --git a/lang/python22-pth/Makefile b/lang/python22-pth/Makefile index 5e6d85b5c6d..f52356c8697 100644 --- a/lang/python22-pth/Makefile +++ b/lang/python22-pth/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.4 2003/05/05 19:05:15 jmmv Exp $ +# $NetBSD: Makefile,v 1.5 2003/05/07 19:36:02 drochner Exp $ # DISTNAME= Python-2.2.2 PKGNAME= python22-pth-2.2.2 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= lang MASTER_SITES= ftp://ftp.python.org/pub/python/2.2.2/ EXTRACT_SUFX= .tgz @@ -19,7 +19,9 @@ GNU_CONFIGURE= YES PLIST_SUBST+= PY_PLATNAME=${LOWER_OPSYS}${OS_VERSION:C/\..*//} -.if ${OPSYS} == "NetBSD" +PTHREAD_OPTS= require +.include "../../mk/pthread.buildlink2.mk" +.if ${PTHREAD_TYPE} == "pth" CONFIGURE_ARGS+= --with-pth .endif @@ -28,7 +30,6 @@ INSTALL_TARGET= altinstall post-extract: ${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc2p2 -.include "../../devel/pth/buildlink2.mk" .include "../../devel/zlib/buildlink2.mk" .include "../../mk/bsd.pkg.mk" |