--- a/components/snort/Makefile Wed Mar 30 10:16:56 2016 -0700
+++ b/components/snort/Makefile Wed Mar 30 13:33:31 2016 -0700
@@ -20,26 +20,22 @@
#
#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
-
+BUILD_BITS= 64
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= snort
COMPONENT_VERSION= 2.9.6.2
-COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
sha256:8e1d7fc5e1523a786d845ca0102cc474abfcebfcc7e964a1653680034b5b5d77
COMPONENT_PROJECT_URL= http://www.snort.org/
COMPONENT_ARCHIVE_URL= http://sourceforge.net/projects/snort.mirror/files/Snort%202.9.6.2/$(COMPONENT_ARCHIVE)/download
-COMPONENT_BUGDB= utility/snort
TPNO= 19385
-include $(WS_MAKE_RULES)/prep.mk
-include $(WS_MAKE_RULES)/configure.mk
-include $(WS_MAKE_RULES)/ips.mk
+TEST_TARGET= $(NO_TESTS)
+include $(WS_MAKE_RULES)/common.mk
PATCH_LEVEL = 0
@@ -51,41 +47,19 @@
# Need to recreate the configure script for gethrtime checks.
COMPONENT_PREP_ACTION += (cd $(@D); autoconf);
-# This option has the side-effect of getting the bindir lines correct in
-# snort_output.pc, snort_preproc.pc and snort.pc under
-# /usr/lib/$(MACH64)/pkgconfig/
-CONFIGURE_OPTIONS += --bindir=/usr/bin
-
-CONFIGURE_OPTIONS += --with-libpcre-libraries="/usr/lib/$(MACH64)"
-CONFIGURE_OPTIONS += --with-dnet-libraries="/usr/lib/$(MACH64)"
+CONFIGURE_OPTIONS += --with-libpcre-libraries="$(USRLIBDIR64)"
+CONFIGURE_OPTIONS += --with-dnet-libraries="$(USRLIBDIR64)"
CONFIGURE_OPTIONS += --without-mysql
CONFIGURE_OPTIONS += --without-postgresql
CONFIGURE_OPTIONS += --enable-zlib
CONFIGURE_OPTIONS += --enable-ipv6
CONFIGURE_OPTIONS += --disable-static-daq
-CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
-CONFIGURE_OPTIONS += LDFLAGS="$(LDFLAGS)"
# Move snort shared objects to 64-bit path to stop pkglint bitching.
COMPONENT_POST_INSTALL_ACTION += \
$(MV) $(PROTOUSRLIBDIR)/snort_dynamicengine $(PROTOUSRLIBDIR64); \
$(MV) $(PROTOUSRLIBDIR)/snort_dynamicpreprocessor $(PROTOUSRLIBDIR64) ;
-# Enable ASLR for this component
-ASLR_MODE = $(ASLR_ENABLE)
-
-# common targets
-configure: $(CONFIGURE_64)
-
-build: $(BUILD_64)
-
-install: $(INSTALL_64)
-
-test: $(NO_TESTS)
-
-system-test: $(NO_TESTS)
-
-
REQUIRED_PACKAGES += developer/lexer/flex
REQUIRED_PACKAGES += developer/parser/bison
REQUIRED_PACKAGES += library/pcre
@@ -94,7 +68,6 @@
REQUIRED_PACKAGES += library/zlib
REQUIRED_PACKAGES += shell/ksh93
REQUIRED_PACKAGES += system/core-os
-REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += system/library/libdaq
REQUIRED_PACKAGES += system/library/libdnet
REQUIRED_PACKAGES += system/library/libpcap