Update 0.15.1 --> 0.16

6 files changed, 12 insertions, 62 deletions

diff --git a/security/aide/Makefile b/security/aide/Makefile
index 032d33e69768..ad4efb586bce 100644
--- a/security/aide/Makefile
+++ b/security/aide/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	aide
-PORTVERSION=	0.15.1
-PORTREVISION=	1
+PORTVERSION=	0.16
 CATEGORIES=	security
 MASTER_SITES=	SF \
 		http://www.cs.tut.fi/~rammer/
diff --git a/security/aide/distinfo b/security/aide/distinfo
index 6e18f9432f52..9f01e225d272 100644
--- a/security/aide/distinfo
+++ b/security/aide/distinfo
@@ -1,2 +1,3 @@
-SHA256 (aide-0.15.1.tar.gz) = 303e5c186257df8c86e418193199f4ea2183fc37d3d4a9098a614f61346059ef
-SIZE (aide-0.15.1.tar.gz) = 424970
+TIMESTAMP = 1469537183
+SHA256 (aide-0.16.tar.gz) = a81c53a131c4fd130b169b3a26ac35386a2f6e1e014f12807524cc273ed97345
+SIZE (aide-0.16.tar.gz) = 391009
diff --git a/security/aide/files/patch-configure.in b/security/aide/files/patch-configure.in
deleted file mode 100644
index 573a6da35921..000000000000
--- a/security/aide/files/patch-configure.in
+++ /dev/null
@@ -1,24 +0,0 @@
---- configure.in.orig	Sat Feb 18 04:46:41 2006
-+++ configure.in	Wed Feb 22 20:26:01 2006
-@@ -362,7 +362,9 @@
- 	AIDE_FSTAT_FUNC="fstat"
- 	AIDE_STAT_TYPE="stat"
- 	AIDE_OFF_TYPE="off_t"
--	AIDE_BLKCNT_TYPE="blkcnt_t"
-+	AC_CHECK_TYPES(blkcnt_t,
-+		AIDE_BLKCNT_TYPE="blkcnt_t",
-+		AIDE_BLKCNT_TYPE="int32_t"),
- 	AIDE_READDIR_FUNC="readdir"
- 	AIDE_READDIR_R_FUNC="readdir_r"
- 	compoptionstring="${compoptionstring}WITH_LSTAT\\n"
-@@ -373,7 +375,9 @@
- 	AIDE_FSTAT_FUNC="fstat"
- 	AIDE_STAT_TYPE="stat"
- 	AIDE_OFF_TYPE="off_t"
--	AIDE_BLKCNT_TYPE="blkcnt_t"
-+	AC_CHECK_TYPES(blkcnt_t,
-+		AIDE_BLKCNT_TYPE="blkcnt_t",
-+		AIDE_BLKCNT_TYPE="int32_t"),
- 	AIDE_READDIR_FUNC="readdir"
- 	AIDE_READDIR_R_FUNC="readdir_r"
- 	compoptionstring="${compoptionstring}WITH_LSTAT\\n"
diff --git a/security/aide/files/patch-doc_aide.1 b/security/aide/files/patch-doc_aide.1
index ef8f3f41c9d2..2dacc0a93438 100644
--- a/security/aide/files/patch-doc_aide.1
+++ b/security/aide/files/patch-doc_aide.1
@@ -1,14 +1,14 @@
---- doc/aide.1.orig	2006-12-15 04:56:35.000000000 -0800
-+++ doc/aide.1	2007-10-08 22:08:32.000000000 -0700
-@@ -75,9 +75,9 @@
+--- doc/aide.1.orig	2016-07-25 14:09:52.000000000 -0700
++++ doc/aide.1	2016-07-26 12:35:55.894637000 -0700
+@@ -103,9 +103,9 @@
  .SH FILES
- .B ${prefix}/etc/aide.conf
+ .IP \fB${prefix}/etc/aide.conf\fR
  Default aide configuration file.
--.B ${prefix}/etc/aide.db
-+.B /var/db/aide/aide.db
+-.IP \fB${prefix}/etc/aide.db\fR
++.IP \fB/var/db/aide/aide.db\fR
  Default aide database.
--.B ${prefix}/etc/aide.db.new
-+.B /var/db/aide/aide.db.new
+-.IP \fB${prefix}/etc/aide.db.new\fR
++.IP \fB/var/db/aide/aide.db.new\fR
  Default aide output database.
  .SH SEE ALSO
  .BR aide.conf (5)
diff --git a/security/aide/files/patch-include__aide.h b/security/aide/files/patch-include__aide.h
deleted file mode 100644
index 223b13ec8e7f..000000000000
--- a/security/aide/files/patch-include__aide.h
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: include/aide.h
-diff -u include/aide.h.orig include/aide.h
---- include/aide.h.orig	2010-08-09 02:39:31.000000000 +0900
-+++ include/aide.h	2012-10-30 02:24:36.845508733 +0900
-@@ -68,7 +68,7 @@
- # define HAVE_STRTOIMAX
- #endif
- 
--#if SIZEOF_OFF64_T == SIZEOF_LONG_LONG
-+#if AIDE_OFF_TYPE == off64_t && SIZEOF_OFF64_T == SIZEOF_LONG_LONG || AIDE_OFF_TYPE == off_t && SIZEOF_OFF_T == SIZEOF_LONG_LONG
- # ifdef HAVE_STRTOLL
- #  define AIDE_STRTOLL_FUNC strtoll
- # else
diff --git a/security/aide/files/patch-src__db_file.c b/security/aide/files/patch-src__db_file.c
deleted file mode 100644
index 156c29de7baa..000000000000
--- a/security/aide/files/patch-src__db_file.c
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/db_file.c
-diff -u -p src/db_file.c.orig src/db_file.c
---- src/db_file.c.orig	2010-08-09 02:39:31.000000000 +0900
-+++ src/db_file.c	2012-10-30 02:25:43.671508126 +0900
-@@ -674,7 +674,7 @@ int db_writelong(AIDE_OFF_TYPE i,FILE* f
-     dofprintf(" ");
-   }
-   
--#if SIZEOF_OFF64_T == SIZEOF_LONG_LONG
-+#if AIDE_OFF_TYPE == off64_t && SIZEOF_OFF64_T == SIZEOF_LONG_LONG || AIDE_OFF_TYPE == off_t && SIZEOF_OFF_T == SIZEOF_LONG_LONG
-   return dofprintf("%lli",(long long)i);
- #else
-   return dofprintf("%li",i);