Changes 2.5.16:

* The latest Python code from the pybsddb project is bundled.

3 files changed, 37 insertions, 35 deletions

diff --git a/databases/py-bdb-xml/Makefile b/databases/py-bdb-xml/Makefile
index cebb23ab9dc..07f90e104f7 100644
--- a/databases/py-bdb-xml/Makefile
+++ b/databases/py-bdb-xml/Makefile
@@ -1,33 +1,35 @@
-# $NetBSD: Makefile,v 1.16 2010/09/16 08:06:14 adam Exp $
+# $NetBSD: Makefile,v 1.17 2011/02/23 10:33:47 adam Exp $
 
-DISTNAME=	dbxml-1.2.1
+DISTNAME=	dbxml-2.5.16
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/db/bdb-/}
-PKGREVISION=	10
 CATEGORIES=	databases python
-MASTER_SITES=	http://www.sleepycat.com/update/snapshot/
+MASTER_SITES=	http://download.oracle.com/berkeley-db/
 
 MAINTAINER=	minskim@NetBSD.org
-HOMEPAGE=	http://www.sleepycat.com/products/xml.shtml
+HOMEPAGE=	http://www.oracle.com/us/products/database/berkeley-db/
 COMMENT=	Python wrapper for Berkeley DB XML C++ API
+LICENSE=	modified-bsd AND apache-1.1
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 CONFLICTS=	${PYPKGPREFIX}-dbxml<=1.2.1
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/src/python
-PYDISTUTILSPKG=	YES
+WRKSRC=		${WRKDIR}/${DISTNAME}/dbxml/src/python
 
-BDB_ACCEPTED=	db4 db5
-USE_LANGUAGES=	c c++
-NO_CONFIGURE=	YES
+USE_LANGUAGES=		c c++
+NO_CONFIGURE=		yes
+PYDISTUTILSPKG=		yes
 
-.include "../../lang/python/extension.mk"
-PYSETUPBUILDARGS+=	--with-berkeleydb=${BUILDLINK_PREFIX.db4} \
-			--with-xerces=${BUILDLINK_PREFIX.xerces-c} \
-			--with-pathan=${BUILDLINK_PREFIX.libpathan}
+SUBST_CLASSES+=		fix-path
+SUBST_STAGE.fix-path=	pre-build
+SUBST_MESSAGE.fix-path=	Fixing library paths.
+SUBST_FILES.fix-path=	setup.py
+SUBST_SED.fix-path=	-e 's,@prefix@,${PREFIX},'
+SUBST_SED.fix-path+=	-e 's,@DB_DIR@,${BDBBASE},'
+SUBST_SED.fix-path+=	-e 's,@XERCES_DIR@,${BUILDLINK_PREFIX.xerces-c},'
+SUBST_SED.fix-path+=	-e 's,@XQILLA_DIR@,${BUILDLINK_PREFIX.xqilla},'
+SUBST_SED.fix-path+=	-e 's,@BDB_TYPE@,${BDB_TYPE},'
 
 .include "../../databases/bdb-xml/buildlink3.mk"
-.include "../../textproc/libpathan/buildlink3.mk"
-.include "../../textproc/xerces-c/buildlink3.mk"
-.include "../../mk/bdb.buildlink3.mk"
+.include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/py-bdb-xml/distinfo b/databases/py-bdb-xml/distinfo
index 8b0f952c130..13e17ff861f 100644
--- a/databases/py-bdb-xml/distinfo
+++ b/databases/py-bdb-xml/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2007/06/15 23:43:14 wiz Exp $
+$NetBSD: distinfo,v 1.6 2011/02/23 10:33:47 adam Exp $
 
-SHA1 (dbxml-1.2.1.tar.gz) = cc6ce354b3fb2e00d5b424c0b15ecee4ec340842
-RMD160 (dbxml-1.2.1.tar.gz) = 162f3e14e509aefd764bb97af80d5bbf06151df7
-Size (dbxml-1.2.1.tar.gz) = 3151529 bytes
-SHA1 (patch-aa) = a41edd431e9f35700115cea06d2e9e8584ea38fa
+SHA1 (dbxml-2.5.16.tar.gz) = 46f0e6b301e556c2502e4da0cd96a599acc53837
+RMD160 (dbxml-2.5.16.tar.gz) = fdb4c85271cb84a8e31931d8fb287ad17fafff9c
+Size (dbxml-2.5.16.tar.gz) = 52819154 bytes
+SHA1 (patch-aa) = 26968f2541a469444f7ee8ec64dfd28f4967ff26
diff --git a/databases/py-bdb-xml/patches/patch-aa b/databases/py-bdb-xml/patches/patch-aa
index 9d82ab04c25..4e828144d8f 100644
--- a/databases/py-bdb-xml/patches/patch-aa
+++ b/databases/py-bdb-xml/patches/patch-aa
@@ -1,22 +1,22 @@
-$NetBSD: patch-aa,v 1.4 2007/06/15 23:43:14 wiz Exp $
+$NetBSD: patch-aa,v 1.5 2011/02/23 10:33:47 adam Exp $
 
---- setup.py.orig	2003-12-17 14:55:18.000000000 -0600
+--- setup.py.orig	2009-12-22 13:21:17.000000000 +0000
 +++ setup.py
-@@ -42,7 +42,7 @@ if "install" in sys.argv and not "build"
+@@ -69,7 +69,7 @@ else:
  
  if os.name == "posix":
-   INCLUDES =    ["../../include",
--                 os.path.join(db_home, "include"),
-+                 os.path.join(db_home, "include", "db4"),
-                  os.path.join(pathan_home, "include"),
-                  os.path.join(xerces_home, "include")]
+   INCLUDES.append(os.path.join(dbxml_home,"include"))
+-  INCLUDES.append(os.path.join(db_home, "include"))
++  INCLUDES.append(os.path.join(db_home, "include", "@BDB_TYPE@"))
  
-@@ -52,7 +52,7 @@ if os.name == "posix":
+   LIBDIRS =     [os.path.join(dbxml_home,"build_unix/.libs"),
+                  os.path.join(dbxml_home, "lib"),
+@@ -78,7 +78,7 @@ if os.name == "posix":
                   os.path.join(xerces_home, "lib")]
  
-   LIBS =        ["dbxml-1.2",
--                 "db_cxx-4.2",
-+                 "db4_cxx",
-                  "pathan", "xerces-c"]
+   LIBS =        ["dbxml",
+-                 "db-4",
++                 "@BDB_TYPE@",
+                  "xqilla", "xerces-c"]
  
    DATAFILES =   []