PR: 55646

Submitted by:	klm <klm@uidzero.org>
Reviewed by:
Approved by:
Obtained from:
MFC after:

Update to 3.3.0

4 files changed, 17 insertions, 67 deletions

diff --git a/security/ftimes/Makefile b/security/ftimes/Makefile
index 0d327da7b338..5fae57a39fa8 100644
--- a/security/ftimes/Makefile
+++ b/security/ftimes/Makefile
@@ -1,28 +1,33 @@
 # New ports collection makefile for:   ftimes
-# Date created:                20 August 2002
-# Whom:                        Klayton Monroe <klm@ir.exodus.net>
+# Date created:		20 August 2002
+# Whom:			Klayton Monroe <klm@uidzero.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=		ftimes
-PORTVERSION=		3.2.1
-PORTREVISION=		1
+PORTVERSION=		3.3.0
 CATEGORIES=		security sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ftimes
 EXTRACT_SUFX=		.tgz
 
-MAINTAINER=		klm@ir.exodus.net
+MAINTAINER=		klm@uidzero.org
 COMMENT=		A system baselining and evidence collection tool
 
 GNU_CONFIGURE=		YES
 
 .if defined(WITHOUT_SSL)
-CONFIGURE_ARGS=		--without-ssl
+CONFIGURE_ARGS+=	--without-ssl
 .else
 USE_OPENSSL=		YES
-CONFIGURE_ARGS=		--with-ssl=${OPENSSLBASE}
+CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}
+.endif
+
+.if defined(NO_STATIC)
+CFLAGS+=
+.else
+CFLAGS+=		-static
 .endif
 
 MAN1=			ftimes.1
diff --git a/security/ftimes/distinfo b/security/ftimes/distinfo
index fc824a321b91..63370dbb641d 100644
--- a/security/ftimes/distinfo
+++ b/security/ftimes/distinfo
@@ -1 +1 @@
-MD5 (ftimes-3.2.1.tgz) = a62ce08399f6b121cabbfbbf96583e7b
+MD5 (ftimes-3.3.0.tgz) = 552c3c6d9796dade37533308a31772dc
diff --git a/security/ftimes/files/patch-aa b/security/ftimes/files/patch-aa
deleted file mode 100644
index bb17b1dd9640..000000000000
--- a/security/ftimes/files/patch-aa
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -urP configure.orig configure
---- configure.orig   Mon Mar 17 19:24:44 2003
-+++ configure       Mon May  5 14:14:32 2003
-@@ -1412,6 +1412,13 @@
- _ACEOF
- 
- 	;;
-+ia64*)
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define K_CPU_IA64 1
-+_ACEOF
-+
-+	;;
- i?86*)
- 
- cat >>confdefs.h <<\_ACEOF
-diff -urP configure.in.orig configure.in
---- configure.in.orig	Mon Mar 17 19:24:44 2003
-+++ configure.in	Mon May  5 14:14:32 2003
-@@ -80,6 +80,9 @@
- alpha*)
-         AC_DEFINE(K_CPU_ALPHA, 1, Define to 1 if the host cpu is alpha.)
- 	;;
-+ia64*)
-+        AC_DEFINE(K_CPU_IA64, 1, Define to 1 if the host cpu is ia64.)
-+	;;
- i?86*)
-         AC_DEFINE(K_CPU_I386, 1, Define to 1 if the host cpu is iX86.)
- 	;;
-diff -urP src/config.h.in.orig src/config.h.in
---- src/config.h.in.orig	Thu Mar 27 15:19:11 2003
-+++ src/config.h.in	Mon May  5 14:14:32 2003
-@@ -161,6 +161,9 @@
- /* Define to 1 if the host cpu is iX86. */
- #undef K_CPU_I386
- 
-+/* Define to 1 if the host cpu is ia64. */
-+#undef K_CPU_IA64
-+
- /* Define to 1 if the host cpu is powerpc. */
- #undef K_CPU_POWERPC
- 
-diff -urP src/md5.h.orig src/md5.h
---- src/md5.h.orig	Sun Feb 23 17:40:08 2003
-+++ src/md5.h	Mon May  5 14:14:45 2003
-@@ -16,7 +16,7 @@
- #define MD5_READ_BUFSIZE    0x8000
- #define MD5_BYTES_PER_BLOCK (512/8)
- 
--#ifdef K_CPU_ALPHA
-+#if defined(K_CPU_ALPHA) || defined(K_CPU_IA64) 
- typedef unsigned int  MD5_UINT32;
- #else
- typedef unsigned long MD5_UINT32;
-
-
diff --git a/security/ftimes/pkg-plist b/security/ftimes/pkg-plist
index ab45912d7dc2..7b017c8119dc 100644
--- a/security/ftimes/pkg-plist
+++ b/security/ftimes/pkg-plist
@@ -1,5 +1,7 @@
 bin/ftimes
-etc/dig.cfg.sample
+etc/digfull.cfg.sample
+etc/diglean.cfg.sample
 etc/get.cfg.sample
-etc/map.cfg.sample
+etc/mapfull.cfg.sample
+etc/maplean.cfg.sample
 etc/put.cfg.sample