--- a/open-src/app/accessx/sun-src/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/app/accessx/sun-src/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2010, 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"),
@@ -41,9 +41,8 @@
install: accessx
mkdir -p $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/share/man/man1
mkdir -p $(DESTDIR)$(PREFIX)/share/X11/locale/C/accessx
- $(INSTALL) accessx $(DESTDIR)$(PREFIX)/bin
- $(INSTALL) accessx.1 $(DESTDIR)$(PREFIX)/share/man/man1
- $(INSTALL) accessx.hlp $(DESTDIR)$(PREFIX)/share/X11/locale/C/accessx/
- $(INSTALL) accessx.uid $(DESTDIR)$(PREFIX)/share/X11/locale/C/accessx/
- $(INSTALL) accessx.uil $(DESTDIR)$(PREFIX)/share/X11/locale/C/accessx/
- $(INSTALL) accessxstrings.uil $(DESTDIR)$(PREFIX)/share/X11/locale/C/accessx/
+ $(INSTALL) -m 0555 accessx $(DESTDIR)$(PREFIX)/bin
+ $(INSTALL) -m 0444 accessx.1 $(DESTDIR)$(PREFIX)/share/man/man1
+ $(INSTALL) -m 0444 \
+ accessx.hlp accessx.uid accessx.uil accessxstrings.uil \
+ $(DESTDIR)$(PREFIX)/share/X11/locale/C/accessx/
--- a/open-src/app/cmap_alloc/sun-src/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/app/cmap_alloc/sun-src/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2010, 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"),
@@ -28,5 +28,5 @@
install: cmap_alloc
mkdir -p $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/share/man/man1
- $(INSTALL) cmap_alloc $(DESTDIR)$(PREFIX)/bin
- $(INSTALL) cmap_alloc.1 $(DESTDIR)$(PREFIX)/share/man/man1
+ $(INSTALL) -m 0555 cmap_alloc $(DESTDIR)$(PREFIX)/bin
+ $(INSTALL) -m 0444 cmap_alloc.1 $(DESTDIR)$(PREFIX)/share/man/man1
--- a/open-src/app/cmap_compact/sun-src/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/app/cmap_compact/sun-src/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2010, 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"),
@@ -37,5 +37,5 @@
install: cmap_compact
mkdir -p $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/share/man/man1
- $(INSTALL) cmap_compact $(DESTDIR)$(PREFIX)/bin
- $(INSTALL) cmap_compact.1 $(DESTDIR)$(PREFIX)/share/man/man1
+ $(INSTALL) -m 0555 cmap_compact $(DESTDIR)$(PREFIX)/bin
+ $(INSTALL) -m 0444 cmap_compact.1 $(DESTDIR)$(PREFIX)/share/man/man1
--- a/open-src/app/dispswitch/sun-src/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/app/dispswitch/sun-src/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2010, 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"),
@@ -36,6 +36,7 @@
mkdir -p $(DESTDIR)$(PREFIX)/bin \
$(DESTDIR)$(PREFIX)/share/man/man1 \
$(DESTDIR)/etc/xdg/autostart
- $(INSTALL) dispswitch $(DESTDIR)$(PREFIX)/bin
- $(INSTALL) dispswitch.man $(DESTDIR)$(PREFIX)/share/man/man1/dispswitch.1
- $(INSTALL) gnome-dispswitch.desktop $(DESTDIR)/etc/xdg/autostart
+ $(INSTALL) -m 0555 dispswitch $(DESTDIR)$(PREFIX)/bin
+ $(INSTALL) -m 0444 dispswitch.man \
+ $(DESTDIR)$(PREFIX)/share/man/man1/dispswitch.1
+ $(INSTALL) -m 0444 gnome-dispswitch.desktop $(DESTDIR)/etc/xdg/autostart
--- a/open-src/app/kbd_mode/sun-src/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/app/kbd_mode/sun-src/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2010, 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"),
@@ -28,5 +28,5 @@
install: kbd_mode
mkdir -p $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/share/man/man1
- $(INSTALL) kbd_mode $(DESTDIR)$(PREFIX)/bin
- $(INSTALL) kbd_mode.1 $(DESTDIR)$(PREFIX)/share/man/man1
+ $(INSTALL) -m 0555 kbd_mode $(DESTDIR)$(PREFIX)/bin
+ $(INSTALL) -m 0444 kbd_mode.1 $(DESTDIR)$(PREFIX)/share/man/man1
--- a/open-src/app/xfs/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/app/xfs/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -66,10 +66,10 @@
install_smf: check_smf
mkdir -p $(PROTODIR)$(SMF_MANIFEST_DIR)
- $(INSTALL_SCRIPT) xfs.xml $(PROTODIR)$(SMF_MANIFEST_DIR)
+ $(INSTALL_SCRIPT) -m 0444 xfs.xml $(PROTODIR)$(SMF_MANIFEST_DIR)
install_fsadmin:
mkdir -p $(PROTODIR)$(X11_DIR)/sbin \
$(PROTODIR)$(X11_MAN_DIR)/man1
- $(INSTALL_SCRIPT) -m 0755 fsadmin $(PROTODIR)$(X11_DIR)/sbin
- $(INSTALL_SCRIPT) fsadmin.1 $(PROTODIR)$(X11_MAN_DIR)/man1
+ $(INSTALL_SCRIPT) -m 0755 fsadmin $(PROTODIR)$(X11_DIR)/sbin/fsadmin
+ $(INSTALL_SCRIPT) -m 0444 fsadmin.1 $(PROTODIR)$(X11_MAN_DIR)/man1/
--- a/open-src/app/xlock/sun-src/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/app/xlock/sun-src/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -1,8 +1,8 @@
###############################################################################
#
-# xlock 1.x Makefile
+# xlock Makefile
#
-# Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2010, 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"),
@@ -39,6 +39,6 @@
pyro.o:=DEFINES=-DSTARSIZE=2
install:
- $(INSTALL) -m 4755 xlock $(DESTDIR)$(bindir)/xlock
+ $(INSTALL) -m 0555 xlock $(DESTDIR)$(bindir)/xlock
$(INSTALL) -m 0444 xlock.1 $(DESTDIR)$(mandir)/man1/xlock.1
$(INSTALL) -m 0444 XLock.ad $(DESTDIR)$(datadir)/X11/app-defaults/XLock
--- a/open-src/app/xmakemap/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/app/xmakemap/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -52,8 +52,8 @@
install_xmakemap: $(SOURCE_TARGETS) $(INSTALL_DEPS)
mkdir -p $(DESTDIR)$(X11_BIN_DIR) \
$(DESTDIR)$(X11_MAN_DIR)/man1
- $(INSTALL_SCRIPT) -m 0755 $(SOURCE_DIR)/xmakemap \
+ $(INSTALL_SCRIPT) -m 0555 $(SOURCE_DIR)/xmakemap \
$(DESTDIR)$(X11_BIN_DIR)
- $(INSTALL_SCRIPT) $(SOURCE_DIR)/xmakemap.man \
+ $(INSTALL_SCRIPT) -m 0444 $(SOURCE_DIR)/xmakemap.man \
$(DESTDIR)$(X11_MAN_DIR)/man1/xmakemap.1
--- a/open-src/app/xrx/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/app/xrx/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -48,6 +48,8 @@
# of trying to keep up with the many incompatible changes from Firefox
MODULE_CONFIG_OPTS = PLUGIN_CFLAGS='-I$$(top_srcdir)/plugin/include'
# Disable build of useless lib*.a files for browser plugin loadable modules
-MODULE_CONFIG_OPTS += --disable-static
+MODULE_CONFIG_OPTS += --enable-shared=yes --enable-static=no
+# Install directly to firefox plugin directory
+MODULE_CONFIG_OPTS += --libdir='/usr/lib/firefox/plugins'
include ../Makefile.inc
--- a/open-src/common/Makefile.inc Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/common/Makefile.inc Fri Jun 18 08:41:15 2010 -0700
@@ -167,6 +167,9 @@
$(MAKE) $(MAKEFLAGS) BUILD_TYPE="$(@:install_%=%)" \
$(BUILD_$(@:install_%=%)_FLAGS) install-gen
+$(PROTODIR)$(MODULE_DOC_DIR):
+ mkdir -p $@
+
DEBUG_BUILD_FLAGS = BUILD_DEBUG=yes
# Allow adding "debug-" prefix to rules like build_32, install, etc.
@@ -280,6 +283,9 @@
### Unpack source and apply patches
+SOURCE_DEPS = $(SOURCE_TARBALL) $(CHECKSUM_TARGET) \
+ $(MODTYPE_SOURCE_DEPS) $(MODULE_SOURCE_DEPS)
+
# Step 1: Initialize source dir with upstream sources
# - if there's a tarball, unpack it.
# - if using a git master, copy it.
@@ -287,7 +293,7 @@
SOURCE_INIT_TARGET=$(SOURCE_DIR)/$(SOURCE_INIT_TARGET_FILE)
init_source: $(SOURCE_INIT_TARGET)
-$(SOURCE_INIT_TARGET):
+$(SOURCE_INIT_TARGET): $(SOURCE_DEPS)
mkdir -p $(BUILD_DIR)
@ if [[ "$(SOURCE_TARBALL_NAME)" == "NONE" ]] ; then \
$(START_CMD_ECHO); mkdir -p $(SOURCE_DIR) ; \
@@ -386,8 +392,6 @@
$(PERL) -i.orig -p $(FIX_PC_OPS) $(@:.orig=)
# Tie them all together
-SOURCE_DEPS = $(SOURCE_TARBALL) $(MODTYPE_SOURCE_DEPS) $(MODULE_SOURCE_DEPS)
-
UNPACK_TARGETS = $(SOURCE_INIT_TARGET) $(PATCHED_TARGET) \
$(SOURCE_ADD_TARGET) $(FIXED_MAN_TARGET) $(FIXED_PC_TARGET)
@@ -404,6 +408,7 @@
# due to: 6785384 SUNWgnu-gettext does not include autoconf m4 files
ACLOCAL_PATH=/usr/bin/aclocal-1.10
ACLOCAL_INCLUDES = -I $(PROTODIR)$(X11_ACLOCAL_DIR) \
+ -I $(TOOLS_ACLOCAL_DIR) \
-I /usr/share/aclocal -I /usr/share/aclocal-1.10 \
-I /opt/jdsbld/share/aclocal
AUTOMAKE_PATH=/usr/bin/automake-1.10
@@ -666,12 +671,3 @@
rm -f $@ ; \
cp -pf $${LICENSE_TO_COPY} $@ ; \
fi
-
-# For use in debugging or calling from scripts like the code review helper
-# Use such as: make print_make_vars VARS="MODTYPE MODULE_NAME"
-# or: make print_make_var BUILD_TYPE=32 VARS=SOURCE_DIR
-print_make_var-%:
- @print -n ' $(@:print_make_var-%=%)="$($(@:print_make_var-%=%))"'
-
-print_make_vars: $(VARS:%=print_make_var-%)
- @print '\n'
--- a/open-src/common/Makefile.init Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/common/Makefile.init Fri Jun 18 08:41:15 2010 -0700
@@ -225,6 +225,7 @@
X11_X11LIB_DIR=$(X11_LIB_DIR)/X11
SHARE_FONT_DIR=/usr/share/fonts
X11_FONT_DIR=$(SHARE_FONT_DIR)/X11
+X11_FONT_CATALOGUE=/etc/X11/fontpath.d
TRUETYPE_FONT_DIR=$(SHARE_FONT_DIR)/TrueType
X11_DOC_DIR=/usr/share/doc/X11
X11_LOCALE_DIR=$(X11_DIR)/share/locale
@@ -254,7 +255,8 @@
# Directory used for installing tools used during build but not
# delivered in packages
-TOOLS_DIR=/tools
+TOOLS_DIR=$(PROTODIR)/tools
+TOOLS_ACLOCAL_DIR=$(TOOLS_DIR)/share/aclocal
# Directory that license files are copied to for use in building package
# license files
@@ -272,7 +274,7 @@
LNDIR=$(PROTODIR)$(X11_BIN_DIR)/lndir
# Tools needed to build docbook documentation
-DOCBOOKUTIL_BINDIR=$(PROTODIR)$(TOOLS_DIR)/bin
+DOCBOOKUTIL_BINDIR=$(TOOLS_DIR)/bin
DOCBOOK2HTML=$(DOCBOOKUTIL_BINDIR)/docbook2html
DOCBOOK2TXT=$(DOCBOOKUTIL_BINDIR)/docbook2txt
XORG_DEFS_ENT=$(PROTODIR)/$(X11_DIR)/share/sgml/X11/defs.ent
@@ -307,3 +309,14 @@
# Target created when sources are unpacked
UNPACK_FILE = .unpack_done
UNPACK_TARGET = $(SOURCE_DIR)/$(UNPACK_FILE)
+
+### Misc rules
+
+# For use in debugging or calling from scripts like the code review helper
+# Use such as: make print_make_vars VARS="MODTYPE MODULE_NAME"
+# or: make print_make_vars BUILD_TYPE=32 VARS=SOURCE_DIR
+print_make_var-%:
+ @print -n ' $(@:print_make_var-%=%)="$($(@:print_make_var-%=%))"'
+
+print_make_vars: $(VARS:%=print_make_var-%)
+ @print '\n'
--- a/open-src/doc/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/doc/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -1,6 +1,6 @@
# Makefile for X Consolidation Open Source Documentation tools & modules
#
-# Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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"),
@@ -44,7 +44,7 @@
TOP=$(PWD)/..
### Include common definitions
-DIRNAME="docs/"
+DIRNAME="doc/"
include $(TOP)/common/Makefile.subdirs
--- a/open-src/doc/Makefile.inc Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/doc/Makefile.inc Fri Jun 18 08:41:15 2010 -0700
@@ -1,6 +1,6 @@
# -*- Makefile -*- rules common to most X.Org doc modules
#
-# Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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"),
@@ -43,7 +43,7 @@
MODTYPE_LD_OPTIONS=
DOCTOOLS_PATH = \
- PATH="$(PROTODIR)$(X11_DIR)/bin:$(PROTODIR)$(TOOLS_DIR)/bin:$$PATH"
+ PATH="$(PROTODIR)$(X11_DIR)/bin:$(DOCBOOKUTIL_BINDIR):$$PATH"
# Additional environment variable options to GNU autoconf configure script
MODTYPE_CONFIG_ENV = $(DOCTOOLS_PATH)
--- a/open-src/doc/docbook-utils/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/doc/docbook-utils/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -49,7 +49,7 @@
AUTORECONF=yes
# Only used during build, so install in tools directory in proto area
-MODULE_PREFIX=$(PROTODIR)$(TOOLS_DIR)
+MODULE_PREFIX=$(TOOLS_DIR)
MODULE_PREFIX_SET=yes
MODULE_MAKEFLAGS= DESTDIR=""
--- a/open-src/doc/xorg-docs/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/doc/xorg-docs/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -43,7 +43,7 @@
MODULE_MAKEFLAGS= MAKEFLAGS="-i"
# Additional arguments to configure script
-MODULE_CONFIG_OPTS=--enable-txt --disable-pdf --disable-ps --disable-html \
+MODULE_CONFIG_OPTS=--enable-txt --disable-pdf --disable-ps --enable-html \
--docdir='$(X11_DOC_DIR)' --with-x11docdir='$(X11_DOC_DIR)' \
XORG_SGML_PATH=$(PROTODIR)$(X11_DIR)/share/sgml
@@ -58,6 +58,11 @@
MAN_DIR=$(PROTODIR)$(X11_MAN_DIR)
-install_docs:
+install_docs: $(MAN_DIR)/man5/X11.5 $(MAN_DIR)/man5/XStandards.5
+
+$(MAN_DIR)/man5/XStandards.5: default_install
+ mv $(MAN_DIR)/man5/Standards.5 $@
+
+$(MAN_DIR)/man5/X11.5:
mkdir -p $(MAN_DIR)/man5
- cp -pf X11.5 $(MAN_DIR)/man5/X11.5
+ $(INSTALL_SCRIPT) -m 0444 X11.5 $@
--- a/open-src/driver/Makefile.inc Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/driver/Makefile.inc Fri Jun 18 08:41:15 2010 -0700
@@ -37,10 +37,11 @@
DRIVER_NAME=$(MODULE_NAME:xf86-$(DRIVER_CLASS)-%=%)
# Build 64-bit on SPARC, 32-bit & 64-bit on x86, to match Xorg server builds
-BUILD_TYPES_SET=yes
-BUILD_TYPES_sparc=64
-BUILD_TYPES_i386=32 64
-BUILD_TYPES=$(BUILD_TYPES_$(MACH))
+BUILD_TYPES_DEFAULT = $(BUILD_TYPES_SET:yes=$(POUND_SIGN))
+$(BUILD_TYPES_DEFAULT) BUILD_TYPES_sparc=64
+$(BUILD_TYPES_DEFAULT) BUILD_TYPES_i386=32 64
+$(BUILD_TYPES_DEFAULT) BUILD_TYPES=$(BUILD_TYPES_$(MACH))
+$(BUILD_TYPES_DEFAULT) BUILD_TYPES_SET=yes
# Additional command line options to GNU autoconf configure script
MODTYPE_CONFIG_OPTS = \
@@ -98,3 +99,10 @@
### Include common rules
include $(TOP)/common/Makefile.inc
+
+# Clean up old 64-bit builds from before we stopped building them
+# for some drivers
+clean: clean_old64
+
+clean_old64:
+ -rm -rf $(BUILD_DIR_64)
--- a/open-src/driver/xf86-input-synaptics/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/driver/xf86-input-synaptics/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -63,4 +63,5 @@
install_fdi: $(SOURCE_TARGETS)
mkdir -p $(FDI_DIR)
- $(INSTALL_SCRIPT) $(SOURCE_DIR)/fdi/11-x11-synaptics.fdi $(FDI_DIR)/
+ $(INSTALL_SCRIPT) -m 0444 $(SOURCE_DIR)/fdi/11-x11-synaptics.fdi \
+ $(FDI_DIR)/
--- a/open-src/driver/xf86-input-vmmouse/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/driver/xf86-input-vmmouse/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -55,4 +55,16 @@
--with-hal-fdi-dir=/etc/hal/fdi/policy/10osvendor$(ARCHLIBSUBDIR) \
--bindir=$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR)
+# Additional install steps to run
+MODULE_ADD_INSTALL_TARGETS_64 = uninstall-hal-files
+MODULE_ADD_INSTALL_TARGETS = $(MODULE_ADD_INSTALL_TARGETS_$(BUILD_TYPE))
+
include ../Makefile.inc
+
+uninstall-hal-files: default_install
+ (cd $(SOURCE_DIR)/tools ; \
+ $(BUILD_ENV) $(MODULE_MAKE) $(MAKEFLAGS) $(DEFAULT_INSTALL_MAKEFLAGS) \
+ uninstall)
+ (cd $(SOURCE_DIR)/fdi ; \
+ $(BUILD_ENV) $(MODULE_MAKE) $(MAKEFLAGS) $(DEFAULT_INSTALL_MAKEFLAGS) \
+ uninstall)
--- a/open-src/driver/xf86-video-apm/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/driver/xf86-video-apm/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -38,6 +38,10 @@
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
+# Only build 32-bit since hardware is too old to be found in 64-bit systems
+BUILD_TYPES=32
+BUILD_TYPES_SET=yes
+
# Man pages to apply Sun footer to & attributes to list
SUNTOUCHED_MANPAGES=man/*.man
SUN_PACKAGE=SUNWxorg-graphics-ddx
--- a/open-src/driver/xf86-video-ark/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/driver/xf86-video-ark/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -38,6 +38,10 @@
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
+# Only build 32-bit since hardware is too old to be found in 64-bit systems
+BUILD_TYPES=32
+BUILD_TYPES_SET=yes
+
# Man pages to apply Sun footer to & attributes to list
#SUNTOUCHED_MANPAGES=man/*.man
SUN_PACKAGE=SUNWxorg-graphics-ddx
--- a/open-src/driver/xf86-video-chips/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/driver/xf86-video-chips/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -38,6 +38,10 @@
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES = xf86UDelay.patch,-p1
+# Only build 32-bit since hardware is too old to be found in 64-bit systems
+BUILD_TYPES=32
+BUILD_TYPES_SET=yes
+
# Man pages to apply Sun footer to & attributes to list
SUNTOUCHED_MANPAGES=man/*.man
SUN_PACKAGE=SUNWxorg-graphics-ddx
--- a/open-src/driver/xf86-video-glint/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/driver/xf86-video-glint/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -38,6 +38,10 @@
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
+# Only build 32-bit since hardware is too old to be found in 64-bit systems
+BUILD_TYPES=32
+BUILD_TYPES_SET=yes
+
# Man pages to apply Sun footer to & attributes to list
SUNTOUCHED_MANPAGES=man/*.man
SUN_PACKAGE=SUNWxorg-graphics-ddx
--- a/open-src/driver/xf86-video-i128/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/driver/xf86-video-i128/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -38,6 +38,10 @@
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
+# Only build 32-bit since hardware is too old to be found in 64-bit systems
+BUILD_TYPES=32
+BUILD_TYPES_SET=yes
+
# Man pages to apply Sun footer to & attributes to list
SUNTOUCHED_MANPAGES=man/*.man
SUN_PACKAGE=SUNWxorg-graphics-ddx
--- a/open-src/driver/xf86-video-i740/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/driver/xf86-video-i740/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -38,6 +38,10 @@
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
+# Only build 32-bit since hardware is too old to be found in 64-bit systems
+BUILD_TYPES=32
+BUILD_TYPES_SET=yes
+
# Man pages to apply Sun footer to & attributes to list
SUNTOUCHED_MANPAGES=man/*.man
SUN_PACKAGE=SUNWxorg-graphics-ddx
--- a/open-src/driver/xf86-video-neomagic/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/driver/xf86-video-neomagic/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -38,6 +38,10 @@
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES = xf86UDelay.patch,-p1
+# Only build 32-bit since hardware is too old to be found in 64-bit systems
+BUILD_TYPES=32
+BUILD_TYPES_SET=yes
+
# Man pages to apply Sun footer to & attributes to list
SUNTOUCHED_MANPAGES=man/*.man
SUN_PACKAGE=SUNWxorg-graphics-ddx
--- a/open-src/driver/xf86-video-rendition/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/driver/xf86-video-rendition/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -38,6 +38,10 @@
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES = xf86UDelay.patch,-p1
+# Only build 32-bit since hardware is too old to be found in 64-bit systems
+BUILD_TYPES=32
+BUILD_TYPES_SET=yes
+
# Man pages to apply Sun footer to & attributes to list
SUNTOUCHED_MANPAGES=man/*.man
SUN_PACKAGE=SUNWxorg-graphics-ddx
--- a/open-src/driver/xf86-video-s3/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/driver/xf86-video-s3/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -38,6 +38,10 @@
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
+# Only build 32-bit since hardware is too old to be found in 64-bit systems
+BUILD_TYPES=32
+BUILD_TYPES_SET=yes
+
# Man pages to apply Sun footer to & attributes to list
SUNTOUCHED_MANPAGES=man/*.man
SUN_PACKAGE=SUNWxorg-graphics-ddx
--- a/open-src/driver/xf86-video-s3virge/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/driver/xf86-video-s3virge/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -38,6 +38,10 @@
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
+# Only build 32-bit since hardware is too old to be found in 64-bit systems
+BUILD_TYPES=32
+BUILD_TYPES_SET=yes
+
# Man pages to apply Sun footer to & attributes to list
SUNTOUCHED_MANPAGES=man/*.man
SUN_PACKAGE=SUNWxorg-graphics-ddx
--- a/open-src/driver/xf86-video-savage/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/driver/xf86-video-savage/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -38,6 +38,10 @@
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES = port.patch
+# Only build 32-bit since hardware is too old to be found in 64-bit systems
+BUILD_TYPES=32
+BUILD_TYPES_SET=yes
+
# Man pages to apply Sun footer to & attributes to list
SUNTOUCHED_MANPAGES=man/*.man
SUN_PACKAGE=SUNWxorg-graphics-ddx
--- a/open-src/driver/xf86-video-siliconmotion/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/driver/xf86-video-siliconmotion/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -38,6 +38,10 @@
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
+# Only build 32-bit since hardware is too old to be found in 64-bit systems
+BUILD_TYPES=32
+BUILD_TYPES_SET=yes
+
# Man pages to apply Sun footer to & attributes to list
SUNTOUCHED_MANPAGES=man/*.man
SUN_PACKAGE=SUNWxorg-graphics-ddx
--- a/open-src/driver/xf86-video-sis/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/driver/xf86-video-sis/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -35,6 +35,10 @@
TARBALL_MD5 = f04baa307e49e9f0e5a5c3d2e89a5576
TARBALL_SHA1 = c7369196d504671b6fdc9e17c90c0f07aa8e0c24
+# Only build 32-bit since hardware is too old to be found in 64-bit systems
+BUILD_TYPES=32
+BUILD_TYPES_SET=yes
+
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES = port.patch
--- a/open-src/driver/xf86-video-tdfx/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/driver/xf86-video-tdfx/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -38,6 +38,10 @@
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
+# Only build 32-bit since hardware is too old to be found in 64-bit systems
+BUILD_TYPES=32
+BUILD_TYPES_SET=yes
+
# Man pages to apply Sun footer to & attributes to list
SUNTOUCHED_MANPAGES=man/*.man
SUN_PACKAGE=SUNWxorg-graphics-ddx
--- a/open-src/driver/xf86-video-tga/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/driver/xf86-video-tga/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -38,6 +38,10 @@
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
+# Only build 32-bit since hardware is too old to be found in 64-bit systems
+BUILD_TYPES=32
+BUILD_TYPES_SET=yes
+
# Man pages to apply Sun footer to & attributes to list
#SUNTOUCHED_MANPAGES=man/*.man
SUN_PACKAGE=SUNWxorg-graphics-ddx
--- a/open-src/driver/xf86-video-tseng/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/driver/xf86-video-tseng/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -38,6 +38,10 @@
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
+# Only build 32-bit since hardware is too old to be found in 64-bit systems
+BUILD_TYPES=32
+BUILD_TYPES_SET=yes
+
# Man pages to apply Sun footer to & attributes to list
SUNTOUCHED_MANPAGES=man/*.man
SUN_PACKAGE=SUNWxorg-graphics-ddx
--- a/open-src/font/Makefile.bdf Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/font/Makefile.bdf Fri Jun 18 08:41:15 2010 -0700
@@ -42,22 +42,28 @@
iso8859-16 jisx0201 koi8-r
# Encodings we split out into separate subdirs for packaging
-BDF_SUBDIR_ENCODINGS = \
+ALL_BDF_SUBDIR_ENCODINGS = \
iso8859-1 \
iso8859-2 \
iso8859-3 \
iso8859-4 \
- iso8859-5 \
- iso8859-7 \
- iso8859-8 \
iso8859-9 \
iso8859-10 \
- iso8859-11 \
iso8859-13 \
iso8859-14 \
iso8859-15 \
iso8859-16
+misc_BDF_SUBDIR_ENCODINGS = \
+ $(ALL_BDF_SUBDIR_ENCODINGS) \
+ iso8859-5 \
+ iso8859-7 \
+ iso8859-8 \
+ iso8859-11
+100dpi_BDF_SUBDIR_ENCODINGS = $(ALL_BDF_SUBDIR_ENCODINGS)
+75dpi_BDF_SUBDIR_ENCODINGS = $(ALL_BDF_SUBDIR_ENCODINGS)
+BDF_SUBDIR_ENCODINGS = $($(FONTSUBDIR)_BDF_SUBDIR_ENCODINGS)
+
BUILD_TYPES = core $(BDF_SUBDIR_ENCODINGS)
BUILD_TYPES_SET = yes
@@ -93,12 +99,44 @@
iso8859-16_ENCODING_CONFIG_OPTS = \
$(DISABLE_ALL_ENCODINGS:--disable-iso8859-16=--enable-iso8859-16)
-ENCODED_FONTDIR=$(X11_FONT_DIR)/$(FONTSUBDIR)-$(BUILD_TYPE:iso%=ISO%)
-MODULE_FONTDIR=$(ENCODED_FONTDIR:%-core=%)
+
+ENCODED_FONTSUBDIR = $(FONTSUBDIR)-$(BUILD_TYPE:iso%=ISO%)
+BDF_SUBDIR = $(ENCODED_FONTSUBDIR:%-core=%)
+MODULE_FONTDIR = $(X11_FONT_DIR)/$(BDF_SUBDIR)
MODULE_CONFIG_OPTS = $($(BUILD_TYPE)_ENCODING_CONFIG_OPTS) \
--with-fontdir="$(MODULE_FONTDIR)"
+# Font path entries
+iso8859-1_PRIORITY = 0
+iso8859-2_PRIORITY = 1
+iso8859-3_PRIORITY = 1
+iso8859-4_PRIORITY = 1
+iso8859-5_PRIORITY = 1
+iso8859-6_PRIORITY = 1
+iso8859-7_PRIORITY = 1
+iso8859-8_PRIORITY = 1
+iso8859-9_PRIORITY = 1
+iso8859-10_PRIORITY = 1
+iso8859-11_PRIORITY = 1
+iso8859-12_PRIORITY = 1
+iso8859-13_PRIORITY = 1
+iso8859-14_PRIORITY = 1
+iso8859-15_PRIORITY = 1
+iso8859-16_PRIORITY = 1
+core_PRIORITY = 2
+
+misc_PRIORITY = 15
+100dpi_PRIORITY = 20
+75dpi_PRIORITY = 25
+
+unscaled_PRIORITY = 0 + $($(BUILD_TYPE)_PRIORITY) + $($(FONTSUBDIR)_PRIORITY)
+scaled_PRIORITY = 70 + $(unscaled_PRIORITY)
+
+# Use of $(( )) causes ksh93 to evaluate the arithmetic expression
+FONTPATH_LINKS = $(BDF_SUBDIR):unscaled:pri=$$(( $(unscaled_PRIORITY) ))
+FONTPATH_LINKS += $(BDF_SUBDIR):pri=$$(( $(scaled_PRIORITY) ))
+
core_INSTALL_CORE_FONTS=yes
# All other build types are left unset for "no"
MODTYPE_MAKEFLAGS_DEFAULT=$($(BUILD_TYPE)_INSTALL_CORE_FONTS:yes=$(POUND_SIGN))
--- a/open-src/font/Makefile.inc Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/font/Makefile.inc Fri Jun 18 08:41:15 2010 -0700
@@ -1,6 +1,6 @@
# -*- Makefile -*- rules common to most X.Org font modules
#
-# Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2010, 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"),
@@ -41,6 +41,7 @@
# Set default installation path for fonts
MODTYPE_CONFIG_OPTS = --with-fontrootdir="$(X11_FONT_DIR)"
+MODTYPE_CONFIG_OPTS += $(MODULE_FONTDIR:%=--with-fontdir="%")
# Disable compression of pcf fonts
MODTYPE_CONFIG_OPTS += --without-compression
@@ -62,6 +63,23 @@
MODTYPE_BUILD_ENV = PATH="$(FONT_UTILS_PATH):$$PATH" \
LD_LIBRARY_PATH="$(FONT_LIBS_PATH)"
+# Need to install links in fontpath.d directory
+MODTYPE_ADD_INSTALL_TARGETS = install_fontpath_links
+
### Include common rulesets
include $(TOP)/common/Makefile.inc
+# Can't use Makefile substitutions or dependencies on the links themselves
+# due to the : characters & shell math expansion in the link names
+# Ignores errors since /usr/bin/ln -sf can fail due to race conditions
+# when parallel makes try making the same symlink at the same time
+install_fontpath_links: $(PROTODIR)$(X11_FONT_CATALOGUE)
+ @for l in $(FONTPATH_LINKS) ; do \
+ if [[ ! -L $(PROTODIR)$(X11_FONT_CATALOGUE)/$$l ]] ; then \
+ ( $(START_CMD_ECHO) ; ln -sf ../../..$(MODULE_FONTDIR) \
+ $(PROTODIR)$(X11_FONT_CATALOGUE)/$$l || true ); \
+ fi \
+ done
+
+$(PROTODIR)$(X11_FONT_CATALOGUE):
+ mkdir -p $@
--- a/open-src/font/Makefile.ttf Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/font/Makefile.ttf Fri Jun 18 08:41:15 2010 -0700
@@ -23,6 +23,14 @@
#
#
+### Include common definitions
+PWD:sh=pwd
+TOP=$(PWD)/../..
+
+MODTYPE=font
+
+include $(TOP)/common/Makefile.init
+
# No configure script to run
CONFIGURE_TARGETS=
CONFIGURE_TARGETS_SET=yes
@@ -32,20 +40,23 @@
BUILD_TARGETS_SET=yes
# What to install
-INSTALL_TARGETS=install_ttf $(MODULE_ADD_INSTALL_TARGETS)
+INSTALL_TARGETS=install_ttf $(MODULE_ADD_INSTALL_TARGETS) $(MODTYPE_ADD_INSTALL_TARGETS)
INSTALL_TARGETS_SET=yes
+# Set default directory name if not set in module makefile
+TTF_SUBDIR_DEFAULT = $(TTF_SUBDIR_SET:yes=$(POUND_SIGN))
+$(TTF_SUBDIR_DEFAULT) TTF_SUBDIR=$(MODULE_TTF)
+
+MODULE_FONTDIR_DEFAULT = $(MODULE_FONTDIR_SET:yes=$(POUND_SIGN))
+$(MODULE_FONTDIR_DEFAULT) MODULE_FONTDIR=$(TRUETYPE_FONT_DIR)/$(TTF_SUBDIR)
+
+FONTPATH_LINKS_DEFAULT = $(FONTPATH_LINKS_SET:yes=$(POUND_SIGN))
+$(FONTPATH_LINKS_DEFAULT) FONTPATH_LINKS=$(TTF_SUBDIR):pri=42
+
### Include common rulesets
include ../Makefile.inc
-# Set default directory name if not set in module makefile
-TTF_SUBDIR_DEFAULT = $(TTF_SUBDIR_SET:yes=$(POUND_SIGN))
-$(TTF_SUBDIR_DEFAULT) TTF_SUBDIR=$(MODULE_NAME)
-
-TTF_FONT_DIR_DEFAULT = $(TTF_FONT_DIR_SET:yes=$(POUND_SIGN))
-$(TTF_FONT_DIR_DEFAULT) TTF_FONT_DIR=$(TRUETYPE_FONT_DIR)/$(TTF_SUBDIR)
-
-FONT_DEST_DIR=$(PROTODIR)/$(TTF_FONT_DIR)
+FONT_DEST_DIR=$(PROTODIR)/$(MODULE_FONTDIR)
SOURCE_FONT_FILES=$(TTF_FONT_FILES:%=$(SOURCE_DIR)/%)
@@ -67,6 +78,5 @@
install_ttf: $(BUILD_TARGETS)
-rm -rf $(FONT_DEST_DIR)
mkdir -p $(FONT_DEST_DIR)
- cp -pf $(SOURCE_FONT_FILES) $(FONT_DEST_DIR)
- cp -pf $(SOURCE_FONT_DATA) $(FONT_DEST_DIR)
-
+ $(INSTALL_SCRIPT) -c -m 0444 $(SOURCE_FONT_FILES) $(SOURCE_FONT_DATA) \
+ $(FONT_DEST_DIR)
--- a/open-src/font/bh-ttf/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/font/bh-ttf/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -34,7 +34,8 @@
TARBALL_SHA1 = 0e9ffbc738072ca832cdf5f82bff071c67b71825
# Directory to install to
-MODULE_CONFIG_OPTS=--with-fontdir=$(TRUETYPE_FONT_DIR)/bh-luxi
+MODULE_FONTDIR = $(TRUETYPE_FONT_DIR)/bh-luxi
+FONTPATH_LINKS = bh-luxi:pri=42
### Include common rulesets
include ../Makefile.inc
--- a/open-src/font/daewoo-misc/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/font/daewoo-misc/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -34,7 +34,8 @@
TARBALL_SHA1 = d169cec4e92fe1e99f3ff6766d4c6edcbb808860
# Install to separate directory for easier packaging
-MODULE_CONFIG_OPTS= --with-fontdir='$(X11_FONT_DIR)/daewoo'
+MODULE_FONTDIR = $(X11_FONT_DIR)/daewoo
+FONTPATH_LINKS = daewoo:unscaled:pri=30 daewoo:pri=75
### Include common rulesets
include ../Makefile.inc
--- a/open-src/font/encodings/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/font/encodings/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -37,7 +37,8 @@
SOURCE_PATCHES=
# Extra configure flags
-MODULE_CONFIG_OPTS=--disable-gzip-small-encodings
+MODULE_CONFIG_OPTS=--disable-gzip-small-encodings \
+ --disable-gzip-large-encodings
### Include common rulesets
include ../Makefile.inc
--- a/open-src/font/isas-misc/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/font/isas-misc/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -34,7 +34,8 @@
TARBALL_SHA1 = 13fe07a669dd93dfdb08717a03efe47936ab9cea
# Install to separate directory for easier packaging
-MODULE_CONFIG_OPTS= --with-fontdir='$(X11_FONT_DIR)/isas'
+MODULE_FONTDIR = $(X11_FONT_DIR)/isas
+FONTPATH_LINKS = isas:unscaled:pri=14 isas:pri=84
### Include common rulesets
include ../Makefile.inc
--- a/open-src/font/jis-misc/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/font/jis-misc/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -34,7 +34,8 @@
TARBALL_SHA1 = adb3275d19e71e9553aa8a5fdc3b2c647277d8d4
# Install to separate directory for easier packaging
-MODULE_CONFIG_OPTS= --with-fontdir='$(X11_FONT_DIR)/jiskan'
+MODULE_FONTDIR = $(X11_FONT_DIR)/jiskan
+FONTPATH_LINKS = jiskan:unscaled:pri=14 jiskan:pri=84
### Include common rulesets
include ../Makefile.inc
--- a/open-src/font/misc-ethiopic/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/font/misc-ethiopic/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -34,9 +34,11 @@
TARBALL_SHA1 = 2677191fd8b515c53bde6402513249fc0f48d53a
# Install to separate directory for easier packaging
+MODULE_FONTDIR = $(TRUETYPE_FONT_DIR)/ethiopic
MODULE_CONFIG_OPTS= \
- --with-ttf-fontdir='$(X11_FONT_DIR)/ethiopic' \
- --with-otf-fontdir='$(X11_FONT_DIR)/ethiopic'
+ --with-ttf-fontdir='$(MODULE_FONTDIR)' \
+ --with-otf-fontdir='$(MODULE_FONTDIR)'
+FONTPATH_LINKS = ethiopic:pri=60
### Include common rulesets
include ../Makefile.inc
--- a/open-src/font/misc-meltho/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/font/misc-meltho/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -34,7 +34,8 @@
TARBALL_SHA1 = d20d9f8ffdeb88b62842b021d5d3d2a8cc31ea2c
# Install to separate directory for easier packaging
-MODULE_CONFIG_OPTS= --with-fontdir='$(X11_FONT_DIR)/syriac'
+MODULE_FONTDIR = $(TRUETYPE_FONT_DIR)/syriac
+FONTPATH_LINKS = syriac:pri=61
### Include common rulesets
include ../Makefile.inc
--- a/open-src/font/sun-aliases/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/font/sun-aliases/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -41,24 +41,30 @@
INSTALL_TARGETS = install_aliases
INSTALL_TARGETS_SET=yes
+BUILD_TYPES = core ISO8859-1
+BUILD_TYPES_SET = yes
+
### Include common rulesets
include ../Makefile.inc
DESTDIR=$(PROTODIR)
INSTDIR=$(DESTDIR)$(X11_FONT_DIR)
-ALIAS_DIRS = Type1 misc 75dpi 100dpi \
- misc-ISO8859-1 75dpi-ISO8859-1 100dpi-ISO8859-1
+ALIAS_DIRS_core = Type1 misc 75dpi 100dpi
+ALIAS_DIRS_ISO8859-1 = misc-ISO8859-1 75dpi-ISO8859-1 100dpi-ISO8859-1
+ALIAS_DIRS = $(ALIAS_DIRS_$(BUILD_TYPE))
ALIAS_FILES = $(ALIAS_DIRS:%=$(INSTDIR)/%/fonts.alias)
install_aliases: $(ALIAS_FILES)
$(INSTDIR)/%-ISO8859-1/fonts.alias.all: $(INSTDIR)/%/fonts.alias.all
-rm -f $@
+ mkdir -p $(@D)
cp -pf $< $@
$(INSTDIR)/%/fonts.alias.all: fonts.alias.%
-rm -f $@
+ mkdir -p $(@:fonts.alias.all=)
@if [[ -f $(@:.all=) ]] ; then \
$(START_CMD_ECHO) ; \
cat $(@:.all=) > $@ ; \
--- a/open-src/lib/DPS/sun-src/libdpstk/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/lib/DPS/sun-src/libdpstk/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -2,7 +2,7 @@
#
# libdpstk Makefile
#
-# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2010, 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"),
@@ -102,5 +102,7 @@
install: all
$(INSTALL) libdpstk.so.5 $(DESTDIR)$(libdir)/libdpstk.so.5
$(INSTALL) libdpstkXm.so.5 $(DESTDIR)$(libdir)/libdpstkXm.so.5
- $(INSTALL) ColorSelect.ad $(DESTDIR)$(datadir)/X11/app-defaults/ColorSelect
- $(INSTALL) FontSelect.ad $(DESTDIR)$(datadir)/X11/app-defaults/FontSelect
+ $(INSTALL) -m 0444 ColorSelect.ad \
+ $(DESTDIR)$(datadir)/X11/app-defaults/ColorSelect
+ $(INSTALL) -m 0444 FontSelect.ad \
+ $(DESTDIR)$(datadir)/X11/app-defaults/FontSelect
--- a/open-src/lib/Makefile.inc Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/lib/Makefile.inc Fri Jun 18 08:41:15 2010 -0700
@@ -68,14 +68,3 @@
DELIBTOOLIZE=yes
include $(TOP)/common/Makefile.inc
-
-# Make 64-bit link when installing 64-bit libraries
-
-LIB_INST_DIR=$(PROTODIR)$(MODULE_PREFIX)/lib$(MODULE_ADD_LIB_SUBDIR)
-
-install_64: $(LIB_INST_DIR)/64
-
-$(LIB_INST_DIR)/64:
- mkdir -p $(LIB_INST_DIR)
- /bin/ln -s $(SUBDIR64) $(LIB_INST_DIR)/64 || true
-
--- a/open-src/lib/freetype/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/lib/freetype/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -122,7 +122,7 @@
# Have to override default_install since the -e causes our BUILD_DIR to
# clash with the one in freetype's Makefiles
install_freetype: $(BUILD_TARGETS)
- mkdir -p $(PROTODIR)/usr/bin$(ARCHLIBSUBDIR)
+ mkdir -p $(PROTODIR)$(FT_bindir)
( cd $(SOURCE_DIR)/builds/unix ; \
./config.status --file ftconfig ; \
rm -f ftconfig.h ; \
@@ -133,21 +133,3 @@
( cd $(SOURCE_DIR) ; \
$(GNUMAKE) DESTDIR=$(PROTODIR) prefix=$(MODULE_PREFIX) libdir=$(FT_libdir) bindir=$(FT_bindir) install )
-# $(PROTODIR)/usr/sfw is made so that the RUNPATH in mkfontscale picks up
-# libfreetype from the $(PROTODIR) when running in the build
-install_32: $(PROTODIR)/usr/sfw
-
-$(PROTODIR)/usr/sfw:
- -/bin/rm -f $(PROTODIR)/usr/sfw
- ln -s . $(PROTODIR)/usr/sfw
-
-# Make 64-bit link when installing 64-bit binaries
-
-BIN_INST_DIR=$(PROTODIR)$(MODULE_PREFIX)/bin
-
-install_64: $(BIN_INST_DIR)/64
-
-$(BIN_INST_DIR)/64:
- -/bin/rm -f $(BIN_INST_DIR)/64
- mkdir -p $(BIN_INST_DIR)
- ln -s $(SUBDIR64) $(BIN_INST_DIR)/64
--- a/open-src/lib/libX11/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/lib/libX11/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -149,6 +149,9 @@
MODULE_ADD_INSTALL_TARGETS_32 = install_extra_headers
MODULE_ADD_INSTALL_TARGETS = $(MODULE_ADD_INSTALL_TARGETS_$(BUILD_TYPE))
+# Install additional links to libX11 that we include in our packages
+MODULE_ADD_INSTALL_TARGETS += install_extra_links
+
include ../Makefile.inc
install_extra_headers: $(INSTALL_DEPS)
@@ -159,3 +162,13 @@
$(PROTODIR)$(X11_INCLUDES_DIR)/X11/extensions/
cp -pf $(SOURCE_DIR)/src/xlibi18n/Xlc*.h \
$(PROTODIR)$(X11_INCLUDES_DIR)/X11/
+
+# Extra links to libX11 for compatibility with SVID / SPARC ABI / etc.
+EXTRA_LINKS = libX.so libX.so.4 libX11.so.5
+EXTRA_PROTO_LINKS = $(EXTRA_LINKS:%=$(PROTODIR)$(MODULE_PREFIX)/lib$(ARCHLIBSUBDIR)/%)
+
+$(EXTRA_PROTO_LINKS): $(INSTALL_DEPS)
+ @rm -f $@
+ ln -s libX11.so.4 $@
+
+install_extra_links: $(EXTRA_PROTO_LINKS)
--- a/open-src/lib/libXt/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/lib/libXt/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -65,4 +65,17 @@
# then the loader can't find them. It complains silently.
MODULE_CFLAGS = -DGETVALUES_BUG -xinline=no%_XtAppCreateShell,no%XtAppNextEvent,no%XtAppProcessEvent
+# Install additional links to libXt that we include in our packages
+MODULE_ADD_INSTALL_TARGETS = install_extra_links
+
include ../Makefile.inc
+
+# Extra links to libXt for compatibility with SVID / SPARC ABI / etc.
+EXTRA_LINKS = libXt.so.5
+EXTRA_PROTO_LINKS = $(EXTRA_LINKS:%=$(PROTODIR)$(MODULE_PREFIX)/lib$(ARCHLIBSUBDIR)/%)
+
+$(EXTRA_PROTO_LINKS): $(INSTALL_DEPS)
+ @rm -f $@
+ ln -s libXt.so.4 $@
+
+install_extra_links: $(EXTRA_PROTO_LINKS)
--- a/open-src/lib/libXtsol/sun-src/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/lib/libXtsol/sun-src/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2010, 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"),
@@ -39,11 +39,9 @@
install: libXtsol.so.1
mkdir -p $(DESTDIR)$(HEADERSPublic_dir)
- for i in $(HEADERSPublic) ; do \
- $(INSTALL) $$i $(DESTDIR)$(HEADERSPublic_dir) ; \
- done
+ $(INSTALL) -m 0444 $(HEADERSPublic) $(DESTDIR)$(HEADERSPublic_dir)
mkdir -p $(DESTDIR)$(libdir)
-rm -f $(DESTDIR)$(libdir)/libXtsol.so \
$(DESTDIR)$(libdir)/libXtsol.so.1
- $(INSTALL) libXtsol.so.1 $(DESTDIR)$(libdir)/libXtsol.so.1
+ $(INSTALL) -m 0555 libXtsol.so.1 $(DESTDIR)$(libdir)/libXtsol.so.1
ln -s libXtsol.so.1 $(DESTDIR)$(libdir)/libXtsol.so
--- a/open-src/lib/libxtrans/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/lib/libxtrans/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -48,8 +48,18 @@
# Man pages to apply Sun footer to & attributes to list
# - Xtrans has none
-# Xtrans doesn't build a library, so use the pkgconfig file it builds instead
-LIB_BUILT = xtrans.pc
+# Because xtrans is not a real library, don't need 64-bit build,
+# and the pkg-config file goes into share directory
+BUILD_TYPES=32
+BUILD_TYPES_SET=yes
+
+MODULE_PKGCONFIG_DIR=$(PKGCONFIG_DIR_SHARE)
+MODULE_PKGCONFIG_DIR_SET=yes
include ../Makefile.inc
+# Clean up old 64-bit builds from before we stopped building them
+clean: clean_64
+
+clean_64:
+ -rm -rf $(BUILD_DIR_64) build_64
--- a/open-src/proto/sun-ext-protos/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/proto/sun-ext-protos/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -32,6 +32,8 @@
SOURCE_TARBALL_NAME_SET=yes
# Don't need to configure or build these or install pkg-config files for them
+SOURCE_TARGETS=
+SOURCE_TARGETS_SET=yes
CONFIGURE_TARGETS=
CONFIGURE_TARGETS_SET=yes
BUILD_TARGETS=
--- a/open-src/util/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/util/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -1,6 +1,6 @@
# Makefile for X Consolidation Open Source utility modules
#
-# Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2010, 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"),
@@ -27,10 +27,9 @@
# These module directories are not listed here on purpose:
# util-macros - has to be the very first, built in top-level Makefile
# build-tools - nothing to build
-# mdb-tools - must be built after X servers, not built/shipped by default,
-# here for developers to build as needed
OS_SUBDIRS_common = \
+ compat-links \
lndir \
imake \
makedepend \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/util/compat-links/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -0,0 +1,67 @@
+###############################################################################
+#
+# Copyright (c) 2010, 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"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# 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. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# 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.
+#
+#
+
+# This makefile simply creates a number of compatibility links in the
+# proto area that we include in our packages
+
+# Package name used in tarballs
+MODULE_NAME=compat-links
+
+# No sources
+MODULE_VERSION=NONE
+SOURCE_TARBALL_NAME=NONE
+SOURCE_TARBALL_NAME_SET=yes
+
+# Don't need default targets for configure, build, or install, since there's
+# nothing to build, and the install rule follows here
+CONFIGURE_TARGETS =
+CONFIGURE_TARGETS_SET=yes
+BUILD_TARGETS =
+BUILD_TARGETS_SET=yes
+INSTALL_TARGETS = install_links
+INSTALL_TARGETS_SET=yes
+
+### Include common rulesets
+include ../Makefile.inc
+
+DESTDIR=$(PROTODIR)
+
+# Even though we deliver all our files to /usr/{bin,lib} now, other
+# consolidations still deliver to /usr/X11, so we have to maintain
+# /usr/X11, which means leaving symlinks there to our programs & libraries
+# to avoid breaking existing scripts and binaries
+$(DESTDIR)/usr/X11:
+ mkdir -p $@
+
+# The SVID ABI established the X->X11 link
+# PSARC 2004/187 established the X11R6->X11 link for compatibility with Linux
+# PSARC 2008/405 removed /usr/openwin and replaced it with a link to /usr/X11
+INSTALL_LINKS = $(DESTDIR)/usr/X $(DESTDIR)/usr/X11R6 $(DESTDIR)/usr/openwin
+
+$(INSTALL_LINKS): $(DESTDIR)/usr/X11
+ @rm -f $@
+ ln -s X11 $@
+
+install_links: $(INSTALL_LINKS)
--- a/open-src/util/util-macros/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/util/util-macros/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -61,10 +61,17 @@
# Libtool versions before 2.2.2 fail to work with LD=cc in 64 bit builds,
# so install fixed libtool m4 macros here as well, so that modules that
# run autoreconf get the fixed sources
-install_libtool_fix:
- mkdir -p $(PROTODIR)$(X11_ACLOCAL_DIR)/
- -rm -f $(PROTODIR)$(X11_ACLOCAL_DIR)/libtool.m4
+install_libtool_fix: $(TOOLS_ACLOCAL_DIR)/libtool.m4
+
+$(TOOLS_ACLOCAL_DIR)/libtool.m4: $(TOOLS_ACLOCAL_DIR) libtool-64.patch
+ -rm -f $(TOOLS_ACLOCAL_DIR)/libtool.m4
SYSTEM_ACLOCAL_DIR=$$($(ACLOCAL_PATH) --print-ac-dir) ; \
cp $${SYSTEM_ACLOCAL_DIR}/libtool.m4 \
- $(PROTODIR)$(X11_ACLOCAL_DIR)/libtool.m4
- gpatch -d $(PROTODIR)$(X11_ACLOCAL_DIR) < libtool-64.patch
+ $(TOOLS_ACLOCAL_DIR)/libtool.m4
+ gpatch -d $(TOOLS_ACLOCAL_DIR) < libtool-64.patch
+
+# autoreconf fails if the aclocal include directories don't exist yet
+$(AUTOCONF_TARGET): $(TOOLS_ACLOCAL_DIR) $(PROTODIR)$(X11_ACLOCAL_DIR)
+
+$(TOOLS_ACLOCAL_DIR) $(PROTODIR)$(X11_ACLOCAL_DIR):
+ mkdir -p $@
--- a/open-src/xserver/Makefile.inc Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/xserver/Makefile.inc Fri Jun 18 08:41:15 2010 -0700
@@ -59,7 +59,7 @@
--with-log-dir=/var/log --with-xkb-output=/var/run/xkb \
--with-module-dir=$(SERVER_MODULES_DIR) \
--with-dri-driver-path=$(DRI_MODULES_DIR) \
- --with-default-font-path='catalogue:/etc/X11/fontpath.d' \
+ --with-default-font-path='catalogue:$(X11_FONT_CATALOGUE)' \
--with-xkb-bin-directory='$${exec_prefix}/bin' \
--with-default-xkb-model=pc105 \
$(ADDITIONAL_CONFIG_OPTS)
@@ -133,22 +133,43 @@
MDB_SCRIPTS=list_Xserver_clients \
list_Xserver_devicegrab_client \
list_Xserver_servergrab_client
+MDB_MODULE_NAMES=Xephyr Xorg Xvfb Xvnc
+
+BUILT_MDB_MODULE=$(MDB_SOURCE_DIR)/modules/Xserver.so
+BUILT_MDB_SCRIPTS=$(MDB_SCRIPTS:%=$(MDB_SOURCE_DIR)/scripts/%)
+
+INSTALLED_MDB_LINKS=$(MDB_MODULE_NAMES:%=$(PROTODIR)$(MDB_MODULE_DIR)/%.so)
+INSTALLED_MDB_MODULE=$(PROTODIR)$(MDB_MODULE_DIR)/Xserver.so
+INSTALLED_MDB_SCRIPTS=$(MDB_SCRIPTS:%=$(PROTODIR)$(MDB_SCRIPT_DIR)/%)
+INSTALLED_MDB_ALL=$(INSTALLED_MDB_MODULE) $(INSTALLED_MDB_LINKS) \
+ $(INSTALLED_MDB_SCRIPTS)
# Since configure options aren't used to build the mdb modules, pass
-# those variables at build tie
+# those variables at build time
MDB_BUILD_ENV=$(CONFIG_ENV) $(BUILD_ENV)
-build_mdb: $(MDB_SOURCE_DIR)/modules/Xserver.so
+build_mdb: $(BUILT_MDB_MODULE)
-$(MDB_SOURCE_DIR)/modules/Xserver.so: $(CONFIGURE_TARGETS)
+$(BUILT_MDB_SCRIPTS): $(SOURCE_TARGETS)
+
+$(BUILT_MDB_MODULE): $(CONFIGURE_TARGETS)
(cd $(MDB_SOURCE_DIR) ; \
$(MDB_BUILD_ENV) $(MAKE) $(MAKEFLAGS) $(DEFAULT_BUILD_MAKEFLAGS))
-install_mdb: $(MDB_SOURCE_DIR)/modules/Xserver.so
- mkdir -p $(PROTODIR)$(MDB_MODULE_DIR) $(PROTODIR)$(MDB_SCRIPT_DIR)
- cp -pf $(MDB_SOURCE_DIR)/modules/Xserver.so \
- $(PROTODIR)$(MDB_MODULE_DIR)/
- cp -pf $(MDB_SCRIPTS:%=$(MDB_SOURCE_DIR)/scripts/%) \
- $(PROTODIR)$(MDB_SCRIPT_DIR)/
- chmod 0755 $(MDB_SCRIPTS:%=$(PROTODIR)$(MDB_SCRIPT_DIR)/%)
- cp -pf $(MDB_SOURCE_DIR)/README $(PROTODIR)$(MDB_SCRIPT_DIR)/
+$(PROTODIR)$(MDB_MODULE_DIR) $(PROTODIR)$(MDB_SCRIPT_DIR):
+ mkdir -p $@
+
+$(INSTALLED_MDB_MODULE): $(PROTODIR)$(MDB_MODULE_DIR) $(BUILT_MDB_MODULE)
+ $(INSTALL_SCRIPT) -c -m 0555 $(BUILT_MDB_MODULE) $@
+
+$(INSTALLED_MDB_LINKS): $(PROTODIR)$(MDB_MODULE_DIR)
+ @rm -f $@
+ ln -s Xserver.so $@
+
+$(INSTALLED_MDB_SCRIPTS): $(BUILT_MDB_SCRIPTS) $(PROTODIR)$(MDB_SCRIPT_DIR)
+ $(INSTALL_SCRIPT) -c -m 0555 $(MDB_SOURCE_DIR)/scripts/$(@F) \
+ $(PROTODIR)$(MDB_SCRIPT_DIR)/
+
+install_mdb: $(INSTALLED_MDB_ALL)
+ $(INSTALL_SCRIPT) -c -m 0444 $(MDB_SOURCE_DIR)/README \
+ $(PROTODIR)$(MDB_SCRIPT_DIR)/
--- a/open-src/xserver/xorg/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/xserver/xorg/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -93,7 +93,8 @@
MODULE_MAKE_SET=yes
# Additional install targets beyond the defaults
-MODULE_ADD_INSTALL_TARGETS=install_extras install_mdb install_pc_common
+MODULE_ADD_INSTALL_TARGETS=install_extras install_mdb install_pc_common \
+ install_fix_paths
EXTRA_INSTALL_sparc=install_pc_copy
EXTRA_INSTALL_i386=
MODULE_ADD_INSTALL_TARGETS += $(EXTRA_INSTALL_$(MACH))
@@ -124,16 +125,14 @@
cp -pf $(SOURCE_DIR)/hw/xfree86/os-support/bus/xf86Sbus.h $(SDK_INCLUDES_DIR)/xf86Sbus.h
cp -pf $(SOURCE_DIR)/hw/xfree86/dri/*.h $(SDK_INCLUDES_DIR)/
-rm -f $(SDK_INCLUDES_DIR)/xf1bpp.h $(SDK_INCLUDES_DIR)/xf4bpp.h
- mkdir -p $(PROTODIR)$(X11_DOC_DIR)
- cp -pf $(SOURCE_DIR)/hw/xfree86/doc/README.* $(PROTODIR)$(X11_DOC_DIR)/
mkdir -p $(PROTODIR)$(X11_MAN_DIR)/man1
cp -pf $(SOURCE_DIR)/doc/Xnest.1 \
$(SOURCE_DIR)/hw/xfree86/doc/man/xorgcfg.1 \
$(SOURCE_DIR)/hw/xfree86/doc/man/xorgconfig.1 \
$(PROTODIR)$(X11_MAN_DIR)/man1
- mkdir -p $(PROTODIR)$(X11_DIR)/share/hal/fdi/policy/10osvendor
+ mkdir -p $(PROTODIR)/etc/hal/fdi/preprobe/10osvendor
cp -pf $(SOURCE_DIR)/config/x11-input.fdi \
- $(PROTODIR)$(X11_DIR)/share/hal/fdi/policy/10osvendor/10-x11-input.fdi
+ $(PROTODIR)/etc/hal/fdi/preprobe/10osvendor/10-x11-input.fdi
# Workaround bug in installing pkgconfig file to wrong directory in 64-bit
# builds
@@ -159,4 +158,40 @@
/usr/ccs/bin/nm -g $(XORGSERVER_BIN) $(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR)/libXfont.so | grep -v UNDEF | sed -n -e 's/^.*\|FUNC \|GLOB \|.*\|\([A-Za-z].*\)$$/ \1 = FUNCTION extern;/p' -e 's/^.*\|OBJT \|GLOB \|.*\|\([A-Za-z].*\)$$/ \1 = DATA extern;/p' >> $@
printf '};\n' >> $@
+# Fix paths in proto area to match paths in packages / installed systems
+install_fix_paths: install_fix_paths_$(MACH)_$(BUILD_TYPE) install_fix_paths_X
+install_fix_paths_$(MACH)_: $(BUILD_TYPES:%=install_fix_paths_$(MACH)_%)
+install_fix_paths_i386_32: install_fix_paths_use_utilities
+install_fix_paths_i386_64: install_fix_paths_remove_utilities
+install_fix_paths_sparc_64: # not needed
+
+install_fix_paths_use_utilities: default_install
+ rm -f $(PROTODIR)$(MODULE_PREFIX)/bin/cvt \
+ $(PROTODIR)$(MODULE_PREFIX)/bin/gtf
+ mv -f $(PROTODIR)$(MODULE_PREFIX)/bin/$(ARCHBINSUBDIR)/cvt \
+ $(PROTODIR)$(MODULE_PREFIX)/bin/$(ARCHBINSUBDIR)/gtf \
+ $(PROTODIR)$(MODULE_PREFIX)/bin
+
+install_fix_paths_remove_utilities: default_install
+ rm -f $(PROTODIR)$(MODULE_PREFIX)/bin/$(ARCHBINSUBDIR)/cvt \
+ $(PROTODIR)$(MODULE_PREFIX)/bin/$(ARCHBINSUBDIR)/gtf
+
+install_fix_paths_X: default_install
+ rm -f $(PROTODIR)$(MODULE_PREFIX)/bin/X \
+ $(PROTODIR)$(MODULE_PREFIX)/bin/$(ARCHBINSUBDIR)/X
+ ln -s Xserver $(PROTODIR)$(MODULE_PREFIX)/bin/X
+
+XSERVERS = Xorg Xephyr Xvfb
+XSERVER_LINKS = $(XSERVERS:%=$(PROTODIR)$(MODULE_PREFIX)/bin/%)
+
+$(PROTODIR)/usr/lib/isaexec:
+ @rm -f $@
+ cp -pf /usr/lib/isaexec $@
+
+$(XSERVER_LINKS): $(PROTODIR)/usr/lib/isaexec
+ @rm -f $@
+ ln $(PROTODIR)/usr/lib/isaexec $@
+
+install_fix_paths_i386_32: install_fix_paths_Xservers_isaexec
+install_fix_paths_Xservers_isaexec: $(XSERVER_LINKS)
--- a/open-src/xserver/xvnc/Makefile Fri Jun 11 06:38:19 2010 -0700
+++ b/open-src/xserver/xvnc/Makefile Fri Jun 18 08:41:15 2010 -0700
@@ -91,8 +91,8 @@
# Xvnc has to configure, build, and install in different directories due to
# the mixed codebases and unusual directory layout
-MODULE_ADD_SOURCE_TARGETS=Xvnc_source_init
-MODULE_SOURCE_DEPS = Xvnc_source_init
+$(NO_RECURSE)MODULE_ADD_SOURCE_TARGETS=Xvnc_source_init
+$(NO_RECURSE)MODULE_SOURCE_DEPS = Xvnc_source_init
CONFIGURE_TARGETS=$(SOURCE_DIR)/unix/Makefile $(XORG_BUILD_DIR)/Makefile
CONFIGURE_TARGETS_SET=yes
BUILD_TARGETS_common=Xvnc_build set-elf-comments
@@ -112,13 +112,17 @@
INSTALL_TARGETS_sparc = install_mdb
INSTALL_TARGETS += $(INSTALL_TARGETS_$(MACH))
+# Since we only build Xvnc in 32-bit mode, don't need ARCHBINSUBDIR set
+# like in the Xorg builds
+MODULE_BUILD_32_FLAGS = ARCHBINSUBDIR=""
+
include ../Makefile.inc
# Merge in additional sources from Xorg tarball & sun-src directory
# This step has to be done before default_source, so that patches applied
# in that step work correctly.
-XORG_SOURCE_INIT_TARGET = $(XORG_BUILD_DIR)/$(SOURCE_INIT_TARGET_FILE)
-XORG_PATCHED_TARGET = $(XORG_BUILD_DIR)/$(PATCHED_TARGET_FILE)
+$(NO_RECURSE)XORG_SOURCE_INIT_TARGET = $(XORG_BUILD_DIR)/$(SOURCE_INIT_TARGET_FILE)
+$(NO_RECURSE)XORG_PATCHED_TARGET = $(XORG_BUILD_DIR)/$(PATCHED_TARGET_FILE)
Xvnc_source_init: $(XORG_PATCHED_TARGET)
$(XORG_TARBALL):
@@ -127,17 +131,25 @@
$(XORG_SOURCE_INIT_TARGET): $(XORG_TARBALL)
mkdir -p $(SOURCE_DIR)/unix
$(MAKE) $(MAKEFLAGS) init_source \
+ NO_RECURSE="$(POUND_SIGN)" \
+ BUILD_TYPE="$(BUILD_TYPE)" \
SOURCE_TARBALL="$(XORG_TARBALL)" \
+ SOURCE_DEPS="$(XORG_TARBALL)" \
SOURCE_UNCOMPRESS="bzcat" \
- SOURCE_DIR="$(XORG_SOURCE_DIR)"
- mv $(XORG_SOURCE_DIR) $(XORG_BUILD_DIR)
+ SOURCE_DIR="$(XORG_BUILD_DIR)" \
+ BUILD_DIR="$(XORG_BUILD_DIR)" \
+ ADD_TAR_FLAGS="--strip-components=1"
(cd $(XORG_BUILD_DIR) && $(LNDIR) ../../../../../xorg/sun-src)
+ touch $(XORG_SOURCE_INIT_TARGET)
$(XORG_PATCHED_TARGET): $(XORG_SOURCE_INIT_TARGET)
$(MAKE) $(MAKEFLAGS) patched_source \
+ NO_RECURSE="$(POUND_SIGN)" \
+ BUILD_TYPE="$(BUILD_TYPE)" \
SOURCE_PATCHES="$(XORG_SOURCE_PATCHES:%=../xorg/%)" \
- SOURCE_DIR="$(XORG_BUILD_DIR)"
-
+ SOURCE_DIR="$(XORG_BUILD_DIR)" \
+ XORG_BUILD_DIR="$(XORG_BUILD_DIR)"
+ touch $(XORG_PATCHED_TARGET)
# Command line options to GNU autoconf configure script for vnc clients
VNC_CONFIG_OPTS= --with-installed-zlib --prefix=/usr \
@@ -210,23 +222,25 @@
mkdir -p $(PROTODIR)/usr/bin/$(ARCHLIBSUBDIR) \
$(PROTODIR)/usr/share/man/man1 \
$(PROTODIR)/var/svc/manifest/application/x11
- cp -pf $(SOURCE_DIR)/unix/vncserver \
+ $(INSTALL_SCRIPT) -m 0755 $(SOURCE_DIR)/unix/vncserver \
$(SOURCE_DIR)/unix/vncpasswd/vncpasswd \
$(SOURCE_DIR)/unix/vncconfig/vncconfig \
$(SOURCE_DIR)/unix/vncviewer/vncviewer \
$(SOURCE_DIR)/unix/x0vncserver/x0vncserver \
$(PROTODIR)/usr/bin/$(ARCHLIBSUBDIR)
- cp -pf $(SOURCE_DIR)/unix/vncserver.man \
+ $(INSTALL_SCRIPT) -m 0444 $(SOURCE_DIR)/unix/vncserver.man \
$(PROTODIR)/usr/share/man/man1/vncserver.1
- cp -pf $(SOURCE_DIR)/unix/vncconfig/vncconfig.man \
+ $(INSTALL_SCRIPT) -m 0444 $(SOURCE_DIR)/unix/vncconfig/vncconfig.man \
$(PROTODIR)/usr/share/man/man1/vncconfig.1
- cp -pf $(SOURCE_DIR)/unix/vncpasswd/vncpasswd.man \
+ $(INSTALL_SCRIPT) -m 0444 $(SOURCE_DIR)/unix/vncpasswd/vncpasswd.man \
$(PROTODIR)/usr/share/man/man1/vncpasswd.1
- cp -pf $(SOURCE_DIR)/unix/vncviewer/vncviewer.man \
+ $(INSTALL_SCRIPT) -m 0444 $(SOURCE_DIR)/unix/vncviewer/vncviewer.man \
$(PROTODIR)/usr/share/man/man1/vncviewer.1
- cp -pf $(SOURCE_DIR)/unix/x0vncserver/x0vncserver.man \
+ $(INSTALL_SCRIPT) -m 0444 \
+ $(SOURCE_DIR)/unix/x0vncserver/x0vncserver.man \
$(PROTODIR)/usr/share/man/man1/x0vncserver.1
- cp -pf xvnc-inetd.xml $(PROTODIR)/var/svc/manifest/application/x11/
+ $(INSTALL_SCRIPT) -m 0444 xvnc-inetd.xml \
+ $(PROTODIR)/var/svc/manifest/application/x11/
# Java VNCviewer applet for connecting from a web browser
JAVA_SOURCE_DIR = $(SOURCE_DIR)/java/src
@@ -258,3 +272,4 @@
cp -pf $(JAVA_SOURCE_DIR)/com/tigervnc/vncviewer/README \
$(JAVA_SOURCE_DIR)/com/tigervnc/vncviewer/LICENCE.TXT \
$(JAVA_INSTALL_DIR)
+ chmod a+x $(JAVA_INSTALL_DIR)/VncViewer.jar
--- a/packages/SUNWfont-misc-ethiopic/postinstall.tmpl Fri Jun 11 06:38:19 2010 -0700
+++ b/packages/SUNWfont-misc-ethiopic/postinstall.tmpl Fri Jun 18 08:41:15 2010 -0700
@@ -1,6 +1,6 @@
###########################################################################
#
-# Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2010, 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"),
@@ -28,6 +28,6 @@
include fontcatlink
-make_font_catalogue_link X11/ethiopic ethiopic:pri=60
+make_font_catalogue_link TrueType/ethiopic ethiopic:pri=60
exit 0
--- a/packages/SUNWfont-misc-ethiopic/prototype Fri Jun 11 06:38:19 2010 -0700
+++ b/packages/SUNWfont-misc-ethiopic/prototype Fri Jun 18 08:41:15 2010 -0700
@@ -1,6 +1,6 @@
###########################################################################
#
-# Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2010, 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"),
@@ -35,11 +35,11 @@
d none share 0755 root sys
d none share/fonts 0755 root bin
-d none share/fonts/X11 0755 root bin
+d none share/fonts/TrueType 0755 root bin
-!search $HOME/share/fonts/X11/ethiopic
-d none share/fonts/X11/ethiopic 0755 root bin
-f none share/fonts/X11/ethiopic/GohaTibebZemen.otf 0444 root bin
-f none share/fonts/X11/ethiopic/GohaTibebZemen.ttf 0444 root bin
-f none share/fonts/X11/ethiopic/fonts.dir 0444 root bin
-f none share/fonts/X11/ethiopic/fonts.scale 0444 root bin
+!search $HOME/share/fonts/TrueType/ethiopic
+d none share/fonts/TrueType/ethiopic 0755 root bin
+f none share/fonts/TrueType/ethiopic/GohaTibebZemen.otf 0444 root bin
+f none share/fonts/TrueType/ethiopic/GohaTibebZemen.ttf 0444 root bin
+f none share/fonts/TrueType/ethiopic/fonts.dir 0444 root bin
+f none share/fonts/TrueType/ethiopic/fonts.scale 0444 root bin
--- a/packages/SUNWfont-misc-meltho/postinstall.tmpl Fri Jun 11 06:38:19 2010 -0700
+++ b/packages/SUNWfont-misc-meltho/postinstall.tmpl Fri Jun 18 08:41:15 2010 -0700
@@ -1,6 +1,6 @@
###########################################################################
#
-# Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2010, 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"),
@@ -28,6 +28,6 @@
include fontcatlink
-make_font_catalogue_link X11/syriac syriac:pri=61
+make_font_catalogue_link TrueType/syriac syriac:pri=61
exit 0
--- a/packages/SUNWfont-misc-meltho/prototype Fri Jun 11 06:38:19 2010 -0700
+++ b/packages/SUNWfont-misc-meltho/prototype Fri Jun 18 08:41:15 2010 -0700
@@ -1,6 +1,6 @@
###########################################################################
#
-# Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2010, 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"),
@@ -35,31 +35,31 @@
d none share 0755 root sys
d none share/fonts 0755 root bin
-d none share/fonts/X11 0755 root bin
+d none share/fonts/TrueType 0755 root bin
-!search $HOME/share/fonts/X11/syriac
-d none share/fonts/X11/syriac 0755 root bin
-f none share/fonts/X11/syriac/SyrCOMAdiabene.otf 0444 root bin
-f none share/fonts/X11/syriac/SyrCOMAntioch.otf 0444 root bin
-f none share/fonts/X11/syriac/SyrCOMBatnan.otf 0444 root bin
-f none share/fonts/X11/syriac/SyrCOMBatnanBold.otf 0444 root bin
-f none share/fonts/X11/syriac/SyrCOMCtesiphon.otf 0444 root bin
-f none share/fonts/X11/syriac/SyrCOMEdessa.otf 0444 root bin
-f none share/fonts/X11/syriac/SyrCOMJerusalem.otf 0444 root bin
-f none share/fonts/X11/syriac/SyrCOMJerusalemBold.otf 0444 root bin
-f none share/fonts/X11/syriac/SyrCOMJerusalemItalic.otf 0444 root bin
-f none share/fonts/X11/syriac/SyrCOMJerusalemOutline.otf 0444 root bin
-f none share/fonts/X11/syriac/SyrCOMKharput.otf 0444 root bin
-f none share/fonts/X11/syriac/SyrCOMMalankara.otf 0444 root bin
-f none share/fonts/X11/syriac/SyrCOMMardin.otf 0444 root bin
-f none share/fonts/X11/syriac/SyrCOMMardinBold.otf 0444 root bin
-f none share/fonts/X11/syriac/SyrCOMMidyat.otf 0444 root bin
-f none share/fonts/X11/syriac/SyrCOMNisibin.otf 0444 root bin
-f none share/fonts/X11/syriac/SyrCOMNisibinOutline.otf 0444 root bin
-f none share/fonts/X11/syriac/SyrCOMQenNeshrin.otf 0444 root bin
-f none share/fonts/X11/syriac/SyrCOMTalada.otf 0444 root bin
-f none share/fonts/X11/syriac/SyrCOMTurAbdin.otf 0444 root bin
-f none share/fonts/X11/syriac/SyrCOMUrhoy.otf 0444 root bin
-f none share/fonts/X11/syriac/SyrCOMUrhoyBold.otf 0444 root bin
-f none share/fonts/X11/syriac/fonts.dir 0444 root bin
-f none share/fonts/X11/syriac/fonts.scale 0444 root bin
+!search $HOME/share/fonts/TrueType/syriac
+d none share/fonts/TrueType/syriac 0755 root bin
+f none share/fonts/TrueType/syriac/SyrCOMAdiabene.otf 0444 root bin
+f none share/fonts/TrueType/syriac/SyrCOMAntioch.otf 0444 root bin
+f none share/fonts/TrueType/syriac/SyrCOMBatnan.otf 0444 root bin
+f none share/fonts/TrueType/syriac/SyrCOMBatnanBold.otf 0444 root bin
+f none share/fonts/TrueType/syriac/SyrCOMCtesiphon.otf 0444 root bin
+f none share/fonts/TrueType/syriac/SyrCOMEdessa.otf 0444 root bin
+f none share/fonts/TrueType/syriac/SyrCOMJerusalem.otf 0444 root bin
+f none share/fonts/TrueType/syriac/SyrCOMJerusalemBold.otf 0444 root bin
+f none share/fonts/TrueType/syriac/SyrCOMJerusalemItalic.otf 0444 root bin
+f none share/fonts/TrueType/syriac/SyrCOMJerusalemOutline.otf 0444 root bin
+f none share/fonts/TrueType/syriac/SyrCOMKharput.otf 0444 root bin
+f none share/fonts/TrueType/syriac/SyrCOMMalankara.otf 0444 root bin
+f none share/fonts/TrueType/syriac/SyrCOMMardin.otf 0444 root bin
+f none share/fonts/TrueType/syriac/SyrCOMMardinBold.otf 0444 root bin
+f none share/fonts/TrueType/syriac/SyrCOMMidyat.otf 0444 root bin
+f none share/fonts/TrueType/syriac/SyrCOMNisibin.otf 0444 root bin
+f none share/fonts/TrueType/syriac/SyrCOMNisibinOutline.otf 0444 root bin
+f none share/fonts/TrueType/syriac/SyrCOMQenNeshrin.otf 0444 root bin
+f none share/fonts/TrueType/syriac/SyrCOMTalada.otf 0444 root bin
+f none share/fonts/TrueType/syriac/SyrCOMTurAbdin.otf 0444 root bin
+f none share/fonts/TrueType/syriac/SyrCOMUrhoy.otf 0444 root bin
+f none share/fonts/TrueType/syriac/SyrCOMUrhoyBold.otf 0444 root bin
+f none share/fonts/TrueType/syriac/fonts.dir 0444 root bin
+f none share/fonts/TrueType/syriac/fonts.scale 0444 root bin
--- a/packages/SUNWxorg-server/prototype_com Fri Jun 11 06:38:19 2010 -0700
+++ b/packages/SUNWxorg-server/prototype_com Fri Jun 18 08:41:15 2010 -0700
@@ -33,7 +33,7 @@
d none X11 0755 root bin
-!search $HOME/$XSERVERBINDIR
+!search $HOME/bin
d none bin 0755 root bin
f none bin/gtf 0555 root bin
f none bin/cvt 0555 root bin
@@ -96,7 +96,6 @@
d none share/doc 0755 root other
d none share/doc/X11 0755 root bin
f none share/doc/X11/LICENSE.txt 0444 root bin
-f none share/doc/X11/README.DRI 0444 root bin
f none share/doc/X11/README.mouse 0444 root bin
f none share/doc/X11/RELNOTES.txt 0444 root bin
--- a/packages/SUNWxvnc/prototype_com Fri Jun 11 06:38:19 2010 -0700
+++ b/packages/SUNWxvnc/prototype_com Fri Jun 18 08:41:15 2010 -0700
@@ -1,6 +1,6 @@
###########################################################################
#
-# Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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"),
@@ -41,8 +41,6 @@
f none bin/vncpasswd 0555 root bin
f none bin/vncserver 0555 root bin
f none bin/x0vncserver 0555 root bin
-
-!search $HOME/$XSERVERBINDIR
f none bin/Xvnc 2555 root root
!search $HOME/share/vnc/classes
--- a/packages/SUNWxwfsw/prototype_com Fri Jun 11 06:38:19 2010 -0700
+++ b/packages/SUNWxwfsw/prototype_com Fri Jun 18 08:41:15 2010 -0700
@@ -75,23 +75,23 @@
!search $HOME/share/fonts/X11/encodings/large
d none share/fonts/X11/encodings/large 0755 root bin
-f none share/fonts/X11/encodings/large/big5.eten-0.enc.gz 0444 root bin
-f none share/fonts/X11/encodings/large/big5hkscs-0.enc.gz 0444 root bin
-f none share/fonts/X11/encodings/large/cns11643-1.enc.gz 0444 root bin
-f none share/fonts/X11/encodings/large/cns11643-2.enc.gz 0444 root bin
-f none share/fonts/X11/encodings/large/cns11643-3.enc.gz 0444 root bin
+f none share/fonts/X11/encodings/large/big5.eten-0.enc 0444 root bin
+f none share/fonts/X11/encodings/large/big5hkscs-0.enc 0444 root bin
+f none share/fonts/X11/encodings/large/cns11643-1.enc 0444 root bin
+f none share/fonts/X11/encodings/large/cns11643-2.enc 0444 root bin
+f none share/fonts/X11/encodings/large/cns11643-3.enc 0444 root bin
f none share/fonts/X11/encodings/large/encodings.dir 0444 root bin
-f none share/fonts/X11/encodings/large/gb18030-0.enc.gz 0444 root bin
-f none share/fonts/X11/encodings/large/gb18030.2000-0.enc.gz 0444 root bin
-f none share/fonts/X11/encodings/large/gb18030.2000-1.enc.gz 0444 root bin
-f none share/fonts/X11/encodings/large/gb2312.1980-0.enc.gz 0444 root bin
-f none share/fonts/X11/encodings/large/gbk-0.enc.gz 0444 root bin
-f none share/fonts/X11/encodings/large/jisx0201.1976-0.enc.gz 0444 root bin
-f none share/fonts/X11/encodings/large/jisx0208.1990-0.enc.gz 0444 root bin
-f none share/fonts/X11/encodings/large/jisx0212.1990-0.enc.gz 0444 root bin
-f none share/fonts/X11/encodings/large/ksc5601.1987-0.enc.gz 0444 root bin
-f none share/fonts/X11/encodings/large/ksc5601.1992-3.enc.gz 0444 root bin
-f none share/fonts/X11/encodings/large/sun.unicode.india-0.enc.gz 0444 root bin
+f none share/fonts/X11/encodings/large/gb18030-0.enc 0444 root bin
+f none share/fonts/X11/encodings/large/gb18030.2000-0.enc 0444 root bin
+f none share/fonts/X11/encodings/large/gb18030.2000-1.enc 0444 root bin
+f none share/fonts/X11/encodings/large/gb2312.1980-0.enc 0444 root bin
+f none share/fonts/X11/encodings/large/gbk-0.enc 0444 root bin
+f none share/fonts/X11/encodings/large/jisx0201.1976-0.enc 0444 root bin
+f none share/fonts/X11/encodings/large/jisx0208.1990-0.enc 0444 root bin
+f none share/fonts/X11/encodings/large/jisx0212.1990-0.enc 0444 root bin
+f none share/fonts/X11/encodings/large/ksc5601.1987-0.enc 0444 root bin
+f none share/fonts/X11/encodings/large/ksc5601.1992-3.enc 0444 root bin
+f none share/fonts/X11/encodings/large/sun.unicode.india-0.enc 0444 root bin
# Font libraries used by Xorg and X11R7-based font programs
!search $HOME/lib/xorg
--- a/packages/SUNWxwinc/prototype_com Fri Jun 11 06:38:19 2010 -0700
+++ b/packages/SUNWxwinc/prototype_com Fri Jun 18 08:41:15 2010 -0700
@@ -537,6 +537,7 @@
f none share/pkgconfig/xbitmaps.pc 0444 root bin
f none share/pkgconfig/xorg-macros.pc 0444 root bin
+f none share/pkgconfig/xtrans.pc 0444 root bin
# Libraries
@@ -573,7 +574,6 @@
f none lib/pkgconfig/xres.pc 0444 root bin
f none lib/pkgconfig/xscrnsaver.pc 0444 root bin
f none lib/pkgconfig/xt.pc 0444 root bin
-f none lib/pkgconfig/xtrans.pc 0444 root bin
f none lib/pkgconfig/xtst.pc 0444 root bin
f none lib/pkgconfig/xv.pc 0444 root bin
f none lib/pkgconfig/xvmc.pc 0444 root bin
@@ -612,7 +612,6 @@
f none lib/$plat_64/pkgconfig/xres.pc 0444 root bin
f none lib/$plat_64/pkgconfig/xscrnsaver.pc 0444 root bin
f none lib/$plat_64/pkgconfig/xt.pc 0444 root bin
-f none lib/$plat_64/pkgconfig/xtrans.pc 0444 root bin
f none lib/$plat_64/pkgconfig/xtst.pc 0444 root bin
f none lib/$plat_64/pkgconfig/xv.pc 0444 root bin
f none lib/$plat_64/pkgconfig/xvmc.pc 0444 root bin
--- a/packages/SUNWxwman/prototype_com Fri Jun 11 06:38:19 2010 -0700
+++ b/packages/SUNWxwman/prototype_com Fri Jun 18 08:41:15 2010 -0700
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1993, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1993, 2010, 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"),
@@ -331,5 +331,5 @@
f none share/man/man5/X.5 0444 root bin
f none share/man/man5/X11.5 0444 root bin
f none share/man/man5/XOrgFoundation.5 0444 root bin
-f none share/man/man5/XStandards.5=$HOME/man5/Standards.5 0444 root bin
+f none share/man/man5/XStandards.5 0444 root bin
f none share/man/man5/Xsecurity.5 0444 root bin
--- a/packages/SUNWxwopt/prototype Fri Jun 11 06:38:19 2010 -0700
+++ b/packages/SUNWxwopt/prototype Fri Jun 18 08:41:15 2010 -0700
@@ -241,9 +241,10 @@
!search $HOME/bin
f none bin/xrx 0755 root bin
s none X11/bin/xrx=../../bin/xrx
-!search $HOME/lib
-f none lib/libxrx.so 0755 root bin
-s none X11/lib/libxrx.so=../../lib/libxrx.so
+!search $HOME/lib/firefox/plugins/
+d none lib/firefox 0755 root bin
+d none lib/firefox/plugins 0755 root bin
+f none lib/firefox/plugins/libxrx.so 0755 root bin
# open-src/util/imake
!search $HOME/bin
--- a/packages/SUNWxwplr/prototype_com Fri Jun 11 06:38:19 2010 -0700
+++ b/packages/SUNWxwplr/prototype_com Fri Jun 18 08:41:15 2010 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2010, 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"),
@@ -87,5 +87,5 @@
d none etc/hal/fdi 0755 root bin
d none etc/hal/fdi/preprobe 0755 root bin
d none etc/hal/fdi/preprobe/10osvendor 0755 root bin
-!search ../usr/share/hal/fdi/policy/10osvendor
+!search ../etc/hal/fdi/preprobe/10osvendor
f none etc/hal/fdi/preprobe/10osvendor/10-x11-input.fdi 0444 root bin