From owner-svn-ports-all@freebsd.org Wed Jul 3 17:39:29 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A3B0915DB45B; Wed, 3 Jul 2019 17:39:29 +0000 (UTC) (envelope-from leres@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4AA91865E7; Wed, 3 Jul 2019 17:39:29 +0000 (UTC) (envelope-from leres@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 22183F113; Wed, 3 Jul 2019 17:39:29 +0000 (UTC) (envelope-from leres@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x63HdThQ003226; Wed, 3 Jul 2019 17:39:29 GMT (envelope-from leres@FreeBSD.org) Received: (from leres@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x63HdShL003225; Wed, 3 Jul 2019 17:39:28 GMT (envelope-from leres@FreeBSD.org) Message-Id: <201907031739.x63HdShL003225@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: leres set sender to leres@FreeBSD.org using -f From: Craig Leres Date: Wed, 3 Jul 2019 17:39:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r505766 - in head/editors/nvi-devel: . files X-SVN-Group: ports-head X-SVN-Commit-Author: leres X-SVN-Commit-Paths: in head/editors/nvi-devel: . files X-SVN-Commit-Revision: 505766 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4AA91865E7 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.976,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jul 2019 17:39:30 -0000 Author: leres Date: Wed Jul 3 17:39:28 2019 New Revision: 505766 URL: https://svnweb.freebsd.org/changeset/ports/505766 Log: editors/nvi-devel: Fix DB_CREATE error and segmentation fault; add the DB_CREATE flag when using bdb >= 4.4. PR: 238712 Approved by: johans (maintainer timeout, 2 weeks), matthew (mentor, implicit) Obtained from: Mac Ports https://trac.macports.org/browser/trunk/dports/editors/nvi/files/patch-common__db.h?rev=108622 Added: head/editors/nvi-devel/files/patch-common__db.h (contents, props changed) Modified: head/editors/nvi-devel/Makefile Modified: head/editors/nvi-devel/Makefile ============================================================================== --- head/editors/nvi-devel/Makefile Wed Jul 3 17:27:18 2019 (r505765) +++ head/editors/nvi-devel/Makefile Wed Jul 3 17:39:28 2019 (r505766) @@ -3,7 +3,7 @@ PORTNAME= nvi PORTVERSION= 1.81.6 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= editors MASTER_SITES= ftp://ftp.stack.nl/pub/users/johans/nvi/ Added: head/editors/nvi-devel/files/patch-common__db.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/nvi-devel/files/patch-common__db.h Wed Jul 3 17:39:28 2019 (r505766) @@ -0,0 +1,16 @@ +https://github.com/handyman5/homebrew/commit/05b62a22b545761870fb1046d1c2c49cdba06b38 +https://trac.macports.org/export/108622/trunk/dports/editors/nvi/files/patch-common__db.h +--- ../common/db.h.orig 2009-09-13 23:17:35.000000000 -0700 ++++ ../common/db.h 2009-09-13 23:18:27.000000000 -0700 +@@ -16,7 +16,10 @@ + (env)->remove(env, path, NULL, flags) + #endif + +-#if DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1 ++#if DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 4 ++#define db_open(db,file,type,flags,mode) \ ++ (db)->open(db, NULL, file, NULL, type, flags | DB_CREATE, mode) ++#elif DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1 + #define db_open(db,file,type,flags,mode) \ + (db)->open(db, NULL, file, NULL, type, flags, mode) + #else