These changes in the X packages in Nevada build 136 will need updates to the IPS distro-import package definitions for those packages.
As usual, this only lists the changes that need distro-import changes, the full list of X changes in these builds can be seen at: http://hub.opensolaris.org/bin/view/Community+Group+x_win/changelogs-nv_130#HBuild136 Diffs are shown against current versions - I assume David will copy these to the 136 directory when making these changes during the resync. -alan- * 6928973 Remove /usr/sfw/lib/64 symlink from SUNWfreetype2 I am assuming that by 136, SUNWips will be backpublished to solve the link removal on upgrade problem, or that IPS will not consider this a link removal, but a link migration from SUNWfreetype2 to SUNWgccruntime, otherwise, you'll have to do the usual IPS override to restore the link. * 6934982 Remove /usr/openwin links from X packages diff --git a/src/util/distro-import/133/common/library:motif:libdpstkXm b/src/util/distro-import/133/common/library:motif:libdpstkXm --- a/src/util/distro-import/133/common/library:motif:libdpstkXm +++ b/src/util/distro-import/133/common/library:motif:libdpstkXm @@ -1,10 +1,7 @@ package library/motif/libdpstkXm consolidation "X" classification "System/X11" -import SUNWxwdxm exclude usr/openwin -# Obsolete - replaced by /usr/openwin -> X11 symlink -drop usr/openwin/lib -drop usr/openwin/lib/libdpstkXm.so.5 +import SUNWxwdxm end package package SUNWxwdxm diff --git a/src/util/distro-import/133/common/x11:clients b/src/util/distro-import/133/common/x11:clients --- a/src/util/distro-import/133/common/x11:clients +++ b/src/util/distro-import/133/common/x11:clients @@ -1,238 +1,7 @@ package x11/clients consolidation "X" classification "System/X11" -import SUNWxwplt exclude usr/openwin -# Obsolete - replaced by /usr/openwin -> X11 symlink -drop usr/openwin/bin -drop usr/openwin/bin/bdftopcf -drop usr/openwin/bin/cmap_alloc -drop usr/openwin/bin/cmap_compact -drop usr/openwin/bin/constype -drop usr/openwin/bin/cxpm -drop usr/openwin/bin/fbconsole -drop usr/openwin/bin/fsinfo -drop usr/openwin/bin/fslsfonts -drop usr/openwin/bin/fstobdf -drop usr/openwin/bin/kbd_mode -drop usr/openwin/bin/resize -drop usr/openwin/bin/rstart -drop usr/openwin/bin/sessreg -drop usr/openwin/bin/showfont -drop usr/openwin/bin/showrgb -drop usr/openwin/bin/smproxy -drop usr/openwin/bin/sxpm -drop usr/openwin/bin/winsysck -drop usr/openwin/bin/xauth -drop usr/openwin/bin/xcalc -drop usr/openwin/bin/xdpr -drop usr/openwin/bin/xdpyinfo -drop usr/openwin/bin/xfd -drop usr/openwin/bin/xhost -drop usr/openwin/bin/xinit -drop usr/openwin/bin/xkbbell -drop usr/openwin/bin/xkbprint -drop usr/openwin/bin/xkbvleds -drop usr/openwin/bin/xkbwatch -drop usr/openwin/bin/xkill -drop usr/openwin/bin/xlock -drop usr/openwin/bin/xlogo -drop usr/openwin/bin/xlsatoms -drop usr/openwin/bin/xlsclients -drop usr/openwin/bin/xlsfonts -drop usr/openwin/bin/xlswins -drop usr/openwin/bin/xmag -drop usr/openwin/bin/xmakemap -drop usr/openwin/bin/xmodmap -drop usr/openwin/bin/xpr -drop usr/openwin/bin/xprop -drop usr/openwin/bin/xrdb -drop usr/openwin/bin/xrefresh -drop usr/openwin/bin/xset -drop usr/openwin/bin/xsetroot -drop usr/openwin/bin/xstdcmap -drop usr/openwin/bin/xterm -drop usr/openwin/bin/xwd -drop usr/openwin/bin/xwininfo -drop usr/openwin/bin/xwud -drop usr/openwin/etc -drop usr/openwin/include -drop usr/openwin/lib -drop usr/openwin/lib/$(ARCH64) -drop usr/openwin/lib/$(ARCH64)/libSM.so -drop usr/openwin/lib/$(ARCH64)/libSM.so.6 -drop usr/openwin/lib/$(ARCH64)/libX.so -drop usr/openwin/lib/$(ARCH64)/libX.so.4 -drop usr/openwin/lib/$(ARCH64)/libX11.so -drop usr/openwin/lib/$(ARCH64)/libX11.so.4 -drop usr/openwin/lib/$(ARCH64)/libX11.so.5 -drop usr/openwin/lib/$(ARCH64)/libXau.so -drop usr/openwin/lib/$(ARCH64)/libXau.so.6 -drop usr/openwin/lib/$(ARCH64)/libXaw.so -drop usr/openwin/lib/$(ARCH64)/libXaw.so.5 -drop usr/openwin/lib/$(ARCH64)/libXdmcp.so -drop usr/openwin/lib/$(ARCH64)/libXdmcp.so.6 -drop usr/openwin/lib/$(ARCH64)/libXext.so -drop usr/openwin/lib/$(ARCH64)/libXext.so.0 -drop usr/openwin/lib/$(ARCH64)/libXfixes.so -drop usr/openwin/lib/$(ARCH64)/libXfixes.so.1 -drop usr/openwin/lib/$(ARCH64)/libXi.so -drop usr/openwin/lib/$(ARCH64)/libXi.so.5 -drop usr/openwin/lib/$(ARCH64)/libXmu.so -drop usr/openwin/lib/$(ARCH64)/libXmu.so.4 -drop usr/openwin/lib/$(ARCH64)/libXp.so -drop usr/openwin/lib/$(ARCH64)/libXp.so.1 -drop usr/openwin/lib/$(ARCH64)/libXpm.so -drop usr/openwin/lib/$(ARCH64)/libXpm.so.4 -drop usr/openwin/lib/$(ARCH64)/libXt.so -drop usr/openwin/lib/$(ARCH64)/libXt.so.4 -drop usr/openwin/lib/$(ARCH64)/libXtsol.so -drop usr/openwin/lib/$(ARCH64)/libXtsol.so.1 -drop usr/openwin/lib/$(ARCH64)/libXtst.so -drop usr/openwin/lib/$(ARCH64)/libXtst.so.1 -$(sparc_ONLY)drop usr/openwin/lib/$(ARCH64)/libdga.so.1 -drop usr/openwin/lib/64 -drop usr/openwin/lib/X11 -drop usr/openwin/lib/X11/XErrorDB -drop usr/openwin/lib/X11/XKeysymDB -drop usr/openwin/lib/X11/Xcms.txt -drop usr/openwin/lib/X11/rgb.dir -drop usr/openwin/lib/X11/rgb.pag -drop usr/openwin/lib/X11/rgb.txt -drop usr/openwin/lib/XErrorDB -drop usr/openwin/lib/XKeysymDB -drop usr/openwin/lib/Xcms.txt -drop usr/openwin/lib/libFS.so -drop usr/openwin/lib/libFS.so.5 -drop usr/openwin/lib/libSM.so -drop usr/openwin/lib/libSM.so.6 -drop usr/openwin/lib/libX.so -drop usr/openwin/lib/libX.so.4 -drop usr/openwin/lib/libX11.so -drop usr/openwin/lib/libX11.so.4 -drop usr/openwin/lib/libX11.so.5 -drop usr/openwin/lib/libXau.so -drop usr/openwin/lib/libXau.so.6 -drop usr/openwin/lib/libXaw.so -drop usr/openwin/lib/libXaw.so.4 -drop usr/openwin/lib/libXaw.so.5 -drop usr/openwin/lib/libXdmcp.so -drop usr/openwin/lib/libXdmcp.so.6 -drop usr/openwin/lib/libXext.so -drop usr/openwin/lib/libXext.so.0 -drop usr/openwin/lib/libXi.so -drop usr/openwin/lib/libXi.so.5 -drop usr/openwin/lib/libXmu.so -drop usr/openwin/lib/libXmu.so.4 -drop usr/openwin/lib/libXp.so -drop usr/openwin/lib/libXp.so.1 -drop usr/openwin/lib/libXpm.so -drop usr/openwin/lib/libXpm.so.4 -drop usr/openwin/lib/libXt.so -drop usr/openwin/lib/libXt.so.4 -drop usr/openwin/lib/libXt.so.5 -drop usr/openwin/lib/libXtsol.so -drop usr/openwin/lib/libXtsol.so.1 -drop usr/openwin/lib/libXtst.so -drop usr/openwin/lib/libXtst.so.1 -drop usr/openwin/lib/libdga.so.1 -drop usr/openwin/lib/libdps.so.5 -drop usr/openwin/lib/libdpstk.so.5 -drop usr/openwin/lib/libowconfig.so -drop usr/openwin/lib/libowconfig.so.0 -drop usr/openwin/lib/libpsres.so.5 -drop usr/openwin/lib/locale -drop usr/openwin/lib/locale/locale.alias -drop usr/openwin/lib/mkcookie -drop usr/openwin/lib/rgb.dir -drop usr/openwin/lib/rgb.pag -drop usr/openwin/lib/rgb.txt -drop usr/openwin/sfw -drop usr/openwin/sfw/lib -drop usr/openwin/share -drop usr/openwin/share/etc -drop usr/openwin/share/etc/workspace -drop usr/openwin/share/etc/workspace/patterns -drop usr/openwin/share/include -drop usr/openwin/share/include/X11 -drop usr/openwin/share/include/X11/bitmaps -drop usr/openwin/share/include/X11/bitmaps/1x1 -drop usr/openwin/share/include/X11/bitmaps/2x2 -drop usr/openwin/share/include/X11/bitmaps/Dashes -drop usr/openwin/share/include/X11/bitmaps/Down -drop usr/openwin/share/include/X11/bitmaps/Excl -drop usr/openwin/share/include/X11/bitmaps/FlipHoriz -drop usr/openwin/share/include/X11/bitmaps/FlipVert -drop usr/openwin/share/include/X11/bitmaps/Fold -drop usr/openwin/share/include/X11/bitmaps/Left -drop usr/openwin/share/include/X11/bitmaps/Right -drop usr/openwin/share/include/X11/bitmaps/RotateLeft -drop usr/openwin/share/include/X11/bitmaps/RotateRight -drop usr/openwin/share/include/X11/bitmaps/Stipple -drop usr/openwin/share/include/X11/bitmaps/Term -drop usr/openwin/share/include/X11/bitmaps/Up -drop usr/openwin/share/include/X11/bitmaps/black -drop usr/openwin/share/include/X11/bitmaps/black6 -drop usr/openwin/share/include/X11/bitmaps/box6 -drop usr/openwin/share/include/X11/bitmaps/boxes -drop usr/openwin/share/include/X11/bitmaps/calculator -drop usr/openwin/share/include/X11/bitmaps/cntr_ptr -drop usr/openwin/share/include/X11/bitmaps/cntr_ptrmsk -drop usr/openwin/share/include/X11/bitmaps/cross_weave -drop usr/openwin/share/include/X11/bitmaps/dimple1 -drop usr/openwin/share/include/X11/bitmaps/dimple3 -drop usr/openwin/share/include/X11/bitmaps/dot -drop usr/openwin/share/include/X11/bitmaps/dropbar7 -drop usr/openwin/share/include/X11/bitmaps/dropbar8 -drop usr/openwin/share/include/X11/bitmaps/escherknot -drop usr/openwin/share/include/X11/bitmaps/flagdown -drop usr/openwin/share/include/X11/bitmaps/flagup -drop usr/openwin/share/include/X11/bitmaps/flipped_gray -drop usr/openwin/share/include/X11/bitmaps/gray -drop usr/openwin/share/include/X11/bitmaps/gray1 -drop usr/openwin/share/include/X11/bitmaps/gray3 -drop usr/openwin/share/include/X11/bitmaps/hlines2 -drop usr/openwin/share/include/X11/bitmaps/hlines3 -drop usr/openwin/share/include/X11/bitmaps/icon -drop usr/openwin/share/include/X11/bitmaps/keyboard16 -drop usr/openwin/share/include/X11/bitmaps/left_ptr -drop usr/openwin/share/include/X11/bitmaps/left_ptrmsk -drop usr/openwin/share/include/X11/bitmaps/letters -drop usr/openwin/share/include/X11/bitmaps/light_gray -drop usr/openwin/share/include/X11/bitmaps/mailempty -drop usr/openwin/share/include/X11/bitmaps/mailemptymsk -drop usr/openwin/share/include/X11/bitmaps/mailfull -drop usr/openwin/share/include/X11/bitmaps/mailfullmsk -drop usr/openwin/share/include/X11/bitmaps/mensetmanus -drop usr/openwin/share/include/X11/bitmaps/menu10 -drop usr/openwin/share/include/X11/bitmaps/menu12 -drop usr/openwin/share/include/X11/bitmaps/menu16 -drop usr/openwin/share/include/X11/bitmaps/menu8 -drop usr/openwin/share/include/X11/bitmaps/noletters -drop usr/openwin/share/include/X11/bitmaps/opendot -drop usr/openwin/share/include/X11/bitmaps/opendotMask -drop usr/openwin/share/include/X11/bitmaps/plaid -drop usr/openwin/share/include/X11/bitmaps/right_ptr -drop usr/openwin/share/include/X11/bitmaps/right_ptrmsk -drop usr/openwin/share/include/X11/bitmaps/root_weave -drop usr/openwin/share/include/X11/bitmaps/scales -drop usr/openwin/share/include/X11/bitmaps/sipb -drop usr/openwin/share/include/X11/bitmaps/star -drop usr/openwin/share/include/X11/bitmaps/starMask -drop usr/openwin/share/include/X11/bitmaps/stipple -drop usr/openwin/share/include/X11/bitmaps/target -drop usr/openwin/share/include/X11/bitmaps/terminal -drop usr/openwin/share/include/X11/bitmaps/tie_fighter -drop usr/openwin/share/include/X11/bitmaps/vlines2 -drop usr/openwin/share/include/X11/bitmaps/vlines3 -drop usr/openwin/share/include/X11/bitmaps/weird_size -drop usr/openwin/share/include/X11/bitmaps/wide_weave -drop usr/openwin/share/include/X11/bitmaps/wingdogs -drop usr/openwin/share/include/X11/bitmaps/woman -drop usr/openwin/share/include/X11/bitmaps/xfd_icon -drop usr/openwin/share/include/X11/bitmaps/xlogo11 -drop usr/openwin/share/include/X11/bitmaps/xlogo16 -drop usr/openwin/share/include/X11/bitmaps/xlogo32 -drop usr/openwin/share/include/X11/bitmaps/xlogo64 +import SUNWxwplt # Links for compatibility with old Solaris locations add link path=usr/X11/lib/XErrorDB target=X11/XErrorDB add link path=usr/X11/lib/XKeysymDB target=X11/XKeysymDB diff --git a/src/util/distro-import/133/common/x11:compatibility:links-svid b/src/util/distro-import/133/common/x11:compatibility:links-svid --- a/src/util/distro-import/133/common/x11:compatibility:links-svid +++ b/src/util/distro-import/133/common/x11:compatibility:links-svid @@ -1,8 +1,7 @@ package x11/compatibility/links-svid consolidation "X" classification "System/X11" -import SUNWxwrtl exclude usr/openwin -chattr_glob * edit target openwin X11 +import SUNWxwrtl # # the following link was removed in snv_103 but due to bug 2369, we # continue to instantiate it so it does not get removed on update diff --git a/src/util/distro-import/133/common/x11:demo b/src/util/distro-import/133/common/x11:demo --- a/src/util/distro-import/133/common/x11:demo +++ b/src/util/distro-import/133/common/x11:demo @@ -1,15 +1,7 @@ package x11/demo consolidation "X" classification "System/X11" -import SUNWxwdem exclude usr/openwin -# Obsolete - replaced by /usr/openwin -> X11 symlink -drop usr/openwin/demo -drop usr/openwin/demo/ico -drop usr/openwin/demo/xev -drop usr/openwin/demo/xeyes -drop usr/openwin/demo/xgc -drop usr/openwin/demo/xmag_multivis -drop usr/openwin/demo/xscope +import SUNWxwdem end package package SUNWxwdem diff --git a/src/util/distro-import/133/common/x11:font-utilities b/src/util/distro-import/133/common/x11:font-utilities --- a/src/util/distro-import/133/common/x11:font-utilities +++ b/src/util/distro-import/133/common/x11:font-utilities @@ -1,13 +1,7 @@ package x11/font-utilities consolidation "X" classification "System/X11" -import SUNWxwfsw exclude usr/openwin -# Obsolete - replaced by /usr/openwin -> X11 symlink -drop usr/openwin/bin -drop usr/openwin/bin/mkfontdir -drop usr/openwin/bin/mkfontscale -drop usr/openwin/lib -drop usr/openwin/lib/installalias +import SUNWxwfsw end package package SUNWxwfsw diff --git a/src/util/distro-import/133/common/x11:header b/src/util/distro-import/133/common/x11:header --- a/src/util/distro-import/133/common/x11:header +++ b/src/util/distro-import/133/common/x11:header @@ -1,75 +1,7 @@ package x11/header consolidation "X" classification "Development/X11" -import SUNWxwinc exclude usr/openwin -# Obsolete - replaced by /usr/openwin -> X11 symlink -drop usr/openwin/share -drop usr/openwin/share/include -drop usr/openwin/share/include/X11 -drop usr/openwin/share/include/X11/Composite.h -drop usr/openwin/share/include/X11/CompositeP.h -drop usr/openwin/share/include/X11/ConstrainP.h -drop usr/openwin/share/include/X11/Constraint.h -drop usr/openwin/share/include/X11/Core.h -drop usr/openwin/share/include/X11/CoreP.h -drop usr/openwin/share/include/X11/DECkeysym.h -drop usr/openwin/share/include/X11/HPkeysym.h -drop usr/openwin/share/include/X11/ICE -drop usr/openwin/share/include/X11/Intrinsic.h -drop usr/openwin/share/include/X11/IntrinsicP.h -drop usr/openwin/share/include/X11/Object.h -drop usr/openwin/share/include/X11/ObjectP.h -drop usr/openwin/share/include/X11/RectObj.h -drop usr/openwin/share/include/X11/RectObjP.h -drop usr/openwin/share/include/X11/SM -drop usr/openwin/share/include/X11/Shell.h -drop usr/openwin/share/include/X11/ShellP.h -drop usr/openwin/share/include/X11/StringDefs.h -drop usr/openwin/share/include/X11/Sunkeysym.h -drop usr/openwin/share/include/X11/Vendor.h -drop usr/openwin/share/include/X11/VendorP.h -drop usr/openwin/share/include/X11/X.h -drop usr/openwin/share/include/X11/XF86keysym.h -drop usr/openwin/share/include/X11/XKBlib.h -drop usr/openwin/share/include/X11/XWDFile.h -drop usr/openwin/share/include/X11/Xalloca.h -drop usr/openwin/share/include/X11/Xarch.h -drop usr/openwin/share/include/X11/Xatom.h -drop usr/openwin/share/include/X11/Xauth.h -drop usr/openwin/share/include/X11/Xaw -drop usr/openwin/share/include/X11/Xcms.h -drop usr/openwin/share/include/X11/Xcursor -drop usr/openwin/share/include/X11/Xdefs.h -drop usr/openwin/share/include/X11/Xdmcp.h -drop usr/openwin/share/include/X11/Xfuncproto.h -drop usr/openwin/share/include/X11/Xfuncs.h -drop usr/openwin/share/include/X11/XlcGeneric.h -drop usr/openwin/share/include/X11/XlcPubI.h -drop usr/openwin/share/include/X11/XlcPublic.h -drop usr/openwin/share/include/X11/Xlcint.h -drop usr/openwin/share/include/X11/Xlib.h -drop usr/openwin/share/include/X11/XlibConf.h -drop usr/openwin/share/include/X11/Xlibint.h -drop usr/openwin/share/include/X11/Xlocale.h -drop usr/openwin/share/include/X11/Xmd.h -drop usr/openwin/share/include/X11/Xmu -drop usr/openwin/share/include/X11/Xos.h -drop usr/openwin/share/include/X11/Xos_r.h -drop usr/openwin/share/include/X11/Xosdefs.h -drop usr/openwin/share/include/X11/Xpoll.h -drop usr/openwin/share/include/X11/Xproto.h -drop usr/openwin/share/include/X11/Xprotostr.h -drop usr/openwin/share/include/X11/Xregion.h -drop usr/openwin/share/include/X11/Xresource.h -drop usr/openwin/share/include/X11/Xthreads.h -drop usr/openwin/share/include/X11/Xutil.h -drop usr/openwin/share/include/X11/ap_keysym.h -drop usr/openwin/share/include/X11/cursorfont.h -drop usr/openwin/share/include/X11/extensions -drop usr/openwin/share/include/X11/keysym.h -drop usr/openwin/share/include/X11/keysymdef.h -drop usr/openwin/share/include/X11/xpm.h -drop usr/openwin/share/include/Xau +import SUNWxwinc depend_path /usr/include/sys/types.h end package diff --git a/src/util/distro-import/133/common/x11:keyboard:accessx b/src/util/distro-import/133/common/x11:keyboard:accessx --- a/src/util/distro-import/133/common/x11:keyboard:accessx +++ b/src/util/distro-import/133/common/x11:keyboard:accessx @@ -1,10 +1,7 @@ package x11/keyboard/accessx consolidation "X" classification "System/X11" -import SUNWxwacx exclude usr/openwin -# Obsolete - replaced by /usr/openwin -> X11 symlink -drop usr/openwin/bin -drop usr/openwin/bin/accessx +import SUNWxwacx end package package SUNWxwacx diff --git a/src/util/distro-import/133/common/x11:library:libice b/src/util/distro-import/133/common/x11:library:libice --- a/src/util/distro-import/133/common/x11:library:libice +++ b/src/util/distro-import/133/common/x11:library:libice @@ -1,15 +1,7 @@ package x11/library/libice consolidation "X" classification "System/X11" -import SUNWxwice exclude usr/openwin -# Obsolete - replaced by /usr/openwin -> X11 symlink -drop usr/openwin/bin -drop usr/openwin/bin/iceauth -drop usr/openwin/lib -drop usr/openwin/lib/$(ARCH64) -drop usr/openwin/lib/$(ARCH64)/libICE.so -drop usr/openwin/lib/$(ARCH64)/libICE.so.6 -drop usr/openwin/lib/libICE.so.6 +import SUNWxwice end package package SUNWxwice diff --git a/src/util/distro-import/133/common/x11:library:libxft b/src/util/distro-import/133/common/x11:library:libxft --- a/src/util/distro-import/133/common/x11:library:libxft +++ b/src/util/distro-import/133/common/x11:library:libxft @@ -1,18 +1,7 @@ package x11/library/libxft consolidation "X" classification "System/X11" -import SUNWxwxft exclude usr/openwin -# Obsolete - replaced by /usr/openwin -> X11 symlink -drop usr/openwin/lib -drop usr/openwin/lib/$(ARCH64) -drop usr/openwin/lib/$(ARCH64)/libXft.so -drop usr/openwin/lib/$(ARCH64)/libXft.so.2 -drop usr/openwin/lib/libXft.so -drop usr/openwin/lib/libXft.so.2 -drop usr/openwin/share -drop usr/openwin/share/include -drop usr/openwin/share/include/X11 -drop usr/openwin/share/include/X11/Xft +import SUNWxwxft version 2.1.14 end package diff --git a/src/util/distro-import/133/common/x11:library:mesa b/src/util/distro-import/133/common/x11:library:mesa --- a/src/util/distro-import/133/common/x11:library:mesa +++ b/src/util/distro-import/133/common/x11:library:mesa @@ -1,26 +1,7 @@ package x11/library/mesa consolidation "X" classification "System/X11" -$(i386_ONLY)import SUNWxorg-mesa exclude usr/openwin -$(sparc_ONLY)import SUNWxorg-mesa -# Obsolete - replaced by /usr/openwin -> X11 symlink -$(i386_ONLY)drop usr/openwin/lib -$(i386_ONLY)drop usr/openwin/lib/amd64 -$(i386_ONLY)drop usr/openwin/lib/amd64/libGL.so -$(i386_ONLY)drop usr/openwin/lib/amd64/libGL.so.1 -$(i386_ONLY)drop usr/openwin/lib/amd64/libGLU.so -$(i386_ONLY)drop usr/openwin/lib/amd64/libGLU.so.1 -$(i386_ONLY)drop usr/openwin/lib/amd64/libGLw.so -$(i386_ONLY)drop usr/openwin/lib/amd64/libGLw.so.1 -$(i386_ONLY)drop usr/openwin/lib/libGL.so -$(i386_ONLY)drop usr/openwin/lib/libGL.so.1 -$(i386_ONLY)drop usr/openwin/lib/libGLU.so -$(i386_ONLY)drop usr/openwin/lib/libGLU.so.1 -$(i386_ONLY)drop usr/openwin/lib/libGLw.so -$(i386_ONLY)drop usr/openwin/lib/libGLw.so.1 -$(i386_ONLY)drop usr/openwin/share -$(i386_ONLY)drop usr/openwin/share/include -$(i386_ONLY)drop usr/openwin/share/include/GL +import SUNWxorg-mesa # Depends on ogl-select service to create links at boot depend_path /var/svc/manifest/application/opengl/ogl-select.xml version 7.4.4 diff --git a/src/util/distro-import/133/common/x11:optional-clients b/src/util/distro-import/133/common/x11:optional-clients --- a/src/util/distro-import/133/common/x11:optional-clients +++ b/src/util/distro-import/133/common/x11:optional-clients @@ -1,44 +1,7 @@ package x11/optional-clients consolidation "X" classification "System/X11" -import SUNWxwopt exclude usr/openwin -# Obsolete - replaced by /usr/openwin -> X11 symlink -drop usr/openwin/bin -drop usr/openwin/bin/appres -drop usr/openwin/bin/atobm -drop usr/openwin/bin/bitmap -drop usr/openwin/bin/bmtoa -drop usr/openwin/bin/editres -drop usr/openwin/bin/imake -drop usr/openwin/bin/lbxproxy -drop usr/openwin/bin/listres -drop usr/openwin/bin/makedepend -drop usr/openwin/bin/oclock -drop usr/openwin/bin/proxymngr -drop usr/openwin/bin/rgb -drop usr/openwin/bin/twm -drop usr/openwin/bin/viewres -drop usr/openwin/bin/xbiff -drop usr/openwin/bin/xclipboard -drop usr/openwin/bin/xclock -drop usr/openwin/bin/xcmsdb -drop usr/openwin/bin/xcolor -drop usr/openwin/bin/xconsole -drop usr/openwin/bin/xcutsel -drop usr/openwin/bin/xditview -drop usr/openwin/bin/xedit -drop usr/openwin/bin/xfindproxy -drop usr/openwin/bin/xfontsel -drop usr/openwin/bin/xfwp -drop usr/openwin/bin/xload -drop usr/openwin/bin/xman -drop usr/openwin/bin/xmkmf -drop usr/openwin/bin/xrx -drop usr/openwin/lib -drop usr/openwin/lib/X11 -drop usr/openwin/lib/X11/config -drop usr/openwin/lib/config -drop usr/openwin/lib/libxrx.so +import SUNWxwopt end package package SUNWxwopt diff --git a/src/util/distro-import/133/common/x11:session:xdm b/src/util/distro-import/133/common/x11:session:xdm --- a/src/util/distro-import/133/common/x11:session:xdm +++ b/src/util/distro-import/133/common/x11:session:xdm @@ -1,9 +1,8 @@ package x11/session/xdm consolidation "X" classification "System/X11" -import SUNWxdm exclude usr/openwin +import SUNWxdm import SUNWxdm-root -chattr_glob * edit path usr/openwin usr/X11 depend_path /usr/bin/sort version 1.1.9 diff --git a/src/util/distro-import/133/common/x11:xfs b/src/util/distro-import/133/common/x11:xfs --- a/src/util/distro-import/133/common/x11:xfs +++ b/src/util/distro-import/133/common/x11:xfs @@ -1,12 +1,7 @@ package x11/xfs consolidation "X" classification "System/X11" -import SUNWxwfs exclude usr/openwin -# Obsolete - replaced by /usr/openwin -> X11 symlink -drop usr/openwin/bin -drop usr/openwin/bin/fs -drop usr/openwin/bin/fsadmin -drop usr/openwin/bin/xfs +import SUNWxwfs # SMF manifest formerly in separate root package from SUNWxwplr import var/svc/manifest/application/x11/xfs.xml -- -Alan Coopersmith- alan.coopersmith at oracle.com Oracle Solaris Platform Engineering: X Window System
