--- a/components/libsdl/Makefile	Wed Mar 30 10:16:56 2016 -0700
+++ b/components/libsdl/Makefile	Wed Mar 30 13:33:31 2016 -0700
@@ -18,15 +18,17 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+
 #
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+#
+# Prefer 32-bit as only "binary" delivered is a script with embedded paths.
+BUILD_BITS= 32_and_64
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME =	SDL
 COMPONENT_VERSION =	1.2.14
 COMPONENT_PROJECT_URL =	http://www.libsdl.org/
-COMPONENT_SRC =		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_ARCHIVE =	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH = \
     sha256:5d927e287034cb6bb0ebccfa382cb1d185cb113c8ab5115a0759798642eed9b6
 COMPONENT_ARCHIVE_URL = $(COMPONENT_PROJECT_URL)release/$(COMPONENT_ARCHIVE)
@@ -34,34 +36,24 @@
 
 TPNO = 7683
 
-include $(WS_MAKE_RULES)/prep.mk
-include $(WS_MAKE_RULES)/configure.mk
-include $(WS_MAKE_RULES)/ips.mk
+TEST_TARGET= $(SKIP_TEST)
+include $(WS_MAKE_RULES)/common.mk
 
 # libtool linking
 CC += $(CC_BITS)
 
 CONFIGURE_OPTIONS += --disable-pulseaudio
-CONFIGURE_OPTIONS += CC="$(CC)"
-CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
-
-configure:	$(CONFIGURE_32_and_64)
-
-build:		$(BUILD_32_and_64)
 
 # elfedit removes wrong RUNPATH/RPATH (see 22383984)
-install:	$(INSTALL_32_and_64)
-	/usr/bin/elfedit -e "dyn:delete RUNPATH" -e "dyn:delete RPATH" \
+COMPONENT_POST_INSTALL_ACTION.32= \
+	$(ELFEDIT) -e "dyn:delete RUNPATH" -e "dyn:delete RPATH" \
 	  $(PROTOUSRLIBDIR)/libSDL-1.2.so.0.*
-	/usr/bin/elfedit -e "dyn:delete RUNPATH" -e "dyn:delete RPATH" \
+
+COMPONENT_POST_INSTALL_ACTION.64= \
+	$(ELFEDIT) -e "dyn:delete RUNPATH" -e "dyn:delete RPATH" \
 	  $(PROTOUSRLIBDIR64)/libSDL-1.2.so.0.*
 
-test:		$(NO_TESTS)
-
-system-test:    $(NO_TESTS)
-
 REQUIRED_PACKAGES += shell/ksh93
-REQUIRED_PACKAGES += system/library
 REQUIRED_PACKAGES += system/library/math
 REQUIRED_PACKAGES += x11/library/libx11
 REQUIRED_PACKAGES += x11/library/libxext