--- a/components/python/netaddr/Makefile Thu Apr 16 01:36:32 2015 -0700
+++ b/components/python/netaddr/Makefile Mon Apr 20 12:35:51 2015 -0700
@@ -18,26 +18,33 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+
#
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= netaddr
-COMPONENT_VERSION= 0.7.10
+COMPONENT_VERSION= 0.7.13
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:9b79763141a855079b0589717696a4ccb5c56c0b807b6e584bfe12333399e0b7
-COMPONENT_PROJECT_URL= http://github.com/drkjam/netaddr/
-COMPONENT_ARCHIVE_URL= http://github.com/downloads/drkjam/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
+ sha256:ca42c260b49e5fd74ba9104efa6a4fca6b55316ca42714d20d2b9b8e751e0412
+COMPONENT_ARCHIVE_URL= $(call pypi_url)
+COMPONENT_PROJECT_URL= http://github.com/drkjam/netaddr/
COMPONENT_BUGDB= python-mod/netaddr
-include $(WS_TOP)/make-rules/prep.mk
-include $(WS_TOP)/make-rules/setup.py.mk
-include $(WS_TOP)/make-rules/ips.mk
+TPNO= 21724
+
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/setup.py.mk
+include $(WS_MAKE_RULES)/ips.mk
COMPONENT_POST_INSTALL_ACTION = \
- (cd $(PROTOUSRBINDIR) ; $(MV) netaddr netaddr-$(PYTHON_VERSION))
+ (cd $(PROTO_DIR)/usr/bin ; $(MV) netaddr netaddr-$(PYTHON_VERSION))
+
+ASLR_MODE = $(ASLR_NOT_APPLICABLE)
# common targets
build: $(BUILD_NO_ARCH)
@@ -47,9 +54,9 @@
COMPONENT_TEST_DIR= $(@D)/lib/netaddr
COMPONENT_TEST_ARGS= tests/__init__.py
COMPONENT_PRE_TEST_ACTION= \
- ( cd $(COMPONENT_TEST_DIR)/tests ; \
- ln -s $(SOURCE_DIR)/netaddr/tests/2.x ; \
- ln -s $(SOURCE_DIR)/netaddr/tests/3.x )
+ (cd $(COMPONENT_TEST_DIR)/tests ; \
+ ln -s $(SOURCE_DIR)/netaddr/tests/2.x ; \
+ ln -s $(SOURCE_DIR)/netaddr/tests/3.x )
test: $(TEST_NO_ARCH)