[pkgsrc/trunk]: pkgsrc/lang/python26 Because we unconditionally try to build ...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/622a14bf0403
branches:  trunk
changeset: 571401:622a14bf0403
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Thu Feb 11 21:21:49 2010 +0000

description:
Because we unconditionally try to build the bsddb module now,
there's no point having special PLIST handling for it.

diffstat:

 lang/python26/Makefile     |  18 +++++++++---------
 lang/python26/PLIST.common |   4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diffs (64 lines):

diff -r e0c2c0ce997c -r 622a14bf0403 lang/python26/Makefile
--- a/lang/python26/Makefile    Thu Feb 11 21:13:07 2010 +0000
+++ b/lang/python26/Makefile    Thu Feb 11 21:21:49 2010 +0000
@@ -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 @@
 .  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.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 @@
 .  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 -r e0c2c0ce997c -r 622a14bf0403 lang/python26/PLIST.common
--- a/lang/python26/PLIST.common        Thu Feb 11 21:13:07 2010 +0000
+++ b/lang/python26/PLIST.common        Thu Feb 11 21:21:49 2010 +0000
@@ -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/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