2 files changed, 30 insertions, 21 deletions

diff --git a/security/snort/Makefile b/security/snort/Makefile
index a5c2e0de12b0..f880c9216efb 100644
--- a/security/snort/Makefile
+++ b/security/snort/Makefile
@@ -7,21 +7,25 @@
 
 PORTNAME=	snort
 PORTVERSION=	2.1.0
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.snort.org/dl/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sergei@FreeBSD.org
 COMMENT=	Lightweight network intrusion detection system
 
+LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
+
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .if defined(WITH_FLEXRESP)
-BUILD_DEPENDS=		${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet
-CONFIGURE_ARGS=		--enable-flexresp
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="${LDFLAGS}"
-LDFLAGS+=		"-L${LOCALBASE}/lib"
+BUILD_DEPENDS+=		${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet
+CONFIGURE_ARGS+=	--enable-flexresp \
+			--with-libnet-includes=${LOCALBASE}/include \
+			--with-libnet-libraries=${LOCALBASE}/lib
 .endif
 
 .if defined(WITH_MYSQL)
@@ -51,10 +55,8 @@ CONFIGURE_ARGS+=	--with-postgresql=no
 .endif
 
 MAN8=	snort.8
-DOCS=	AUTHORS NEWS README.csv BUGS README README.database \
-	CREDITS README.FLEXRESP FAQ snort_manual.pdf \
-	README.PLUGINS USAGE README.thresholding README.flow \
-	README.flow-portscan README.http_inspect README.wireless
+DOCS=	ChangeLog doc/AUTHORS doc/BUGS doc/CREDITS doc/FAQ doc/NEWS \
+	doc/README* doc/TODO doc/USAGE doc/snort_manual.pdf
 
 post-patch:
 	${REINPLACE_CMD} "s,%%PREFIX%%,${PREFIX}," ${WRKSRC}/src/snort.c
@@ -68,11 +70,12 @@ pre-configure:
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
 	@${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/rules/*.rules ${DATADIR}; \
-	${INSTALL_DATA} ${WRKSRC}/etc/classification.config ${DATADIR}/classification.config-sample; \
+	${INSTALL_DATA} ${WRKSRC}/etc/classification.config \
+		${DATADIR}/classification.config-sample; \
 	if [ ! -f ${DATADIR}/classification.config ]; then \
 	    ${CP} ${DATADIR}/classification.config-sample \
 		${DATADIR}/classification.config; \
diff --git a/security/snort/pkg-plist b/security/snort/pkg-plist
index e1d52ae7cc3c..c51cca90bb3c 100644
--- a/security/snort/pkg-plist
+++ b/security/snort/pkg-plist
@@ -1,25 +1,32 @@
+@comment $FreeBSD$
 bin/snort
 @unexec if [ -f %D/etc/snort.conf ] && cmp -s %D/etc/snort.conf %D/etc/snort.conf-sample; then rm -f %D/etc/snort.conf; fi
 etc/snort.conf-sample
 etc/rc.d/snort.sh.sample
 @exec [ -f %B/snort.conf ] || cp %B/%f %B/snort.conf
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README.csv
 %%PORTDOCS%%%%DOCSDIR%%/BUGS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.database
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS
-%%PORTDOCS%%%%DOCSDIR%%/README.FLEXRESP
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.FLEXRESP
 %%PORTDOCS%%%%DOCSDIR%%/README.PLUGINS
-%%PORTDOCS%%%%DOCSDIR%%/USAGE
-%%PORTDOCS%%%%DOCSDIR%%/README.thresholding
-%%PORTDOCS%%%%DOCSDIR%%/snort_manual.pdf
+%%PORTDOCS%%%%DOCSDIR%%/README.UNSOCK
+%%PORTDOCS%%%%DOCSDIR%%/README.WIN32
+%%PORTDOCS%%%%DOCSDIR%%/README.alert_order
+%%PORTDOCS%%%%DOCSDIR%%/README.csv
+%%PORTDOCS%%%%DOCSDIR%%/README.database
 %%PORTDOCS%%%%DOCSDIR%%/README.flow
 %%PORTDOCS%%%%DOCSDIR%%/README.flow-portscan
 %%PORTDOCS%%%%DOCSDIR%%/README.http_inspect
+%%PORTDOCS%%%%DOCSDIR%%/README.thresholding
 %%PORTDOCS%%%%DOCSDIR%%/README.wireless
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/USAGE
+%%PORTDOCS%%%%DOCSDIR%%/snort_manual.pdf
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%DATADIR%%/attack-responses.rules
 %%DATADIR%%/backdoor.rules
 %%DATADIR%%/bad-traffic.rules
@@ -74,5 +81,4 @@ etc/rc.d/snort.sh.sample
 %%DATADIR%%/web-misc.rules
 %%DATADIR%%/web-php.rules
 %%DATADIR%%/x11.rules
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%