--- a/components/gnutls/Makefile	Wed Mar 30 10:16:56 2016 -0700
+++ b/components/gnutls/Makefile	Wed Mar 30 13:33:31 2016 -0700
@@ -20,51 +20,36 @@
 #
 
 #
-# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
 #
-
+BUILD_BITS= 64_and_32
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		gnutls
 COMPONENT_VERSION=	2.8.6
-COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_PROJECT_URL=  https://ftp.gnu.org/gnu/gnutls/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH= \
     sha256:d6f846a7064af3ee2c9aebd65dcee76953b767170cbcd719e990ed6b9688a356
-COMPONENT_ARCHIVE_URL=  https://ftp.gnu.org/gnu/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	library/gnutls
 
 TPNO=			9291
 
 COMPONENT_BUILD_TARGETS = all info
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/gnu-component.mk
 
-PATH=$(dir $(CC)):/usr/lib:/usr/bin:/usr/sbin:/usr/gnu/bin
+PATH=$(dir $(CC)):$(USRLIBDIR):$(USRBINDIR):$(USRSBINDIR):$(GNUBIN)
 
-CC += $(CC_BITS)
-CXX += $(CC_BITS)
-
-CONFIGURE_OPTIONS  += --sysconfdir=/etc 
-CONFIGURE_OPTIONS  += --infodir=/usr/share/info 
-CONFIGURE_OPTIONS  += --localstatedir=/var 
+CONFIGURE_OPTIONS  += --sysconfdir=$(ETCDIR)
+CONFIGURE_OPTIONS  += --infodir=$(CONFIGURE_INFODIR)
+CONFIGURE_OPTIONS  += --localstatedir=$(VARDIR)
 CONFIGURE_OPTIONS  += --enable-guile=no 
 CONFIGURE_OPTIONS  += --disable-camellia
-CONFIGURE_OPTIONS  +=   CXX="$(CXX) -norunpath" 
 
 ASLR_MODE = $(ASLR_ENABLE)
 
 include ../../make-rules/shared-targets.mk
 
-configure:      $(CONFIGURE_32_and_64)
-
-build:          $(BUILD_32_and_64)
-
-install:	$(INSTALL_32_and_64)
-
 COMPONENT_TEST_TRANSFORMS += \
 	'-n -e "/: x509self/d" ' \
 	'-e "/: x509signself/d" ' \
@@ -74,14 +59,9 @@
 	'-e "/PASS/p" ' \
 	'-e "/FAIL/p" '
 
-test:		$(TEST_32_and_64)
-
-system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
-
 REQUIRED_PACKAGES += library/libtasn1
 REQUIRED_PACKAGES += library/security/libgpg-error
 REQUIRED_PACKAGES += library/zlib
-REQUIRED_PACKAGES += system/library
 REQUIRED_PACKAGES += system/library/security/libgcrypt
 REQUIRED_PACKAGES += system/library/c++-runtime
 REQUIRED_PACKAGES += library/ncurses