equal
deleted
inserted
replaced
1 #!/bin/ksh |
1 #!/bin/ksh |
2 |
2 |
3 ### |
3 ### |
4 # |
4 # |
5 # @(#)upgrade-X 1.34 07/11/07 |
5 # @(#)upgrade-X 1.35 08/02/05 |
6 # |
6 # |
7 # Copyright 2007 Sun Microsystems, Inc. All rights reserved. |
7 # Copyright 2007 Sun Microsystems, Inc. All rights reserved. |
8 # |
8 # |
9 # Permission is hereby granted, free of charge, to any person obtaining a |
9 # Permission is hereby granted, free of charge, to any person obtaining a |
10 # copy of this software and associated documentation files (the |
10 # copy of this software and associated documentation files (the |
231 fi |
231 fi |
232 |
232 |
233 if [ -d SUNWxorg-mesa ] ; then |
233 if [ -d SUNWxorg-mesa ] ; then |
234 FORCE_ADD="${FORCE_ADD} ${PKGS_XORG_MESA}" |
234 FORCE_ADD="${FORCE_ADD} ${PKGS_XORG_MESA}" |
235 PKGS_32="${PKGS_32} ${PKGS_XORG_MESA}" |
235 PKGS_32="${PKGS_32} ${PKGS_XORG_MESA}" |
|
236 fi |
|
237 |
|
238 # 6658871 changed /usr/X11/lib/X11/fonts/Type1 from a link in SUNWxorg-server |
|
239 # to a directory in SUNWxwcft, need to remove old link before installing |
|
240 # directory |
|
241 if [ -L /usr/X11/lib/X11/fonts/Type1 ] ; then |
|
242 REM_PKGS="SUNWxorg-server" |
|
243 FORCE_ADD="${FORCE_ADD} SUNWxorg-server" |
236 fi |
244 fi |
237 |
245 |
238 if [ "$MACH" = "sparc" ]; then |
246 if [ "$MACH" = "sparc" ]; then |
239 # special for S10 - builds before 34 had separate 64-bit packages |
247 # special for S10 - builds before 34 had separate 64-bit packages |
240 # they were merged into core packages at build 34. |
248 # they were merged into core packages at build 34. |