From owner-dev-commits-ports-all@freebsd.org  Tue May 25 17:57:04 2021
Return-Path: <owner-dev-commits-ports-all@freebsd.org>
Delivered-To: dev-commits-ports-all@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 B5DFE651707;
 Tue, 25 May 2021 17:57:04 +0000 (UTC) (envelope-from git@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 4FqMGm4LjXz3tP6;
 Tue, 25 May 2021 17:57:04 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:5])
 (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 did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6D93621F98;
 Tue, 25 May 2021 17:57:04 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
 by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14PHv4Hg016088;
 Tue, 25 May 2021 17:57:04 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14PHv4bo016087;
 Tue, 25 May 2021 17:57:04 GMT (envelope-from git)
Date: Tue, 25 May 2021 17:57:04 GMT
Message-Id: <202105251757.14PHv4bo016087@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
 dev-commits-ports-main@FreeBSD.org
From: Muhammad Moinur Rahman <bofh@FreeBSD.org>
Subject: git: 19cde191d2a2 - main - databases/py-berkeleydb: Update version
 18.1.2=>18.1.4
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: bofh
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 19cde191d2a227f05ef824cb4914256e2f33506e
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-ports-all@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commit messages for all branches of the ports repository
 <dev-commits-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-ports-all>, 
 <mailto:dev-commits-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-ports-all/>
List-Post: <mailto:dev-commits-ports-all@freebsd.org>
List-Help: <mailto:dev-commits-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-ports-all>, 
 <mailto:dev-commits-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 May 2021 17:57:05 -0000

The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=19cde191d2a227f05ef824cb4914256e2f33506e

commit 19cde191d2a227f05ef824cb4914256e2f33506e
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2021-05-25 05:07:38 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2021-05-25 17:55:10 +0000

    databases/py-berkeleydb: Update version 18.1.2=>18.1.4
---
 databases/py-berkeleydb/Makefile              |  4 ++--
 databases/py-berkeleydb/distinfo              |  6 +++---
 databases/py-berkeleydb/files/patch-setup3.py | 23 ++++++++++-------------
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/databases/py-berkeleydb/Makefile b/databases/py-berkeleydb/Makefile
index 8679ebb39f7d..a3c4e26d6558 100644
--- a/databases/py-berkeleydb/Makefile
+++ b/databases/py-berkeleydb/Makefile
@@ -1,7 +1,7 @@
 # Created by: Hye-Shik Chang <perky@python.or.kr>
 
 PORTNAME=	berkeleydb
-PORTVERSION=	18.1.2
+PORTVERSION=	18.1.4
 CATEGORIES=	databases python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -29,7 +29,7 @@ post-patch:
 		s|%%BDB_INCLUDE_DIR%%|${BDB_INCLUDE_DIR}| ; \
 		s|%%BDB_LIB_NAME%%|${BDB_LIB_NAME}|' \
 		${WRKSRC}/setup3.py
-	@${REINPLACE_CMD} 's|<db\.h>|<${BDB_INCLUDE_DIR}/db.h>|' ${WRKSRC}/src/Modules/berkeleydb.h
+	@${REINPLACE_CMD} 's|<db\.h>|<${BDB_INCLUDE_DIR}/db.h>|' ${WRKSRC}/src/Module/berkeleydb.h
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/databases/py-berkeleydb/distinfo b/databases/py-berkeleydb/distinfo
index 3205d2dd4aa9..815905527a76 100644
--- a/databases/py-berkeleydb/distinfo
+++ b/databases/py-berkeleydb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1613155635
-SHA256 (berkeleydb-18.1.2.tar.gz) = b617a8f8562a36e5a395beb93e07a0905dd5e68e7ba2e87916a740db9126470e
-SIZE (berkeleydb-18.1.2.tar.gz) = 168233
+TIMESTAMP = 1621889489
+SHA256 (berkeleydb-18.1.4.tar.gz) = 3f6da579e727cdec7cdf192feaeb2ad58dca7a8479902f20cc2d73b2027b9e54
+SIZE (berkeleydb-18.1.4.tar.gz) = 129690
diff --git a/databases/py-berkeleydb/files/patch-setup3.py b/databases/py-berkeleydb/files/patch-setup3.py
index 8991b8079829..5fb8600126b4 100644
--- a/databases/py-berkeleydb/files/patch-setup3.py
+++ b/databases/py-berkeleydb/files/patch-setup3.py
@@ -1,18 +1,15 @@
---- setup3.py.orig	2020-12-07 19:17:41 UTC
+--- setup3.py.orig	2021-05-19 15:44:48 UTC
 +++ setup3.py
-@@ -41,10 +41,7 @@ import sys
- import glob
- 
- 
--try :
--  from setuptools import setup, Extension
--except Exception:
--  from distutils.core import setup, Extension
+@@ -44,7 +44,7 @@ import glob
+ # See https://setuptools.readthedocs.io/en/latest/deprecated/\
+ #                                      distutils-legacy.html
+ os.environ['SETUPTOOLS_USE_DISTUTILS'] = 'local'
+-from setuptools import setup, Extension
 +from distutils.core import setup, Extension
- 
- from distutils.dep_util import newer
  import distutils.ccompiler
-@@ -258,8 +255,8 @@ if os.name == 'posix':
+ 
+ # read the module version number out of the .c file
+@@ -256,8 +256,8 @@ if os.name == 'posix':
          incdir = os.path.join(BERKELEYDB_DIR, 'include')
      if not libdir:
          libdir = os.path.join(BERKELEYDB_DIR, 'lib')
@@ -23,7 +20,7 @@
      else:
          if debug: print("LIBS already contains '-ldb' not adding our own", "'-l"+dblib+"'")
          libname = []
-@@ -298,7 +295,7 @@ if os.name == 'posix':
+@@ -296,7 +296,7 @@ if os.name == 'posix':
  
      # read db.h to figure out what version of Oracle Berkeley DB this is
      ver = None