Update 0.10 --> 0.11

7 files changed, 39 insertions, 56 deletions

diff --git a/security/aide/Makefile b/security/aide/Makefile
index c976432fa29a..ded4ab39fb01 100644
--- a/security/aide/Makefile
+++ b/security/aide/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	aide
-PORTVERSION=	0.10
-PORTREVISION=	1
+PORTVERSION=	0.11
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.cs.tut.fi/~rammer/
@@ -20,12 +19,14 @@ LIB_DEPENDS=	mhash.2:${PORTSDIR}/security/mhash
 
 USE_GMAKE=	yes
 USE_BISON=	yes
+USE_AUTOTOOLS=	autoconf:259
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-mhash \
 		--with-zlib \
 		--with-config_file=${PREFIX}/etc/aide.conf
 
-CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV+=	CFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 MAN1=		aide.1
 MAN5=		aide.conf.5
diff --git a/security/aide/distinfo b/security/aide/distinfo
index b19c82ad36c4..476789af8f23 100644
--- a/security/aide/distinfo
+++ b/security/aide/distinfo
@@ -1,3 +1,3 @@
-MD5 (aide-0.10.tar.gz) = 39eb7d21064cac7b409c45d038b86cd8
-SHA256 (aide-0.10.tar.gz) = 4819b9b46acaedb5293c87fc7c742a89dcb6f63b71b1fcdeb81349fb41f2935c
-SIZE (aide-0.10.tar.gz) = 234184
+MD5 (aide-0.11.tar.gz) = 9a44e5386b0355ef57c60f627ff4d085
+SHA256 (aide-0.11.tar.gz) = ebc866c7d70166ac76ab0fa158e4bbf42780b4bd360e177f7a6586778b301374
+SIZE (aide-0.11.tar.gz) = 266978
diff --git a/security/aide/files/patch-Makefile.in b/security/aide/files/patch-Makefile.in
deleted file mode 100644
index 48c7b748d0f2..000000000000
--- a/security/aide/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig   Sat Nov 29 00:14:08 2003
-+++ Makefile.in        Fri Jul  8 16:23:06 2005
-@@ -95,7 +95,7 @@
- VERSION = @VERSION@
- YACC = @YACC@
-
--SUBDIRS = src doc po
-+SUBDIRS = src doc
-
- CLEANFILES = *~
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/security/aide/files/patch-config.h.in b/security/aide/files/patch-config.h.in
deleted file mode 100644
index 7a08dddf8531..000000000000
--- a/security/aide/files/patch-config.h.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- config.h.in.orig	Fri Nov 28 07:14:07 2003
-+++ config.h.in	Sat Jan  3 20:28:39 2004
-@@ -56,7 +56,7 @@
- #define AIDE_STAT_TYPE stat
- #define AIDE_INO_TYPE ino_t
- #define AIDE_OFF_TYPE off_t
--#define AIDE_BLKCNT_TYPE blkcnt_t
-+#define AIDE_BLKCNT_TYPE int32_t
- 
- /* Defines for READDIR64 */
- #define AIDE_READDIR_FUNC readdir
diff --git a/security/aide/files/patch-configure b/security/aide/files/patch-configure
deleted file mode 100644
index 7bb06ca03a0a..000000000000
--- a/security/aide/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Fri Nov 28 07:14:08 2003
-+++ configure	Sat Jan  3 20:21:15 2004
-@@ -2885,7 +2885,7 @@
- EOF
- 
-   	cat >> confdefs.h <<EOF
--#define AIDE_BLKCNT_TYPE blkcnt_t
-+#define AIDE_BLKCNT_TYPE int32_t
- EOF
- 
-   	cat >> confdefs.h <<EOF
diff --git a/security/aide/files/patch-configure.in b/security/aide/files/patch-configure.in
new file mode 100644
index 000000000000..573a6da35921
--- /dev/null
+++ b/security/aide/files/patch-configure.in
@@ -0,0 +1,24 @@
+--- 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 f063b3e85387..5a1dcc11c494 100644
--- a/security/aide/files/patch-doc_aide.1
+++ b/security/aide/files/patch-doc_aide.1
@@ -1,23 +1,14 @@
---- doc/aide.1.orig	Wed Jan 19 12:11:36 2000
-+++ doc/aide.1	Sat Sep  2 13:00:57 2000
-@@ -45,11 +45,17 @@
- Prints out the standard help message.
- .PP
+--- doc/aide.1.orig	Sat Feb 18 04:50:16 2006
++++ doc/aide.1	Wed Feb 22 07:07:07 2006
+@@ -50,9 +50,9 @@
  .SH FILES
--.B <prefix>/etc/aide.conf
-+.TP
-+.BI <prefix>/etc/aide.conf.sample
-+Example aide configuration file.
-+.TP
-+.BI <prefix>/etc/aide.conf
+ .B /usr/local/etc/aide.conf
  Default aide configuration file.
--.B <prefix>/etc/aide.db
-+.TP
-+.BI /var/db/aide/databases/aide.db
+-.B /usr/local/etc/aide.db
++.B /var/db/aide/aide.db
  Default aide database.
--.B <prefix>/etc/aide.db.new
-+.TP
-+.BI /var/db/aide/databases/aide.db.new
+-.B /usr/local/etc/aide.db.new
++.B /var/db/aide/aide.db.new
  Default aide output database.
  .SH SEE ALSO
  .BR aide.conf (5)