diff -r b8fe51f35344 -r 94c0ca64c022 components/ant/Makefile
--- a/components/ant/Makefile	Wed Mar 30 10:16:56 2016 -0700
+++ b/components/ant/Makefile	Wed Mar 30 13:33:31 2016 -0700
@@ -22,40 +22,37 @@
 #
 # Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
-
+BUILD_BITS= NO_ARCH
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		ant
 COMPONENT_VERSION=	1.9.6
 COMPONENT_PROJECT_URL=	http://ant.apache.org/
 COMPONENT_SRC_NAME=	apache-ant
-COMPONENT_SRC=		$(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC)-src.tar.bz2
 COMPONENT_ARCHIVE_HASH=	\
     sha256:2ad98dd3a4805452e546e0f5b682360370ae11692a2157fff8ec6d177c957123
 COMPONENT_ARCHIVE_URL=	http://archive.apache.org/dist/ant/source/$(COMPONENT_ARCHIVE)
-COMPONENT_BUGDB=	utility/ant
 
 TPNO=			25967
 
-include $(WS_MAKE_RULES)/prep.mk
-include $(WS_MAKE_RULES)/justmake.mk
-include $(WS_MAKE_RULES)/ips.mk
+BUILD_STYLE= justmake
+include $(WS_MAKE_RULES)/common.mk
 
 GMAKE=./build.sh
 
 ANT_ENV+=JAVA_HOME=$(JAVA_HOME)
 
 ANT_DIST_DIRS+=-Ddist.dir=$(PROTO_DIR)
-ANT_DIST_DIRS+=-Ddist.bin=$(PROTO_DIR)/usr/bin
-ANT_DIST_DIRS+=-Ddist.etc=$(PROTO_DIR)/usr/share/lib/ant
-ANT_DIST_DIRS+=-Ddist.docs=$(PROTO_DIR)/usr/share/doc/ant
-ANT_DIST_DIRS+=-Ddist.manual=$(PROTO_DIR)/usr/share/doc/ant/manual
-ANT_DIST_DIRS+=-Ddist.javadocs=$(PROTO_DIR)/usr/share/doc/ant/manual/api
-ANT_DIST_DIRS+=-Ddist.lib=$(PROTO_DIR)/usr/share/lib/ant
+ANT_DIST_DIRS+=-Ddist.bin=$(PROTOUSRBINDIR)
+ANT_DIST_DIRS+=-Ddist.etc=$(PROTOUSRSHARELIBDIR)/ant
+ANT_DIST_DIRS+=-Ddist.docs=$(PROTOUSRSHAREDOCDIR)/ant
+ANT_DIST_DIRS+=-Ddist.manual=$(PROTOUSRSHAREDOCDIR)/ant/manual
+ANT_DIST_DIRS+=-Ddist.javadocs=$(PROTOUSRSHAREDOCDIR)/ant/manual/api
+ANT_DIST_DIRS+=-Ddist.lib=$(PROTOUSRSHARELIBDIR)/ant
 
-OPTIONAL_LIBS+=/usr/share/lib/java/junit.jar
-OPTIONAL_LIBS+=/usr/share/antlr-2.7.7/antlr.jar
+OPTIONAL_LIBS+=$(USRSHARELIBDIR)/java/junit.jar
+OPTIONAL_LIBS+=$(USRSHAREDIR)/antlr-2.7.7/antlr.jar
 
 COMPONENT_PRE_BUILD_ACTION = $(CP) $(OPTIONAL_LIBS) $(@D)/lib/optional
 
@@ -80,17 +77,6 @@
 	'-e "/^Buildfile: /d" ' \
 	'-e "/^Total time: /d" '
 
-ASLR_MODE = $(ASLR_NOT_APPLICABLE)
-
-build:	$(BUILD_32)
-
-install: $(INSTALL_32)
-
-test:  $(TEST_32)
-
-system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
-
-
 REQUIRED_PACKAGES += developer/java/junit
 REQUIRED_PACKAGES += developer/parser/antlr-2
 REQUIRED_PACKAGES += runtime/perl-522