--- a/components/httping/Makefile	Wed Mar 30 10:16:56 2016 -0700
+++ b/components/httping/Makefile	Wed Mar 30 13:33:31 2016 -0700
@@ -18,50 +18,47 @@
 #
 # CDDL HEADER END
 #
-# 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
+COMPILER= gcc
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		httping
 COMPONENT_VERSION=	2.4
-COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_PROJECT_URL=	http://www.vanheusden.com/httping/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tgz
 COMPONENT_ARCHIVE_HASH=	\
     sha256:dab59f02b08bfbbc978c005bb16d2db6fe21e1fc841fde96af3d497ddfc82084
 COMPONENT_ARCHIVE_URL=	http://www.vanheusden.com/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
-COMPONENT_BUGDB=	utility/httping
 
 TPNO=			21552
 
-include $(WS_MAKE_RULES)/prep.mk
-include $(WS_MAKE_RULES)/justmake.mk
-include $(WS_MAKE_RULES)/ips.mk
-
-COMPILER =	gcc
-
-CC +=		$(CC_BITS)
+BUILD_STYLE= justmake
+TEST_TARGET= $(NO_TESTS)
+include $(WS_MAKE_RULES)/common.mk
 
 ifeq ($(OS_VERSION),5.11)
 EXTRA_LIBRARIES =	-lsocket -lnsl
 endif
-EXTRA_LIBRARIES +=	-lfftw3 -lssl -lcrypto -lresolv -lm
-COMPONENT_BUILD_ARGS +=	LDFLAGS="$(LDFLAGS) $(EXTRA_LIBRARIES)"
-COMPONENT_BUILD_ENV += CC="$(CC)"
+EXTRA_LIBRARIES +=	-lncurses -lfftw3 -lssl -lcrypto -lresolv -lm
 
-ASLR_MODE = $(ASLR_ENABLE)
+# The usual Solaris curses.h vs ncurses/curses.h mess.
+CFLAGS += -I$(USRINCDIR)/ncurses
 
-build:		$(BUILD_64)
-
-install:	$(INSTALL_64)
+# Make 64-bit linking work.
+LDFLAGS += $(CC_BITS)
 
-test:		$(NO_TESTS)
-
-system-test:    $(NO_TESTS)
-
+# force enable ncurses support
+COMPONENT_BUILD_ARGS += NC=yes
+COMPONENT_BUILD_ARGS += CC="$(CC)"
+COMPONENT_BUILD_ARGS += OFLAGS="$(CFLAGS)"
+COMPONENT_BUILD_ARGS += LDFLAGS="$(LDFLAGS) $(EXTRA_LIBRARIES)"
 
 REQUIRED_PACKAGES += library/fftw-3
+REQUIRED_PACKAGES += library/ncurses
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += library/security/openssl/openssl-fips-140
-REQUIRED_PACKAGES += system/library
 REQUIRED_PACKAGES += system/library/math