Wed Dec 11 19:18:56 2013 UTC ()
Update to 6.0.1, update LICENSE:

6.0.1:
  * Clarification of license. Thanks to
    Jan Stan��k <jstanek@redhat.com> for bringing this issue up.
    This work is now explicitly licensed under 3-clause BSD license.
  * Fixed a long standing bug (August 2008, rev 9fd52748fa59)
    on "dbtables.py". Notified by Maxime Labelle.
  * If you want to link with Oracle Berkeley DB 6.0, you will
    need to create the environment variable
    'YES_I_HAVE_THE_RIGHT_TO_USE_THIS_BERKELEY_DB_VERSION'
    to signal to the pybsddb that you are legal. To be legal,
    your code MUST be AGPL3 *OR* you have to buy a commercial
    license from Oracle.

    If you are not legally entitled to use Berkeley DB 6.0 and
    you have previous versions of Berkeley DB on your system,
    you can a) delete Berkeley DB 6.0 and try again, OR
    b) instruct pybsddb to use a previous Berkeley DB version,
    using environment variables or command line options.

    Sorry for the inconvenience. I am trying to protect you.

    Some details:

        https://forums.oracle.com/message/11184885
        http://lists.debian.org/debian-legal/2013/07/


(wiz)
diff -r1.46 -r1.47 pkgsrc/databases/py-bsddb3/Makefile
diff -r1.22 -r1.23 pkgsrc/databases/py-bsddb3/distinfo
cvs diff -r1.46 -r1.47 pkgsrc/databases/py-bsddb3/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/py-bsddb3/Makefile 2013/10/23 08:35:28 1.46
+++ pkgsrc/databases/py-bsddb3/Makefile 2013/12/11 19:18:56 1.47
@@ -1,34 +1,38 @@ @@ -1,34 +1,38 @@
1# $NetBSD: Makefile,v 1.46 2013/10/23 08:35:28 wiz Exp $ 1# $NetBSD: Makefile,v 1.47 2013/12/11 19:18:56 wiz Exp $
2 2
3DISTNAME= bsddb3-6.0.0 3DISTNAME= bsddb3-6.0.1
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
5CATEGORIES= databases python 5CATEGORIES= databases python
6MASTER_SITES= http://pypi.python.org/packages/source/b/bsddb3/ 6MASTER_SITES= http://pypi.python.org/packages/source/b/bsddb3/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://pypi.python.org/pypi/bsddb3/ 9HOMEPAGE= http://pypi.python.org/pypi/bsddb3/
10COMMENT= Python extension module for Berkeley DB 4 10COMMENT= Python extension module for Berkeley DB 4 and 5
11LICENSE= mit 11LICENSE= modified-bsd
12 12
13BDB_ACCEPTED= db4 db5 13BDB_ACCEPTED= db4 db5
14 14
15PYSETUPBUILDARGS= --berkeley-db=${BDBBASE} 15PYSETUPBUILDARGS= --berkeley-db=${BDBBASE}
16PYSETUPINSTALLARGS= --berkeley-db=${BDBBASE} 16PYSETUPINSTALLARGS= --berkeley-db=${BDBBASE}
 17PYSETUPBUILDARGS+= --berkeley-db-incdir=${BDBBASE}/include/${BDB_TYPE}
 18PYSETUPINSTALLARGS+= --berkeley-db-incdir=${BDBBASE}/include/${BDB_TYPE}
17 19
18PYDISTUTILSPKG= yes 20PYTHON_VERSIONS_INCLUDE_3X= yes
19 21
20REPLACE_PYTHON= Lib/bsddb/dbshelve.py 22REPLACE_PYTHON= Lib/bsddb/dbshelve.py
21REPLACE_PYTHON+= Lib3/bsddb/dbshelve.py 23REPLACE_PYTHON+= Lib3/bsddb/dbshelve.py
 24REPLACE_PYTHON+= Lib/bsddb/test/test_dbtables.py
 25REPLACE_PYTHON+= Lib3/bsddb/test/test_dbtables.py
22 26
23SUBST_CLASSES+= bdb 27SUBST_CLASSES+= bdb
24SUBST_STAGE.bdb= pre-configure 28SUBST_STAGE.bdb= pre-configure
25SUBST_FILES.bdb= ${WRKSRC}/setup2.py 29SUBST_FILES.bdb= ${WRKSRC}/setup2.py
26SUBST_SED.bdb= -e "s,dblib = 'db',dblib = '${BDB_TYPE}',g" 30SUBST_SED.bdb= -e "s,dblib = 'db',dblib = '${BDB_TYPE}',g"
27 31
28do-test: 32do-test:
29 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} test.py 33 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} test.py
30 34
31.include "../../lang/python/application.mk" 35.include "../../lang/python/application.mk"
32.include "../../lang/python/egg.mk" 36.include "../../lang/python/egg.mk"
33.include "../../mk/bdb.buildlink3.mk" 37.include "../../mk/bdb.buildlink3.mk"
34.include "../../mk/pthread.buildlink3.mk" 38.include "../../mk/pthread.buildlink3.mk"
cvs diff -r1.22 -r1.23 pkgsrc/databases/py-bsddb3/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/py-bsddb3/distinfo 2013/10/23 08:35:28 1.22
+++ pkgsrc/databases/py-bsddb3/distinfo 2013/12/11 19:18:56 1.23
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.22 2013/10/23 08:35:28 wiz Exp $ 1$NetBSD: distinfo,v 1.23 2013/12/11 19:18:56 wiz Exp $
2 2
3SHA1 (bsddb3-6.0.0.tar.gz) = ca5c204b2c9cf4fff396ba3d49994fe1a95d669f 3SHA1 (bsddb3-6.0.1.tar.gz) = c12e47f7c21b4bc586c68cce64e0079d070312e8
4RMD160 (bsddb3-6.0.0.tar.gz) = 5e33f120cf82d0d7f8b88f7699cd546855b51384 4RMD160 (bsddb3-6.0.1.tar.gz) = ede4858b3bd004653fe024b2eaa97dfb5ab93770
5Size (bsddb3-6.0.0.tar.gz) = 342086 bytes 5Size (bsddb3-6.0.1.tar.gz) = 347002 bytes