update to version 1.15

4 files changed, 35 insertions, 63 deletions

diff --git a/databases/db/Makefile b/databases/db/Makefile
index f4536405ad7b..b7bbd2bffb58 100644
--- a/databases/db/Makefile
+++ b/databases/db/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	db
-PORTVERSION=	1.11
-PORTREVISION=	1
+PORTVERSION=	1.15
 CATEGORIES=	databases
 MASTER_SITES=	http://www.mavetju.org/download/
 
@@ -20,4 +19,19 @@ PLIST_FILES=	bin/db
 
 MAKE_ENV=	BINDIR=${PREFIX}/bin SHAREDIR=${PREFIX}
 
+DIST_CVS=	http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/src/usr.bin/db/db
+DB1VERSION=	1.17
+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
+
+tarball:
+	${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}
+
 .include <bsd.port.mk>
diff --git a/databases/db/distinfo b/databases/db/distinfo
index 775ddc856523..6f6bea883e32 100644
--- a/databases/db/distinfo
+++ b/databases/db/distinfo
@@ -1,3 +1,3 @@
-MD5 (db-1.11.tar.gz) = 2a230f51506fe313ec557a5bb07069b2
-SHA256 (db-1.11.tar.gz) = e38f5657014e8e797a6b97b81075ec98899b280f45e27646824b09c7b8830890
-SIZE (db-1.11.tar.gz) = 6848
+MD5 (db-1.15.tar.gz) = 76f5323551806293ac432fc712b9c32d
+SHA256 (db-1.15.tar.gz) = 6fc45e43e48ac9f01b0da4859f12a1b543d8ba8ab2d7e35fa453e6adc03dbb01
+SIZE (db-1.15.tar.gz) = 7042
diff --git a/databases/db/files/patch-db.1 b/databases/db/files/patch-db.1
index 49c5916501ec..ef28ce9b1fd2 100644
--- a/databases/db/files/patch-db.1
+++ b/databases/db/files/patch-db.1
@@ -1,24 +1,24 @@
---- db.1.orig	Sat Jan  3 10:42:58 2004
-+++ db.1	Sat Jan  3 10:44:30 2004
+--- db.1.orig	Mon Jun 20 12:53:38 2005
++++ db.1	Thu Jun 21 11:21:15 2007
 @@ -67,8 +67,6 @@
- .Op Fl T Ar str
+ .Op Fl T Ar visspec
  .Ek
  .Bk -words
--.Op Fl X Ar str
+-.Op Fl X Ar extravis
 -.Ek
  .Ar type
- .Ar database
+ .Ar dbfile
  .Bk -words
-@@ -264,14 +262,6 @@
+@@ -265,14 +263,6 @@
  .
  .It Fl V
  Display value.
 -.
--.It Fl X Ar str
+-.It Fl X Ar extravis
 -When encoding items with
 -.Fl S
 -option also encode characters in
--.Ar str ,
+-.Ar extravis ,
 -per
 -.Xr svis 3 .
  .
diff --git a/databases/db/files/patch-db.c b/databases/db/files/patch-db.c
index 1cb11cfa0bcc..146ffbc54e1f 100644
--- a/databases/db/files/patch-db.c
+++ b/databases/db/files/patch-db.c
@@ -1,60 +1,18 @@
---- db.c.orig	Sat Jan  3 08:43:09 2004
-+++ db.c	Sat Jan  3 08:43:43 2004
-@@ -90,7 +90,6 @@
- DB	*db;
- char	*outputsep = "\t";
- int	encflags = 0;
--char	*extra_echars = NULL;
- 
- int
- main(int argc, char *argv[])
-@@ -120,7 +119,7 @@
- 
- 				/* parse arguments */
- 	while ( (ch = getopt(argc, argv,
--			     "CDdE:F:f:iKm:NO:qRS:T:U:VwX:")) != -1) {
-+			     "CDdE:F:f:iKm:NO:qRS:T:U:Vw")) != -1) {
- 		switch (ch) {
- 
- 		case 'C':
-@@ -224,10 +223,6 @@
- 			flags |= F_WRITE;
- 			break;
- 
--		case 'X':
--			extra_echars = optarg;
--			break;
--
- 		default:
- 			usage();
- 
-@@ -548,11 +543,7 @@
+--- db.c.orig	Thu Jun 21 11:20:05 2007
++++ db.c	Thu Jun 21 11:20:32 2007
+@@ -571,11 +571,11 @@
  		buflen = elen;
  	}
  	*edata = buf;
 -	if (extra_echars) {
 -		return (strsvisx(buf, data, len, encflags, extra_echars));
 -	} else {
--		return (strvisx(buf, data, len, encflags));
++//	if (extra_echars) {
++//		return (strsvisx(buf, data, len, encflags, extra_echars));
++//	} else {
+ 		return (strvisx(buf, data, len, encflags));
 -	}
-+	return (strvisx(buf, data, len, encflags));
++//	}
  }
  
  int
-@@ -625,7 +616,7 @@
- 	const char *p = getprogname();
- 
- 	fprintf(stderr,
--    "Usage: %s [-KiNqV] [-E end] [-f inf] [-O str] [-S chr] [-T str] [-X str]\n"
-+    "Usage: %s [-KiNqV] [-E end] [-f inf] [-O str] [-S chr] [-T str] \n"
-     "             type dbfile [key [...]]\n"
-     "       %s -d [-iNq] [-E end] [-f inf] [-U chr] type dbfile [key [...]]\n"
-     "       %s -w [-CDiNqR] [-E end] [-F sep] [-f inf] [-m mod] [-U chr]\n"
-@@ -653,7 +644,6 @@
- 	    "\t-T str\toptions to control -S encoding like vis(1) options\n"
- 	    "\t-U chr\titems to strunvis(3) decode: 'k'ey, 'v'alue, 'b'oth\n"
- 	    "\t-V\tprint value\n"
--	    "\t-X str\textra characters to encode with -S\n"
- 	    );
- 	exit(1);
- }