- Update to 1.1.1.

- Use libhtp from ports instead of the bundled one.
- Remove check for 6.x.

PR:		ports/163603
Submitted by:	wxs@
Approved by:	eksffa@freebsdbrasil.com.br (maintiner timeout)

4 files changed, 9 insertions, 29 deletions

diff --git a/security/suricata/Makefile b/security/suricata/Makefile
index c44601ca2089..a9559a9aed49 100644
--- a/security/suricata/Makefile
+++ b/security/suricata/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	suricata
-PORTVERSION=	1.0.3
+PORTVERSION=	1.1.1
 CATEGORIES=	security
-MASTER_SITES=	http://openinfosecfoundation.org/download/ \
-		http://www6.freebsdbrasil.com.br/~eksffa/l/dev/suricata/
+MASTER_SITES=	http://www.openinfosecfoundation.org/download/
 
 MAINTAINER=	eksffa@freebsdbrasil.com.br
 COMMENT=	Open Source next generation IDS/IPS engine by OISF
@@ -19,7 +18,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre \
 		yaml:${PORTSDIR}/textproc/libyaml \
-		pcap.1:${PORTSDIR}/net/libpcap
+		pcap.1:${PORTSDIR}/net/libpcap \
+		htp-0.2.1:${PORTSDIR}/devel/libhtp
 
 BUILD_DEPENDS+=	${LIBNET_CONFIG}:${PORTSDIR}/net/libnet \
 		pkg-config:${PORTSDIR}/devel/pkg-config
@@ -48,9 +48,6 @@ LOGS_DIR=	/var/log/suricata
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 700000
-BROKEN=		does not configure on 6.X
-.endif
 .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
 BROKEN=		Does not compile on ia64, powerpc, or sparc64
 .endif
@@ -69,6 +66,9 @@ CONFIGURE_ARGS+=	--enable-ipfw
 CONFIGURE_ARGS+=	--enable-dag
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -Ee 's|^(install-data-am: )install-pkgconfigDATA|\1|' ${WRKSRC}/libhtp/Makefile.in
+
 pre-install:
 	@${REINPLACE_CMD} -e 's|/etc/suricata|${PREFIX}/etc/suricata|g' ${WRKSRC}/suricata.yaml
 
@@ -82,7 +82,6 @@ post-install:
 		${CP} -p ${CONFIG_DIR}/${f}-sample ${CONFIG_DIR}/${f} ; \
 	fi
 .endfor
-
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/security/suricata/distinfo b/security/suricata/distinfo
index 8aeed3579904..662f5f0c4c2b 100644
--- a/security/suricata/distinfo
+++ b/security/suricata/distinfo
@@ -1,2 +1,2 @@
-SHA256 (suricata-1.0.3.tar.gz) = df0245181057603a8dc37c937816adecbd8468cc2531d7431525df8205995d92
-SIZE (suricata-1.0.3.tar.gz) = 1639825
+SHA256 (suricata-1.1.1.tar.gz) = 6ff337ca71ca015d50e73a2bb90e02d894b617935482802102648d51b3876fac
+SIZE (suricata-1.1.1.tar.gz) = 2018055
diff --git a/security/suricata/files/patch-Makefile.in b/security/suricata/files/patch-Makefile.in
deleted file mode 100644
index 95b8161a7ba4..000000000000
--- a/security/suricata/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libhtp/Makefile.in.dist	2010-08-30 22:01:03.000000000 -0300
-+++ libhtp/Makefile.in	2010-08-30 22:02:08.000000000 -0300
-@@ -250,7 +250,7 @@
- ACLOCAL_AMFLAGS = -I m4
- SUBDIRS = $(GENERIC_LIBRARY_NAME) test
- EXTRA_DIST = ChangeLog COPYING LICENSE LIBHTP_LICENSING_EXCEPTION docs/doxygen.conf docs/QUICK_START
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(libdir)/../libdata/pkgconfig
- pkgconfig_DATA = htp.pc
- all: config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/security/suricata/pkg-plist b/security/suricata/pkg-plist
index 6039f0ae70b6..3e313c1960c6 100644
--- a/security/suricata/pkg-plist
+++ b/security/suricata/pkg-plist
@@ -1,9 +1,3 @@
-lib/libhtp.a
-lib/libhtp-0.2.so
-lib/libhtp-0.2.so.1
-libdata/pkgconfig/htp.pc
-lib/libhtp.la
-lib/libhtp.so
 bin/suricata
 etc/suricata/suricata.yaml
 etc/suricata/suricata.yaml-sample
@@ -11,5 +5,3 @@ etc/suricata/classification.config-sample
 etc/suricata/classification.config
 @unexec /bin/rmdir %D/etc/suricata/rules 2>/dev/null || true
 @unexec /bin/rmdir %D/etc/suricata 2>/dev/null || true
-@unexec echo "completely uninstalling %D/include/htp"
-@unexec /bin/rm -rf %D/include/htp 2>/dev/null || true