From owner-svn-ports-head@freebsd.org Fri Feb 12 18:50:33 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6E7BB52CC55; Fri, 12 Feb 2021 18:50:33 +0000 (UTC) (envelope-from bofh@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DcjHY2lfLz3l5C; Fri, 12 Feb 2021 18:50:33 +0000 (UTC) (envelope-from bofh@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5145DC6E; Fri, 12 Feb 2021 18:50:33 +0000 (UTC) (envelope-from bofh@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 11CIoXH8080302; Fri, 12 Feb 2021 18:50:33 GMT (envelope-from bofh@FreeBSD.org) Received: (from bofh@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 11CIoWhg080298; Fri, 12 Feb 2021 18:50:32 GMT (envelope-from bofh@FreeBSD.org) Message-Id: <202102121850.11CIoWhg080298@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bofh set sender to bofh@FreeBSD.org using -f From: Muhammad Moinur Rahman Date: Fri, 12 Feb 2021 18:50:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r565050 - in head/databases/py-berkeleydb: . files X-SVN-Group: ports-head X-SVN-Commit-Author: bofh X-SVN-Commit-Paths: in head/databases/py-berkeleydb: . files X-SVN-Commit-Revision: 565050 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Feb 2021 18:50:33 -0000 Author: bofh Date: Fri Feb 12 18:50:32 2021 New Revision: 565050 URL: https://svnweb.freebsd.org/changeset/ports/565050 Log: databases/py-berkeleydb: Import over repocopied py-bsddb3 Deleted: head/databases/py-berkeleydb/files/patch-setup2.py Modified: head/databases/py-berkeleydb/Makefile head/databases/py-berkeleydb/distinfo head/databases/py-berkeleydb/files/patch-setup3.py head/databases/py-berkeleydb/pkg-descr Modified: head/databases/py-berkeleydb/Makefile ============================================================================== --- head/databases/py-berkeleydb/Makefile Fri Feb 12 18:50:04 2021 (r565049) +++ head/databases/py-berkeleydb/Makefile Fri Feb 12 18:50:32 2021 (r565050) @@ -1,14 +1,14 @@ # Created by: Hye-Shik Chang # $FreeBSD$ -PORTNAME= bsddb3 -PORTVERSION= 6.2.9 +PORTNAME= berkeleydb +PORTVERSION= 18.1.2 CATEGORIES= databases python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= bofh@FreeBSD.org -COMMENT= Python extension module for BerkeleyDB 4.7, 4.8, 5.1, 5.3, 6.1 and 6.2 +COMMENT= Python bindings for Oracle Berkeley DB LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt @@ -26,14 +26,17 @@ DOCSDIR= ${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${ OPTIONS_DEFINE= DOCS post-patch: - @${REINPLACE_CMD} 's,%%DBVERSION%%,${BDB_LIB_NAME},g' ${WRKSRC}/setup2.py ${WRKSRC}/setup3.py - @${REINPLACE_CMD} 's,,<${BDB_INCLUDE_DIR}/db.h>,' ${WRKSRC}/Modules/bsddb.h - @${REINPLACE_CMD} 's,%%BDB_INCLUDE_DIR%%,${BDB_INCLUDE_DIR},' ${WRKSRC}/setup2.py ${WRKSRC}/setup3.py - @${REINPLACE_CMD} 's,%%BDB_LIB_NAME%%,${BDB_LIB_NAME},' ${WRKSRC}/setup3.py + @${REINPLACE_CMD} 's|%%DBVERSION%%|${BDB_LIB_NAME}| ; \ + s|%%BDB_INCLUDE_DIR%%|${BDB_INCLUDE_DIR}| ; \ + s|%%BDB_LIB_NAME%%|${BDB_LIB_NAME}|' \ + ${WRKSRC}/setup3.py + @${REINPLACE_CMD} 's||<${BDB_INCLUDE_DIR}/db.h>|' ${WRKSRC}/src/Modules/berkeleydb.h -post-install: +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} @(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}) - @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/bsddb3/_pybsddb*.so + +do-test: + @(cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} ./test.py .include Modified: head/databases/py-berkeleydb/distinfo ============================================================================== --- head/databases/py-berkeleydb/distinfo Fri Feb 12 18:50:04 2021 (r565049) +++ head/databases/py-berkeleydb/distinfo Fri Feb 12 18:50:32 2021 (r565050) @@ -1,3 +1,3 @@ -TIMESTAMP = 1609332820 -SHA256 (bsddb3-6.2.9.tar.gz) = 70d05ec8dc568f42e70fc919a442e0daadc2a905a1cfb7ca77f549d49d6e7801 -SIZE (bsddb3-6.2.9.tar.gz) = 230475 +TIMESTAMP = 1613155635 +SHA256 (berkeleydb-18.1.2.tar.gz) = b617a8f8562a36e5a395beb93e07a0905dd5e68e7ba2e87916a740db9126470e +SIZE (berkeleydb-18.1.2.tar.gz) = 168233 Modified: head/databases/py-berkeleydb/files/patch-setup3.py ============================================================================== --- head/databases/py-berkeleydb/files/patch-setup3.py Fri Feb 12 18:50:04 2021 (r565049) +++ head/databases/py-berkeleydb/files/patch-setup3.py Fri Feb 12 18:50:32 2021 (r565050) @@ -1,19 +1,18 @@ ---- setup3.py.orig 2016-02-08 21:18:47 UTC +--- setup3.py.orig 2020-12-07 19:17:41 UTC +++ setup3.py -@@ -81,11 +81,7 @@ if (sys.version_info[0] < 3) and (sys.ve - category=DeprecationWarning) +@@ -41,10 +41,7 @@ import sys + import glob -try : - from setuptools import setup, Extension --except : +-except Exception: - from distutils.core import setup, Extension -- +from distutils.core import setup, Extension + from distutils.dep_util import newer import distutils.ccompiler - -@@ -288,8 +284,8 @@ if os.name == 'posix': +@@ -258,8 +255,8 @@ if os.name == 'posix': incdir = os.path.join(BERKELEYDB_DIR, 'include') if not libdir: libdir = os.path.join(BERKELEYDB_DIR, 'lib') @@ -24,9 +23,9 @@ else: if debug: print("LIBS already contains '-ldb' not adding our own", "'-l"+dblib+"'") libname = [] -@@ -328,7 +324,7 @@ if os.name == 'posix': +@@ -298,7 +295,7 @@ if os.name == 'posix': - # read db.h to figure out what version of Berkeley DB this is + # read db.h to figure out what version of Oracle Berkeley DB this is ver = None - with open(os.path.join(incdir, 'db.h'), 'r') as f : + with open('%%BDB_INCLUDE_DIR%%/db.h', 'r') as f : Modified: head/databases/py-berkeleydb/pkg-descr ============================================================================== --- head/databases/py-berkeleydb/pkg-descr Fri Feb 12 18:50:04 2021 (r565049) +++ head/databases/py-berkeleydb/pkg-descr Fri Feb 12 18:50:32 2021 (r565050) @@ -1,10 +1,14 @@ -This module provides a nearly complete wrapping of the Sleepycat C API -for the Database Environment, Database, Cursor, and Transaction -objects, and each of these is exposed as a Python Type in the -bsddb3.db module. The database objects can use different access -methods, btree, hash, recno, and queue. For the first time all of -these are fully supported in the Python wrappers. Please see the -document in developers' web site for more details on the types and -methods provided. +This module provides a nearly complete wrapping of the Oracle/Sleepycat C API +for the Database Environment, Database, Cursor, Log Cursor, Sequence and +Transaction objects, and each of these is exposed as a Python type in the +berkeleydb.db module. The database objects can use various access methods: +btree, hash, recno, queue and heap. Complete support of Oracle Berkeley DB +distributed transactions. Complete support for Oracle Berkeley DB Replication +Manager. Complete support for Oracle Berkeley DB Base Replication. + +Please see the documents in the docs directory of the source distribution or at +the website for more details on the types and methods provided. The goal is to +mirror most of the real Oracle Berkeley DB API so fall back to the Oracle +Berkeley DB documentation as appropriate. WWW: https://www.jcea.es/programacion/pybsddb.htm