Index: Portfile
===================================================================
--- Portfile	(Revision 50462)
+++ Portfile	(Arbeitskopie)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
 PortSystem 1.0
@@ -3,5 +4,5 @@
 
 name             snort
-version          2.6.1.5
+version          2.8.4
 categories       net
 maintainers      markd
@@ -18,23 +19,26 @@
 platforms        darwin freebsd
 master_sites     ${homepage}dl/current/ \
 		 ${homepage}dl/old/
-checksums        sha1 14e65990f70dab4e740e0b8116c671364d3ca8c4
-patchfiles       patch-etc-snort.conf
-depends_lib      port:pcre
-configure.args   --mandir=${prefix}/share/man --disable-dynamicplugin
+checksums        md5 193179da8db8aac5ee6b0a751ce7b76d\
+	         sha1 2e400f34728613f0e285f28dc38a0ae38733ea22\
+	         rmd160 3fae1b0a472a5ae73eea323f312364bc9d7e1e2a
+	
+#patchfiles       patch-etc-snort.conf
+depends_lib      port:pcre port:libpcap
+#configure.args   --mandir=${prefix}/share/man --disable-dynamicplugin
 
-variant mysql5 {
+variant mysql5 description {mysql 5 support} {
 	depends_lib-append    port:mysql5
 	configure.args-append --with-mysql=${prefix}
 	patchfiles-append	patch-configure
 }
 
-variant mysql4 {
+variant mysql4 description {mysql 4 support} {
 	depends_lib-append    port:mysql4
 	configure.args-append --with-mysql=${prefix}
 }
 
-variant server {
+variant server description {startupitem} {
     startupitem.create    yes
     startupitem.start "${prefix}/share/${name}/snort.sh"
     startupitem.stop  "/bin/kill \$(cat /var/run/snort_*.pid)"
@@ -48,9 +52,16 @@
 # Copy Snort's etc/ files
 	xinstall -d -m 755 ${destroot}${prefix}/etc/${name}
 	eval xinstall [glob ${worksrcpath}/etc/*.map] ${destroot}${prefix}/etc/${name}
-	eval xinstall [glob ${worksrcpath}/etc/*.conf] ${destroot}${prefix}/etc/${name}
+	eval xinstall [glob ${worksrcpath}/etc/*.conf*] ${destroot}${prefix}/etc/${name}
 	file rename ${destroot}${prefix}/etc/${name}/snort.conf ${destroot}${prefix}/etc/${name}/snort.conf.dist
 
+# fix snort.conf.dist
+	reinplace "s|dynamicpreprocessor directory /usr/local/lib/snort_dynamicpreprocessor/|dynamicpreprocessor directory ${prefix}/lib/snort_dynamicpreprocessor/|g" ${destroot}${prefix}/etc/${name}/snort.conf.dist
+	reinplace "s|dynamicengine /usr/local/lib/snort_dynamicengine/libsf_engine.so|dynamicengine ${prefix}/lib/snort_dynamicengine/libsf_engine.dylib|g" ${destroot}${prefix}/etc/${name}/snort.conf.dist
+	reinplace "s|dynamicdetection directory /usr/local/lib/snort_dynamicrule/|dynamicdetection directory ${prefix}/lib/snort_dynamicrule/|g" ${destroot}${prefix}/etc/${name}/snort.conf.dist
+	reinplace "s|dynamicdetection file /usr/local/lib/snort_dynamicrule/libdynamicexamplerule.so|dynamicdetection file ${prefix}/lib/snort_dynamicrule/libdynamicexamplerule.dylib|g" ${destroot}${prefix}/etc/${name}/snort.conf.dist
+
+
         if { [variant_isset server] } {
            	xinstall -m 755 ${portpath}/${filesdir}/snort.sh \
 			${destroot}${prefix}/share/${name}/snort.sh
@@ -65,7 +76,7 @@
                 ***** File locations *****
 
 	The Snort database schemas -> ${prefix}/share/${name}/schemas
-	The snort.conf sample file -> ${prefix}/etc/${name}/snort.conf.sample (rename to snort.conf)
+	The snort.conf sample file -> ${prefix}/etc/${name}/snort.conf.dist (rename to snort.conf)
 
 NOTE:	If you installed Snort using the +server variant, make sure you do not
 	change the location of the snort.conf file or the startup scripts