- Update to 1.7.

- Pass maintainer to submitter.

PR:		ports/136074
Submitted by:	Sylvio Cesar <scjamorim@bsd.com.br>

6 files changed, 17 insertions, 65 deletions

diff --git a/databases/dbtool/Makefile b/databases/dbtool/Makefile
index afd29e328dfb..654f8b2b1d57 100644
--- a/databases/dbtool/Makefile
+++ b/databases/dbtool/Makefile
@@ -7,12 +7,11 @@
 #
 
 PORTNAME=	dbtool
-PORTVERSION=	1.6
-PORTREVISION=	3
+PORTVERSION=	1.7
 CATEGORIES=	databases
 MASTER_SITES=	http://www.daemon.de/idisk/Apps/dbtool/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	scjamorim@bsd.com.br
 COMMENT=	Store and retrieve data in a key/value format in a hash database
 
 LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
@@ -60,6 +59,7 @@ post-patch:
 .for file in ${UB2PFX}
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/${file}
 	@${RM} ${WRKSRC}/${file}.orig
+	@${RM} ${WRKSRC}/${file}~
 .endfor
 .endif
 
diff --git a/databases/dbtool/distinfo b/databases/dbtool/distinfo
index 51db11df9008..2cded58a452e 100644
--- a/databases/dbtool/distinfo
+++ b/databases/dbtool/distinfo
@@ -1,3 +1,3 @@
-MD5 (dbtool-1.6.tar.gz) = a8e3f0982b42b0dbb3b9c1c31c975060
-SHA256 (dbtool-1.6.tar.gz) = fa97490f922fe65f0c73972addde09fa1373d4210d84f71d85fd920eaa97d248
-SIZE (dbtool-1.6.tar.gz) = 81631
+MD5 (dbtool-1.7.tar.gz) = f33106e3fc1c30f59f6f6cc2f313e280
+SHA256 (dbtool-1.7.tar.gz) = 90e813b57f4d5f3714c3c54c95982b3fc9c1f6b011cade19e101045eb3f1e7a9
+SIZE (dbtool-1.7.tar.gz) = 124794
diff --git a/databases/dbtool/files/patch-Makefile.in b/databases/dbtool/files/patch-Makefile.in
deleted file mode 100644
index 18d04801c1e0..000000000000
--- a/databases/dbtool/files/patch-Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.in.orig	Sat Apr 20 20:43:22 2002
-+++ Makefile.in	Sat Mar 22 14:06:46 2003
-@@ -68,7 +68,7 @@
- dbtool_SOURCES = cipher.cc  config.cc  dbtool.cc  digest.cc  engine.cc  rijndael.cc
- man_MANS = dbtool.1
- EXTRA_DIST = $(man_MANS)
--CXXFLAGS = -g -Wstrict-prototypes -O
-+CXXFLAGS = @CXXFLAGS@
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_CLEAN_FILES = 
-@@ -84,7 +84,7 @@
- dbtool_LDADD = $(LDADD)
- dbtool_DEPENDENCIES = 
- dbtool_LDFLAGS = 
--CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS)
- CXXLD = $(CXX)
- CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
- man1dir = $(mandir)/man1
diff --git a/databases/dbtool/files/patch-cipher.h b/databases/dbtool/files/patch-cipher.h
deleted file mode 100644
index 0a329367f976..000000000000
--- a/databases/dbtool/files/patch-cipher.h
+++ /dev/null
@@ -1,17 +0,0 @@
---- cipher.h.orig	Thu Dec 21 14:26:06 2006
-+++ cipher.h	Thu Dec 21 14:26:26 2006
-@@ -62,12 +62,12 @@
-   MD5Digest dig;
-   unsigned char key[32];
-   string blah;
--  const char* cipher::error(int num);
-+  const char* error(int num);
- 
-  public:
-   cipher() {};
-   ~cipher() {};
--  void cipher::init(const string & phrase);
-+  void init(const string & phrase);
-   string encrypt(const string& source);
-   string decrypt(const string& source);
- };
diff --git a/databases/dbtool/files/patch-config.h b/databases/dbtool/files/patch-config.h
deleted file mode 100644
index 6ac4101664d8..000000000000
--- a/databases/dbtool/files/patch-config.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- config.h.orig	Thu Dec 21 14:30:15 2006
-+++ config.h	Thu Dec 21 14:30:26 2006
-@@ -71,7 +71,7 @@
- 
-  public:
-   Config();
--  void Config::args(int argc, char *argv[]);
-+  void args(int argc, char *argv[]);
-   int parse();
-   int     force, command, with, reverse, readonly, encrypted;
-   string  filename, key, value, usage, token, phrase;
diff --git a/databases/dbtool/pkg-plist b/databases/dbtool/pkg-plist
index 4760ce055610..f610e4fc99c6 100644
--- a/databases/dbtool/pkg-plist
+++ b/databases/dbtool/pkg-plist
@@ -1,12 +1,12 @@
 bin/dbtool
-%%PORTDOCS%%%%EXAMPLESDIR%%/account-db/README
-%%PORTDOCS%%%%EXAMPLESDIR%%/account-db/accdb
-%%PORTDOCS%%%%EXAMPLESDIR%%/locate/README
-%%PORTDOCS%%%%EXAMPLESDIR%%/locate/locate
-%%PORTDOCS%%%%EXAMPLESDIR%%/locate/updatedb
-%%PORTDOCS%%%%EXAMPLESDIR%%/uback/README
-%%PORTDOCS%%%%EXAMPLESDIR%%/README
-@dirrm %%PORTDOCS%%%%EXAMPLESDIR%%/account-db
-@dirrm %%PORTDOCS%%%%EXAMPLESDIR%%/locate
-@dirrm %%PORTDOCS%%%%EXAMPLESDIR%%/uback
-@dirrm %%PORTDOCS%%%%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/account-db/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/account-db/accdb
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/locate/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/locate/locate
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/locate/updatedb
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/uback/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
+@dirrmtry %%PORTEXAMPLES%%%%EXAMPLESDIR%%/account-db
+@dirrmtry %%PORTEXAMPLES%%%%EXAMPLESDIR%%/locate
+@dirrmtry %%PORTEXAMPLES%%%%EXAMPLESDIR%%/uback
+@dirrmtry %%PORTEXAMPLES%%%%EXAMPLESDIR%%