Index: head/databases/db/Makefile
===================================================================
--- head/databases/db/Makefile	(revision 427009)
+++ head/databases/db/Makefile	(revision 427010)
@@ -1,34 +1,35 @@
 # Created by: Edwin Groothuis (edwin@mavetju.org)
 # $FreeBSD$
 
 PORTNAME=	db
 PORTVERSION=	1.14
 PORTEPOCH=	2
 CATEGORIES=	databases
 MASTER_SITES=	http://www.mavetju.org/download/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Manipulate db(3)'s btree(3) and hash(3) databases - NetBSD port
 
-PLIST_FILES=	bin/db \
-		man/man1/db.1.gz
+LICENSE=	BSD4CLAUSE
 
 USES=		uidfix
 MAKE_ENV=	BINDIR=${PREFIX}/bin SHAREDIR=${PREFIX}
 
 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
 
+PLIST_FILES=	bin/db \
+		man/man1/db.1.gz
 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>
Index: head/databases/db/files/patch-db.1
===================================================================
--- head/databases/db/files/patch-db.1	(revision 427009)
+++ head/databases/db/files/patch-db.1	(revision 427010)
@@ -1,26 +1,26 @@
---- db.1.orig	Mon Jun 20 12:53:38 2005
-+++ db.1	Thu Jun 21 11:21:15 2007
-@@ -67,8 +67,6 @@
+--- 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
-@@ -265,14 +263,6 @@
- .
+@@ -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
Index: head/databases/db/files/patch-db.c
===================================================================
--- head/databases/db/files/patch-db.c	(revision 427009)
+++ head/databases/db/files/patch-db.c	(revision 427010)
@@ -1,18 +1,18 @@
---- db.c.orig	Thu Jun 21 11:20:05 2007
-+++ db.c	Thu Jun 21 11:20:32 2007
-@@ -571,11 +571,11 @@
+--- 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