--- a/open-src/app/Makefile.inc Mon Mar 24 14:42:43 2008 -0700
+++ b/open-src/app/Makefile.inc Mon Mar 24 16:05:09 2008 -0700
@@ -1,6 +1,6 @@
# -*- Makefile -*- rules common to most X.Org application modules
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# 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
@@ -55,8 +55,8 @@
# Environment variable options to GNU autoconf configure script
CONFIG_ENV = CC=$(CC) CFLAGS="$(PROG_CFLAGS)" LD="$(LD) $(LDFLAGS)" \
- CPPFLAGS="-I $(PROTODIR)$(X11_INCLUDES_DIR) $(APP_ADD_CPPFLAGS)" \
- LDFLAGS="$(PROG_LDFLAGS) -L$(PROTODIR)$(X11_DIR)/lib$(ARCHLIBSUBDIR) $(APP_ADD_LDFLAGS)" \
+ CPPFLAGS="-I $(PROTODIR)$(X11_INCLUDES_DIR) -I $(PROTODIR)/usr/include -I $(PROTODIR)/usr/include/freetype2 $(APP_ADD_CPPFLAGS)" \
+ LDFLAGS="$(PROG_LDFLAGS) -L$(PROTODIR)/usr/lib -L$(PROTODIR)$(X11_DIR)/lib$(ARCHLIBSUBDIR) $(APP_ADD_LDFLAGS)" \
PKG_CONFIG_PATH=$(PROTODIR)/usr/lib/$(ARCHLIBSUBDIR)/pkgconfig:$(TOP)/common/pc-files/$(BUILD_DIR) \
$(APP_CONFIG_ENV)
--- a/open-src/app/mesa-demos/Makefile Mon Mar 24 14:42:43 2008 -0700
+++ b/open-src/app/mesa-demos/Makefile Mon Mar 24 16:05:09 2008 -0700
@@ -95,19 +95,23 @@
BUILD_32_FLAGS= MESA_CFG=$(MESA_CFG_32)
BUILD_64_FLAGS= MESA_CFG=$(MESA_CFG_64)
+# Flags passed on make command line when building
+ADD_MAKE_FLAGS = X11_INCLUDES="-I$(PROTODIR)$(X11_INCLUDES_DIR)" \
+ LDFLAGS="$(PROG_LDFLAGS) -L$(PROTODIR)$(X11_DIR)/lib$(ARCHLIBSUBDIR)"
+
# Build Mesa demos
$(GLXGEARS_BIN): $(UNPACK_TARGET)
(cd $(SOURCE_DIR)/configs && rm -f current && ln -s $(MESA_CFG) current)
- (cd $(DEMOS_DIR) && $(MAKE) $(MFLAGS) LDFLAGS="$(PROG_LDFLAGS)" glxgears )
+ (cd $(DEMOS_DIR) && $(MAKE) $(MFLAGS) $(ADD_MAKE_FLAGS) glxgears )
$(GLXINFO_BIN): $(UNPACK_TARGET)
(cd $(SOURCE_DIR)/configs && rm -f current && ln -s $(MESA_CFG) current)
- (cd $(DEMOS_DIR) && $(MAKE) $(MFLAGS) LDFLAGS="$(PROG_LDFLAGS)" glxinfo )
+ (cd $(DEMOS_DIR) && $(MAKE) $(MFLAGS) $(ADD_MAKE_FLAGS) glxinfo )
# For testing - we don't ship the rest of these
all-xdemos_gen: $(UNPACK_TARGET)
(cd $(SOURCE_DIR)/configs && rm -f current && ln -s $(MESA_CFG) current)
- (cd $(DEMOS_DIR) && $(MAKE) $(MFLAGS) LDFLAGS="$(PROG_LDFLAGS)")
+ (cd $(DEMOS_DIR) && $(MAKE) $(MFLAGS) $(ADD_MAKE_FLAGS) )
all-xdemos:
$(MAKE) $(MFLAGS) BUILD_DIR=$(BUILD_DIR_32) ARCH_FLAGS="$(ARCH32_FLAGS)" $(BUILD_32_FLAGS) all-xdemos_gen
--- a/open-src/app/xgamma/Makefile Mon Mar 24 14:42:43 2008 -0700
+++ b/open-src/app/xgamma/Makefile Mon Mar 24 16:05:09 2008 -0700
@@ -37,7 +37,7 @@
APP_NAME=xgamma
# Version number (used in path names)
-APP_VERS=1.0.1
+APP_VERS=1.0.2
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/xpm/Makefile Mon Mar 24 14:42:43 2008 -0700
+++ b/open-src/app/xpm/Makefile Mon Mar 24 16:05:09 2008 -0700
@@ -2,7 +2,7 @@
#
# Xpm Makefile
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# 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
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.7 08/03/07
+# @(#)Makefile 1.8 08/03/24
#
PWD:sh=pwd
@@ -40,10 +40,10 @@
MODULE_NAME=libXpm
# Version number (used in path names)
-MODULE_VERS=3.5.6
+MODULE_VERS=3.5.7
# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = gettext.patch,-p1
+SOURCE_PATCHES =
# Source tarball
SOURCE_TARBALL_NAME=$(MODULE_NAME)-$(MODULE_VERS).tar.bz2
--- a/open-src/app/xscreensaver/Makefile Mon Mar 24 14:42:43 2008 -0700
+++ b/open-src/app/xscreensaver/Makefile Mon Mar 24 16:05:09 2008 -0700
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.91 08/03/20
+# @(#)Makefile 1.93 08/03/24
#
PWD:sh=pwd
@@ -40,14 +40,14 @@
XSCREENSAVER_VERS=5.01
# Source tarball
-SOURCE_TARBALL_NAME=xscreensaver-$(XSCREENSAVER_VERS).tar.gz
+SOURCE_TARBALL_NAME=xscreensaver-$(XSCREENSAVER_VERS).tar.bz2
# Download site for source - master site no longer carries 5.01 so we use
# a mirror site until we upgrade to a newer version
#SOURCE_URL=http://www.jwz.org/xscreensaver/$(SOURCE_TARBALL_NAME)
-SOURCE_URL=http://ftp.osuosl.org/pub/FreeBSD/distfiles/$(SOURCE_TARBALL_NAME)
+SOURCE_URL=http://www.genunix.org/distributions/belenix_site/binfiles/$(SOURCE_TARBALL_NAME)
SOURCE_URL_SET=yes
-SOURCE_UNCOMPRESS=gzcat
+SOURCE_UNCOMPRESS=bzcat
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES = \
@@ -121,7 +121,8 @@
--with-configdir=/usr/X11/lib/xscreensaver/config/control-center-2.0 \
--with-image-directory=/usr/share/pixmaps/backgrounds \
--with-text-file=/etc/motd \
- --with-x-app-defaults=/usr/X11/lib/X11/app-defaults
+ --with-x-app-defaults=/usr/X11/lib/X11/app-defaults \
+ LDFLAGS="$(PROG_LDFLAGS) -L$(PROTODIR)/usr/X11/lib -R/usr/X11/lib"
# BINARY built in tree
XS_BIN=$(SOURCE_DIR)/xscreensaver
@@ -139,7 +140,7 @@
XS_MAN=$(SOURCE_DIR)/driver/xscreensaver.man.orig
# Include Paths
-INCLUDES=-I/usr/X11/include
+INCLUDES=-I$(PROTODIR)/usr/X11/include -I/usr/X11/include
# Additional optimization flags, to make the hacks show off the hardware
# better and we can get away with optimizations not allowed in the core X code
@@ -155,10 +156,9 @@
# since intltool-update doesn't work with Solaris xgettext (see bugs
# 4812320 & 4826523)
XS_CNFG_ENV=CC=$(CC) CFLAGS="$(XS_CFLAGS) $(INCLUDES)" CPPFLAGS="$(INCLUDES)" \
- PATH=/usr/perl5/bin:/usr/sfw/bin:/opt/sfw/bin:$(PATH) \
+ PATH=/usr/perl5/bin:/usr/sfw/bin:/opt/jdsbld/bin:/opt/sfw/bin:$(PATH) \
GNOME_DATADIR='$${prefix}/lib/xscreensaver/config' \
GLADE_DATADIR='$${prefix}/lib/xscreensaver/config' \
- LDFLAGS="$(PROG_LDFLAGS) -L/usr/X11/lib -R/usr/X11/lib" \
PKG_CONFIG_PATH=$(PROTODIR)/usr/lib/$(ARCHLIBSUBDIR)/pkgconfig:$(TOP)/common/pc-files/$(BUILD_DIR) \
PERL=/usr/perl5/bin/perl
XS_MAKE_ENV=install_prefix=$(PROTODIR)
@@ -177,9 +177,10 @@
$(XS_POT): $(SOURCE_DIR)/Makefile
(cd $(SOURCE_DIR)/po ; \
- PATH=/opt/sfw/bin:$(PATH) $(MAKE) -e $(XS_MAKE_ENV) generate_potfiles_in ; \
- PATH=/opt/sfw/bin:$(PATH) $(MAKE) -e $(XS_MAKE_ENV) POTFILES ; \
- PATH=/opt/sfw/bin:$(PATH) $(MAKE) -e $(XS_MAKE_ENV) xscreensaver.pot )
+ PATH=/opt/jdsbld/bin:/opt/sfw/bin:$(PATH) ; export PATH ; \
+ $(MAKE) -e $(XS_MAKE_ENV) generate_potfiles_in ; \
+ $(MAKE) -e $(XS_MAKE_ENV) POTFILES ; \
+ $(MAKE) -e $(XS_MAKE_ENV) xscreensaver.pot )
# Add Sun attributes section to man pages
$(XS_MAN):
--- a/open-src/data/workspace-patterns/Makefile Mon Mar 24 14:42:43 2008 -0700
+++ b/open-src/data/workspace-patterns/Makefile Mon Mar 24 16:05:09 2008 -0700
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# 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
@@ -38,33 +38,33 @@
include $(TOP)/common/Makefile.inc
DESTDIR=$(PROTODIR)
-INSTDIR=$(DESTDIR)/$(OW_DIR)/share/etc/workspace/patterns/
+INSTDIR=$(DESTDIR)/$(X11_DIR)/share/patterns/
install_gen::
mkdir -p $(INSTDIR)
- cp -p attributes $(INSTDIR)
- cp -p background.xbm $(INSTDIR)
- cp -p bricks.xbm $(INSTDIR)
- cp -p burl.xbm $(INSTDIR)
- cp -p corn.xbm $(INSTDIR)
- cp -p dmndpla.xbm $(INSTDIR)
- cp -p dolphin.xbm $(INSTDIR)
- cp -p dotwave2.xbm $(INSTDIR)
- cp -p dune.xbm $(INSTDIR)
- cp -p flowers.xbm $(INSTDIR)
- cp -p flyseye.xbm $(INSTDIR)
- cp -p foreground.xbm $(INSTDIR)
- cp -p fuji.xbm $(INSTDIR)
- cp -p geiger2.xbm $(INSTDIR)
- cp -p gray25.xbm $(INSTDIR)
- cp -p gray50.xbm $(INSTDIR)
- cp -p gray75.xbm $(INSTDIR)
- cp -p miniweave.xbm $(INSTDIR)
- cp -p sbump.xbm $(INSTDIR)
- cp -p sizmk2.xbm $(INSTDIR)
- cp -p southwest.xbm $(INSTDIR)
- cp -p squares.xbm $(INSTDIR)
- cp -p sunmulti.xbm $(INSTDIR)
- cp -p swirl2.xbm $(INSTDIR)
- cp -p wave1.xbm $(INSTDIR)
- cp -p wrnkle2.xbm $(INSTDIR)
+ cp -pf attributes $(INSTDIR)
+ cp -pf background.xbm $(INSTDIR)
+ cp -pf bricks.xbm $(INSTDIR)
+ cp -pf burl.xbm $(INSTDIR)
+ cp -pf corn.xbm $(INSTDIR)
+ cp -pf dmndpla.xbm $(INSTDIR)
+ cp -pf dolphin.xbm $(INSTDIR)
+ cp -pf dotwave2.xbm $(INSTDIR)
+ cp -pf dune.xbm $(INSTDIR)
+ cp -pf flowers.xbm $(INSTDIR)
+ cp -pf flyseye.xbm $(INSTDIR)
+ cp -pf foreground.xbm $(INSTDIR)
+ cp -pf fuji.xbm $(INSTDIR)
+ cp -pf geiger2.xbm $(INSTDIR)
+ cp -pf gray25.xbm $(INSTDIR)
+ cp -pf gray50.xbm $(INSTDIR)
+ cp -pf gray75.xbm $(INSTDIR)
+ cp -pf miniweave.xbm $(INSTDIR)
+ cp -pf sbump.xbm $(INSTDIR)
+ cp -pf sizmk2.xbm $(INSTDIR)
+ cp -pf southwest.xbm $(INSTDIR)
+ cp -pf squares.xbm $(INSTDIR)
+ cp -pf sunmulti.xbm $(INSTDIR)
+ cp -pf swirl2.xbm $(INSTDIR)
+ cp -pf wave1.xbm $(INSTDIR)
+ cp -pf wrnkle2.xbm $(INSTDIR)
--- a/open-src/font/Makefile.inc Mon Mar 24 14:42:43 2008 -0700
+++ b/open-src/font/Makefile.inc Mon Mar 24 16:05:09 2008 -0700
@@ -28,7 +28,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile.inc 1.4 08/02/05
+# @(#)Makefile.inc 1.5 08/03/24
#
### Makefile settings/rules common to all X.Org font modules
@@ -70,6 +70,7 @@
# Run configure script
$(SOURCE_DIR)/Makefile: $(UNPACK_TARGET)
(cd $(SOURCE_DIR) ; \
+ [ -n "$(RECONF)" ] && ACLOCAL="$(ACLOCAL_PATH)" autoreconf -v --install --force; \
chmod a+x configure ; \
$(CONFIG_ENV) ./configure $(FONT_CFG) )
--- a/open-src/lib/libXft/Makefile Mon Mar 24 14:42:43 2008 -0700
+++ b/open-src/lib/libXft/Makefile Mon Mar 24 16:05:09 2008 -0700
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.11 08/01/23
+# @(#)Makefile 1.12 08/03/24
#
PWD:sh=pwd
@@ -67,7 +67,7 @@
LIB_ADD_MAKEFLAGS = bindir=$(XFT_prefix)/bin$(ARCHLIBSUBDIR)
# Include Paths - need headers for fontconfig & freetype from build area
-LIB_ADD_CFLAGS = -I$(PROTODIR)/usr/include -I$(PROTODIR)/usr/X11/include
+LIB_ADD_CFLAGS = -I$(PROTODIR)/usr/include -I$(PROTODIR)/usr/include/freetype2
# Library built in tree
LIB_BUILT=$(BUILD_DIR)/.libs/libXft.so.2
--- a/open-src/lib/libXpm/Makefile Mon Mar 24 14:42:43 2008 -0700
+++ b/open-src/lib/libXpm/Makefile Mon Mar 24 16:05:09 2008 -0700
@@ -2,7 +2,7 @@
#
# Xpm Makefile
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# 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
@@ -30,14 +30,14 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.1 06/12/07
+# @(#)Makefile 1.2 08/03/24
#
# Package name used in tarballs
LIB_MODULE=libXpm
# Version number (used in path names)
-LIB_VERS=3.5.6
+LIB_VERS=3.5.7
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES = setuid.patch
--- a/open-src/lib/libXpm/setuid.patch Mon Mar 24 14:42:43 2008 -0700
+++ b/open-src/lib/libXpm/setuid.patch Mon Mar 24 16:05:09 2008 -0700
@@ -26,7 +26,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)setuid.patch 1.2 07/01/03 SMI
+# @(#)setuid.patch 1.3 08/03/24 SMI
#
Additional security checks for setuid programs that X.Org upstream doesn't
@@ -52,15 +52,3 @@
goto err;
}
---- src/WrFFrI.c 2006-10-11 15:31:40.000000000 -0700
-+++ src/WrFFrI.c 2006-10-03 16:34:35.563386000 -0700
-@@ -139,7 +139,8 @@
- }
- if (index(name, '-')) {
- if (name != new_name) {
-- strcpy(new_name, name);
-+ strncpy(new_name, name, sizeof(new_name));
-+ new_name[sizeof(new_name)-1] = '\0';
- name = new_name;
- }
- /* change '-' to '_' */
--- a/open-src/lib/mesa/Makefile Mon Mar 24 14:42:43 2008 -0700
+++ b/open-src/lib/mesa/Makefile Mon Mar 24 16:05:09 2008 -0700
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# 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
@@ -28,7 +28,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.10 08/03/07
+# @(#)Makefile 1.11 08/03/24
#
PWD:sh=pwd
@@ -54,6 +54,7 @@
mklib.patch \
solaris-dri-port.patch \
glext.h.patch \
+ glxext.h.patch \
6538497.patch \
6559710.patch \
mesa965.patch \
--- a/open-src/xserver/xorg/IA.patch Mon Mar 24 14:42:43 2008 -0700
+++ b/open-src/xserver/xorg/IA.patch Mon Mar 24 16:05:09 2008 -0700
@@ -193,3 +193,13 @@
}
void
+--- hw/dmx/Makefile.am.orig 2008-01-13 23:02:37.956946569 -0700
++++ hw/dmx/Makefile.am 2008-01-13 23:01:59.409213790 -0700
+@@ -82,6 +82,7 @@
+ $(GLX_LIBS) \
+ input/libdmxinput.a \
+ config/libdmxconfig.a \
++ $(top_builddir)/IA/libIA.la \
+ @DMXMODULES_LIBS@
+
+ Xdmx_CFLAGS = \
--- a/open-src/xserver/xorg/xtsol.patch Mon Mar 24 14:42:43 2008 -0700
+++ b/open-src/xserver/xorg/xtsol.patch Mon Mar 24 16:05:09 2008 -0700
@@ -825,3 +825,16 @@
auth_id = CheckAuthorization (proto_n, auth_proto,
string_n, auth_string, client, &reason);
+--- hw/dmx/Makefile.am.orig 2008-01-13 23:05:52.858949249 -0700
++++ hw/dmx/Makefile.am 2008-01-13 23:07:17.138575807 -0700
+@@ -85,6 +85,10 @@
+ $(top_builddir)/IA/libIA.la \
+ @DMXMODULES_LIBS@
+
++if BUILD_TSOL_MODULE
++Xdmx_LDADD += $(top_builddir)/tsol/libxtsol.la
++endif
++
+ Xdmx_CFLAGS = \
+ -DHAVE_DMX_CONFIG_H \
+ $(DIX_CFLAGS) \
--- a/packages/SUNWxorg-server/prototype_com Mon Mar 24 14:42:43 2008 -0700
+++ b/packages/SUNWxorg-server/prototype_com Mon Mar 24 16:05:09 2008 -0700
@@ -29,7 +29,7 @@
#
###########################################################################
#
-# ident "@(#)prototype_com 1.28 08/02/05 SMI"
+# ident "@(#)prototype_com 1.29 08/03/24 SMI"
#
# X.Org Foundation X server for Solaris
@@ -51,7 +51,6 @@
!search $HOME/lib/X11
d none X11/lib/X11 0755 root bin
f none X11/lib/X11/Options 0444 root bin
-s none X11/lib/X11/XKeysymDB=../../../openwin/lib/X11/XKeysymDB
s none X11/lib/X11/rgb.txt=../../../openwin/lib/X11/rgb.txt
f none X11/lib/X11/Cards 0444 root bin
--- a/packages/SUNWxwplt/prototype_com Mon Mar 24 14:42:43 2008 -0700
+++ b/packages/SUNWxwplt/prototype_com Mon Mar 24 16:05:09 2008 -0700
@@ -26,7 +26,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# "@(#)prototype_com 35.171 08/03/24 Sun Microsystems"
+# "@(#)prototype_com 35.172 08/03/24 Sun Microsystems"
#
# X Window System required core package
@@ -522,6 +522,8 @@
s none openwin/lib/XKeysymDB=X11/XKeysymDB
s none openwin/lib/X11/XErrorDB=../../../X11/share/X11/XErrorDB
s none openwin/lib/X11/XKeysymDB=../../../X11/share/X11/XKeysymDB
+s none X11/lib/X11/XErrorDB=../../share/X11/XErrorDB
+s none X11/lib/X11/XKeysymDB=../../share/X11/XKeysymDB
# open-src/lib/libX11
!search $HOME/X11/share/X11/locale
@@ -877,42 +879,40 @@
f none X11/share/X11/locale/zh_TW.big5/XI18N_OBJS 0444 root bin
f none X11/share/X11/locale/zh_TW.big5/XLC_LOCALE 0444 root bin
-!search $HOME/openwin/share
-d none openwin/share 0755 root bin
-
-!search $HOME/openwin/share/etc
+d none openwin/share 0755 root bin
s none openwin/etc=./share/etc
-d none openwin/share/etc 0755 root bin
+d none openwin/share/etc 0755 root bin
+d none openwin/share/etc/workspace 0755 root bin
+s none openwin/share/etc/workspace/patterns=../../../../X11/share/patterns
-!search $HOME/openwin/share/etc/workspace/patterns
-d none openwin/share/etc/workspace 0755 root bin
-d none openwin/share/etc/workspace/patterns 0755 root bin
-f none openwin/share/etc/workspace/patterns/attributes 0644 root bin
-f none openwin/share/etc/workspace/patterns/background.xbm 0644 root bin
-f none openwin/share/etc/workspace/patterns/bricks.xbm 0644 root bin
-f none openwin/share/etc/workspace/patterns/burl.xbm 0644 root bin
-f none openwin/share/etc/workspace/patterns/corn.xbm 0644 root bin
-f none openwin/share/etc/workspace/patterns/dmndpla.xbm 0644 root bin
-f none openwin/share/etc/workspace/patterns/dolphin.xbm 0644 root bin
-f none openwin/share/etc/workspace/patterns/dotwave2.xbm 0644 root bin
-f none openwin/share/etc/workspace/patterns/dune.xbm 0644 root bin
-f none openwin/share/etc/workspace/patterns/flowers.xbm 0644 root bin
-f none openwin/share/etc/workspace/patterns/flyseye.xbm 0644 root bin
-f none openwin/share/etc/workspace/patterns/foreground.xbm 0644 root bin
-f none openwin/share/etc/workspace/patterns/fuji.xbm 0644 root bin
-f none openwin/share/etc/workspace/patterns/geiger2.xbm 0644 root bin
-f none openwin/share/etc/workspace/patterns/gray25.xbm 0644 root bin
-f none openwin/share/etc/workspace/patterns/gray50.xbm 0644 root bin
-f none openwin/share/etc/workspace/patterns/gray75.xbm 0644 root bin
-f none openwin/share/etc/workspace/patterns/miniweave.xbm 0644 root bin
-f none openwin/share/etc/workspace/patterns/sbump.xbm 0644 root bin
-f none openwin/share/etc/workspace/patterns/sizmk2.xbm 0644 root bin
-f none openwin/share/etc/workspace/patterns/southwest.xbm 0644 root bin
-f none openwin/share/etc/workspace/patterns/squares.xbm 0644 root bin
-f none openwin/share/etc/workspace/patterns/sunmulti.xbm 0644 root bin
-f none openwin/share/etc/workspace/patterns/swirl2.xbm 0644 root bin
-f none openwin/share/etc/workspace/patterns/wave1.xbm 0644 root bin
-f none openwin/share/etc/workspace/patterns/wrnkle2.xbm 0644 root bin
+!search $HOME/X11/share/patterns
+d none X11/share/patterns 0755 root bin
+f none X11/share/patterns/attributes 0444 root bin
+f none X11/share/patterns/background.xbm 0444 root bin
+f none X11/share/patterns/bricks.xbm 0444 root bin
+f none X11/share/patterns/burl.xbm 0444 root bin
+f none X11/share/patterns/corn.xbm 0444 root bin
+f none X11/share/patterns/dmndpla.xbm 0444 root bin
+f none X11/share/patterns/dolphin.xbm 0444 root bin
+f none X11/share/patterns/dotwave2.xbm 0444 root bin
+f none X11/share/patterns/dune.xbm 0444 root bin
+f none X11/share/patterns/flowers.xbm 0444 root bin
+f none X11/share/patterns/flyseye.xbm 0444 root bin
+f none X11/share/patterns/foreground.xbm 0444 root bin
+f none X11/share/patterns/fuji.xbm 0444 root bin
+f none X11/share/patterns/geiger2.xbm 0444 root bin
+f none X11/share/patterns/gray25.xbm 0444 root bin
+f none X11/share/patterns/gray50.xbm 0444 root bin
+f none X11/share/patterns/gray75.xbm 0444 root bin
+f none X11/share/patterns/miniweave.xbm 0444 root bin
+f none X11/share/patterns/sbump.xbm 0444 root bin
+f none X11/share/patterns/sizmk2.xbm 0444 root bin
+f none X11/share/patterns/southwest.xbm 0444 root bin
+f none X11/share/patterns/squares.xbm 0444 root bin
+f none X11/share/patterns/sunmulti.xbm 0444 root bin
+f none X11/share/patterns/swirl2.xbm 0444 root bin
+f none X11/share/patterns/wave1.xbm 0444 root bin
+f none X11/share/patterns/wrnkle2.xbm 0444 root bin
s none openwin/include=./share/include