From owner-dev-commits-ports-all@freebsd.org Thu Aug 19 16:14:41 2021 Return-Path: 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 2F658667DE0; Thu, 19 Aug 2021 16:14:41 +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 4Gr8ww5Mn2z4vpc; Thu, 19 Aug 2021 16:14:40 +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 A05489B2; Thu, 19 Aug 2021 16:14:40 +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 17JGEewe023962; Thu, 19 Aug 2021 16:14:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17JGEekO023961; Thu, 19 Aug 2021 16:14:40 GMT (envelope-from git) Date: Thu, 19 Aug 2021 16:14:40 GMT Message-Id: <202108191614.17JGEekO023961@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando Apestegu=C3=ADa?= Subject: git: ebb7c74c21dc - main - databases/db: update to 1.26 and simplify MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ebb7c74c21dc231dae7e7c462438ef79a799663a 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Aug 2021 16:14:41 -0000 The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=ebb7c74c21dc231dae7e7c462438ef79a799663a commit ebb7c74c21dc231dae7e7c462438ef79a799663a Author: Helge Oldach AuthorDate: 2021-08-19 10:57:43 +0000 Commit: Fernando Apesteguía CommitDate: 2021-08-19 16:08:37 +0000 databases/db: update to 1.26 and simplify ChangeLog: http://cvsweb.netbsd.org/bsdweb.cgi/src/usr.bin/db/db.c PR: 257930 Reported by: freebsd@oldach.net --- databases/db/Makefile | 31 +++++++++++++++---------------- databases/db/distinfo | 10 +++++++--- databases/db/files/patch-db.1 | 26 -------------------------- databases/db/files/patch-db.c | 18 ------------------ databases/db/pkg-descr | 4 ---- 5 files changed, 22 insertions(+), 67 deletions(-) diff --git a/databases/db/Makefile b/databases/db/Makefile index 1cbe906ca3d9..2b815ab56b59 100644 --- a/databases/db/Makefile +++ b/databases/db/Makefile @@ -1,34 +1,33 @@ # Created by: Edwin Groothuis (edwin@mavetju.org) PORTNAME= db -PORTVERSION= 1.16 +PORTVERSION= 1.26 PORTEPOCH= 2 CATEGORIES= databases -MASTER_SITES= http://www.mavetju.org/download/ +MASTER_SITES= https://ftp.netbsd.org/pub/NetBSD/NetBSD-current/src/usr.bin/db/ +DISTFILES= Makefile db.c db.1 +DIST_SUBDIR= ${PKGNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Manipulate db(3)'s btree(3) and hash(3) databases - NetBSD port LICENSE= BSD4CLAUSE -USES= uidfix -MAKE_ENV= BINDIR=${PREFIX}/bin SHAREDIR=${PREFIX} +CFLAGS+= -D__dead="" -DIST_CVS= http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/src/usr.bin/db/db -DB1VERSION= 1.19 -MAKEVERSION= 1.2 -DIST_DB1= http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/src/usr.bin/db/db.1?rev=${DB1VERSION}&content-type=text/plain&only_with_tag=HEAD -DIST_DBC= http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/src/usr.bin/db/db.c?rev=${PORTVERSION}&content-type=text/plain -DIST_MAKEFILE= http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/src/usr.bin/db/Makefile?rev=${MAKEVERSION}&content-type=text/plain +NO_WRKSUBDIR= yes PLIST_FILES= bin/db \ man/man1/db.1.gz -tarball: + +do-extract: ${MKDIR} ${WRKSRC} - fetch -o ${WRKSRC}/db.1 "${DIST_DB1}" - fetch -o ${WRKSRC}/db.c "${DIST_DBC}" - fetch -o ${WRKSRC}/Makefile "${DIST_MAKEFILE}" - cd ${WRKDIR} && ${TAR} zcvf ${DISTFILES} ${PORTNAME}-${PORTVERSION} - ${MV} ${WRKDIR}/${DISTFILES} ${DISTDIR} +. for distfile in ${DISTFILES} + ${CP} ${_DISTDIR}/${distfile} ${WRKSRC} +. endfor + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/db ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/db.1 ${STAGEDIR}${PREFIX}/man/man1 .include diff --git a/databases/db/distinfo b/databases/db/distinfo index 0030a7c08a0e..948fedf36125 100644 --- a/databases/db/distinfo +++ b/databases/db/distinfo @@ -1,3 +1,7 @@ -TIMESTAMP = 1612663351 -SHA256 (db-1.16.tar.gz) = e2cc18621932fb9769ef4fdf17a538e619a358ec0ab14c085c666b022afef359 -SIZE (db-1.16.tar.gz) = 6860 +TIMESTAMP = 1629369890 +SHA256 (db-1.26,2/Makefile) = fd19fa7f61662f92826dd7bdb734767f28e82634746363bf84db3a395b4064d9 +SIZE (db-1.26,2/Makefile) = 128 +SHA256 (db-1.26,2/db.c) = afcba6fe3bccc2fd14f9525ad386847a0f689f643fe22ebd7d598d5a5b1be44b +SIZE (db-1.26,2/db.c) = 16971 +SHA256 (db-1.26,2/db.1) = dc6a135fa61041700b2889b8bbea286ebdbd452535eb63b6c359e51cd16e9f80 +SIZE (db-1.26,2/db.1) = 7257 diff --git a/databases/db/files/patch-db.1 b/databases/db/files/patch-db.1 deleted file mode 100644 index fcd707e8054c..000000000000 --- a/databases/db/files/patch-db.1 +++ /dev/null @@ -1,26 +0,0 @@ ---- db.1.orig 2005-06-20 02:53:38 UTC -+++ db.1 -@@ -67,8 +67,6 @@ databases - .Op Fl T Ar visspec - .Ek - .Bk -words --.Op Fl X Ar extravis --.Ek - .Ar type - .Ar dbfile - .Bk -words -@@ -266,14 +264,6 @@ corresponding options for the meaning of - .It Fl V - Display value. - . --.It Fl X Ar extravis --When encoding items with --.Fl S --option also encode characters in --.Ar extravis , --per --.Xr svis 3 . --. - .El - .Pp - .Bd -ragged -offset indent diff --git a/databases/db/files/patch-db.c b/databases/db/files/patch-db.c deleted file mode 100644 index 4f216e2f6479..000000000000 --- a/databases/db/files/patch-db.c +++ /dev/null @@ -1,18 +0,0 @@ ---- db.c.orig 2005-06-20 02:53:38 UTC -+++ db.c -@@ -551,11 +551,11 @@ encode_data(size_t len, char *data, char - buflen = elen; - } - *edata = buf; -- if (extra_echars) { -- return (strsvisx(buf, data, len, encflags, extra_echars)); -- } else { -+// if (extra_echars) { -+// return (strsvisx(buf, data, len, encflags, extra_echars)); -+// } else { - return (strvisx(buf, data, len, encflags)); -- } -+// } - } - - int diff --git a/databases/db/pkg-descr b/databases/db/pkg-descr index 7d8c19d97975..13c55d87a341 100644 --- a/databases/db/pkg-descr +++ b/databases/db/pkg-descr @@ -1,7 +1,3 @@ db allows manipulation of btree(3) and hash(3) (db(3)) databases. -See NetBSD Problem Report #39254 -(http://www.netbsd.org/cgi-bin/query-pr-single.pl?number=39254) for -the issues with the version 1.15 and higher. - WWW: http://cvsweb.netbsd.org/bsdweb.cgi/src/usr.bin/db/