Mercurial Mercurial > sustaining > oi_151a > xnv / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7038208 EOF xrx ("Broadway") [PSARC/2011/203]
authorAlan Coopersmith <Alan.Coopersmith@Oracle.COM>
Sat, 07 May 2011 18:29:44 -0700
changeset 1122 2c2ae878a442
parent 1121 dc6734258624
child 1123 4678f8c1d429
7038208 EOF xrx ("Broadway") [PSARC/2011/203]
open-src/app/Makefile file | annotate | diff | comparison | revisions
open-src/app/xrx/Makefile file | annotate | diff | comparison | revisions
pkg/legacy/web-browser-firefox-plugin-firefox-xrx.p5m file | annotate | diff | comparison | revisions
pkg/manifests/compatibility-packages-SUNWxwman.p5m file | annotate | diff | comparison | revisions
pkg/manifests/compatibility-packages-SUNWxwopt.p5m file | annotate | diff | comparison | revisions
pkg/manifests/developer-opensolaris-X.p5m file | annotate | diff | comparison | revisions
pkg/manifests/web-browser-firefox-plugin-firefox-xrx.p5m file | annotate | diff | comparison | revisions 
--- a/open-src/app/Makefile	Wed May 04 19:00:45 2011 -0700
+++ b/open-src/app/Makefile	Sat May 07 18:29:44 2011 -0700
@@ -112,7 +112,6 @@
 	xrandr \
 	xrdb \
 	xrefresh \
-	xrx \
 	xscope \
 	xset \
 	xsetroot \
@@ -133,6 +132,7 @@
 	rstart \
 	xplsprinters \
 	xprehashprinterlist \
+	xrx \
 	xscreensaver \
 	rss-glx
 
--- a/open-src/app/xrx/Makefile	Wed May 04 19:00:45 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-###############################################################################
-#
-# xrx 1.x Makefile
-#
-# Copyright (c) 2008, 2011, 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.
-#
-#
-
-# Package name used in tarballs
-MODULE_NAME=xrx
-
-# pkg(5) name we deliver the files in (override default)
-MODULE_PKGNAME=web/browser/firefox/plugin/firefox-xrx
-MODULE_PKGNAME_SET=yes
-
-# Package classification (override default)
-MODULE_PKGCLASS=Applications/Plug-ins and Run-times
-MODULE_PKGCLASS_SET=yes
-
-# Additional metadata to include in pkg
-MODULE_ATTRDATA_COMMANDS = \
-	print 'set name=info.upstream_url' \
-		'value="http://www.broadwayinfo.com/"' >> $@
-
-# Version number (used in path names)
-MODULE_VERSION=1.0.4
-
-# Checksums for upstream tarball
-TARBALL_MD5  = c93be22d20658ac5ff60469207dec118
-TARBALL_SHA1 = ff5b8c329ed255138eb78e6b9c034add2b02de94
-
-# Have to build 32-bit so the plugin matches Firefox
-BUILD_TYPES_SET=yes
-BUILD_TYPES=32
-
-# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES= 
-
-# Man pages to apply Sun footer to & attributes to list
-SUNTOUCHED_MANPAGES=helper/xrx.man plugin/libxrx.man
-MODULE_STABILITY=Committed
-
-# Additional flags to pass to configure script:
-# PLUGIN_CFLAGS - force use of bundled browser plugin headers instead
-# 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 += --enable-shared=yes --enable-static=no 
-# Install directly to firefox plugin directory
-MODULE_CONFIG_OPTS += --libdir='/usr/lib/firefox/plugins'
-
-# Compatibility links from /usr/X11/bin to /usr/bin
-MODULE_X11_BINCOMPAT_LINKS = xrx
-
-include ../Makefile.inc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pkg/legacy/web-browser-firefox-plugin-firefox-xrx.p5m	Sat May 07 18:29:44 2011 -0700
@@ -0,0 +1,24 @@
+# Copyright (c) 2010, 2011, 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.
+#
+set name=pkg.fmri \
+    value=pkg:/web/browser/firefox/plugin/[email protected],5.11-0.166
+set name=pkg.obsolete value=true
--- a/pkg/manifests/compatibility-packages-SUNWxwman.p5m	Wed May 04 19:00:45 2011 -0700
+++ b/pkg/manifests/compatibility-packages-SUNWxwman.p5m	Sat May 07 18:29:44 2011 -0700
@@ -73,9 +73,6 @@
 # app/xterm
 depend fmri=pkg:/terminal/xterm type=require
 
-# app/xrx
-depend fmri=pkg:/web/browser/firefox/plugin/firefox-xrx type=require
-
 # app/oclock
 depend fmri=pkg:/x11/oclock type=require
 
--- a/pkg/manifests/compatibility-packages-SUNWxwopt.p5m	Wed May 04 19:00:45 2011 -0700
+++ b/pkg/manifests/compatibility-packages-SUNWxwopt.p5m	Sat May 07 18:29:44 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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"),
@@ -54,9 +54,6 @@
 # xcursorgen
 depend fmri=pkg:/image/xcursorgen type=require
 
-# xrx
-depend fmri=pkg:/web/browser/firefox/plugin/firefox-xrx type=require
-
 # oclock
 depend fmri=pkg:/x11/oclock type=require
 
--- a/pkg/manifests/developer-opensolaris-X.p5m	Wed May 04 19:00:45 2011 -0700
+++ b/pkg/manifests/developer-opensolaris-X.p5m	Sat May 07 18:29:44 2011 -0700
@@ -115,9 +115,6 @@
 # xterm uses ncurses/term.h
 depend fmri=pkg:/library/ncurses type=require
 
-# app/xrx needs Firefox NSPR headers
-depend fmri=pkg:/library/nspr/header-nspr type=require
-
 # libXfont & libfontenc link with libz
 depend fmri=pkg:/library/zlib type=require
 
@@ -157,9 +154,6 @@
 depend fmri=pkg:/developer/gperf type=require
 depend fmri=pkg:/developer/macro/gnu-m4 type=require
 
-# app/xrx needs Firefox plugin headers
-depend fmri=pkg:/web/browser/firefox type=require
-
 # docbook2txt uses lynx to translate html docs to text during the build
 depend fmri=pkg:/web/browser/lynx type=require
 
--- a/pkg/manifests/web-browser-firefox-plugin-firefox-xrx.p5m	Wed May 04 19:00:45 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-# 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.
-#
-set name=pkg.fmri \
-    value=pkg:/web/browser/firefox/plugin/firefox-xrx@__version:xrx__
-set name=pkg.description \
-    value="Web browser plugin and helper application that allow embedding X client applications in a web page."
-set name=pkg.summary value="RX: X Remote eXecution (aka Xweb or Broadway)"
-dir path=usr
-dir path=usr/X11
-dir path=usr/X11/bin
-dir path=usr/bin
-dir path=usr/lib
-dir path=usr/lib/firefox
-dir path=usr/lib/firefox/plugins
-dir path=usr/share
-dir path=usr/share/man
-dir path=usr/share/man/man1
-file path=usr/bin/xrx
-file path=usr/lib/firefox/plugins/libxrx.so
-file path=usr/lib/firefox/plugins/libxrxnest.so
-file path=usr/share/man/man1/libxrx.1
-file path=usr/share/man/man1/xrx.1
-link path=usr/X11/bin/xrx target=../../bin/xrx
sustaining/oi_151a/xnv