Index: head/security/sguil-sensor/Makefile
===================================================================
--- head/security/sguil-sensor/Makefile	(revision 213244)
+++ head/security/sguil-sensor/Makefile	(revision 213245)
@@ -1,120 +1,121 @@
 # New ports collection makefile for:	sguil-sensor
 # Date created:				23 Mar 2006
 # Whom:					Paul Schmehl <pauls@utdallas.edu>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	sguil-sensor
 PORTVERSION=	0.7.0
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	sguil
 
 MAINTAINER=	pauls@utdallas.edu
 COMMENT=	Sguil is a network security monitoring program
 
 LIB_DEPENDS=	tls:${PORTSDIR}/devel/tcltls
 RUN_DEPENDS=	snort:${PORTSDIR}/security/snort \
 		barnyard:${PORTSDIR}/security/barnyard-sguil \
 		${LOCALBASE}/lib/tclx8.4/tclx.tcl:${PORTSDIR}/lang/tclX
 
 OPTIONS=	SANCP "Include sancp sensor" off \
 		PADS "Include pads sensor" off
 
 NO_BUILD=	yes
 USE_RC_SUBR=	example_agent.sh pcap_agent.sh snort_agent.sh
 TCLSH_CMD?=	tclsh8.4
 WRKSRC=		${WRKDIR}/sguil-${PORTVERSION}
 SUB_LIST=	SGUILDIR=${SGUILDIR}
 SUB_FILES=	pkg-message example_agent.sh pcap_agent.sh snort_agent.sh
 PLIST_SUB=	SGUILDIR=${SGUILDIR}
 SGUILDIR?=	sguil-sensor
 AGENTS=		example_agent.tcl pads_agent.tcl pcap_agent.tcl sancp_agent.tcl snort_agent.tcl
 
 PORTDOCS=	CHANGES FAQ INSTALL INSTALL.openbsd LICENSE.QPL \
 		OPENSSL.README TODO UPGRADE USAGE sguildb.dia
 
 .include <bsd.port.pre.mk>
 
 WITH_PCRE=	true
 
 .if defined(WITH_SANCP)
 RUN_DEPENDS+=	sancp:${PORTSDIR}/security/sancp
 USE_RC_SUBR+=	sancp_agent.sh
 SUB_FILES+=	sancp_agent.sh
 PLIST_SUB+=	USESANCP=
 .else
 PLIST_SUB+=	USESANCP="@comment "
 .endif
 
 .if defined(WITH_PADS)
 RUN_DEPENDS+=	pads:${PORTSDIR}/net-mgmt/pads
 USE_RC_SUBR+=	pads_agent.sh
 SUB_FILES+=	pads_agent.sh
 PLIST_SUB+=	USEPADS=
 .else
 PLIST_SUB+=	USEPADS="@comment "
 .endif
 
 post-patch:
 .for f in ${AGENTS}
 	@${REINPLACE_CMD} -e 's:exec tclsh:exec ${PREFIX}/bin/${TCLSH_CMD}:g' \
 		${WRKSRC}/sensor/${f}
 	@${REINPLACE_CMD} -e 's:/etc/:${PREFIX}/etc/${SGUILDIR}/:g' \
 		${WRKSRC}/sensor/${f}
 .endfor
 
 do-install:
 	@${MKDIR} ${PREFIX}/bin/${SGUILDIR}
 	@${MKDIR} ${PREFIX}/etc/${SGUILDIR}
 .for f in example_agent.tcl pcap_agent.tcl snort_agent.tcl
 	${INSTALL_SCRIPT} -m 751 ${WRKSRC}/sensor/${f} \
 		${PREFIX}/bin/${SGUILDIR}/${f}
 .endfor
 .for f in log_packets.sh
 	${INSTALL_SCRIPT} -m 751 ${WRKSRC}/sensor/${f} \
 		${PREFIX}/bin/${SGUILDIR}/${f}
 .endfor
 .for f in example_agent.conf pcap_agent.conf snort_agent.conf
 	${INSTALL_DATA} ${WRKSRC}/sensor/${f} \
 		${PREFIX}/etc/${SGUILDIR}/${f}-sample
 .endfor
 .for f in log_packets.conf
 	${INSTALL_DATA} ${FILESDIR}/${f} \
 		${PREFIX}/etc/${SGUILDIR}/${f}-sample
 .endfor
 .if defined(WITH_SANCP)
 .for f in sancp_agent.conf
 	${INSTALL_DATA} ${WRKSRC}/sensor/${f} \
 		${PREFIX}/etc/${SGUILDIR}/${f}-sample
 .endfor
 .for f in sancp.conf
 	${INSTALL_DATA} ${WRKSRC}/sensor/sancp/${f} \
 		${PREFIX}/etc/${f}-sample
 .endfor
 .for f in sancp_agent.tcl
 	${INSTALL_SCRIPT} ${WRKSRC}/sensor/${f} \
 		${PREFIX}/bin/${SGUILDIR}/${f}
 .endfor
 .endif
 .if defined(WITH_PADS)
 .for f in pads_agent.conf
 	${INSTALL_DATA} ${WRKSRC}/sensor/${f} \
 		${PREFIX}/etc/${SGUILDIR}/${f}-sample
 .endfor
 .for f in pads_agent.tcl
 	${INSTALL_SCRIPT} ${WRKSRC}/sensor/${f} \
 		${PREFIX}/bin/${SGUILDIR}/${f}
 .endfor
 .endif
 post-install:
 
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC}/doc && ${INSTALL_DATA} \
 		${PORTDOCS} ${DOCSDIR}
 .endif
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

Property changes on: head/security/sguil-sensor/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/security/sguil-sensor/files/patch-sensor_agent.tcl
===================================================================
--- head/security/sguil-sensor/files/patch-sensor_agent.tcl	(revision 213244)
+++ head/security/sguil-sensor/files/patch-sensor_agent.tcl	(nonexistent)
@@ -1,23 +0,0 @@
---- sensor/sensor_agent.tcl.orig	Mon Mar 20 20:38:18 2006
-+++ sensor/sensor_agent.tcl	Mon Mar 20 20:40:06 2006
-@@ -1005,16 +1005,16 @@
-   }
- }
- # Parse the config file here
--# Default location is /etc/sensor_agent.conf or pwd
-+# Default location is /usr/local/etc/sensor_agent.conf or pwd
- if { ![info exists CONF_FILE] } {
-   # No conf file specified check the defaults
--  if { [file exists /etc/sensor_agent.conf] } {
--    set CONF_FILE /etc/sensor_agent.conf
-+  if { [file exists /usr/local/etc/sensor_agent.conf] } {
-+    set CONF_FILE /usr/local/etc/sensor_agent.conf
-   } elseif { [file exists ./sensor_agent.conf] } {
-     set CONF_FILE ./sensor_agent.conf
-   } else {
-     puts "Couldn't determine where the sensor_agent.tcl config file is"
--    puts "Looked for /etc/sensor_agent.conf and ./sensor_agent.conf."
-+    puts "Looked for /usr/local/etc/sensor_agent.conf and ./sensor_agent.conf."
-     DisplayUsage $argv0
-   }
- }

Property changes on: head/security/sguil-sensor/files/patch-sensor_agent.tcl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property