diff -r f6336578f3e5 -r 7fe3e5b43e6a components/indri/Makefile
--- a/components/indri/Makefile	Thu Dec 17 23:00:14 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
-#
-
-COMPILER			 = gcc
-
-include ../../make-rules/shared-macros.mk
-
-COMPONENT_NAME		= indri
-COMPONENT_VERSION	= 5.4
-COMPONENT_PROJECT_URL	= http://lemurproject.org/indri.php
-COMPONENT_SRC		= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_ARCHIVE 	= $(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH	= \
-	sha256:b1d27f6da4cb15776cee0121c9511ed0e998d47564d785a2bb41a44c654e3e3f
-COMPONENT_ARCHIVE_URL	= http://sourceforge.net/projects/lemur/files/lemur/$(COMPONENT_SRC)/$(COMPONENT_SRC).tar.gz/download
-COMPONENT_BUGDB		= library/libindri
-
-TPNO=			13668
-
-include $(WS_MAKE_RULES)/prep.mk
-include $(WS_MAKE_RULES)/configure.mk
-include $(WS_MAKE_RULES)/ips.mk
-
-COMPONENT_PRE_CONFIGURE_ACTION	 = $(CLONEY) $(SOURCE_DIR) $(@D)
-CONFIGURE_OPTIONS		+= "CFLAGS=$(CFLAGS)"
-CONFIGURE_OPTIONS		+= "CXXFLAGS=$(CXXFLAGS)"
-CONFIGURE_OPTIONS		+= "LDFLAGS=$(LDFLAGS)"
-COMPONENT_INSTALL_ARGS		 = "includedir=$(PROTOUSRINCDIR)"
-COMPONENT_INSTALL_ARGS		+= "datarootdir=$(PROTOUSRSHAREDIR)"
-
-$(BUILD_DIR_32)/.installed: COMPONENT_INSTALL_ARGS += "bindir=$(PROTOUSRBINDIR)"
-$(BUILD_DIR_32)/.installed: COMPONENT_INSTALL_ARGS += "libdir=$(PROTOUSRLIBDIR)"
-$(BUILD_DIR_64)/.installed: COMPONENT_INSTALL_ARGS += "bindir=$(PROTOUSRBINDIR64)"
-$(BUILD_DIR_64)/.installed: COMPONENT_INSTALL_ARGS += "libdir=$(PROTOUSRLIBDIR64)"
-# Because of 18041236
-$(BUILD_DIR_64)/.built:     LD_B_DIRECT =
-
-COMPONENT_POST_BUILD_ACTION = \
-	(cd $(@D) ; $(ENV) $(COMPONENT_BUILD_ENV) \
-		$(GMAKE) -f Makefile.app)
-
-GPATCH_FLAGS += -E # remove empty files
-
-ASLR_MODE = $(ASLR_ENABLE)
-
-# common targets
-configure:	$(CONFIGURE_32_and_64)
-
-build:          $(BUILD_32_and_64)
-
-install:        $(INSTALL_32_and_64)
-
-test:           $(NO_TESTS)
-
-system-test:    $(NO_TESTS)
-
-
-REQUIRED_PACKAGES += developer/lexer/flex
-REQUIRED_PACKAGES += developer/parser/bison
-REQUIRED_PACKAGES += library/zlib
-REQUIRED_PACKAGES += system/library
-REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime
-REQUIRED_PACKAGES += system/library/gcc/gcc-c++-runtime
-REQUIRED_PACKAGES += system/library/math