--- a/components/libevent/Makefile Wed Mar 30 10:16:56 2016 -0700
+++ b/components/libevent/Makefile Wed Mar 30 13:33:31 2016 -0700
@@ -20,9 +20,9 @@
#
#
-# 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_and_32
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= libevent
@@ -30,7 +30,6 @@
IPS_COMPONENT_VERSION= 1.4.14.2
COMPONENT_PROJECT_URL= http://monkey.org/~provos/libevent/
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)-stable
-COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
sha256:afa61b476a222ba43fc7cca2d24849ab0bbd940124400cb699915d3c60e46301
COMPONENT_ARCHIVE_URL= http://cloud.github.com/downloads/libevent/libevent/$(COMPONENT_ARCHIVE)
@@ -38,26 +37,20 @@
TPNO= 5581
-include $(WS_MAKE_RULES)/prep.mk
-include $(WS_MAKE_RULES)/configure.mk
-include $(WS_MAKE_RULES)/ips.mk
-include $(WS_MAKE_RULES)/lint-libraries.mk
+include $(WS_MAKE_RULES)/common.mk
COMPONENT_PRE_CONFIGURE_ACTION = \
($(CLONEY) $(SOURCE_DIR) $(@D))
-#The original manpage is in a format that the Solaris man command does
-#not understand. Hence it has been manually converted.
-#
-#List of files from the original package that are not being delivered
+# The original manpage is in a format that the Solaris man command does not
+# understand. Hence it has been manually converted.
#
-#/usr/bin/event_rpcgen.py
+# List of files from the original package that are not being delivered
+#
+# /usr/bin/event_rpcgen.py
-CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
CONFIGURE_OPTIONS += --disable-static
-ASLR_MODE = $(ASLR_NOT_APPLICABLE)
-
COMPONENT_TEST_TARGETS = verify
# \x24 represents the character '$'
@@ -67,16 +60,3 @@
# Master test results are the same for 32-bit and 64-bit, so override
# here, rather than create multiple identical master files.
COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
-
-configure: $(CONFIGURE_32_and_64)
-
-build: $(BUILD_32_and_64)
-
-install: $(INSTALL_32_and_64)
-
-test: $(TEST_32_and_64)
-
-system-test: $(SYSTEM_TESTS_NOT_IMPLEMENTED)
-
-
-REQUIRED_PACKAGES += system/library