- Update to 1.0

- Update WWW
- Remove MD5 checksum

PR:		ports/155797
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

5 files changed, 22 insertions, 41 deletions

diff --git a/security/snortsnarf/Makefile b/security/snortsnarf/Makefile
index 6005da26572d..f43d579bf3eb 100644
--- a/security/snortsnarf/Makefile
+++ b/security/snortsnarf/Makefile
@@ -6,43 +6,33 @@
 #
 
 PORTNAME=	snortsnarf
-PORTVERSION=	050314
+PORTVERSION=	1.0
+PORTEPOCH=	1
 CATEGORIES=	security
-MASTER_SITES=	http://www.snort.org/dl/contrib/data_analysis/snortsnarf/
-DISTNAME=	SnortSnarf-${PORTVERSION}.1
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Initial%20Release%20${PORTVERSION}
+DISTNAME=	SnortSnarf-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generate HTML report summaries from snort incident alerts
 
-DEPRECATED=     Upstream disapear and distfile is no more available
-EXPIRATION_DATE=        2011-05-01
-
 RUN_DEPENDS=	${SITE_PERL}/Time/JulianDay.pm:${PORTSDIR}/devel/p5-Time-modules
 
 NO_BUILD=	yes
-USE_PERL5=	yes
+USE_PERL5_RUN=	yes
+
+post-patch:
+	@${SED} -e 's|\./include|${PREFIX}/libdata/${PORTNAME}|' \
+		< ${WRKSRC}/snortsnarf.pl > ${WRKSRC}/snortsnarf
 
 do-install:
-	${SED} s,%LOCALBASE%,${LOCALBASE}, < ${WRKSRC}/snortsnarf.pl > ${WRKSRC}/snortsnarf
-	${INSTALL_SCRIPT} ${WRKSRC}/snortsnarf ${LOCALBASE}/bin/snortsnarf
-	${MKDIR} ${LOCALBASE}/libdata/snortsnarf
-	${MKDIR} ${LOCALBASE}/libdata/snortsnarf/SnortSnarf
-.for i in IPAddrContact.pm ann_xml.pl web_utils.pl xml_help.pl
-	${INSTALL_DATA} ${WRKSRC}/include/${i} ${LOCALBASE}/libdata/snortsnarf/
-.endfor
-.for i in AlertBase.pm HTMLOutput.pm MemTimeBase.pm MultiStore.pm \
-	MemPacket.pm HTMLMemStorage.pm Filtering.pm PacketBase.pm \
-	AllMods.pm BasicFilters.pm KnownEquiv.pm SnortFileInput.pm \
-	HTMLAnomMemStorage.pm Input.pm SorterBase.pm Sort.pm \
-	StorageBase.pm MemAlert.pm BasicSorters.pm Filter.pm \
-	SnortRules.pm MemStorage.pm SnortDBInput.pm TimeFilters.pm \
-	IPObfuscater.pm
-	${INSTALL_DATA} ${WRKSRC}/include/SnortSnarf/${i} ${LOCALBASE}/libdata/snortsnarf/SnortSnarf/
-.endfor
+	${INSTALL_SCRIPT} ${WRKSRC}/snortsnarf ${LOCALBASE}/bin
+	@${MKDIR} ${PREFIX}/libdata/snortsnarf
+	@(cd ${WRKSRC}/include \
+		&& ${COPYTREE_SHARE} . ${PREFIX}/libdata/${PORTNAME})
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${LOCALBASE}/share/doc/snortsnarf
-.for i in README Usage
-	${INSTALL_DATA} ${WRKSRC}/${i} ${LOCALBASE}/share/doc/snortsnarf
+	@${MKDIR} ${DOCSDIR}
+.for file in README Usage
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/security/snortsnarf/distinfo b/security/snortsnarf/distinfo
index f485c38a08ad..0c401579eaff 100644
--- a/security/snortsnarf/distinfo
+++ b/security/snortsnarf/distinfo
@@ -1,3 +1,2 @@
-MD5 (SnortSnarf-050314.1.tar.gz) = 28ad6d1c492d69ff519f7cab1549123d
-SHA256 (SnortSnarf-050314.1.tar.gz) = 0e0ed4032c231cd41a7cb84c9a279a66b170735f1104384a73fdef12378b0b78
-SIZE (SnortSnarf-050314.1.tar.gz) = 144103
+SHA256 (SnortSnarf-1.0.tar.gz) = c595a4382fce818c15e27b174e596140d1600f7fee8ac8f9e413754619c90097
+SIZE (SnortSnarf-1.0.tar.gz) = 1018558
diff --git a/security/snortsnarf/files/patch-aa b/security/snortsnarf/files/patch-aa
deleted file mode 100644
index ef2e28a268ad..000000000000
--- a/security/snortsnarf/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- snortsnarf.pl.orig	Sun Jul 29 16:53:40 2001
-+++ snortsnarf.pl	Sun Jul 29 16:56:20 2001
-@@ -199,7 +199,7 @@
- 
- # Version control info: $Id: snortsnarf.pl,v 1.16 2000/06/14 18:40:45 jim Exp $
- 
--use lib qw(./include);
-+use lib qw(%LOCALBASE%/libdata/snortsnarf/);
- use Cwd;
- 
- # avoid needing to refer to SnortSnarf packages as SnortSnarf::*, even if
diff --git a/security/snortsnarf/pkg-descr b/security/snortsnarf/pkg-descr
index f1c02c6b4ff2..23994091cd43 100644
--- a/security/snortsnarf/pkg-descr
+++ b/security/snortsnarf/pkg-descr
@@ -3,4 +3,4 @@ conveniently navigate around output files of the Snort intrusion
 detection system (http://www.snort.org/).  The reports summarize the
 incidents logged in the snort alert file.
 
-WWW: http://www.silicondefense.com/software/snortsnarf/
+WWW: http://sourceforge.net/projects/snortsnarf/
diff --git a/security/snortsnarf/pkg-plist b/security/snortsnarf/pkg-plist
index e55e5c686ced..471241f3bb9c 100644
--- a/security/snortsnarf/pkg-plist
+++ b/security/snortsnarf/pkg-plist
@@ -8,6 +8,7 @@ libdata/snortsnarf/SnortSnarf/Filter.pm
 libdata/snortsnarf/SnortSnarf/Filtering.pm
 libdata/snortsnarf/SnortSnarf/HTMLAnomMemStorage.pm
 libdata/snortsnarf/SnortSnarf/HTMLMemStorage.pm
+libdata/snortsnarf/SnortSnarf/HTMLOutput+other.pm
 libdata/snortsnarf/SnortSnarf/HTMLOutput.pm
 libdata/snortsnarf/SnortSnarf/IPObfuscater.pm
 libdata/snortsnarf/SnortSnarf/Input.pm
@@ -19,6 +20,8 @@ libdata/snortsnarf/SnortSnarf/MemTimeBase.pm
 libdata/snortsnarf/SnortSnarf/MultiStore.pm
 libdata/snortsnarf/SnortSnarf/PacketBase.pm
 libdata/snortsnarf/SnortSnarf/SnortDBInput.pm
+libdata/snortsnarf/SnortSnarf/SnortDBInput.pm.save
+libdata/snortsnarf/SnortSnarf/SnortDBInput.ps
 libdata/snortsnarf/SnortSnarf/SnortFileInput.pm
 libdata/snortsnarf/SnortSnarf/SnortRules.pm
 libdata/snortsnarf/SnortSnarf/Sort.pm