--- a/open-src/common/Makefile.inc Thu Mar 06 15:45:05 2008 -0800
+++ b/open-src/common/Makefile.inc Fri Mar 07 15:38:30 2008 -0800
@@ -28,7 +28,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile.inc 1.85 08/02/28
+# @(#)Makefile.inc 1.86 08/03/06
#
# Borrowed from Solaris OS/Net makefile.master:
@@ -230,9 +230,9 @@
FIX_PC_OPS= \
-e 's|-L\$${libdir}|-L\$${libdir} -R\$${libdir}|;' \
- -e 's|(Requires: .*)\bx11\b|$$1|;' \
-e 's|Requires.private: .*$$||;'
+# -e 's|(Requires: .*)\bx11\b|$$1|;' \
# -e 's|^prefix=@prefix@|prefix=\$$\{top_builddir\}@prefix@|'
source_gen::
--- a/open-src/lib/Makefile Thu Mar 06 15:45:05 2008 -0800
+++ b/open-src/lib/Makefile Fri Mar 07 15:38:30 2008 -0800
@@ -28,10 +28,22 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.14 08/02/27
+# @(#)Makefile 1.16 08/03/06
#
###############################################################################
+# Order copied from X.Org's util/modular/build.sh:
+# the libraries have a dependency order:
+# xtrans, Xau, Xdmcp before anything else
+# fontenc before Xfont
+# ICE before SM
+# X11 before Xext
+# (X11 and SM) before Xt
+# Xt before Xmu and Xpm and Xtst
+# Xext before any other extension library
+# Xfixes before Xcomposite
+# Xp before XprintUtil before XprintAppUtil
+
OS_SUBDIRS_common = \
freetype \
fontconfig \
@@ -39,9 +51,10 @@
libXau \
libXdmcp \
libX11 \
+ libfontenc \
libICE \
libSM \
- libfontenc \
+ libXt \
libXmu \
libXpm \
libXaw \
--- a/open-src/lib/libXmu/Makefile Thu Mar 06 15:45:05 2008 -0800
+++ b/open-src/lib/libXmu/Makefile Fri Mar 07 15:38:30 2008 -0800
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.3 08/01/23
+# @(#)Makefile 1.4 08/03/06
#
# Package name used in tarballs
@@ -65,10 +65,10 @@
# Work around libtool brokenness that adds -R `pwd` to libXmu build
LIB_ADD_BUILD_DEPS=delibtoolize
-include ../Makefile.inc
+# Regenerate Makefile.in's from Makefile.am's after patching them
+AUTORECONF=true
-# Regenerate Makefile.in's from Makefile.am's after patching them
-$(SOURCE_DIR)/Makefile: $(UNPACK_TARGET) autoreconf
+include ../Makefile.inc
# Add-in Sun-added source files
source_gen::
--- a/open-src/lib/libXmu/solaris-abi.patch Thu Mar 06 15:45:05 2008 -0800
+++ b/open-src/lib/libXmu/solaris-abi.patch Fri Mar 07 15:38:30 2008 -0800
@@ -44,7 +44,7 @@
-libXmuu_la_LIBADD = $(XMUU_LIBS)
+libXmu_la_DEPENDENCIES = libXmuu.so.1
+
-+libXmu_la_LIBADD = $(XMU_LIBS) libXmuu.so.1 -lc -lm
++libXmu_la_LIBADD = $(XMU_LIBS) libXmuu.so.1 -lX11 -lc -lm
+libXmuu_la_LIBADD = $(XMUU_LIBS) -lc
libXmuu_la_SOURCES = \
--- a/open-src/lib/libXt/6671721.patch Thu Mar 06 15:45:05 2008 -0800
+++ b/open-src/lib/libXt/6671721.patch Fri Mar 07 15:38:30 2008 -0800
@@ -10,39 +10,17 @@
#
# The util directory contains a program that builds some of the sources.
---- src/Makefile.in Tue Mar 4 16:36:48 2008
-+++ src/Makefile.in Wed Mar 5 12:44:55 2008
-@@ -284,7 +284,8 @@
-
- DISTCLEANFILES = StringDefs.c
- libXt_la_LIBADD = @XT_LIBS@
--libXt_la_LDFLAGS = -version-number 6:0:0 -no-undefined
-+libXt_la_LDFLAGS = -version-number 4:0:0 -no-undefined \
-+ -M $(top_srcdir)/../../mapfile-vers
-
- #
- # The util directory contains a program that builds some of the sources.
--- configure.ac Wed Mar 5 10:10:39 2008
+++ configure.ac Wed Mar 5 10:33:20 2008
-@@ -43,7 +43,7 @@
+@@ -43,8 +43,6 @@
AC_CHECK_HEADER([alloca.h], AC_DEFINE(INCLUDE_ALLOCA_H, 1, [Define to 1 if Xalloca.h should include <alloca.h>]))
# Map function checks to old Imake #defines
-AC_CHECK_FUNC(poll, AC_DEFINE(USE_POLL,1,
-+AC_CHECK_FUNC(poll, AC_DEFINE(USE_POLL,0,
- [Define to 1 if you have the `poll' function.]))
+- [Define to 1 if you have the `poll' function.]))
AC_CHECK_FUNC(snprintf, AC_DEFINE(USE_SNPRINTF,1,
[Define to 1 if you have the `snprintf' function.]))
---- configure Wed Mar 5 10:26:41 2008
-+++ configure Wed Mar 5 10:39:20 2008
-@@ -20221,7 +20221,6 @@
- if test $ac_cv_func_poll = yes; then
- cat >>confdefs.h <<\_ACEOF
--#define USE_POLL 1
- _ACEOF
-
- fi
--- src/Create.c Tue Mar 4 16:36:48 2008
+++ src/Create.c Wed Mar 5 09:23:20 2008
@@ -398,8 +398,7 @@
--- a/open-src/lib/libXt/Makefile Thu Mar 06 15:45:05 2008 -0800
+++ b/open-src/lib/libXt/Makefile Fri Mar 07 15:38:30 2008 -0800
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.1 08/03/05
+# @(#)Makefile 1.3 08/03/07
#
# Package name used in tarballs
@@ -40,7 +40,10 @@
LIB_VERS=1.0.5
# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = 6671721.patch
+SOURCE_PATCHES = 6671721.patch abistrings.patch
+
+# Regenerate configure script & Makefile.in's after applying patches
+AUTORECONF=true
# Library name (used for specfiles/mapfiles)
LIBNAME=Xt
@@ -57,4 +60,6 @@
# pkg-config files that need to have -R added
FIX_PC_FILES=xt.pc.in
+LIB_ADD_CONFIG_OPTS= --with-appdefaultdir=$(X11_DIR)/lib/X11/app-defaults
+
include ../Makefile.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/libXt/abistrings.patch Fri Mar 07 15:38:30 2008 -0800
@@ -0,0 +1,43 @@
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Use subject to license terms.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+# @(#)abistrings.patch 1.1 08/03/07
+#
+
+diff -urp -x '*~' -x '*.orig' configure.ac configure.ac
+--- configure.ac 2008-03-07 14:36:14.083670000 -0800
++++ configure.ac 2008-03-07 14:36:17.636942000 -0800
+@@ -80,7 +80,7 @@ AC_DEFINE_DIR([appdefaultdir], [appdefau
+ case $host_os in
+ solaris*)
+ case $host_cpu in
+- sparc*) STRINGSABIOPTIONS="-sparcabi -solarisabinames" ;;
++ # Solaris really uses -intelabi on SPARC too
+ *) STRINGSABIOPTIONS="-intelabi -solarisabinames" ;;
+ esac
+ ;;
--- a/packages/SUNWxwslb/prototype_sparc Thu Mar 06 15:45:05 2008 -0800
+++ b/packages/SUNWxwslb/prototype_sparc Fri Mar 07 15:38:30 2008 -0800
@@ -30,7 +30,7 @@
###########################################################################
#
-# @(#)prototype_sparc 1.9 08/02/27 SMI
+# @(#)prototype_sparc 1.10 08/03/07 SMI
#
# X Window System 64-bit lint libraries
@@ -41,4 +41,3 @@
d none openwin/lib/sparcv9 0755 root bin
f none openwin/lib/sparcv9/llib-lXaw.ln 0755 root bin
f none openwin/lib/sparcv9/llib-lXext.ln 0755 root bin
-f none openwin/lib/sparcv9/llib-lXt.ln 0755 root bin