summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authortnn <tnn>2010-02-11 21:21:49 +0000
committertnn <tnn>2010-02-11 21:21:49 +0000
commit46f85b07df1f6ce38aed58bbe742e6efefb3bc9c (patch)
tree89cf332594decf53882ffdb324b04acbc56b3582 /lang
parent6e02e9ae4916fca6303f32019c5ec73cca569b87 (diff)
downloadpkgsrc-46f85b07df1f6ce38aed58bbe742e6efefb3bc9c.tar.gz
Because we unconditionally try to build the bsddb module now,
there's no point having special PLIST handling for it.
Diffstat (limited to 'lang')
-rw-r--r--lang/python26/Makefile18
-rw-r--r--lang/python26/PLIST.common4
2 files changed, 11 insertions, 11 deletions
diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index 8f582e1d214..9b3f7da62fe 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2010/02/11 21:13:07 tnn Exp $
+# $NetBSD: Makefile,v 1.21 2010/02/11 21:21:49 tnn Exp $
DISTNAME= Python-2.6.4
PKGNAME= ${DISTNAME:S/Python/python26/}
@@ -115,7 +115,7 @@ PLIST.nav= yes
. endif
.endif
-PLIST_VARS+= bsddb dll nis no-nis
+PLIST_VARS+= dll nis no-nis
.if ${OPSYS} == "IRIX"
. if ${ABI} == "64"
PLIST.no-nis= yes
@@ -123,13 +123,6 @@ PLIST.no-nis= yes
PLIST.nis= yes
. endif
.else
-. include "../../mk/bdb.buildlink3.mk"
-MAKE_ENV+= PY_BDB_TYPE=${BDB_TYPE}
-.if empty(BDB_LIBS)
-BUILDLINK_TRANSFORM+= rm:-ldb
-.endif
-CFLAGS+= -DHAVE_DB_185_H
-PLIST.bsddb= yes
PLIST.dll= yes
. if ${OPSYS} != "NetBSD" || exists(/usr/bin/ypcat)
PLIST.nis= yes
@@ -138,6 +131,13 @@ PLIST.no-nis= yes
. endif
.endif
+.include "../../mk/bdb.buildlink3.mk"
+MAKE_ENV+= PY_BDB_TYPE=${BDB_TYPE}
+.if empty(BDB_LIBS)
+BUILDLINK_TRANSFORM+= rm:-ldb
+.endif
+CFLAGS+= -DHAVE_DB_185_H
+
.if ${OPSYS} == "OSF1"
# configure complains about buggy getaddrinfo()
CONFIGURE_ARGS+= --disable-ipv6
diff --git a/lang/python26/PLIST.common b/lang/python26/PLIST.common
index 02efb1c8f6a..93bb5f49721 100644
--- a/lang/python26/PLIST.common
+++ b/lang/python26/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.8 2010/01/26 12:15:26 tron Exp $
+@comment $NetBSD: PLIST.common,v 1.9 2010/02/11 21:21:49 tnn Exp $
bin/2to3
bin/pydoc${PY_VER_SUFFIX}
bin/python${PY_VER_SUFFIX}
@@ -1708,7 +1708,7 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/_weakref.so
lib/python${PY_VER_SUFFIX}/lib-dynload/array.so
lib/python${PY_VER_SUFFIX}/lib-dynload/audioop.so
lib/python${PY_VER_SUFFIX}/lib-dynload/binascii.so
-${PLIST.bsddb}lib/python${PY_VER_SUFFIX}/lib-dynload/bsddb185.so
+lib/python${PY_VER_SUFFIX}/lib-dynload/bsddb185.so
lib/python${PY_VER_SUFFIX}/lib-dynload/bz2.so
lib/python${PY_VER_SUFFIX}/lib-dynload/cPickle.so
lib/python${PY_VER_SUFFIX}/lib-dynload/cStringIO.so