--- a/open-src/lib/libXtsol/Makefile	Wed Sep 24 10:01:00 2014 -0700
+++ b/open-src/lib/libXtsol/Makefile	Tue Sep 23 20:14:15 2014 -0700
@@ -38,14 +38,14 @@
 
 # Dates to show in Oracle copyright notice in pkg license file
 # Earliest & latest of the copyrights in the Oracle files in this pkg
-ORACLE_COPYRIGHT_YEARS = 2004, 2007
+ORACLE_COPYRIGHT_YEARS = 2004, 2014
 
 # No upstream sources, only local sources
 MODULE_VERSION=src
 SOURCE_TARBALL_NAME=NONE
 SOURCE_TARBALL_NAME_SET=yes
-ADDITIONAL_SOURCE_DIR=sun-src
-MODULE_ADD_SOURCE_TARGETS=source_auditwrite
+SOURCE_TARGETS =
+SOURCE_TARGETS_SET=yes
 
 # Library name (used for specfiles/mapfiles)
 LIBNAME=Xtsol
@@ -68,8 +68,8 @@
 CONFIGURE_TARGETS_SET=yes
 
 # Since we don't have a configure script, pass configure flags to make
-# and pass path to $(SOURCE_DIR) for makefiles & source files
-REL_SOURCE_DIR = ../$(SOURCE_DIR)
+# and pass path to $(REL_SOURCE_DIR) for makefiles & source files
+REL_SOURCE_DIR = ../sun-src
 MODULE_MAKEFLAGS  = VPATH=$(REL_SOURCE_DIR) -f $(REL_SOURCE_DIR)/Makefile
 MODULE_BUILD_ENV  = $(CONFIG_ENV) PREFIX=$(MODULE_PREFIX)
 
@@ -77,10 +77,3 @@
 MODULE_X11_LIBCOMPAT_LINKS = libXtsol.so libXtsol.so.1
 
 include ../Makefile.inc
-
-source_auditwrite: $(SOURCE_DIR)/auditwrite.c $(SOURCE_DIR)/auditwrite.h
-
-$(SOURCE_DIR)/auditwrite.c + $(SOURCE_DIR)/auditwrite.h:
-	mkdir -p $(SOURCE_DIR)
-	(cd $(SOURCE_DIR) ; \
-	 ln -s ../../../xserver/xorg/sun-src/tsol/auditwrite.[ch] . )

--- a/open-src/lib/libXtsol/sun-src/Makefile	Wed Sep 24 10:01:00 2014 -0700
+++ b/open-src/lib/libXtsol/sun-src/Makefile	Tue Sep 23 20:14:15 2014 -0700
@@ -23,10 +23,10 @@
 HEADERSPublic = Xtsol.h Xtsolproto.h
 HEADERSPublic_dir = $(PREFIX)/include/X11/extensions
 
-SRCS = Xtsol.c auditwrite.c
+SRCS = Xtsol.c
 OBJS = $(SRCS:.c=.o)
 
-REQUIREDLIBS = -lX11 -lbsm -ltsol -lc
+REQUIREDLIBS = -lX11 -ltsol -lc
 
 XLIB_CFLAGS:sh = pkg-config --cflags x11
 

--- a/open-src/lib/libXtsol/sun-src/mapfile-vers	Wed Sep 24 10:01:00 2014 -0700
+++ b/open-src/lib/libXtsol/sun-src/mapfile-vers	Tue Sep 23 20:14:15 2014 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -18,6 +18,7 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
+
 SUNW_1.1 {
     global:
 	XTSOLgetResAttributes;
@@ -46,14 +47,3 @@
     local:
 	*;
 };
-
-SUNWprivate_1.1 {
-    global:
-	auditwrite;
-	aw_perror;
-	aw_perror_r;
-	aw_geterrno;
-	aw_strerror;
-	aw_errno;
-};
-