# HG changeset patch # User Niveditha Rau # Date 1201125420 28800 # Node ID 016d87bea02c4d5508a85235dacbf1bcdfa9f408 # Parent bd2a2d0c962211ab6c84ed06000f2d5e11bf5300 6653913 Replace xmag, xcalc with the opensrc version from X.Org diff -r bd2a2d0c9622 -r 016d87bea02c open-src/app/Makefile --- a/open-src/app/Makefile Wed Jan 23 12:48:22 2008 -0800 +++ b/open-src/app/Makefile Wed Jan 23 13:57:00 2008 -0800 @@ -28,7 +28,7 @@ # or other dealings in this Software without prior written authorization # of the copyright holder. # -# @(#)Makefile 1.16 08/01/22 +# @(#)Makefile 1.17 08/01/23 # ############################################################################### @@ -36,12 +36,14 @@ constype \ mesa-demos \ mkfontscale \ + xcalc \ xcursorgen \ xdpyinfo \ xgamma \ xkbcomp \ xkill \ xlsatoms \ + xmag \ xmodmap \ xpm \ xrandr \ diff -r bd2a2d0c9622 -r 016d87bea02c open-src/app/xcalc/Makefile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/open-src/app/xcalc/Makefile Wed Jan 23 13:57:00 2008 -0800 @@ -0,0 +1,50 @@ +############################################################################### +# +# xcalc 1.x Makefile +# +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. +# Use subject to license terms. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, and/or sell copies of the Software, and to permit persons +# to whom the Software is furnished to do so, provided that the above +# copyright notice(s) and this permission notice appear in all copies of +# the Software and that both the above copyright notice(s) and this +# permission notice appear in supporting documentation. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# +# Except as contained in this notice, the name of a copyright holder +# shall not be used in advertising or otherwise to promote the sale, use +# or other dealings in this Software without prior written authorization +# of the copyright holder. +# +# @(#)Makefile 1.1 08/01/23 +# + +# Package name used in tarballs +APP_NAME=xcalc + +# Version number (used in path names) +APP_VERS=1.0.2 + +# Patches to apply to source after unpacking, in order +SOURCE_PATCHES = + +# Man pages to apply Sun footer to & attributes to list +SUNTOUCHED_MANPAGES=*.man +SUNTOUCH_MAN_FLAGS= \ + -a '{Availability, SUNWxwplt} {Interface Stability, Committed}' + +include ../Makefile.inc diff -r bd2a2d0c9622 -r 016d87bea02c open-src/app/xmag/Makefile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/open-src/app/xmag/Makefile Wed Jan 23 13:57:00 2008 -0800 @@ -0,0 +1,50 @@ +############################################################################### +# +# xmag 1.x Makefile +# +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. +# Use subject to license terms. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, and/or sell copies of the Software, and to permit persons +# to whom the Software is furnished to do so, provided that the above +# copyright notice(s) and this permission notice appear in all copies of +# the Software and that both the above copyright notice(s) and this +# permission notice appear in supporting documentation. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# +# Except as contained in this notice, the name of a copyright holder +# shall not be used in advertising or otherwise to promote the sale, use +# or other dealings in this Software without prior written authorization +# of the copyright holder. +# +# @(#)Makefile 1.1 08/01/23 +# + +# Package name used in tarballs +APP_NAME=xmag + +# Version number (used in path names) +APP_VERS=1.0.2 + +# Patches to apply to source after unpacking, in order +SOURCE_PATCHES = + +# Man pages to apply Sun footer to & attributes to list +SUNTOUCHED_MANPAGES=*.man +SUNTOUCH_MAN_FLAGS= \ + -a '{Availability, SUNWxwplt} {Interface Stability, Committed}' + +include ../Makefile.inc diff -r bd2a2d0c9622 -r 016d87bea02c packages/SUNWxorg-cfg/prototype_com --- a/packages/SUNWxorg-cfg/prototype_com Wed Jan 23 12:48:22 2008 -0800 +++ b/packages/SUNWxorg-cfg/prototype_com Wed Jan 23 13:57:00 2008 -0800 @@ -29,7 +29,7 @@ # ########################################################################## # -# ident "@(#)prototype_com 1.14 07/01/04 SMI" +# ident "@(#)prototype_com 1.15 08/01/23 SMI" # # X.Org server configuration tool @@ -49,7 +49,6 @@ d none X11/lib 0755 root bin d none X11/lib/xorgcfg 0755 root bin f none X11/lib/xorgcfg/libxkbui.so.1 0444 root bin -f none X11/lib/xorgcfg/libXaw.so.7 0444 root bin !search $HOME/lib/X11/app-defaults d none X11/lib/X11 0755 root bin diff -r bd2a2d0c9622 -r 016d87bea02c packages/SUNWxwman/prototype_com --- a/packages/SUNWxwman/prototype_com Wed Jan 23 12:48:22 2008 -0800 +++ b/packages/SUNWxwman/prototype_com Wed Jan 23 13:57:00 2008 -0800 @@ -26,7 +26,7 @@ # or other dealings in this Software without prior written authorization # of the copyright holder. # -# ident "@(#)prototype_com 35.40 08/01/22 SMI" +# ident "@(#)prototype_com 35.41 08/01/23 SMI" # # X Window System online user man pages @@ -107,7 +107,6 @@ f none openwin/share/man/man1/winsysck.1 0444 root bin f none openwin/share/man/man1/xauth.1 0444 root bin f none openwin/share/man/man1/xbiff.1 0444 root bin -f none openwin/share/man/man1/xcalc.1 0444 root bin f none openwin/share/man/man1/xclipboard.1 0444 root bin f none openwin/share/man/man1/xclock.1 0444 root bin f none openwin/share/man/man1/xcmsdb.1 0444 root bin @@ -129,7 +128,6 @@ f none openwin/share/man/man1/xlsclients.1 0444 root bin f none openwin/share/man/man1/xlsfonts.1 0444 root bin f none openwin/share/man/man1/xlswins.1 0444 root bin -f none openwin/share/man/man1/xmag.1 0444 root bin f none openwin/share/man/man1/xmakemap.1 0444 root bin f none openwin/share/man/man1/xman.1 0444 root bin f none openwin/share/man/man1/xmh.1 0444 root bin @@ -187,12 +185,18 @@ # open-src/app/constype f none X11/share/man/man1/constype.1 0444 root bin +# open-src/app/xcalc +f none X11/share/man/man1/xcalc.1 0444 root bin + # open-src/app/xcursorgen f none X11/share/man/man1/xcursorgen.1 0444 root bin # open-src/app/xdpyinfo f none X11/share/man/man1/xdpyinfo.1 0444 root bin +# open-src/app/xmag +f none X11/share/man/man1/xmag.1 0444 root bin + # open-src/app/xmodmap f none X11/share/man/man1/xmodmap.1 0444 root bin diff -r bd2a2d0c9622 -r 016d87bea02c packages/SUNWxwplt/prototype_com --- a/packages/SUNWxwplt/prototype_com Wed Jan 23 12:48:22 2008 -0800 +++ b/packages/SUNWxwplt/prototype_com Wed Jan 23 13:57:00 2008 -0800 @@ -26,7 +26,7 @@ # or other dealings in this Software without prior written authorization # of the copyright holder. # -# "@(#)prototype_com 35.141 08/01/22 Sun Microsystems" +# "@(#)prototype_com 35.142 08/01/23 Sun Microsystems" # # X Window System required core package @@ -65,7 +65,6 @@ f none openwin/bin/showfont 0755 root bin f none openwin/bin/winsysck 0755 root bin f none openwin/bin/xauth 0755 root bin -f none openwin/bin/xcalc 0755 root bin f none openwin/bin/xdpr 0755 root bin f none openwin/bin/xfd 0755 root bin f none openwin/bin/xhost 0755 root bin @@ -75,7 +74,6 @@ f none openwin/bin/xlsclients 0755 root bin f none openwin/bin/xlsfonts 0755 root bin f none openwin/bin/xlswins 0755 root bin -f none openwin/bin/xmag 0755 root bin f none openwin/bin/xmakemap 0755 root bin f none openwin/bin/xpr 0755 root bin f none openwin/bin/xprop 0755 root bin @@ -109,10 +107,18 @@ f none X11/bin/constype 0755 root bin s none openwin/bin/constype=../../X11/bin/constype +# open-src/app/xcalc +f none X11/bin/xcalc 0755 root bin +s none openwin/bin/xcalc=../../X11/bin/xcalc + # open-src/app/xdpyinfo f none X11/bin/xdpyinfo 0755 root bin s none openwin/bin/xdpyinfo=../../X11/bin/xdpyinfo +# open-src/app/xmag +f none X11/bin/xmag 0755 root bin +s none openwin/bin/xmag=../../X11/bin/xmag + # open-src/app/xmodmap f none X11/bin/xmodmap 0755 root bin s none openwin/bin/xmodmap=../../X11/bin/xmodmap @@ -204,6 +210,11 @@ s none X11/lib/libXau.so=./libXau.so.6 f none X11/lib/libXau.so.6 0555 root bin +# $HOME/lib/xorgcfg +s none X11/lib/xorgcfg/libXaw7.so=./libXaw7.so.7 +s none X11/lib/xorgcfg/libXaw7.so.7=./libXaw.so.7 +f none X11/lib/xorgcfg/libXaw.so.7 0444 root bin + # open-src/lib/libXcomposite (never delivered into /usr/openwin/lib) f none X11/lib/libXcomposite.so.1 0644 root bin s none X11/lib/libXcomposite.so=libXcomposite.so.1