summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrecht <recht@pkgsrc.org>2004-01-25 21:10:10 +0000
committerrecht <recht@pkgsrc.org>2004-01-25 21:10:10 +0000
commitf4a7cde5250343db9ddfa67dce59af3be5ffce3c (patch)
tree0880ac53fdc2f75afe04a4d7366c9bf4d271860e
parent496994359c688ddeaec3dcf27848af48efe7b562 (diff)
downloadpkgsrc-f4a7cde5250343db9ddfa67dce59af3be5ffce3c.tar.gz
Revert python23{,pth} back to buildlink2. The build fails on NetBSD 1.6
since BUILDLINK_CPPFLAGS and friends are undefined in db's buildlink3.
-rw-r--r--lang/python23-pth/Makefile4
-rw-r--r--lang/python23/Makefile.common14
2 files changed, 9 insertions, 9 deletions
diff --git a/lang/python23-pth/Makefile b/lang/python23-pth/Makefile
index f3bced770f8..7bda1cee009 100644
--- a/lang/python23-pth/Makefile
+++ b/lang/python23-pth/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2004/01/24 20:53:54 recht Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/25 21:10:11 recht Exp $
#
PKGNAME= python23-pth-2.3.3
PTHREAD_OPTS= require
-.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/pthread.buildlink2.mk"
.if ${PTHREAD_TYPE} == "pth"
CONFIGURE_ARGS+= --with-pth
.endif
diff --git a/lang/python23/Makefile.common b/lang/python23/Makefile.common
index 519fdcb4007..caa8f80aa7e 100644
--- a/lang/python23/Makefile.common
+++ b/lang/python23/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2004/01/24 20:53:54 recht Exp $
+# $NetBSD: Makefile.common,v 1.3 2004/01/25 21:10:10 recht Exp $
#
DISTNAME= Python-2.3.3
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.python.org/
COMMENT= Interpreted, interactive, object-oriented programming language
USE_DB185= yes
-USE_BUILDLINK3= yes
+USE_BUILDLINK2= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-shared
CONFIGURE_ARGS+= OPT="${CFLAGS}"
@@ -59,7 +59,7 @@ PLIST_SUBST+= X86_ONLY=${X86_SUBST}
PLIST_SUBST+= OSSAUDIODEV=${OSSAUDIODEV_SUBST}
# ensure that the bsddb185 module is built on all platforms
-.include "../../databases/db/buildlink3.mk"
+.include "../../databases/db/buildlink2.mk"
SUBST_CLASSES+= setup
SUBST_MESSAGE.setup= "Fixing paths for db 1.85."
@@ -97,8 +97,8 @@ INSTALL_TARGET= altinstall
post-extract:
${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX}
-.include "../../archivers/bzip2/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../archivers/bzip2/buildlink2.mk"
+.include "../../devel/zlib/buildlink2.mk"
+.include "../../security/openssl/buildlink2.mk"
+.include "../../mk/ossaudio.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"