Attachment #227321 for bug #257930




# Created by: Edwin Groothuis (edwin@mavetju.org)

PORTNAME=	db
PORTVERSION=	1.26
PORTEPOCH=	2
CATEGORIES=	databases
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

NO_WRKSUBDIR=	yes
MAKE_ENV=	BINDIR=${PREFIX}/bin SHAREDIR=${PREFIX}

CFLAGS+=	-D__dead=""
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

PLIST_FILES=	bin/db \
		man/man1/db.1.gz

do-extract:
	${MKDIR} ${WRKSRC}
.	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 <bsd.port.mk>

Lines 1-3 Link Here

(-)b/databases/db/distinfo (-3 / +7 lines)
1	TIMESTAMP = 1612663351	1	TIMESTAMP = 1629298015
2	SHA256 (db-1.16.tar.gz) = e2cc18621932fb9769ef4fdf17a538e619a358ec0ab14c085c666b022afef359	2	SHA256 (db-1.26/Makefile) = fd19fa7f61662f92826dd7bdb734767f28e82634746363bf84db3a395b4064d9
3	SIZE (db-1.16.tar.gz) = 6860	3	SIZE (db-1.26/Makefile) = 128
		4	SHA256 (db-1.26/db.c) = afcba6fe3bccc2fd14f9525ad386847a0f689f643fe22ebd7d598d5a5b1be44b
		5	SIZE (db-1.26/db.c) = 16971
		6	SHA256 (db-1.26/db.1) = dc6a135fa61041700b2889b8bbea286ebdbd452535eb63b6c359e51cd16e9f80
		7	SIZE (db-1.26/db.1) = 7257




--- 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




--- 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

Lines 1-7 Link Here

(-)b/databases/db/pkg-descr (-4 lines)
1	db allows manipulation of btree(3) and hash(3) (db(3)) databases.	1	db allows manipulation of btree(3) and hash(3) (db(3)) databases.
2		2
3	See NetBSD Problem Report #39254
4	(http://www.netbsd.org/cgi-bin/query-pr-single.pl?number=39254) for
5	the issues with the version 1.15 and higher.
6
7	WWW: http://cvsweb.netbsd.org/bsdweb.cgi/src/usr.bin/db/	3	WWW: http://cvsweb.netbsd.org/bsdweb.cgi/src/usr.bin/db/

Return to bug 257930

Lines 1-34 Link Here

(-)b/databases/db/Makefile (-16 / +15 lines)
1	# Created by: Edwin Groothuis (edwin@mavetju.org)	1	# Created by: Edwin Groothuis (edwin@mavetju.org)
2		2
3	PORTNAME= db	3	PORTNAME= db
4	PORTVERSION= 1.16	4	PORTVERSION= 1.26
5	PORTEPOCH= 2	5	PORTEPOCH= 2
6	CATEGORIES= databases	6	CATEGORIES= databases
7	MASTER_SITES= http://www.mavetju.org/download/	7	MASTER_SITES= https://ftp.netbsd.org/pub/NetBSD/NetBSD-current/src/usr.bin/db/
		8	DISTFILES= Makefile db.c db.1
		9	DIST_SUBDIR= ${PKGNAME}
8		10
9	MAINTAINER= ports@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
10	COMMENT= Manipulate db(3)'s btree(3) and hash(3) databases - NetBSD port	12	COMMENT= Manipulate db(3)'s btree(3) and hash(3) databases - NetBSD port
11		13
12	LICENSE= BSD4CLAUSE	14	LICENSE= BSD4CLAUSE
13		15
14	USES= uidfix	16	NO_WRKSUBDIR= yes
15	MAKE_ENV= BINDIR=${PREFIX}/bin SHAREDIR=${PREFIX}
16		17
17	DIST_CVS= http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/src/usr.bin/db/db	18	CFLAGS+= -D__dead=""
18	DB1VERSION= 1.19
19	MAKEVERSION= 1.2
20	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
21	DIST_DBC= http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/src/usr.bin/db/db.c?rev=${PORTVERSION}&content-type=text/plain
22	DIST_MAKEFILE= http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/src/usr.bin/db/Makefile?rev=${MAKEVERSION}&content-type=text/plain
23		19
24	PLIST_FILES= bin/db \	20	PLIST_FILES= bin/db \
25	man/man1/db.1.gz	21	man/man1/db.1.gz
26	tarball:	22
		23	do-extract:
27	${MKDIR} ${WRKSRC}	24	${MKDIR} ${WRKSRC}
28	fetch -o ${WRKSRC}/db.1 "${DIST_DB1}"	25	. for distfile in ${DISTFILES}
29	fetch -o ${WRKSRC}/db.c "${DIST_DBC}"	26	${CP} ${_DISTDIR}/${distfile} ${WRKSRC}
30	fetch -o ${WRKSRC}/Makefile "${DIST_MAKEFILE}"	27	. endfor
31	cd ${WRKDIR} && ${TAR} zcvf ${DISTFILES} ${PORTNAME}-${PORTVERSION}	28
32	${MV} ${WRKDIR}/${DISTFILES} ${DISTDIR}	29	do-install:
		30	${INSTALL_PROGRAM} ${WRKSRC}/db ${STAGEDIR}${PREFIX}/bin
		31	${INSTALL_MAN} ${WRKSRC}/db.1 ${STAGEDIR}${PREFIX}/man/man1
33		32
34	.include <bsd.port.mk>	33	.include <bsd.port.mk>

Removed Link Here

(-)a/databases/db/files/patch-db.1 (-26 lines)
1	--- db.1.orig 2005-06-20 02:53:38 UTC
2	+++ db.1
3	@@ -67,8 +67,6 @@ databases
4	.Op Fl T Ar visspec
5	.Ek
6	.Bk -words
7	-.Op Fl X Ar extravis
8	-.Ek
9	.Ar type
10	.Ar dbfile
11	.Bk -words
12	@@ -266,14 +264,6 @@ corresponding options for the meaning of
13	.It Fl V
14	Display value.
15	.
16	-.It Fl X Ar extravis
17	-When encoding items with
18	-.Fl S
19	-option also encode characters in
20	-.Ar extravis ,
21	-per
22	-.Xr svis 3 .
23	-.
24	.El
25	.Pp
26	.Bd -ragged -offset indent

Removed Link Here

(-)a/databases/db/files/patch-db.c (-18 lines)
1	--- db.c.orig 2005-06-20 02:53:38 UTC
2	+++ db.c
3	@@ -551,11 +551,11 @@ encode_data(size_t len, char *data, char
4	buflen = elen;
5	}
6	*edata = buf;
7	- if (extra_echars) {
8	- return (strsvisx(buf, data, len, encflags, extra_echars));
9	- } else {
10	+// if (extra_echars) {
11	+// return (strsvisx(buf, data, len, encflags, extra_echars));
12	+// } else {
13	return (strvisx(buf, data, len, encflags));
14	- }
15	+// }
16	}
17
18	int