--- a/components/help2man/Makefile	Wed Mar 30 10:16:56 2016 -0700
+++ b/components/help2man/Makefile	Wed Mar 30 13:33:31 2016 -0700
@@ -18,48 +18,31 @@
 #
 # CDDL HEADER END
 #
+
+#
 # Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
+BUILD_BITS= 64
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		help2man
 COMPONENT_VERSION=	1.47.3
-COMPONENT_PROJECT_URL=	http://www.gnu.org/software/help2man/
-COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.xz
 COMPONENT_ARCHIVE_HASH=	\
     sha256:c232af6475ef65bee02770862a362f4c4c2e6c9967d39e987eb94cadcfc13856
 COMPONENT_ARCHIVE_URL=	http://mirror.team-cymru.org/gnu/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
-COMPONENT_BUGDB=	utility/help2man
 
 TPNO=			27415
 
-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)/gnu-component.mk
 
 CONFIGURE_ENV +=	PERL=$(PERL.5.22)
 
 # Needed to successfully create the message files.
 COMPONENT_PRE_CONFIGURE_ACTION += ($(CLONEY) $(SOURCE_DIR) $(@D));
 
-CC += $(CC_BITS)
-
-CONFIGURE_OPTIONS += --bindir=$(USRBINDIR)
-
 # Needed to get all the localized files.
-COMPONENT_INSTALL_TARGETS = install install_l10n
-
-ASLR_MODE = $(ASLR_ENABLE)
-
-configure:	$(CONFIGURE_64)
-
-build:		$(BUILD_64)
-
-install:	$(INSTALL_64)
-
-test:		$(NO_TESTS)
-
-system-test:    $(NO_TESTS)
+COMPONENT_INSTALL_TARGETS += install_l10n
 
 REQUIRED_PACKAGES += runtime/perl-522