--- a/open-src/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -1,6 +1,6 @@
# Makefile for X Consolidation Open Source bits
#
-# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 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"),
@@ -45,16 +45,16 @@
# High level dependencies
proto: util/util-macros util/lndir
util/lndir: proto/x11proto
-lib: proto util
-util: proto
-app: lib data/xbitmaps
-xserver/xorg xserver/xvnc: proto doc/xorg-sgml-doctools lib
+lib: proto font/util util
+util: proto font/util
+app: lib data/xbitmaps font/util
+xserver/xorg xserver/xvnc: proto doc/xorg-sgml-doctools lib font/util
driver: xserver/xorg
app/rgb: xserver/xorg
doc/xorg-docs: doc/xorg-sgml-doctools
data: app
FONTAPPS = app/bdftopcf app/mkfontscale app/mkfontdir
-font: $(FONTAPPS)
+font: $(FONTAPPS) font/util
$(FONTAPPS): lib
OS_SUBDIRS_common = \
@@ -63,6 +63,7 @@
util/lndir \
proto \
data/xbitmaps \
+ font/util \
util \
doc/xorg-sgml-doctools \
doc/xorg-docs \
--- a/open-src/app/appres/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/appres/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# appres 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -33,11 +33,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.2
+MODULE_VERSION=1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = 6f2f5d9f41669d498b56d73dc3206951
-TARBALL_SHA1 = a82009c1d548b91282fc49efd1be446dc0ee8e32
+TARBALL_MD5 = 48d56924f76738872ef6c90f99030e34
+TARBALL_SHA1 = 7303f12fae8cce92da2dbd88c9d31d816dc5da06
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/bdftopcf/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/bdftopcf/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# bdftopcf Makefile
#
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 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"),
@@ -33,11 +33,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.2
+MODULE_VERSION=1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = 148f20d28caaa69bbe7dcca7c2674fb6
-TARBALL_SHA1 = 245778068b5e5ccde07151635ded50da90333524
+TARBALL_MD5 = 4a7a4a848c43c42f7d499b60666434a4
+TARBALL_SHA1 = 146b4ece2867479045c3b4593b22c9f1d21da14a
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
@@ -46,17 +46,7 @@
SUNTOUCHED_MANPAGES=*.man
MODULE_STABILITY=Committed
-# Need to link with libXfont in server private directory
-MODULE_LDFLAGS = $(X11_SERVERLIBS_LDFLAGS)
-MODULE_LD_OPTIONS = -R $$ORIGIN/../lib/xorg$(ARCHLIBSUBDIR)
-
# Compatibility links from /usr/X11/bin to /usr/bin
MODULE_X11_BINCOMPAT_LINKS = bdftopcf
include ../Makefile.inc
-
-# Clean up old 64-bit builds from before we stopped building them
-clean: clean_64
-
-clean_64:
- -rm -rf build_64
--- a/open-src/app/bitmap/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/bitmap/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# bitmap 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -37,17 +37,17 @@
MODULE_PKGCLASS_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.4
+MODULE_VERSION=1.0.5
# Checksums for upstream tarball
-TARBALL_MD5 = 7d0c1ac193be2491c72a91ccf37ef18e
-TARBALL_SHA1 = b83483937b1d4c542379b5f82edf408a023f8671
+TARBALL_MD5 = 0b7ceb0ded994dac645bb81e86ce69cc
+TARBALL_SHA1 = 4f6f847b6cfc3e250f1befe907a3d1957f4a43c8
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
# Man pages to apply Sun footer to & attributes to list
-SUNTOUCHED_MANPAGES=*.man
+SUNTOUCHED_MANPAGES=man/bitmap.man
MODULE_STABILITY=Committed
# Compatibility links from /usr/X11/bin to /usr/bin
--- a/open-src/app/constype/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/constype/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# constype 1.x Makefile
#
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 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"),
@@ -36,11 +36,11 @@
MODULE_PKGCLASS_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.2
+MODULE_VERSION=1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = 83f623f961400ecc56ff52a716308173
-TARBALL_SHA1 = 7d38de9d5acc4b87106926cd0b774b9ce56ee4c0
+TARBALL_MD5 = 7347bb324e3095f8791386b8154edc11
+TARBALL_SHA1 = fc4cbf7773fbc755b5ebba5b85b7d0e39e6d3e82
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/editres/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/editres/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# editres 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -33,16 +33,15 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.4
+MODULE_VERSION=1.0.5
# Checksums for upstream tarball
-TARBALL_MD5 = 1800dda934ebb7c588ea686278a10e9f
-TARBALL_SHA1 = 5f84cf0592ed2e1c8430c907db36b7e70905fa78
+TARBALL_MD5 = 87e499fd2599910af7961187205ca7ed
+TARBALL_SHA1 = a1a8af23afde85bada5472da1ac029a384dedae4
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
-
# Man pages to apply Sun footer to & attributes to list
SUNTOUCHED_MANPAGES=*.man
MODULE_STABILITY=Committed
--- a/open-src/app/fslsfonts/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/fslsfonts/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# fslsfonts Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -33,11 +33,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.2
+MODULE_VERSION=1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = a61be25c87ee42169ee4dc8344acc9e2
-TARBALL_SHA1 = 707710c9360b0554ee1ab9a2ef388025a6a8a27a
+TARBALL_MD5 = 9b50d967ac6d4bae9bffb62a5e527a50
+TARBALL_SHA1 = 00177564597ac629207ca597f663b689902817df
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/fstobdf/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/fstobdf/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# fstobdf Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -33,11 +33,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.3
+MODULE_VERSION=1.0.4
# Checksums for upstream tarball
-TARBALL_MD5 = 49a6225380f6c18fff664a043cd569b1
-TARBALL_SHA1 = c7f9184afe3f7526a51b4e19722af8451b33d873
+TARBALL_MD5 = fc1f42aac16d6b76c79a1a3a0fb6a53b
+TARBALL_SHA1 = 5310493f53277fd196f93bbb7f2a204cad8997b7
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/iceauth/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/iceauth/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# iceauth 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -33,11 +33,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.3
+MODULE_VERSION=1.0.4
# Checksums for upstream tarball
-TARBALL_MD5 = 975ade3f238c1eb10705da0a91e6e8e7
-TARBALL_SHA1 = b75b87fed108bc4fe14ef06f76025016fa54299a
+TARBALL_MD5 = bb2e4d2611047f7c5a1a82ec956a9de4
+TARBALL_SHA1 = 9b446c0d1815dce48bdea32db7dea7e429f6a310
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/ico/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/ico/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# ico 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -33,11 +33,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.2
+MODULE_VERSION=1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = 5711827c5c2563620b56c33aababbc63
-TARBALL_SHA1 = 64940e202d8d53b6c036ad17bc5af9f4823f7fb0
+TARBALL_MD5 = 9574a53c122b3a6e85bbf3476ebf8ee8
+TARBALL_SHA1 = f5a73d6626b9d4016423594ad18b3073b556e3bf
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/luit/6824625.patch Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/luit/6824625.patch Wed Feb 02 11:28:42 2011 -0800
@@ -1,28 +1,60 @@
---- sys.h Sat Nov 4 05:58:45 2006
-+++ sys.h Fri Apr 3 09:29:56 2009
-@@ -28,6 +28,7 @@
- int copyTermios(int sfd, int dfd);
- int saveTermios(void);
- int restoreTermios(void);
-+int restoreTermios_1(int fd, int opt);
- int setRawTermios(void);
- char *my_basename(char *path);
- int allocatePty(int *pty_return, char **line_return);
---- sys.c Tue Jan 29 12:01:42 2008
-+++ sys.c Fri Apr 3 09:30:22 2009
-@@ -21,6 +21,7 @@
- */
- /* $XFree86: xc/programs/luit/sys.c,v 1.9 2003/08/17 20:39:58 dawes Exp $ */
+diff -urp -x '*~' -x '*.orig' luit.c luit.c
+--- luit.c 2010-07-01 10:55:09.000000000 -0700
++++ luit.c 2011-01-25 08:15:02.448685019 -0800
+@@ -25,6 +25,7 @@ THE SOFTWARE.
+ #endif
+
+ #include <stdio.h>
++#include <X11/Xosdefs.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <locale.h>
+@@ -36,6 +37,7 @@ THE SOFTWARE.
+ #include <stdarg.h>
+ #include <sys/ioctl.h>
+ #include <signal.h>
++#include <termios.h>
+
+ #include "luit.h"
+ #include "sys.h"
+@@ -483,9 +485,11 @@ setup_io(int pty)
+ #endif
+ installHandler(SIGCHLD, sigchldHandler);
+
++#ifndef sun
+ rc = copyTermios(0, pty);
+ if (rc < 0)
+ FatalError("Couldn't copy terminal settings\n");
++#endif
+
+ rc = setRawTermios();
+ if (rc < 0)
+@@ -627,6 +631,10 @@ child(char *line, char *path, char *cons
+ write_waitpipe(c2p_waitpipe);
+ }
+
++#ifdef sun
++ restoreTermios_1(tty, TCSAFLUSH);
++#endif
++
+ if (tty != 0)
+ dup2(tty, 0);
+ if (tty != 1)
+diff -urp -x '*~' -x '*.orig' sys.c sys.c
+--- sys.c 2010-07-01 10:55:09.000000000 -0700
++++ sys.c 2011-01-25 08:15:02.448290768 -0800
+@@ -24,6 +24,7 @@ THE SOFTWARE.
+ # include "config.h"
+ #endif
+#include <X11/Xosdefs.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
-@@ -249,6 +250,14 @@
- return tcsetattr(0, TCSAFLUSH, &saved_tio);
+@@ -246,6 +247,14 @@ restoreTermios(void)
}
-+int
+ int
+restoreTermios_1(int fd, int opt)
+{
+ if(!saved_tio_valid)
@@ -30,49 +62,18 @@
+ return tcsetattr(fd, opt, &saved_tio);
+}
+
- int
++int
setRawTermios(void)
{
---- luit.c Tue Jan 29 12:01:42 2008
-+++ luit.c Fri Apr 3 09:33:17 2009
-@@ -22,6 +22,7 @@
- /* $XFree86: xc/programs/luit/luit.c,v 1.9 2002/10/17 01:06:09 dawes Exp $ */
-
- #include <stdio.h>
-+#include <X11/Xosdefs.h>
- #include <stdlib.h>
- #include <string.h>
- #include <locale.h>
-@@ -33,6 +34,7 @@
- #include <stdarg.h>
- #include <sys/ioctl.h>
- #include <signal.h>
-+#include <termios.h>
-
- #ifdef SVR4
- #include <stropts.h>
-@@ -473,9 +475,11 @@
- #endif
- installHandler(SIGCHLD, sigchldHandler);
-
-+#ifndef sun
- rc = copyTermios(0, pty);
- if(rc < 0)
- FatalError("Couldn't copy terminal settings\n");
-+#endif
-
- rc = setRawTermios();
- if(rc < 0)
-@@ -536,7 +540,11 @@
- kill(getppid(), SIGABRT);
- exit(1);
- }
--
-+
-+#ifdef sun
-+ restoreTermios_1(tty, TCSAFLUSH);
-+#endif
-+
- if(tty != 0)
- dup2(tty, 0);
- if(tty != 1)
+ struct termios tio;
+diff -urp -x '*~' -x '*.orig' sys.h sys.h
+--- sys.h 2010-07-01 10:55:09.000000000 -0700
++++ sys.h 2011-01-25 08:15:02.447938807 -0800
+@@ -38,6 +38,7 @@ int installHandler(int signum, void (*ha
+ int copyTermios(int sfd, int dfd);
+ int saveTermios(void);
+ int restoreTermios(void);
++int restoreTermios_1(int fd, int opt);
+ int setRawTermios(void);
+ char *my_basename(char *path);
+ int allocatePty(int *pty_return, char **line_return);
--- a/open-src/app/luit/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/luit/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# luit 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -29,11 +29,11 @@
MODULE_NAME=luit
# Version number (used in path names)
-MODULE_VERSION=1.0.5
+MODULE_VERSION=1.1.0
# Checksums for upstream tarball
-TARBALL_MD5 = fd8579a993c4480978e3504a4c53c189
-TARBALL_SHA1 = 7260feca7db48d8aa80d493b4cbcf6b7c5774d8d
+TARBALL_MD5 = cb9377b09e562e4084cc614a44df2641
+TARBALL_SHA1 = fa974b417f6b65c241398d8d011207c6facb0766
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES = solaris-man.patch \
@@ -50,9 +50,11 @@
# ARC cases that covered this module
# PSARC/2008/100 luit
MODULE_ARC_CASES = PSARC/2008/100
+# PSARC/2011/033 X11R7.6 application updates
+MODULE_ARC_CASES += PSARC/2011/033
# Man pages to apply Sun footer to & attributes to list
-SUNTOUCHED_MANPAGES=*.man
+SUNTOUCHED_MANPAGES=man/luit.man
MODULE_STABILITY=Uncommitted
# Need to link with libfontenc in server private directory
--- a/open-src/app/luit/solaris-man.patch Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/luit/solaris-man.patch Wed Feb 02 11:28:42 2011 -0800
@@ -1,18 +1,22 @@
Update See Also section of man page to remove man pages not found on Solaris
and to not overflow the number of words Solaris nroff can have in a .I macro.
---- luit.man 2008-01-28 18:26:16.083034000 -0800
-+++ luit.man 2008-01-28 18:27:34.635445000 -0800
-@@ -213,9 +213,9 @@
+diff -urp -x '*~' -x '*.orig' man/luit.man man/luit.man
+--- man/luit.man 2010-09-03 16:03:33.000000000 -0700
++++ man/luit.man 2011-01-25 08:15:02.270624108 -0800
+@@ -230,12 +230,12 @@ Charsets with a non-trivial intermediary
Selecting alternate sets of control characters is not supported and
will never be.
.SH SEE ALSO
--xterm(1), unicode(7), utf-8(7), charsets(7).
+-xterm(__appmansuffix__), unicode(__miscmansuffix__), utf-8(__miscmansuffix__), charsets(__miscmansuffix__).
++xterm(1),
+ .nf
+ .br
-.I Character Code Structure and Extension Techniques (ISO\ 2022, ECMA-35).
++\fICharacter Code Structure and Extension Techniques (ISO\ 2022, ECMA-35)\fR,
+ .br
-.I Control Functions for Coded Character Sets (ISO\ 6429, ECMA-48).
-+xterm(1),
-+\fICharacter Code Structure and Extension Techniques (ISO\ 2022, ECMA-35)\fR,
+\fIControl Functions for Coded Character Sets (ISO\ 6429, ECMA-48)\fR.
+ .fi
.SH AUTHOR
The version of
- .B Luit
--- a/open-src/app/mkfontdir/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/mkfontdir/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# mkfontdir 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -33,14 +33,14 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.5
+MODULE_VERSION=1.0.6
# Checksums for upstream tarball
-TARBALL_MD5 = 9365ac66d19186eaf030482d312fca06
-TARBALL_SHA1 = 971728b0f453ea5df028aa5d54fe3fbdb8e99a7d
+TARBALL_MD5 = dc342dd8858416254bb5f71a9ddce589
+TARBALL_SHA1 = c2b504f5a019777f2f0d3c2fc635b114c7924804
# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = altroot.patch
+SOURCE_PATCHES =
# ARC cases that covered this module
# LSARC/2008/009 X11R7 font server and utilities
--- a/open-src/app/mkfontdir/altroot.patch Mon Jan 31 13:13:15 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-###############################################################################
-#
-# mkfontdir 1.x Makefile
-#
-# Copyright (c) 2008, 2009, 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.
-#
-
-If mkfontdir is called from an alternate path, look there first for mkfontscale
-(needed for use in packaging scripts in SVR4 packages used in Live Upgrade or
- other alternate root scenarios).
-
---- mkfontdir.cpp Thu Mar 6 13:44:46 2008
-+++ mkfontdir.cpp Fri Sep 12 16:28:45 2008
-@@ -1,4 +1,12 @@
- XCOMM!/bin/sh
- XCOMM $XFree86: xc/programs/mkfontdir/mkfontdir,v 1.2 2003/07/18 14:51:43 tsi Exp $
-
--exec BINDIR/mkfontscale -b -s -l "$@"
-+FONTUTILDIR=`dirname $0`
-+if [ ! -x ${FONTUTILDIR}/mkfontscale ] ; then
-+ FONTUTILDIR=${FONTUTILDIR}/../bin
-+ if [ ! -x ${FONTUTILDIR}/mkfontscale ] ; then
-+ FONTUTILDIR=BINDIR
-+ fi
-+fi
-+
-+exec ${FONTUTILDIR}/mkfontscale -b -s -l "$@"
--- a/open-src/app/mkfontscale/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/mkfontscale/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# mkfontscale 1.x Makefile
#
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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"),
@@ -33,11 +33,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.7
+MODULE_VERSION=1.0.8
# Checksums for upstream tarball
-TARBALL_MD5 = 96ca346f185c0ab48e42bf5bb0375da5
-TARBALL_SHA1 = 0a0c25da68c87380e2c013c808a6e0cc0983fae9
+TARBALL_MD5 = 5210c9385c6cc4a00ce829d8dc9c819b
+TARBALL_SHA1 = accfb12751bf3b7ae7b28c1b0b863d5be871398f
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
@@ -53,9 +53,6 @@
# Additional configure script options
MODULE_CONFIG_OPTS= --with-bzip2
-# Need to link with libfontenc in server private directory
-MODULE_LDFLAGS= -L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR)
-
# Compatibility links from /usr/X11/bin to /usr/bin
MODULE_X11_BINCOMPAT_LINKS = mkfontscale
--- a/open-src/app/oclock/COPYING Mon Jan 31 13:13:15 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-Copyright 1989, 1993, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice 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
-OPEN GROUP 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.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-Copyright (C) 1994 X Consortium
-
-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 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
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not
-be used in advertising or otherwise to promote the sale, use or other deal-
-ings in this Software without prior written authorization from the X Consor-
-tium.
--- a/open-src/app/oclock/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/oclock/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# oclock 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -33,11 +33,11 @@
MODULE_PKGCLASS_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION=1.0.2
# Checksums for upstream tarball
-TARBALL_MD5 = 91f49547f9ed3cd0137c8b7c3183e360
-TARBALL_SHA1 = 5245ac01d5dc940c89b8c39c3ee435b4f20a5db7
+TARBALL_MD5 = 353d939113901ea3cdcf1c0369b522e4
+TARBALL_SHA1 = ba606d39fba6021c4db76d79751779f7b5c862e9
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/proxymngr/COPYING Mon Jan 31 13:13:15 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
- Copyright 1996, 1998 The Open Group
-
- Permission to use, copy, modify, distribute, and sell this software and its
- documentation for any purpose is hereby granted without fee, provided that
- the above copyright notice appear in all copies and that both that
- copyright notice and this permission notice appear in supporting
- documentation.
-
- The above copyright notice and this permission notice 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 OPEN GROUP 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.
-
- Except as contained in this notice, the name of The Open Group shall
- not be used in advertising or otherwise to promote the sale, use or
- other dealings in this Software without prior written authorization
- from The Open Group.
-
-
--- a/open-src/app/proxymngr/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/proxymngr/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# proxymngr 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -37,11 +37,11 @@
MODULE_PKGCLASS_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION=1.0.2
# Checksums for upstream tarball
-TARBALL_MD5 = aad44d0f65b97fd6d564b1d2ae510bb1
-TARBALL_SHA1 = e2bfdab14e5a893831bb3b6178f667ee68cb48d8
+TARBALL_MD5 = 714c4656e749ce856690b872e3d4ac4c
+TARBALL_SHA1 = 1fe5a8d935c4b5f15c35fb37d9828465b599c2cd
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/rgb/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/rgb/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# rgb 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -33,14 +33,14 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.3
+MODULE_VERSION=1.0.4
# Checksums for upstream tarball
-TARBALL_MD5 = 44ea16cc3104de6401bc74035f642357
-TARBALL_SHA1 = 89970e73e95819756e6f3fb11631fa917031813a
+TARBALL_MD5 = 35c6cccbf25a872bdd62bfcb1a73d951
+TARBALL_SHA1 = d0360dda290b76c41fa467c47d4c122ea8cc92a4
# Man pages to apply Sun footer to & attributes to list
-SUNTOUCHED_MANPAGES=*.man
+SUNTOUCHED_MANPAGES=man/*.man
MODULE_STABILITY=Committed
MODULE_CONFIG_OPTS = --with-rgb-db-dir=$(X11_DIR)/lib/X11/rgb \
--- a/open-src/app/rstart/COPYING Mon Jan 31 13:13:15 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-Copyright (c) 1993 Quarterdeck Office Systems
-
-Permission to use, copy, modify, distribute, and sell this software
-and software and its documentation for any purpose is hereby granted
-without fee, provided that the above copyright notice appear in all
-copies and that both that copyright notice and this permission
-notice appear in supporting documentation, and that the name
-Quarterdeck Office Systems, Inc. not be used in advertising or
-publicity pertaining to distribution of this software without
-specific, written prior permission.
-
-THIS SOFTWARE IS PROVIDED `AS-IS'. QUARTERDECK OFFICE SYSTEMS,
-INC., DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING WITHOUT LIMITATION ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
-NONINFRINGEMENT. IN NO EVENT SHALL QUARTERDECK OFFICE SYSTEMS,
-INC., BE LIABLE FOR ANY DAMAGES WHATSOEVER, INCLUDING SPECIAL,
-INCIDENTAL OR CONSEQUENTIAL DAMAGES, INCLUDING LOSS OF USE, DATA, OR
-PROFITS, EVEN IF ADVISED OF THE POSSIBILITY THEREOF, AND REGARDLESS
-OF WHETHER IN AN ACTION IN CONTRACT, TORT OR NEGLIGENCE, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
--- a/open-src/app/rstart/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/rstart/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# rstart 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -37,11 +37,11 @@
MODULE_PKGCLASS_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.3
+MODULE_VERSION=1.0.4
# Checksums for upstream tarball
-TARBALL_MD5 = e09c14cf1ac78260f95a9aa45bccab4c
-TARBALL_SHA1 = 253ebb330f5cb2b49711e04ae0ad8a659e854244
+TARBALL_MD5 = eb82a6290dfbaa1fc09a3b7426b2eac2
+TARBALL_SHA1 = 92b1743af23e7bc8be732f314cba92dedf7907d3
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/setxkbmap/6971649.patch Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/setxkbmap/6971649.patch Wed Feb 02 11:28:42 2011 -0800
@@ -1,20 +1,38 @@
---- setxkbmap.c.orig Tue Apr 28 18:56:08 2009
-+++ setxkbmap.c Fri Jul 23 14:19:10 2010
-@@ -392,9 +392,14 @@
- ok = setOptString(&i, argc, argv, COMPAT_NDX, FROM_CMD_LINE);
+From 7bacea73e67e6882cef51840bb98d1bafb8f2291 Mon Sep 17 00:00:00 2001
+From: Stuart Kreitman <[email protected]>
+Date: Tue, 18 Jan 2011 22:33:34 -0800
+Subject: [PATCH:setxkbmap] Fix crash when when -device is specified without argument
+
+http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6971649
+
+Signed-off-by: Stuart Kreitman <[email protected]>
+Signed-off-by: Alan Coopersmith <[email protected]>
+Reviewed-by: Dirk Wallenstein <[email protected]>
+Reviewed-by: Daniel Stone <[email protected]>
+---
+ setxkbmap.c | 9 ++++++++-
+ 1 files changed, 8 insertions(+), 1 deletions(-)
+
+diff --git a/setxkbmap.c b/setxkbmap.c
+index 338b06c..e812a9c 100644
+--- a/setxkbmap.c
++++ b/setxkbmap.c
+@@ -397,7 +397,14 @@ parseArgs(int argc, char **argv)
else if (streq(argv[i], "-config"))
ok = setOptString(&i, argc, argv, CONFIG_NDX, FROM_CMD_LINE);
-- else if (streq(argv[i], "-device"))
+ else if (streq(argv[i], "-device"))
- deviceSpec = atoi(argv[++i]); /* only allow device IDs, not names */
-- else if (streq(argv[i], "-display"))
-+ else if (streq(argv[i], "-device")) {
-+ if( ++i < argc ) {
++ {
++ if ( ++i < argc ) {
+ deviceSpec = atoi(argv[i]); /* only allow device IDs, not names */
-+ } else {
++ } else {
+ usage(argc, argv);
-+ exit(0);
-+ }
-+ } else if (streq(argv[i], "-display"))
++ exit(-1);
++ }
++ }
+ else if (streq(argv[i], "-display"))
ok = setOptString(&i, argc, argv, DISPLAY_NDX, FROM_CMD_LINE);
else if (streq(argv[i], "-geometry"))
- ok = setOptString(&i, argc, argv, GEOMETRY_NDX, FROM_CMD_LINE);
+--
+1.7.3.2
+
--- a/open-src/app/setxkbmap/COPYING Mon Jan 31 13:13:15 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc.
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be
-used in advertising or publicity pertaining to distribution
-of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability
-of this software for any purpose. It is provided "as is"
-without any express or implied warranty.
-
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR 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.
--- a/open-src/app/setxkbmap/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/setxkbmap/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# setxkbmap 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -33,14 +33,20 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.1.0
+MODULE_VERSION=1.2.0
# Checksums for upstream tarball
-TARBALL_MD5 = 2f902e0a89aaf2b19e06e7f26c6efb3a
-TARBALL_SHA1 = f02f93a08ac060d760566693c748e0fba3db8a06
+TARBALL_MD5 = 2f6df89201eb9a2cbfb905d6b82a191e
+TARBALL_SHA1 = 860785e16313d30792fe62604f65d84281812322
# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = 6971649.patch
+SOURCE_PATCHES = 6971649.patch,-p1
+
+# ARC cases that covered this module
+# PSARC/2008/162 setxkbmap
+MODULE_ARC_CASES = PSARC/2008/162
+# PSARC/2011/033 X11R7.6 application updates
+MODULE_ARC_CASES += PSARC/2011/033
# Man pages to apply Sun footer to & attributes to list
SUNTOUCHED_MANPAGES=*.man
--- a/open-src/app/showfont/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/showfont/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# showfont Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -33,11 +33,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.2
+MODULE_VERSION=1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = 8f83d774ed4cc2a6dca86edd856d820a
-TARBALL_SHA1 = 02ad183046d0a2e34bbb8d44e754fbcb0cf27f32
+TARBALL_MD5 = 50b466ab6ed4a5b8df5abf1ef844309a
+TARBALL_SHA1 = 161bf5f037db70dd75cb327648fbba559e821e76
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/smproxy/COPYING Mon Jan 31 13:13:15 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-Copyright 1994, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice 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
-OPEN GROUP 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.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
--- a/open-src/app/smproxy/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/smproxy/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# smproxy 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -33,11 +33,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.3
+MODULE_VERSION=1.0.4
# Checksums for upstream tarball
-TARBALL_MD5 = ba7dbde81be24fc1bd4156b360e5f8cf
-TARBALL_SHA1 = 1ba44a4a58b05d6a6f7c4b1f67b793dce2ccf2ba
+TARBALL_MD5 = 8ab518393bef44d3ea2bccb027021aab
+TARBALL_SHA1 = ea9639b6d0669f157ac62b807cdba64f509b25ed
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/twm/COPYING Mon Jan 31 13:13:15 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-Copyright 1989, 1994, 1998 The Open Group
-Copyright 2005 Hitachi, Ltd.
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice 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
-OPEN GROUP 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.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
- Copyright 1988 by Evans & Sutherland Computer Corporation,
- Salt Lake City, Utah
- Cambridge, Massachusetts
-
- All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that copyright notice and this permis-
-sion notice appear in supporting documentation, and that the
-name of Evans & Sutherland not be used in advertising
-in publicity pertaining to distribution of the software without
-specific, written prior permission.
-
-EVANS & SUTHERLAND DISCLAIMs ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANT-
-ABILITY AND FITNESS, IN NO EVENT SHALL EVANS & SUTHERLAND
-BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAM-
-AGES 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.
-
-
-
-Copyright (C) 1998 The XFree86 Project, Inc. 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 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
-XFREE86 PROJECT 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.
-
-Except as contained in this notice, the name of the XFree86 Project shall
-not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from the
-XFree86 Project.
--- a/open-src/app/twm/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/twm/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# twm 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -33,11 +33,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.4
+MODULE_VERSION=1.0.6
# Checksums for upstream tarball
-TARBALL_MD5 = 0865e14c73c08fa8c501ae877298ee9f
-TARBALL_SHA1 = 7456e90f19e4747e1785f596b93f692d68a9f079
+TARBALL_MD5 = 952d06a0c2ec34687b536c7b619fc671
+TARBALL_SHA1 = 5c28194c9c620b34df56fdee140d662425ba8a86
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/viewres/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/viewres/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# viewres 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -33,11 +33,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.2
+MODULE_VERSION=1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = f35c4ad7e1aa1ee2b25373dcdc34345b
-TARBALL_SHA1 = 2ab60b6751c135a3bbb5a7f3f5a1fd711a4d233b
+TARBALL_MD5 = c9d15462c0190dce61d04a6717dd7622
+TARBALL_SHA1 = 383ff3cc93340b246e9fee29cad605478399eb62
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/x11perf/COPYING Mon Jan 31 13:13:15 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
-
- All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR 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.
-
-****************************************************************************
-
-Copyright (c) 1993 by Hewlett-Packard Company
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both the copyright notice and this permission notice appear in
-supporting documentation, and that the name of Hewlett-Packard not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
--- a/open-src/app/x11perf/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/x11perf/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# x11perf 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -29,11 +29,11 @@
MODULE_NAME=x11perf
# Version number (used in path names)
-MODULE_VERSION=1.5.1
+MODULE_VERSION=1.5.3
# Checksums for upstream tarball
-TARBALL_MD5 = 66e4aa4645f83809071eb69553ed0222
-TARBALL_SHA1 = d1f85da3df5b216b64c1735d109380214787222d
+TARBALL_MD5 = c3ac3667a6f5c3cead9847fbf4b5f36e
+TARBALL_SHA1 = 2fd00ba38c36c569751bbe3d60917df2a39e10ba
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/xauth/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xauth/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xauth 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -33,11 +33,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.4
+MODULE_VERSION=1.0.5
# Checksums for upstream tarball
-TARBALL_MD5 = fa00078c414c4a57cab7a6d89a0c8734
-TARBALL_SHA1 = 90d32f28bb61ca6d831dcc35429a5ad53be73283
+TARBALL_MD5 = 46fc44e5e947d3720f3be5054044ff0e
+TARBALL_SHA1 = 6d94b5822e8ce08630a8ff510230246d5ed45290
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/xbiff/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xbiff/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xbiff 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -33,17 +33,17 @@
MODULE_PKGCLASS_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.2
+MODULE_VERSION=1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = 1d4ad06725f9dc4b877ecd210b7b1607
-TARBALL_SHA1 = 9980a9f92b060168cfb46006f7c98c7f34459011
+TARBALL_MD5 = f38a0c63c2a7ed6fb9d6f8884785b5c9
+TARBALL_SHA1 = 17337a951264f0f96f6d03893f9dfd9cf8f12a5a
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
# Man pages to apply Sun footer to & attributes to list
-SUNTOUCHED_MANPAGES=*.man
+SUNTOUCHED_MANPAGES=man/xbiff.man
MODULE_STABILITY=Committed
# Compatibility links from /usr/X11/bin to /usr/bin
--- a/open-src/app/xcalc/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xcalc/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xcalc 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -33,11 +33,11 @@
MODULE_PKGCLASS_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.3
+MODULE_VERSION=1.0.4.1
# Checksums for upstream tarball
-TARBALL_MD5 = 0b981e360b54584fcb6dc2ec4658c406
-TARBALL_SHA1 = 0871efa12f0b28228457b898c3487bc8723d1ea8
+TARBALL_MD5 = 052c59f7d917b1302e7142bbd888d808
+TARBALL_SHA1 = 2206fc4bf3719c43fa13a6c64a37b40607d8e5e2
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/xclipboard/COPYING Mon Jan 31 13:13:15 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-Copyright 1989, 1994, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice 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
-OPEN GROUP 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.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
--- a/open-src/app/xclipboard/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xclipboard/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xclipboard 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -33,11 +33,11 @@
MODULE_PKGCLASS_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.1.0
+MODULE_VERSION=1.1.1
# Checksums for upstream tarball
-TARBALL_MD5 = 113eccea3ee73a1ef7b43d2291ca1e09
-TARBALL_SHA1 = d1ec94f032174f5d011e33817cb7f48e3cd957be
+TARBALL_MD5 = b9102fe787eda2a1c9578079d8f55eed
+TARBALL_SHA1 = 922ddf89acd0781156e9ccdf191a3e0c6376415a
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/xclock/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xclock/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xclock 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -33,11 +33,11 @@
MODULE_PKGCLASS_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.4
+MODULE_VERSION=1.0.5
# Checksums for upstream tarball
-TARBALL_MD5 = bb9fd5e00d39c348a0078b97fdf8258f
-TARBALL_SHA1 = 1987cafb3163c6b68bc7ecfbe143c8cd373d64bb
+TARBALL_MD5 = eaf124bbc9d13e1a12a29faaa2ed3612
+TARBALL_SHA1 = 1651ac8961c0aa287a6a7412ee5e6d3bfc3bb3e2
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/xcmsdb/COPYING Mon Jan 31 13:13:15 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-(c) Copyright 1990 Tektronix Inc.
- All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Tektronix not be used
-in advertising or publicity pertaining to distribution of the software
-without specific, written prior permission.
-
-Tektronix disclaims all warranties with regard to this software, including
-all implied warranties of merchantability and fitness, in no event shall
-Tektronix be liable for 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.
-
-
-Copyright 1993, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice 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 OPEN GROUP 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.
-
-Except as contained in this notice, the name of The Open Group shall not
-be used in advertising or otherwise to promote the sale, use or other
-dealing in this Software without prior written authorization from the
-The Open Group.
--- a/open-src/app/xcmsdb/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xcmsdb/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xcmsdb 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -33,11 +33,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.2
+MODULE_VERSION=1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = 7f2bed9f4dd3301d18d83eb296c3be0d
-TARBALL_SHA1 = 8341f7219a5720da758b0571eb1f4d9072265485
+TARBALL_MD5 = a8f013229f7234d582e0ee2c89879e30
+TARBALL_SHA1 = 14df39b4d5518f551302c210131dcc5bac03f3ff
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/xconsole/COPYING Mon Jan 31 13:13:15 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-Copyright 1990, 1994, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice 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
-OPEN GROUP 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.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
--- a/open-src/app/xconsole/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xconsole/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xconsole 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -29,11 +29,11 @@
MODULE_NAME=xconsole
# Version number (used in path names)
-MODULE_VERSION=1.0.3
+MODULE_VERSION=1.0.4
# Checksums for upstream tarball
-TARBALL_MD5 = 0e1a3110bebabecc2897d67a973526b0
-TARBALL_SHA1 = 31408b28b67fe74f3d21c98cc2cada03ff9cefab
+TARBALL_MD5 = 8665c037032e5f6a3acd4b341749aa17
+TARBALL_SHA1 = 195299d4948ba4c62e961ddd0bd4572283244715
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/xcursorgen/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xcursorgen/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xcursorgen 1.x Makefile
#
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 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"),
@@ -37,11 +37,11 @@
MODULE_PKGCLASS_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.3
+MODULE_VERSION=1.0.4
# Checksums for upstream tarball
-TARBALL_MD5 = 69df079b3950a0db4e5f4e6f0e00ddee
-TARBALL_SHA1 = 7df26b371476654dc191c45e7d20ae3a5e0cad87
+TARBALL_MD5 = 731c39ea88217c12ddd37f8627d97f3f
+TARBALL_SHA1 = 244c180aae8cc07175b93f314d5bbbf24171658a
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/xditview/COPYING Mon Jan 31 13:13:15 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-Copyright (c) 1991, 1994 X Consortium
-
-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 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 X CONSORTIUM 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.
-
-Except as contained in this notice, the name of the X Consortium shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from the X Consortium.
--- a/open-src/app/xdpyinfo/COPYING Mon Jan 31 13:13:15 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-Copyright 1988, 1998 The Open Group
-Copyright 2005 Hitachi, Ltd.
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice 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
-OPEN GROUP 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.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
--- a/open-src/app/xdpyinfo/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xdpyinfo/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xdpyinfo Makefile
#
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 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"),
@@ -33,11 +33,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.1.0
+MODULE_VERSION=1.2.0
# Checksums for upstream tarball
-TARBALL_MD5 = d1d516610316138105cd07064b257c5c
-TARBALL_SHA1 = 01971f007048a46a4a31a69c661bc3a378de60f0
+TARBALL_MD5 = c52fda7bbc80e74b7839f29298cb1d77
+TARBALL_SHA1 = 5d53cd31afd40bdc4575b5347f2cda67f135f5f2
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/xdriinfo/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xdriinfo/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xdriinfo 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -29,11 +29,11 @@
MODULE_NAME=xdriinfo
# Version number (used in path names)
-MODULE_VERSION=1.0.3
+MODULE_VERSION=1.0.4
# Checksums for upstream tarball
-TARBALL_MD5 = cb304d1ce562ac48b68eedeba38c662f
-TARBALL_SHA1 = d211d6f12f4c801d2f4cf184c6daae37aa5858ff
+TARBALL_MD5 = 3d3cad4d754e10e325438193433d59fd
+TARBALL_SHA1 = 723482b3fc627d7cc6124fec43dd1c21d102daaa
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES = compile-on-sparc.patch
--- a/open-src/app/xedit/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xedit/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xedit 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -37,11 +37,11 @@
MODULE_PKGCLASS_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.1.2
+MODULE_VERSION=1.2.0
# Checksums for upstream tarball
-TARBALL_MD5 = 67193be728414d45a1922911e6437991
-TARBALL_SHA1 = e2d9f49dd7e82959e0678c2417256cd59b06772f
+TARBALL_MD5 = f55e84713542a36887e966fc0648dd7b
+TARBALL_SHA1 = e6f8735d09c9da67bba3cd3c39f34f5d1fc79a70
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/xev/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xev/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xev 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -33,15 +33,20 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.4
+MODULE_VERSION=1.1.0
# Checksums for upstream tarball
-TARBALL_MD5 = 5f98c0a2725a33d60ef4956befe078fb
-TARBALL_SHA1 = 4f62e131ba96842eef1660e8869533cd3923ac35
+TARBALL_MD5 = 515cfd1fe857b66abe43ec3343634954
+TARBALL_SHA1 = 77dcbdaa2046db56f31936f921843bd05df2255f
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
+# ARC cases that covered this module
+# Original integration predates ARC
+# PSARC/2011/033 X11R7.6 application updates
+MODULE_ARC_CASES = PSARC/2011/033
+
# Man pages to apply Sun footer to & attributes to list
SUNTOUCHED_MANPAGES=*.man
MODULE_STABILITY=Committed
--- a/open-src/app/xeyes/COPYING Mon Jan 31 13:13:15 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-
-Copyright (c) 1991 X Consortium
-
-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 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 X CONSORTIUM 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.
-
-Except as contained in this notice, the name of the X Consortium shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from the X Consortium.
-
--- a/open-src/app/xeyes/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xeyes/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xeyes 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -33,11 +33,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.1.0
+MODULE_VERSION=1.1.1
# Checksums for upstream tarball
-TARBALL_MD5 = 933f6d2b132d14f707f1f3c87b39ebe2
-TARBALL_SHA1 = 3422f65b6c5b9480cf74f48df115a6c837b84dae
+TARBALL_MD5 = a3035dcecdbdb89e864177c080924981
+TARBALL_SHA1 = efe6116d31a7f69e4fb6038613e52b0960b9b61c
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/xfd/COPYING Mon Jan 31 13:13:15 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-Copyright 1989, 1993, 1994, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice 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
-OPEN GROUP 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.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
--- a/open-src/app/xfd/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xfd/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xfd 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -29,14 +29,14 @@
MODULE_NAME=xfd
# Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION=1.1.0
# Checksums for upstream tarball
-TARBALL_MD5 = c72abd90f50ef459bc14b39ec9fcc7f8
-TARBALL_SHA1 = 4b4987d8c8d41b29c0475474261f1aaea7d5efcb
+TARBALL_MD5 = 17d8ef0d490301158f8abf7641cca243
+TARBALL_SHA1 = 9cf24f00b428bc02d8635634cdb3b7422e7d74a5
# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = xfd.patch
+SOURCE_PATCHES =
# ARC cases that covered this module
# PSARC/2008/137 xfd -fa
--- a/open-src/app/xfd/xfd.patch Mon Jan 31 13:13:15 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,107 +0,0 @@
---- xfd.c.orig Thu Feb 21 13:55:37 2008
-+++ xfd.c Fri Feb 22 15:03:44 2008
-@@ -40,6 +40,9 @@
- #include <X11/Xaw/Command.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <stdlib.h>
-+#include <libintl.h>
-+#include <locale.h>
- #include "grid.h"
- #ifdef XRENDER
- #include <X11/Xft/Xft.h>
-@@ -127,26 +130,31 @@
- static void
- usage(void)
- {
-- fprintf (stderr, "usage: %s [-options ...] -fn font\n", ProgramName);
-+ fprintf (stderr, gettext("usage: %s [-options ...] "), ProgramName);
-+ fprintf (stderr, "-fn ");
-+ fprintf (stderr, gettext("font\n\n"));
- #ifdef XRENDER
-- fprintf (stderr, " %s [-options ...] -fa font\n", ProgramName);
-+ fprintf (stderr, gettext(" %s [-options ...] "), ProgramName);
-+ fprintf (stderr, "-fa ");
-+ fprintf (stderr, gettext("font\n\n"));
- #endif
-- fprintf (stderr, "where options include:\n");
-- fprintf (stderr,
-- " -display dpy X server to contact\n");
-- fprintf (stderr,
-- " -geometry geom size and location of window\n");
-- fprintf (stderr,
-- " -start num first character to show\n");
-- fprintf (stderr,
-- " -box show a box around each character\n");
-- fprintf (stderr,
-- " -center center each character inside its grid\n");
-- fprintf (stderr,
-- " -rows number number of rows in grid\n");
-- fprintf (stderr,
-- " -columns number number of columns in grid\n");
-- fprintf (stderr, "\n");
-+ fprintf (stderr, gettext("where options include:\n"));
-+ fprintf (stderr, " -display ");
-+ fprintf (stderr, gettext("display X server to contact\n"));
-+ fprintf (stderr, " -geometry ");
-+ fprintf (stderr, gettext("geometry size and location of window\n"));
-+ fprintf (stderr, " -bc ");
-+ fprintf (stderr, gettext("color color for ImageText boxes\n"));
-+ fprintf (stderr, " -start ");
-+ fprintf (stderr, gettext("number first character to show\n"));
-+ fprintf (stderr, " -box ");
-+ fprintf (stderr, gettext("show a box around each character\n"));
-+ fprintf (stderr, " -center ");
-+ fprintf (stderr, gettext("center each character inside its grid\n"));
-+ fprintf (stderr, " -rows ");
-+ fprintf (stderr, gettext("number number of rows in grid\n"));
-+ fprintf (stderr, " -columns ");
-+ fprintf (stderr, gettext("number number of columns in grid\n"));
- exit (1);
- }
-
-@@ -170,13 +178,31 @@
- XftFont *xft;
- #endif
- char *fontname;
-+ char *domaindir;
- long minn, maxn;
-
-+ XtSetLanguageProc(NULL, NULL, NULL);
-+
- ProgramName = argv[0];
-
- toplevel = XtAppInitialize (&xtcontext, "Xfd",
- xfd_options, XtNumber(xfd_options),
- &argc, argv, NULL, NULL, 0);
-+
-+ textdomain("xfd");
-+
-+ /* mainly for debugging */
-+ if((domaindir = getenv("TEXTDOMAINDIR")) == NULL) {
-+ domaindir = "/usr/share/locale";
-+ }
-+ bindtextdomain("xfd", domaindir);
-+
-+ Resources[0].default_addr = gettext(DEF_SELECT_FORMAT);
-+ Resources[1].default_addr = gettext(DEF_METRICS_FORMAT);
-+ Resources[2].default_addr = gettext(DEF_RANGE_FORMAT);
-+ Resources[3].default_addr = gettext(DEF_START_FORMAT);
-+ Resources[4].default_addr = gettext(DEF_NOCHAR_FORMAT);
-+
- if (argc != 1) usage ();
- XtAppAddActions (xtcontext, xfd_actions, XtNumber (xfd_actions));
- XtOverrideTranslations
-@@ -271,10 +297,11 @@
- XtSetArg (av[i], XtNfont, &fs); i++;
- XtGetValues (fontGrid, av, i);
- if (!fs || fontConversionFailed) {
-- fprintf (stderr, "%s: no font to display\n", ProgramName);
-+ fprintf (stderr, gettext("%s: no font to display\n"), ProgramName);
- exit (1);
- }
- fontname = get_font_name (XtDisplay(toplevel), fs);
-+ if (!fontname) fontname = gettext("unknown font!");
- }
- i = 0;
- XtSetArg (av[i], XtNlabel, fontname); i++;
--- a/open-src/app/xfindproxy/COPYING Mon Jan 31 13:13:15 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-Copyright 1996, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice 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 OPEN GROUP 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.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
--- a/open-src/app/xfindproxy/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xfindproxy/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xfindproxy 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -37,11 +37,11 @@
MODULE_PKGCLASS_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION=1.0.2
# Checksums for upstream tarball
-TARBALL_MD5 = 5df3a162429bdd6ce5aea3ca5f6365b8
-TARBALL_SHA1 = 2d7fcbce9a7426bdacf55a3acf60933f42bd4829
+TARBALL_MD5 = 2fa74c68511ae845f52c2f33e641d0fd
+TARBALL_SHA1 = 26da3f96eeeae0deeb10797dc0b8479c1fe16924
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/xfontsel/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xfontsel/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xfontsel 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -29,11 +29,11 @@
MODULE_NAME=xfontsel
# Version number (used in path names)
-MODULE_VERSION=1.0.2
+MODULE_VERSION=1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = 288fe4cf8a990e4e602aac16dd9109fb
-TARBALL_SHA1 = c492444a3bada3e44bc0319cfd85a89cd7770b84
+TARBALL_MD5 = 299fabe7d7be92b6572d814895ce3bb1
+TARBALL_SHA1 = df2eb12b90339b7091bd362b095344015ec8b6fa
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES = \
--- a/open-src/app/xfontsel/xfontsel.patch Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xfontsel/xfontsel.patch Wed Feb 02 11:28:42 2011 -0800
@@ -1,6 +1,7 @@
---- xfontsel.c Mon Jul 10 19:52:48 2006
-+++ xfontsel.latest.c Thu Aug 7 14:02:31 2008
-@@ -54,6 +54,9 @@
+diff -urp -x '*~' -x '*.orig' xfontsel.c xfontsel.c
+--- xfontsel.c 2009-10-16 14:39:19.000000000 -0700
++++ xfontsel.c 2011-01-28 17:56:03.979720384 -0800
+@@ -54,6 +54,9 @@ Modified: Mark Leisher <[email protected]
#include <X11/Xfuncs.h>
#include "ULabel.h"
@@ -10,9 +11,9 @@
#define MIN_APP_DEFAULTS_VERSION 1
#define FIELD_COUNT 14
#define DELIM '-'
-@@ -153,24 +156,25 @@
- static void Syntax(call)
- char *call;
+@@ -152,24 +155,25 @@ static XrmOptionDescRec options[] = {
+
+ static void Syntax(char *call)
{
- fprintf (stderr, "usage: %s [-options ...] -fn font\n\n", call);
- fprintf (stderr, "where options include:\n");
@@ -54,7 +55,7 @@
fprintf (stderr, "\n");
exit (1);
}
-@@ -266,11 +270,29 @@
+@@ -263,10 +267,28 @@ main(int argc, char **argv)
{
Widget topLevel, pane;
@@ -75,16 +76,15 @@
+ * happens. (Goofy X server)
+ */
+ textdomain("xfontsel");
-
++
+ if((domaindir = getenv("TEXTDOMAINDIR")) == NULL){
+ domaindir = getenv("XLOCALEDIR");
+ }
+ bindtextdomain("xfontsel", domaindir);
-+
+
if (argc != 1) Syntax(argv[0]);
- XtAppAddActions(appCtx, xfontsel_actions, XtNumber(xfontsel_actions));
-@@ -280,12 +302,15 @@
+@@ -277,12 +299,15 @@ main(int argc, char **argv)
XtGetApplicationResources( topLevel, (XtPointer)&AppRes,
resources, XtNumber(resources), NZ );
if (AppRes.app_defaults_version < MIN_APP_DEFAULTS_VERSION) {
@@ -105,7 +105,7 @@
}
ScheduleWork(GetFontNames, (XtPointer)XtDisplay(topLevel), 0);
-@@ -532,7 +557,7 @@
+@@ -524,7 +549,7 @@ void GetFontNames(XtPointer closure)
}
else
XtAppWarning( appCtx,
@@ -114,7 +114,7 @@
}
else {
SetNoFonts();
-@@ -1048,11 +1073,11 @@
+@@ -1026,11 +1051,11 @@ static void SetCurrentFontCount(void)
char label[80];
Arg args[1];
if (matchingFontCount == 1)
@@ -129,7 +129,7 @@
XtSetArg( args[0], XtNlabel, label );
XtSetValues( countLabel, args, ONE );
}
-@@ -1063,9 +1088,9 @@
+@@ -1041,9 +1066,9 @@ static void SetParsingFontCount(int coun
char label[80];
Arg args[1];
if (count == 1)
@@ -141,7 +141,7 @@
XtSetArg( args[0], XtNlabel, label );
XtSetValues( countLabel, args, ONE );
FlushXqueue(XtDisplay(countLabel));
-@@ -1282,9 +1307,9 @@
+@@ -1252,9 +1277,9 @@ void SelectField(Widget w, XtPointer clo
int field = (long)closure;
FieldValue *values = fieldValues[field]->value;
int count = fieldValues[field]->count;
--- a/open-src/app/xfs/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xfs/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xfs Makefile
#
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 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"),
@@ -29,19 +29,23 @@
MODULE_NAME=xfs
# Version number (used in path names)
-MODULE_VERSION=1.1.0
+MODULE_VERSION=1.1.1
# Checksums for upstream tarball
-TARBALL_MD5 = 5cfc06a320f74f07a0aa73da62307e9a
-TARBALL_SHA1 = 040dee6ff7628c192874447fb178a965c744eea9
+TARBALL_MD5 = e02c6cae689c082b8c98a421df8f8670
+TARBALL_SHA1 = aa0f4cb4e307c531a78ba9d09c44d042c072742b
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES = \
+ solaris-make.patch,-p1 \
smf-manpage.patch \
config-warning.patch
+# Need to rebuild config/Makefile.in after applying solaris-make.patch
+AUTORECONF=yes
+
# Man pages to apply Sun footer to & attributes to list
-SUNTOUCHED_MANPAGES=*.man
+SUNTOUCHED_MANPAGES=man/xfs.man
MODULE_STABILITY=Committed
# pkg(5) name we deliver the files in (override default)
--- a/open-src/app/xfs/config-warning.patch Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xfs/config-warning.patch Wed Feb 02 11:28:42 2011 -0800
@@ -22,12 +22,12 @@
# DEALINGS IN THE SOFTWARE.
#
-diff -urp -x '*~' -x '*.orig' config.cpp config.cpp
---- config.cpp 2008-12-03 19:43:27.000000000 -0800
-+++ config.cpp 2009-06-18 14:33:55.670348000 -0700
+diff -urp -x '*~' -x '*.orig' config/config.cpp config/config.cpp
+--- config/config.cpp 2010-08-06 18:40:29.000000000 -0700
++++ config/config.cpp 2011-01-28 18:01:17.331211005 -0800
@@ -1,6 +1,13 @@
- XCOMM X font server configuration file
- XCOMM See xfs(__appmansuffix__) man page for more information.
+ # X font server configuration file
+ # See xfs(__appmansuffix__) man page for more information.
+XCOMM DO NOT EDIT /usr/lib/X11/fs/config directly.
+XCOMM
--- a/open-src/app/xfs/smf-manpage.patch Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xfs/smf-manpage.patch Wed Feb 02 11:28:42 2011 -0800
@@ -25,9 +25,9 @@
Add notes on SMF integration and change to reflect default startup via
inetd.
-diff -urp -x '*~' -x '*.orig' xfs.man xfs.man
---- xfs.man 2009-06-17 18:32:46.000000000 -0700
-+++ xfs.man 2009-06-18 14:33:54.591588000 -0700
+diff -urp -x '*~' -x '*.orig' man/xfs.man man/xfs.man
+--- man/xfs.man 2010-08-06 18:40:29.000000000 -0700
++++ man/xfs.man 2011-01-28 18:01:17.083394642 -0800
@@ -68,10 +68,14 @@ xfs \- X font server
.B xfs
is the X Window System font server.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/xfs/solaris-make.patch Wed Feb 02 11:28:42 2011 -0800
@@ -0,0 +1,26 @@
+From 68bf267fa4080e4a85df91e4a196bb701ee921d1 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <[email protected]>
+Date: Fri, 7 Jan 2011 18:19:56 -0800
+Subject: [PATCH:xfs] Make config.cpp rule compatible with Solaris make
+
+Solaris make doesn't support $< in direct target rules.
+
+Signed-off-by: Alan Coopersmith <[email protected]>
+---
+ config/Makefile.am | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/config/Makefile.am b/config/Makefile.am
+index 70bb896..4f8613e 100644
+--- a/config/Makefile.am
++++ b/config/Makefile.am
+@@ -33,5 +33,5 @@ MAN_SUBSTS += -e 's|DEFAULTFONTPATH|$(FONTPATH)|g'
+ MAN_SUBSTS += -e 's|FSERRORS|/var/log/xfs.log|g'
+
+ config: config.cpp
+- $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
++ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < config.cpp > $@
+
+--
+1.7.3.2
+
--- a/open-src/app/xfsinfo/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xfsinfo/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xfsinfo Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -33,11 +33,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.2
+MODULE_VERSION=1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = e6c0071f6d5436113982f4a575d3f94b
-TARBALL_SHA1 = 035ea714088d1b08bc27c02a6806d75dabc4eade
+TARBALL_MD5 = aae6fa48b5c2ce9186a5ff4ccc14a1d4
+TARBALL_SHA1 = 21c5f544f34d9164797575da85727558f5e09d33
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/xfwp/COPYING Mon Jan 31 13:13:15 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-
-Copyright 1986-1997, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and the following permission notice
-shall be included in all copies 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 NON-INFRINGEMENT. IN NO EVENT SHALL THE OPEN GROUP BE LIABLE
-FOR ANY CLAIM, DAMAGES OR OTHER SIABILITIY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF, OR IN
-CONNNECTION WITH THE SOFTWARE OR THE USE OF OTHER DEALINGS IN
-THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group
-shall not be used in advertising or otherwise to promote the use
-or other dealings in this Software without prior written
-authorization from The Open Group.
-
-X Window System is a trademark of The Open Group.
--- a/open-src/app/xfwp/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xfwp/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xfwp 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -37,11 +37,11 @@
MODULE_PKGCLASS_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION=1.0.2
# Checksums for upstream tarball
-TARBALL_MD5 = 0dbde8b3867032b9e4a383d46dfd7e48
-TARBALL_SHA1 = 2b5be6d941182f4b309f68e1bde11c0e092db33e
+TARBALL_MD5 = eeb558aad30a8b2bc1f1f0e919ea6f38
+TARBALL_SHA1 = 2878987e3f1c9d35fca5292d860c23daa6b5d1f1
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/xgamma/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xgamma/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xgamma 1.x Makefile
#
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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"),
@@ -29,11 +29,11 @@
MODULE_NAME=xgamma
# Version number (used in path names)
-MODULE_VERSION=1.0.3
+MODULE_VERSION=1.0.4
# Checksums for upstream tarball
-TARBALL_MD5 = e8a88bf1a18f35b724619849dca97f4f
-TARBALL_SHA1 = f9c7d93f4b271bab41ee3c91b371d52572e4e08c
+TARBALL_MD5 = 34d22b130bffd8aa857eae6d9da4bbb1
+TARBALL_SHA1 = c4124b42618c6d4bc9eb9690348b5d60e4c9daed
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/xgc/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xgc/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xgc 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -33,11 +33,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.2
+MODULE_VERSION=1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = fec79887ca14575bef4c757b4e95a693
-TARBALL_SHA1 = fbba25046970fa95af4ebbdb5ab0c8e1419531ed
+TARBALL_MD5 = f9addda7d1e157fc7d17ff87b1e360f8
+TARBALL_SHA1 = cb0c0285f1354a983b5cd4a925844a8ab56e4f09
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/xhost/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xhost/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xhost 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -33,11 +33,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.3
+MODULE_VERSION=1.0.4
# Checksums for upstream tarball
-TARBALL_MD5 = c7f91b4a750d297f269c2a0a3206a1b2
-TARBALL_SHA1 = ebcdccdc908e642e527eebbde6ba8084d90c04f6
+TARBALL_MD5 = 2be663a0afbcc0856c1591477d5bf32a
+TARBALL_SHA1 = b4fde9899861f1a97395f8c7197db00cc44242a7
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES = xhost.patch manual.patch
--- a/open-src/app/xhost/manual.patch Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xhost/manual.patch Wed Feb 02 11:28:42 2011 -0800
@@ -1,8 +1,9 @@
---- xhost.man.orig 2007-04-11 17:51:16.000000000 -0400
-+++ xhost.man 2010-07-21 00:31:38.057633427 -0400
-@@ -132,7 +132,8 @@
- .SH FILES
- /etc/X*.hosts
+diff -urp -x '*~' -x '*.orig' xhost.man xhost.man
+--- xhost.man 2010-10-30 09:45:05.000000000 -0700
++++ xhost.man 2011-01-28 18:14:02.974827934 -0800
+@@ -150,7 +150,8 @@ For each name removed from the access co
+ a line of the form "\fIname\fP being removed from access control list"
+ is printed.
.SH "SEE ALSO"
-X(__miscmansuffix__), Xsecurity(__miscmansuffix__), Xserver(1), xdm(1), xauth(1), getaddrinfo(3)
+X(__miscmansuffix__), Xsecurity(__miscmansuffix__), Xserver(1), xdm(1),
@@ -10,13 +11,13 @@
.SH ENVIRONMENT
.TP 8
.B DISPLAY
-@@ -151,6 +152,9 @@
+@@ -169,6 +170,9 @@ the server-interpreted hostname type add
host's network address while the server is still running, and you are
using a network-address based form of authentication, \fIxhost\fP must
be used to add the new address and/or remove the old address.
+.SH WARNINGS
-+__distroname__ is secure by default. See Xserver(1) which details how to re-enable
-+remote connections to the X server as in previous releases.
++__distroname__ is secure by default. See Xserver(1) which details how to
++re-enable remote connections to the X server as in previous releases.
.SH AUTHORS
Bob Scheifler, MIT Laboratory for Computer Science,
.br
--- a/open-src/app/xhost/xhost.patch Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xhost/xhost.patch Wed Feb 02 11:28:42 2011 -0800
@@ -1,6 +1,7 @@
---- xhost.c Mon Jul 10 19:53:04 2006
-+++ filemerge.out Wed Jan 23 14:22:49 2008
-@@ -124,6 +124,11 @@
+diff -urp -x '*~' -x '*.orig' xhost.c xhost.c
+--- xhost.c 2010-10-30 09:45:28.000000000 -0700
++++ xhost.c 2011-01-28 18:14:02.723885503 -0800
+@@ -142,6 +142,11 @@ extern int getdomainname(char *name, siz
#endif
#endif
@@ -12,7 +13,7 @@
static int change_host(Display *dpy, char *name, Bool add);
static char *get_hostname(XHostAddress *ha);
static int local_xerror(Display *dpy, XErrorEvent *rep);
-@@ -193,10 +198,24 @@
+@@ -211,10 +216,24 @@ main(int argc, char *argv[])
char *cp;
#endif
@@ -38,7 +39,7 @@
ProgramName, XDisplayName (NULL));
exit(1);
}
-@@ -211,9 +230,11 @@
+@@ -229,9 +248,11 @@ main(int argc, char *argv[])
sethostent(1); /* don't close the data base each time */
list = XListHosts(dpy, &nhosts, &enabled);
if (enabled)
@@ -52,7 +53,7 @@
if (nhosts != 0) {
for (i = 0; i < nhosts; i++ ) {
-@@ -242,16 +263,18 @@
+@@ -260,16 +281,18 @@ main(int argc, char *argv[])
printf("SI:");
break;
default:
@@ -74,7 +75,7 @@
NAMESERVER_TIMEOUT);
nameserver_timedout = 0;
} else
-@@ -264,7 +287,8 @@
+@@ -282,7 +305,8 @@ main(int argc, char *argv[])
}
if (argc == 2 && !strcmp(argv[1], "-help")) {
@@ -84,7 +85,7 @@
exit(1);
}
-@@ -273,12 +297,14 @@
+@@ -291,26 +315,30 @@ main(int argc, char *argv[])
if (*arg == '-') {
if (!argv[i][1] && ((i+1) == argc)) {
@@ -101,7 +102,6 @@
ProgramName, arg);
nfailed++;
}
-@@ -285,7 +311,8 @@
}
} else {
if (*arg == '+' && !argv[i][1] && ((i+1) == argc)) {
@@ -111,7 +111,6 @@
XDisableAccessControl(dpy);
} else {
if (*arg == '+') {
-@@ -292,7 +319,8 @@
arg = argv[i][1]? &argv[i][1] : argv[++i];
}
if (!change_host (dpy, arg, True)) {
@@ -121,26 +120,7 @@
ProgramName, arg);
nfailed++;
}
-@@ -324,6 +352,7 @@
- krb5_data kbuf;
- #endif
- #ifdef NEEDSOCKETS
-+#ifndef AMTCPCONN
- static struct in_addr addr; /* so we can point at it */
- #if defined(IPv6) && defined(AF_INET6)
- static struct in6_addr addr6; /* so we can point at it */
-@@ -330,7 +359,10 @@
- #else
- struct hostent *hp;
- #endif
-+#else
-+ static ipaddr_t addr;
- #endif
-+#endif
- char *cp;
- #ifdef DNETCONN
- struct dn_naddr *dnaddrp;
-@@ -337,12 +369,14 @@
+@@ -355,12 +383,14 @@ change_host(Display *dpy, char *name, Bo
struct nodeent *np;
static struct dn_naddr dnaddr;
#endif /* DNETCONN */
@@ -158,12 +138,7 @@
exit (1);
}
for (i = 0; i < namelen; i++) {
-@@ -350,12 +384,12 @@
- }
- lname[namelen] = '\0';
- if (!strncmp("inet:", lname, 5)) {
--#if defined(TCPCONN) || defined(STREAMSCONN)
-+#if defined(TCPCONN) || defined(STREAMSCONN) || defined(AMTCPCONN)
+@@ -372,8 +402,8 @@ change_host(Display *dpy, char *name, Bo
family = FamilyInternet;
name += 5;
#else
@@ -174,7 +149,7 @@
return 0;
#endif
}
-@@ -365,8 +399,8 @@
+@@ -383,8 +413,8 @@ change_host(Display *dpy, char *name, Bo
family = FamilyInternet6;
name += 6;
#else
@@ -185,7 +160,7 @@
return 0;
#endif
}
-@@ -378,8 +412,8 @@
+@@ -396,8 +426,8 @@ change_host(Display *dpy, char *name, Bo
family = FamilyInternet6;
name += 7;
#else
@@ -196,7 +171,7 @@
return 0;
#endif
}
-@@ -389,8 +423,8 @@
+@@ -407,8 +437,8 @@ change_host(Display *dpy, char *name, Bo
family = FamilyDECnet;
name += 5;
#else
@@ -207,7 +182,7 @@
return 0;
#endif
}
-@@ -399,8 +433,8 @@
+@@ -417,8 +447,8 @@ change_host(Display *dpy, char *name, Bo
family = FamilyNetname;
name += 4;
#else
@@ -218,7 +193,7 @@
return 0;
#endif
}
-@@ -409,8 +443,8 @@
+@@ -427,8 +457,8 @@ change_host(Display *dpy, char *name, Bo
family = FamilyKrb5Principal;
name +=4;
#else
@@ -229,7 +204,7 @@
return 0;
#endif
}
-@@ -422,11 +456,21 @@
+@@ -440,11 +470,21 @@ change_host(Display *dpy, char *name, Bo
name += 3;
}
if (family == FamilyWild && (cp = strchr(lname, ':'))) {
@@ -256,7 +231,7 @@
}
free(lname);
-@@ -436,8 +480,8 @@
+@@ -454,8 +494,8 @@ change_host(Display *dpy, char *name, Bo
cp = strchr(name, ':');
if (cp == NULL || cp == name) {
@@ -267,7 +242,7 @@
ProgramName, name);
return 0;
}
-@@ -471,7 +515,8 @@
+@@ -489,7 +529,8 @@ change_host(Display *dpy, char *name, Bo
dnaddr = *dnaddrp;
} else {
if ((np = getnodebyname (name)) == NULL) {
@@ -277,7 +252,7 @@
ProgramName, name);
return 0;
}
-@@ -497,7 +542,8 @@
+@@ -515,7 +556,8 @@ change_host(Display *dpy, char *name, Bo
retval = krb5_parse_name(name, &princ);
if (retval) {
krb5_init_ets(); /* init krb errs for error_message() */
@@ -287,7 +262,7 @@
ProgramName, error_message(retval));
return 0;
}
-@@ -523,7 +569,7 @@
+@@ -541,7 +583,7 @@ change_host(Display *dpy, char *name, Bo
XAddHost(dpy, &ha);
else
XRemoveHost(dpy, &ha);
@@ -296,7 +271,7 @@
return 1;
}
/*
-@@ -542,12 +588,14 @@
+@@ -560,12 +602,14 @@ change_host(Display *dpy, char *name, Bo
*cp = '\0';
pwd = getpwnam(name);
if (!pwd) {
@@ -313,21 +288,7 @@
return 0;
}
netname = username;
-@@ -570,8 +618,13 @@
- /*
- * First see if inet_addr() can grok the name; if so, then use it.
- */
-+#ifndef AMTCPCONN
- if (((family == FamilyWild) || (family == FamilyInternet)) &&
- ((addr.s_addr = inet_addr(name)) != -1)) {
-+#else
-+ if (((family == FamilyWild) || (family == FamilyInternet)) &&
-+ ((addr = inet_addr(name)) != -1)) {
-+#endif
- ha.family = FamilyInternet;
- ha.length = 4; /* but for Cray would be sizeof(addr.s_addr) */
- ha.address = (char *)&addr; /* but for Cray would be &addr.s_addr */
-@@ -654,8 +707,11 @@
+@@ -672,8 +716,11 @@ change_host(Display *dpy, char *name, Bo
familyMsg = "inet ";
}
@@ -341,37 +302,7 @@
}
freeaddrinfo(addresses);
return 1;
-@@ -715,7 +771,7 @@
- static char *
- get_hostname(XHostAddress *ha)
- {
--#if (defined(TCPCONN) || defined(STREAMSCONN)) && \
-+#if (defined(TCPCONN) || defined(STREAMSCONN) || defined(AMTCPCONN)) && \
- (!defined(IPv6) || !defined(AF_INET6))
- static struct hostent *hp = NULL;
- #endif
-@@ -733,7 +789,7 @@
- struct sigaction sa;
- #endif
-
--#if defined(TCPCONN) || defined(STREAMSCONN)
-+#if defined(TCPCONN) || defined(STREAMSCONN) || defined(AMTCPCONN)
- #if defined(IPv6) && defined(AF_INET6)
- if ((ha->family == FamilyInternet) || (ha->family == FamilyInternet6)) {
- struct sockaddr_storage saddr;
-@@ -823,7 +879,11 @@
- alarm(0);
- if (hp)
- return (hp->h_name);
-+#ifndef AMTCPCONN
- else return (inet_ntoa(*((struct in_addr *)(ha->address))));
-+#else
-+ else return (inet_ntoa(*((ipaddr_t *)(ha->address))));
-+#endif
- }
- #endif /* IPv6 */
- #endif
-@@ -933,14 +993,16 @@
+@@ -951,14 +998,16 @@ static int
local_xerror(Display *dpy, XErrorEvent *rep)
{
if ((rep->error_code == BadAccess) && (rep->request_code == X_ChangeHosts)) {
--- a/open-src/app/xinit/6714067.patch Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xinit/6714067.patch Wed Feb 02 11:28:42 2011 -0800
@@ -1,6 +1,6 @@
diff -urp -x '*~' -x '*.orig' Makefile.am Makefile.am
---- Makefile.am 2010-03-15 15:35:56.000000000 -0700
-+++ Makefile.am 2010-05-03 16:23:32.292195265 -0700
+--- Makefile.am 2010-04-26 08:48:51.000000000 -0700
++++ Makefile.am 2011-01-28 18:41:11.374909599 -0800
@@ -52,6 +52,7 @@ PROGCPPDEFS = \
-DXINIT=@XINIT@
@@ -10,9 +10,9 @@
-DSHELL_CMD=$(SHELL_CMD) $(STARTX_COOKIE_FLAGS) \
-D__libexecdir__="$(libexecdir)" \
diff -urp -x '*~' -x '*.orig' Makefile.in Makefile.in
---- Makefile.in 2010-03-15 15:42:07.000000000 -0700
-+++ Makefile.in 2010-05-03 16:23:32.293031588 -0700
-@@ -372,6 +372,7 @@ PROGCPPDEFS = \
+--- Makefile.in 2010-10-30 16:44:46.000000000 -0700
++++ Makefile.in 2011-01-28 18:41:11.375365804 -0800
+@@ -374,6 +374,7 @@ PROGCPPDEFS = \
-DXINIT=@XINIT@
CPP_FILES_FLAGS = \
@@ -21,102 +21,32 @@
-DSHELL_CMD=$(SHELL_CMD) $(STARTX_COOKIE_FLAGS) \
-D__libexecdir__="$(libexecdir)" \
diff -urp -x '*~' -x '*.orig' xinit.c xinit.c
---- xinit.c 2009-11-23 14:49:24.000000000 -0800
-+++ xinit.c 2010-05-03 16:23:32.293658400 -0700
-@@ -174,6 +174,11 @@ static void set_environment ( void );
- static void Fatal(char *msg);
- static void Error ( char *fmt, ... );
+--- xinit.c 2010-06-11 18:14:10.000000000 -0700
++++ xinit.c 2011-01-28 18:41:11.375613442 -0800
+@@ -630,6 +630,26 @@ shutdown(void)
-+/* Bug 4284529, vivekp, this flag is set by the SIGUSR1
-+ signal handler in xinit, it tells Xserver is ready to accept connection.
-+*/
-+volatile static int received_SIGUSR1_from_xserver = 0;
-+
- #ifdef RETSIGTYPE /* autoconf AC_TYPE_SIGNAL */
- # define SIGVAL RETSIGTYPE
- #endif /* RETSIGTYPE */
-@@ -196,6 +201,14 @@ sigAlarm(int sig)
- static SIGVAL
- sigUsr1(int sig)
- {
-+ /* Bug 4284529, vivekp, set this flag if received SIGUSR1 from X server
-+ so that we know X server is ready to accept connections.
-+
-+ SIGUSR1 is not received by xinit if Xsun is executed thru shell that
-+ is in case of executing X server thru .xserverrc.
-+ */
-+ received_SIGUSR1_from_xserver = 1;
-+
- #if defined(SYSV) || defined(SVR4) || defined(linux) || defined(__UNIXOS2__) || defined(__APPLE__)
- signal (sig, sigUsr1);
- #endif
-@@ -533,6 +546,12 @@ startServer(char *server[])
- sigaddset(&mask, SIGUSR1);
- sigprocmask(SIG_BLOCK, &mask, &old);
-
-+ /* Bug 4284529, vivekp, reset it, this flag gets set in
-+ SIGUSR1 handler, sigUsr1().
-+ */
-+ received_SIGUSR1_from_xserver = 0;
-+
-+
- serverpid = fork();
-
- switch(serverpid) {
-@@ -620,6 +639,17 @@ startServer(char *server[])
- if (!sigismember(&pendings, SIGUSR1))
- #endif /* __UNIXOS2__ */
- sigsuspend(&old);
+ if (processTimeout(3, "server to die"))
+ Fatalx("X server refuses to die");
++#ifdef sun
++ else {
++ /* Restore keyboard mode. */
++ serverpid = fork();
++ switch (serverpid) {
++ case 0:
++ execlp ("kbd_mode", "kbd_mode", "-a");
++ Fatal("Unable to run program \"%s\"", "kbd_mode");
++ break;
+
-+ /* Bug 4284529, vivekp, check if SIGUSR1 is already received,
-+ no need to pause. SIGUSR1 is never received only in the case
-+ where Xserver is started thru $HOME/.xserverrc file.
-+ This fix corrects last few fixes from version 1.6, 1.3, 1.4
-+ of xinit.c. That is bug 4284529, 4245301 and 4226277.
-+ */
-+ if (!received_SIGUSR1_from_xserver)
-+ pause ();
-+
-+
- alarm (0);
- sigprocmask(SIG_SETMASK, &old, NULL);
-
-@@ -786,7 +816,12 @@ shutdown(void)
- if (serverpid < 0)
- return;
- errno = 0;
-+#ifndef i386
- if (killpg(serverpid, SIGTERM) < 0) {
-+#else
-+ if (kill(serverpid, SIGTERM) < 0) {
-+#endif
++ case 1:
++ Error("fork failed");
++ break;
+
- if (errno == EPERM)
- Fatal("Can't kill X server\r\n");
- if (errno == ESRCH)
-@@ -810,6 +845,13 @@ shutdown(void)
- fprintf (stderr, "\r\n");
- Fatal("Can't kill server\r\n");
- }
-+ else {
-+ /* B U G : 4221128 */
-+ /* Restore keyboard mode. */
-+ fprintf (stderr, "\r\nRestoring keyboard mode\r\n");
-+ execlp ("kbd_mode", "kbd_mode", "-a");
-+ }
-+
- fprintf (stderr, "\r\n");
- return;
++ default:
++ fprintf (stderr, "\r\nRestoring keyboard mode\r\n");
++ processTimeout(1, "kbd_mode");
++ }
++ }
++#endif
}
-diff -urp -x '*~' -x '*.orig' xinitrc.cpp xinitrc.cpp
---- xinitrc.cpp 2009-11-23 14:49:24.000000000 -0800
-+++ xinitrc.cpp 2010-05-03 16:23:32.293824820 -0700
-@@ -96,7 +96,7 @@ fi
- #endif
- TWM &
--XCLOCK -geometry 50x50-1+1 &
-+XCOMM XCLOCK -geometry 50x50-1+1 &
- XTERM -geometry 80x50+494+51 &
- XTERM -geometry 80x20+494-0 &
- exec XTERM -geometry 80x66+0+0 -name login
+ static void
--- a/open-src/app/xinit/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xinit/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xinit 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -29,11 +29,11 @@
MODULE_NAME=xinit
# Version number (used in path names)
-MODULE_VERSION=1.2.1
+MODULE_VERSION=1.3.0
# Checksums for upstream tarball
-TARBALL_MD5 = 56f2d202b3dc10fcd21931a67bb270f7
-TARBALL_SHA1 = baf36374aa1632054816a8281e55e1539459664b
+TARBALL_MD5 = bc4e8b7d1919597cc37a0d24aa149dda
+TARBALL_SHA1 = 6437292214bbca6efad8889c68e72a1ca584928b
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES = 6714067.patch
@@ -45,6 +45,8 @@
# ARC cases that covered this module
# PSARC/2008/379 startx
MODULE_ARC_CASES = PSARC/2008/379
+# PSARC/2011/033 X11R7.6 application updates
+MODULE_ARC_CASES += PSARC/2011/033
# Man pages to apply Sun footer to & attributes to list
SUNTOUCHED_MANPAGES=*.man
@@ -53,4 +55,7 @@
# Compatibility links from /usr/X11/bin to /usr/bin
MODULE_X11_BINCOMPAT_LINKS = xinit startx
+# Additional flags to pass to configure script
+MODULE_CONFIG_OPTS = --with-xinitdir=/etc/X11/xinit
+
include ../Makefile.inc
--- a/open-src/app/xinput/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xinput/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xinput 1.x Makefile
#
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 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"),
@@ -29,11 +29,11 @@
MODULE_NAME=xinput
# Version number (used in path names)
-MODULE_VERSION=1.5.2
+MODULE_VERSION=1.5.3
# Checksums for upstream tarball
-TARBALL_MD5 = 8cec6023f90180cb8e4be31d98c43fda
-TARBALL_SHA1 = 4b352ad59e67dc6e63361a9050d3fbe5a6aec3de
+TARBALL_MD5 = 1e2f0ad4f3fa833b65c568907f171d28
+TARBALL_SHA1 = 70f258279acaa45fb77820ae3f8c2bee9f2d2235
# pkg(5) name we deliver the files in (override default)
MODULE_PKGNAME=x11/x11-server-utilities
--- a/open-src/app/xkbcomp/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xkbcomp/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xkbcomp 1.x Makefile
#
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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"),
@@ -33,11 +33,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.1.1
+MODULE_VERSION=1.2.0
# Checksums for upstream tarball
-TARBALL_MD5 = 38c387bacdc01038c8ac280588792bcf
-TARBALL_SHA1 = aeb733c495d7afd42136bf8ae5c6e792c63f0b4b
+TARBALL_MD5 = 0f55995cd8da9b2d88553e1a2e17cd0a
+TARBALL_SHA1 = 67a10a1671fd1a0d6e09b4dfe93d0331af699f26
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/xkbprint/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xkbprint/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xkbprint 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -33,11 +33,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.2
+MODULE_VERSION=1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = 3d3eb10466442354d6b73b503b9829db
-TARBALL_SHA1 = 36e4c8a143b6ab3672843c110db9357b39589927
+TARBALL_MD5 = 526b5ba87cccd05aa700fa628bcfda3e
+TARBALL_SHA1 = 4e7c91a137f0746202b3a74bbaf49c849484aa30
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/xkbutils/COPYING Mon Jan 31 13:13:15 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-Copyright (c) 1993, 1995 by Silicon Graphics Computer Systems, Inc.
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be
-used in advertising or publicity pertaining to distribution
-of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability
-of this software for any purpose. It is provided "as is"
-without any express or implied warranty.
-
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR 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.
-
-
- COPYRIGHT 1990
- DIGITAL EQUIPMENT CORPORATION
- MAYNARD, MASSACHUSETTS
- ALL RIGHTS RESERVED.
-
-THE INFORMATION IN THIS SOFTWARE IS SUBJECT TO CHANGE WITHOUT NOTICE AND
-SHOULD NOT BE CONSTRUED AS A COMMITMENT BY DIGITAL EQUIPMENT CORPORATION.
-DIGITAL MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THIS SOFTWARE
-FOR ANY PURPOSE. IT IS SUPPLIED "AS IS" WITHOUT EXPRESS OR IMPLIED
-WARRANTY.
-
-IF THE SOFTWARE IS MODIFIED IN A MANNER CREATING DERIVATIVE COPYRIGHT
-RIGHTS, APPROPRIATE LEGENDS MAY BE PLACED ON THE DERIVATIVE WORK IN
-ADDITION TO THAT SET FORTH ABOVE.
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted, provided
-that the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Digital Equipment Corporation not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-
-Copyright 2008 Sun Microsystems, Inc. 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.
--- a/open-src/app/xkbutils/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xkbutils/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xkbutils 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -33,11 +33,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.2
+MODULE_VERSION=1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = 369a21641b7ca983d6641298e51d97f8
-TARBALL_SHA1 = 2c025038ca12ee2494b2401ea2c12c74fe88bf91
+TARBALL_MD5 = 52ad6d8d87577a8ac736ab5488bec210
+TARBALL_SHA1 = e5a2619b9449f95e02b520b492de0575bc4551d6
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/xkill/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xkill/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xkill 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -29,11 +29,11 @@
MODULE_NAME=xkill
# Version number (used in path names)
-MODULE_VERSION=1.0.2
+MODULE_VERSION=1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = dca031355b4afcf8517a8258eeb730c3
-TARBALL_SHA1 = 90f08652859daf71b682c3b9163ebf72ce88c4bc
+TARBALL_MD5 = e7f0d57b6ba49c384e9cf8c9ff3243c1
+TARBALL_SHA1 = bab7b9c7f3bc053d743eb339cf5fa496bace57e5
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/xload/COPYING Mon Jan 31 13:13:15 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-Copyright (c) 1989 X Consortium
-
-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 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 X CONSORTIUM 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.
-
-Except as contained in this notice, the name of the X Consortium shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from the X Consortium.
-
- ----------------------------------------
-
-Copyright (c) 2000, 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.
-
-
- ----------------------------------------
-
-get_rload.c (rwhod support) was added in 2001 by the XFree86 Project without
-a copyright notice, and is thus covered by this general notice:
-
-XFree86 code without an explicit copyright is covered by the following copy-
-right/license:
-
-Copyright (C) 1994-2003 The XFree86 Project, Inc. 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 fur-
-nished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice 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, FIT-
-NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
-NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the XFree86 Project shall not
-be used in advertising or otherwise to promote the sale, use or other deal-
-ings in this Software without prior written authorization from the XFree86
-Project.
--- a/open-src/app/xload/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xload/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xload 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -37,15 +37,14 @@
MODULE_PKGCLASS_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.2
+MODULE_VERSION=1.1.0
# Checksums for upstream tarball
-TARBALL_MD5 = b41ed6b4bcfc9897366c27a94d2bf150
-TARBALL_SHA1 = cbbbf23531e0d781b556f5864cc3b83874f786d2
+TARBALL_MD5 = 5f6e8c54da51ad0e751abf54980b0ef1
+TARBALL_SHA1 = dcad93d769b0614466f1e48fed5dd956349cfcfb
# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = patch.xload
-
+SOURCE_PATCHES =
# Man pages to apply Sun footer to & attributes to list
SUNTOUCHED_MANPAGES=*.man
--- a/open-src/app/xload/patch.xload Mon Jan 31 13:13:15 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,100 +0,0 @@
---- xload.c Tue Aug 1 18:20:40 2006
-+++ filemerge.out Tue Jun 17 12:36:02 2008
-@@ -50,6 +50,9 @@
- #include <X11/Xmu/SysUtil.h>
- #include "xload.h"
-
-+#include <libintl.h>
-+#include <X11/Xlocale.h>
-+
- #include "xload.bit"
-
- char *ProgramName;
-@@ -118,32 +121,32 @@
-
- static void usage(void)
- {
-- fprintf (stderr, "usage: %s [-options ...]\n\n", ProgramName);
-- fprintf (stderr, "where options include:\n");
-- fprintf (stderr,
-- " -display dpy X server on which to display\n");
-- fprintf (stderr,
-- " -geometry geom size and location of window\n");
-- fprintf (stderr,
-- " -fn font font to use in label\n");
-- fprintf (stderr,
-- " -scale number minimum number of scale lines\n");
-- fprintf (stderr,
-- " -update seconds interval between updates\n");
-- fprintf (stderr,
-- " -label string annotation text\n");
-- fprintf (stderr,
-- " -bg color background color\n");
-- fprintf (stderr,
-- " -fg color graph color\n");
-- fprintf (stderr,
-- " -hl color scale and text color\n");
-- fprintf (stderr,
-- " -nolabel removes the label from above the chart.\n");
-- fprintf (stderr,
-- " -jumpscroll value number of pixels to scroll on overflow\n");
-- fprintf (stderr,
-- " -remote host remote host to monitor\n");
-+ fprintf (stderr, gettext("usage: %s [-options ...]\n\n"), ProgramName);
-+ fprintf (stderr, gettext("where options include:\n"));
-+ fprintf (stderr, " -display %s",
-+ gettext("display X server on which to display\n"));
-+ fprintf (stderr, " -geometry %s",
-+ gettext("geometry size and location of window\n"));
-+ fprintf (stderr, " -fn %s",
-+ gettext("font font to use in label\n"));
-+ fprintf (stderr, " -scale %s",
-+ gettext("number minimum number of scale lines\n"));
-+ fprintf (stderr, " -update %s",
-+ gettext("seconds interval between updates\n"));
-+ fprintf (stderr, " -label %s",
-+ gettext("string annotation text\n"));
-+ fprintf (stderr, " -bg %s",
-+ gettext("color background color\n"));
-+ fprintf (stderr, " -fg %s",
-+ gettext("color graph color\n"));
-+ fprintf (stderr, " -hl %s",
-+ gettext("color scale and text color\n"));
-+ fprintf (stderr, " -nolabel %s",
-+ gettext("removes the label from above the chart.\n"));
-+ fprintf (stderr, " -jumpscroll %s",
-+ gettext("value number of pixels to scroll on overflow\n"));
-+ fprintf (stderr, " -lights %s",
-+ gettext("use keyboard leds to display current load\n"));
- fprintf (stderr, "\n");
- exit(1);
- }
-@@ -157,6 +160,13 @@
- Pixmap icon_pixmap = None;
- char *label, host[256];
-
-+ /*
-+ * Internationalize for Bug: JHobson 6/21/00
-+ */
-+ char *domaindir;
-+
-+ XtSetLanguageProc ( NULL, NULL, NULL );
-+
- ProgramName = argv[0];
-
- /* For security reasons, we reset our uid/gid after doing the necessary
-@@ -178,6 +188,14 @@
-
- toplevel = XtAppInitialize(&app_con, "XLoad", options, XtNumber(options),
- &argc, argv, NULL, NULL, (Cardinal) 0);
-+
-+ textdomain("xload");
-+
-+ if ((domaindir = getenv ( "TEXTDOMAINDIR" )) == NULL) {
-+ domaindir = "/usr/share/locale"; /*XLOCALEDIR;*/
-+ }
-+ bindtextdomain("xload", domaindir);
-+
- if (argc != 1) usage();
-
- XtGetApplicationResources( toplevel, (XtPointer) &resources,
--- a/open-src/app/xlogo/COPYING Mon Jan 31 13:13:15 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-Copyright 1988, 1990, 1993 1994, 1998 The Open Group
-Copyright 2004 Roland Mainz <[email protected]>
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice 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 OPEN GROUP 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.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
--- a/open-src/app/xlogo/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xlogo/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xlogo 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -29,11 +29,11 @@
MODULE_NAME=xlogo
# Version number (used in path names)
-MODULE_VERSION=1.0.2
+MODULE_VERSION=1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = 7365c0852750134119734bc1879f60ca
-TARBALL_SHA1 = 79f0370e1944194cb6dcce9c4efd144be69e8657
+TARBALL_MD5 = 8149f95f5a0f04f404549363557eef41
+TARBALL_SHA1 = 5016e74ba16ac80f3eac1c97738a6afbfc8b3bdd
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/xlsclients/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xlsclients/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xlsclients 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -33,11 +33,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.1.0
+MODULE_VERSION=1.1.1
# Checksums for upstream tarball
-TARBALL_MD5 = 550a0fee047c5043f2cbf190b41f8a1b
-TARBALL_SHA1 = 1961ee982f98d270c9069eaf84790c6b9dcdc851
+TARBALL_MD5 = 6d42621616da0c720f640d23873604ce
+TARBALL_SHA1 = 67bfdcb089e8669df7ec5bc7a137e037047f2535
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/xmag/COPYING Mon Jan 31 13:13:15 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-Copyright 1989, 1990, 1991, 1993, 1994, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice 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 OPEN GROUP 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.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-
-Copyright (C) 1999 The XFree86 Project, Inc. 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 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
-XFREE86 PROJECT 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.
-
-Except as contained in this notice, the name of the XFree86 Project shall
-not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from the
-XFree86 Project.
--- a/open-src/app/xmag/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xmag/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xmag 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -29,11 +29,11 @@
MODULE_NAME=xmag
# Version number (used in path names)
-MODULE_VERSION=1.0.3
+MODULE_VERSION=1.0.4
# Checksums for upstream tarball
-TARBALL_MD5 = 32f7ed4c089365cadb9382f6fbd750a9
-TARBALL_SHA1 = 1acbc1ccdcd0399b62ad6e96a47021c00dcfde7d
+TARBALL_MD5 = 2a76128511214bde973258baef537be3
+TARBALL_SHA1 = 95695d4d4a731e5deb4196a0cc6d04ecaba023fe
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/xmag_multivis/6726838.patch Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xmag_multivis/6726838.patch Wed Feb 02 11:28:42 2011 -0800
@@ -1,5 +1,6 @@
---- Makefile.am Wed Aug 15 17:58:23 2007
-+++ /tmp/Makefile.am Wed Jul 16 14:22:11 2008
+diff -urp -x '*~' -x '*.orig' Makefile.am Makefile.am
+--- Makefile.am 2010-10-30 17:17:29.000000000 -0700
++++ Makefile.am 2011-01-28 20:22:00.477766877 -0800
@@ -19,24 +19,18 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
@@ -7,9 +8,10 @@
-bin_PROGRAMS = xmag
+bin_PROGRAMS = xmag_multivis
- AM_CFLAGS = $(XMAG_CFLAGS)
+-AM_CFLAGS = $(XMAG_CFLAGS) $(CWARNFLAGS)
-xmag_LDADD = $(XMAG_LIBS) -lm
-+xmag_multivis_LDADD = $(XMAG_LIBS) -lm
++AM_CFLAGS = $(XMAG_CFLAGS) $(CWARNFLAGS) -DSHAPE -DALLPLANES
++xmag_multivis_LDADD = $(XMAG_LIBS) -lXext -lm
-xmag_SOURCES = \
- CutPaste.c \
@@ -23,14 +25,12 @@
- xmag.c
+xmag_multivis_SOURCES = \
+ xmag_multivis.c \
-+ multivis.c \
-+ multivis.h
++ multivis.c \
++ multivis.h
appman_PRE = \
- xmag.man
+ xmag_multivis.man
# App default files (*.ad)
-
-
--- a/open-src/app/xmag_multivis/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xmag_multivis/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xmag-multivis 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -33,11 +33,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.3
+MODULE_VERSION=1.0.4
# Checksums for upstream tarball
-TARBALL_MD5 = 32f7ed4c089365cadb9382f6fbd750a9
-TARBALL_SHA1 = 1acbc1ccdcd0399b62ad6e96a47021c00dcfde7d
+TARBALL_MD5 = 2a76128511214bde973258baef537be3
+TARBALL_SHA1 = 95695d4d4a731e5deb4196a0cc6d04ecaba023fe
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES = 6726838.patch
--- a/open-src/app/xmag_multivis/sun-src/multivis.c Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xmag_multivis/sun-src/multivis.c Wed Feb 02 11:28:42 2011 -0800
@@ -1,7 +1,16 @@
/*-
* multivis.c - Mechanism for GetImage across Multiple Visuals
*
- * Copyright 1990, 1997, Oracle and/or its affiliates. All rights reserved.
+ * Original author:
+ * Milind M. Pansare
+ * Window Systems Group
+ * Sun Microsystems, Inc.
+ *
+ * Revision History:
+ * 11-15-90 Written
+ */
+
+/* Copyright (c) 1990, 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"),
@@ -21,16 +30,9 @@
* 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.
- *
- * Original author:
- * Milind M. Pansare
- * Window Systems Group
- * Sun Microsystems, Inc.
- *
- * Revision History:
- * 11-15-90 Written
*/
+#include <stdlib.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#ifdef SHAPE
--- a/open-src/app/xmag_multivis/sun-src/xmag_multivis.c Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xmag_multivis/sun-src/xmag_multivis.c Wed Feb 02 11:28:42 2011 -0800
@@ -23,12 +23,40 @@
*
*/
+/*
+ * Copyright (c) 1990, 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.
+ */
+
+
#include <X11/Xos.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/cursorfont.h>
#include <X11/Xatom.h>
#include <stdio.h>
+#include <stdlib.h>
+#ifdef ALLPLANES
+# include <X11/extensions/allplanes.h>
+#endif
#include "multivis.h"
#ifdef SYSV
--- a/open-src/app/xman/6708109.patch Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xman/6708109.patch Wed Feb 02 11:28:42 2011 -0800
@@ -1,6 +1,339 @@
---- main.c Fri Aug 10 07:14:12 2007
-+++ main.c Tue Apr 15 16:20:10 2008
-@@ -37,6 +37,8 @@
+diff -urp -x '*~' -x '*.orig' buttons.c buttons.c
+--- buttons.c 2009-10-16 14:39:48.000000000 -0700
++++ buttons.c 2011-01-28 20:32:24.195046596 -0800
+@@ -36,6 +36,8 @@ from the X Consortium.
+ * Created: October 27, 1987
+ */
+
++#include <libintl.h>
++#include <X11/Xlocale.h>
+ #include "globals.h"
+ #include "vendor.h"
+
+@@ -47,6 +49,7 @@ from the X Consortium.
+
+ static void CreateOptionMenu(ManpageGlobals * man_globals, Widget parent);
+ static void CreateSectionMenu(ManpageGlobals * man_globals, Widget parent);
++static void CreateMoreMenu(ManpageGlobals * man_globals, Widget parent);
+ static void StartManpage(ManpageGlobals * man_globals, Boolean help, Boolean page);
+ static Widget * ConvertNamesToWidgets(Widget parent, char ** names);
+
+@@ -57,6 +60,7 @@ static Widget * ConvertNamesToWidgets(Wi
+ */
+
+ #define TOPARGS 5
++#define MAX_MENU 30
+
+ Widget top; /* needed in PopupWarning, misc.c */
+
+@@ -213,7 +217,7 @@ Boolean full_instance)
+ {
+ Arg arglist[MANPAGEARGS]; /* An argument list for widget creation */
+ Cardinal num_args; /* The number of arguments in the list. */
+- Widget mytop, pane, hpane, mysections; /* Widgets */
++ Widget mytop, pane, hpane, mysections, sect1; /* Widgets */
+ ManPageWidgets * mpw = &(man_globals->manpagewidgets);
+
+ num_args = (Cardinal) 0;
+@@ -240,8 +244,13 @@ Boolean full_instance)
+ num_args++;
+ XtSetValues(mytop, arglist, num_args);
+
++#ifdef SUNSOFT
++ pane = XtCreateManagedWidget("Manpage_Vpane", panedWidgetClass, mytop, NULL,
++ (Cardinal) 0);
++#else
+ pane = XtCreateManagedWidget("vertPane", panedWidgetClass, mytop, NULL,
+ (Cardinal) 0);
++#endif
+
+ /* Create menu bar. */
+
+@@ -259,15 +268,24 @@ Boolean full_instance)
+ mysections = XtCreateManagedWidget("sections", menuButtonWidgetClass,
+ hpane, arglist, num_args);
+
++ if(sections > MAX_MENU){
++ num_args = 0;
++ XtSetArg(arglist[num_args], XtNmenuName, MORE_MENU); num_args++;
++ sect1 = XtCreateManagedWidget("More...", menuButtonWidgetClass,
++ hpane, arglist, num_args);
++ }
++
+ XtSetArg(arglist[0], XtNlabel, SHOW_BOTH);
+ XtSetValues(man_globals->both_screens_entry, arglist, (Cardinal) 1);
+
+ if (full_instance) {
+ MakeSearchWidget(man_globals, mytop);
+ CreateSectionMenu(man_globals, mytop);
++ if(sections > MAX_MENU) CreateMoreMenu(man_globals, mytop);
+ MakeSaveWidgets(man_globals, mytop);
+ } else {
+ XtSetSensitive(mysections, FALSE);
++ if(sections > MAX_MENU) XtSetSensitive(sect1, FALSE);
+ XtSetArg(arglist[0], XtNsensitive, FALSE);
+ XtSetValues(man_globals->dir_entry, arglist, ONE);
+ XtSetValues(man_globals->manpage_entry, arglist, ONE);
+@@ -281,8 +299,13 @@ Boolean full_instance)
+ XtSetValues(man_globals->print_entry, arglist, ONE);
+ #endif /* INCLUDE_XPRINT_SUPPORT */
+
++#ifdef SUNSOFT
++ man_globals->label = XtCreateManagedWidget(MANNAME, labelWidgetClass,
++ hpane, NULL, (Cardinal) 0);
++#else
+ man_globals->label = XtCreateManagedWidget("manualTitle", labelWidgetClass,
+ hpane, NULL, (Cardinal) 0);
++#endif
+
+ /* Create Directory */
+
+@@ -330,7 +353,7 @@ StartManpage(ManpageGlobals * man_global
+
+ if (page || help) {
+ if (help)
+- strcpy(man_globals->manpage_title, "Xman Help");
++ strcpy(man_globals->manpage_title, gettext("Xman Help"));
+
+ if (man_globals->both_shown) {
+ XtManageChild(dir);
+@@ -519,7 +542,7 @@ CreateSectionMenu(ManpageGlobals * man_g
+ menu = XtCreatePopupShell(SECTION_MENU, simpleMenuWidgetClass, parent,
+ NULL, (Cardinal) 0);
+
+- for (i = 0 ; i < sections ; i ++) {
++ for (i = 0 ; i < ((sections <= MAX_MENU) ? sections:sections/2) ; i ++) {
+ num_args = 0;
+ XtSetArg(args[num_args], XtNlabel, manual[i].blabel); num_args++;
+ sprintf(entry_name, "section%d", i);
+@@ -535,6 +558,37 @@ CreateSectionMenu(ManpageGlobals * man_g
+ }
+ }
+
++static void
++CreateMoreMenu(man_globals, parent)
++ManpageGlobals * man_globals;
++Widget parent;
++{
++ Widget menu, entry;
++ int i;
++ MenuStruct * menu_struct;
++ Arg args[1];
++ Cardinal num_args;
++ char entry_name[BUFSIZ];
++
++ menu = XtCreatePopupShell(MORE_MENU, simpleMenuWidgetClass, parent,
++ NULL, (Cardinal) 0);
++
++ for (i = sections/2-1 ; i < sections ; i ++) {
++ num_args = 0;
++ XtSetArg(args[num_args], XtNlabel, manual[i].blabel); num_args++;
++ sprintf(entry_name, "section%d", i);
++
++ entry = XtCreateManagedWidget(entry_name, smeBSBObjectClass,
++ menu, args, num_args);
++ menu_struct = (MenuStruct *) XtMalloc(sizeof(MenuStruct));
++ menu_struct->data = (caddr_t) man_globals;
++ menu_struct->number = i;
++ XtAddCallback(entry, XtNcallback, DirPopupCallback, (caddr_t) menu_struct);
++ XtAddCallback(entry, XtNdestroyCallback,MenuDestroy, (caddr_t)menu_struct);
++
++ }
++}
++
+ /* Function Name: CreateList
+ * Description: this function prints a label in the directory list
+ * Arguments: section - the manual section.
+@@ -579,7 +633,7 @@ MakeDirectoryBox(ManpageGlobals *man_glo
+ return;
+
+ name = manual[section].blabel; /* Set the section name */
+- sprintf(label_name,"Directory of: %s",name);
++ snprintf(label_name, sizeof(label_name), gettext("Directory of: %s"),name);
+ man_globals->section_name[section] = StrAlloc(label_name);
+
+ num_args = 0;
+@@ -677,7 +731,7 @@ FormUpWidgets(Widget parent, char ** ful
+
+ if (long_widget == (Widget) NULL) { /* Make sure we found one. */
+ PopupWarning(GetGlobals(parent),
+- "Could not find longest widget, aborting...");
++ gettext("Could not find longest widget, aborting..."));
+ XtFree((char *)full_widgets);
+ XtFree((char *)half_widgets);
+ return;
+@@ -745,7 +799,8 @@ ConvertNamesToWidgets(Widget parent, cha
+ if (*temp_ids == NULL) {
+ char error_buf[BUFSIZ];
+
+- sprintf(error_buf, "Could not find widget named '%s'", *names);
++ snprintf(error_buf, sizeof(error_buf),
++ gettext("Could not find widget named '%s'"), *names);
+ PrintError(error_buf);
+ XtFree((char *)ids);
+ return(NULL);
+diff -urp -x '*~' -x '*.orig' defs.h defs.h
+--- defs.h 2009-10-16 14:39:48.000000000 -0700
++++ defs.h 2011-01-28 20:32:24.195247147 -0800
+@@ -51,6 +51,7 @@ from the X Consortium.
+
+ #define OPTION_MENU "optionMenu" /* Name of the Option Menu. */
+ #define SECTION_MENU "sectionMenu" /* Name of the Section Menu. */
++#define MORE_MENU "moreMenu" /* Name of the More... Menu. */
+
+ #define HELP_BUTTON "helpButton" /* Name of top help button */
+ #define QUIT_BUTTON "quitButton" /* Name of top quit button */
+diff -urp -x '*~' -x '*.orig' handler.c handler.c
+--- handler.c 2009-11-06 17:58:29.000000000 -0800
++++ handler.c 2011-01-28 20:32:24.173913473 -0800
+@@ -43,6 +43,8 @@ from the X Consortium.
+ #include <sys/stat.h>
+ #include "globals.h"
+ #include "vendor.h"
++#include <libintl.h>
++#include <X11/Xlocale.h>
+ #ifdef INCLUDE_XPRINT_SUPPORT
+ #include "printdialog.h"
+ #include "print.h"
+@@ -309,8 +311,10 @@ SaveFormattedPage(Widget w, XEvent * eve
+ char cmdbuf[BUFSIZ], error_buf[BUFSIZ];
+
+ if (*num_params != 1) {
+- XtAppWarning(XtWidgetToApplicationContext(w),
+- "Xman - SaveFormattedPage: This action routine requires one argument.");
++ snprintf(error_buf, sizeof(error_buf),
++ gettext("%s This action routine requires one argument."),
++ "Xman - SaveFormattedPage:");
++ XtAppWarning(XtWidgetToApplicationContext(w), error_buf);
+ return;
+ }
+
+@@ -347,12 +351,12 @@ SaveFormattedPage(Widget w, XEvent * eve
+ /* make sure the formatted man page is fully accessible by the world */
+ if (chmod(man_globals->save_file, CHMOD_MODE) != 0) {
+ sprintf(error_buf,
+- "Couldn't set permissions on formatted man page '%s'.\n",
++ gettext("Couldn't set permissions on formatted man page '%s'.\n"),
+ man_globals->save_file);
+ PopupWarning( man_globals, error_buf);
+ }
+ } else {
+- sprintf(error_buf, "Error while executing the command '%s'.\n",
++ sprintf(error_buf, gettext("Error while executing the command '%s'.\n"),
+ cmdbuf);
+ PopupWarning( man_globals, error_buf);
+ }
+@@ -362,7 +366,7 @@ SaveFormattedPage(Widget w, XEvent * eve
+ break;
+ default:
+ sprintf(error_buf,"%s %s", "Xman - SaveFormattedPagee:",
+- "Unknown argument must be either 'Save' or 'Cancel'.");
++ gettext("Unknown argument must be either 'Save' or 'Cancel'."));
+ PopupWarning(man_globals, error_buf);
+ return;
+ }
+@@ -397,8 +401,10 @@ GotoPage(Widget w, XEvent * event, Strin
+ Boolean sensitive;
+
+ if (*num_params != 1) {
+- XtAppWarning(XtWidgetToApplicationContext(w),
+- "Xman - GotoPage: This action routine requires one argument.");
++ snprintf(error_buf, sizeof(error_buf),
++ gettext("%s This action routine requires one argument."),
++ gettext("Xman - GotoPage:"));
++ XtAppWarning(XtWidgetToApplicationContext(w), error_buf);
+ return;
+ }
+
+@@ -431,8 +437,8 @@ GotoPage(Widget w, XEvent * event, Strin
+ man_globals->dir_shown = TRUE;
+ break;
+ default:
+- sprintf(error_buf,"%s %s", "Xman - GotoPage: Unknown argument must be",
+- "either Manpage or Directory.");
++ sprintf(error_buf,"%s %s", gettext("Xman - GotoPage: Unknown argument must be"),
++ gettext("either Manpage or Directory."));
+ XtAppWarning(XtWidgetToApplicationContext(w), error_buf);
+ return;
+ }
+@@ -550,13 +556,16 @@ void
+ Search(Widget w, XEvent * event, String * params, Cardinal * num_params)
+ {
+ ManpageGlobals * man_globals = GetGlobals(w);
++ char error_buf[BUFSIZ];
+ FILE * file = NULL;
+
+ XtPopdown( XtParent(XtParent(w)) ); /* popdown the search widget */
+
+ if ( (*num_params < 1) || (*num_params > 2) ) {
+- XtAppWarning(XtWidgetToApplicationContext(w),
+- "Xman - Search: This action routine requires one or two arguments.");
++ snprintf(error_buf, sizeof(error_buf),
++ gettext("%s This action routine requires one or two arguments."),
++ gettext("Xman - Search:"));
++ XtAppWarning(XtWidgetToApplicationContext(w), error_buf);
+ return;
+ }
+
+@@ -574,8 +583,10 @@ Search(Widget w, XEvent * event, String
+ file = NULL;
+ break;
+ default:
+- XtAppWarning(XtWidgetToApplicationContext(w),
+- "Xman - Search: First parameter unknown.");
++ snprintf(error_buf, sizeof(error_buf),
++ gettext("%s First parameter unknown."),
++ gettext("Xman - Search:"));
++ XtAppWarning(XtWidgetToApplicationContext(w), error_buf);
+ file = NULL;
+ break;
+ }
+@@ -600,8 +611,9 @@ Search(Widget w, XEvent * event, String
+ }
+ break;
+ default:
+- XtAppWarning(XtWidgetToApplicationContext(w),
+- "Xman - Search: Second parameter unknown.");
++ snprintf(error_buf, sizeof(error_buf),
++ gettext("%s Second parameter unknown."), "Xman - Search:");
++ XtAppWarning(XtWidgetToApplicationContext(w), error_buf);
+ break;
+ }
+ else {
+diff -urp -x '*~' -x '*.orig' help.c help.c
+--- help.c 2009-10-16 14:39:48.000000000 -0700
++++ help.c 2011-01-28 20:32:24.173431338 -0800
+@@ -36,6 +36,8 @@ from the X Consortium.
+ * Created: January 19, 1988
+ */
+
++#include <libintl.h>
++#include <X11/Xlocale.h>
+ #include "globals.h"
+
+ /* Function Name: MakeHelpWidget.
+@@ -66,7 +68,7 @@ MakeHelpWidget(void)
+ return(FALSE);
+ }
+
+- ChangeLabel(man_globals->label, "Xman Help");
++ ChangeLabel(man_globals->label, gettext("Xman Help"));
+
+ XtManageChild( man_globals->manpagewidgets.manpage );
+ XtRealizeWidget( help_widget );
+@@ -99,7 +101,7 @@ OpenHelpfile(ManpageGlobals * man_global
+
+ if( (help_file_ptr = fopen(resources.help_file, "r")) == NULL ) {
+ PopupWarning(man_globals,
+- "Could not open help file, NO HELP WILL BE AVALIABLE.");
++ gettext("Could not open help file, NO HELP WILL BE AVALIABLE."));
+ return(FALSE);
+ }
+
+diff -urp -x '*~' -x '*.orig' main.c main.c
+--- main.c 2009-10-16 14:39:48.000000000 -0700
++++ main.c 2011-01-28 20:32:24.172597167 -0800
+@@ -37,6 +37,8 @@ from the X Consortium.
* Created: October 22, 1987
*/
@@ -9,7 +342,7 @@
#include "globals.h"
#ifndef ZERO
#include <X11/Xaw/Cardinals.h>
-@@ -150,6 +152,7 @@
+@@ -146,6 +148,7 @@ int main(int argc, char ** argv)
{
XtAppContext app_con;
@@ -17,7 +350,7 @@
saved_argc = argc;
saved_argv = (char **)XtMalloc(argc * sizeof(char *));
bcopy(argv, saved_argv, argc * sizeof(char *));
-@@ -162,6 +165,13 @@
+@@ -158,6 +161,13 @@ int main(int argc, char ** argv)
wm_delete_window = XInternAtom(XtDisplay(initial_widget), "WM_DELETE_WINDOW",
False);
@@ -31,7 +364,7 @@
manglobals_context = XStringToContext(MANNAME);
AdjustDefResources();
-@@ -178,10 +188,10 @@
+@@ -174,10 +184,10 @@ int main(int argc, char ** argv)
XtAppAddActions(app_con, xman_actions, XtNumber(xman_actions));
if (!resources.fonts.directory)
@@ -44,7 +377,7 @@
#endif
/*
-@@ -199,7 +209,7 @@
+@@ -195,7 +205,7 @@ int main(int argc, char ** argv)
default_height /= 4;
if ( (sections = Man()) == 0 )
@@ -53,7 +386,7 @@
if (resources.top_box_active)
MakeTopBox();
-@@ -223,7 +233,7 @@
+@@ -219,7 +229,7 @@ int main(int argc, char ** argv)
}
/* Function Name: ArgError
@@ -62,7 +395,7 @@
* Arguments: argc, argv - args not understood.
* Returns: none.
*/
-@@ -233,42 +243,53 @@
+@@ -229,42 +239,53 @@ ArgError(int argc, char ** argv)
{
int i;
@@ -149,10 +482,10 @@
}
/* Function Name: AdjustDefResources
-
---- man.c Fri Aug 10 07:14:12 2007
-+++ man.c Mon Apr 14 14:11:10 2008
-@@ -31,7 +31,8 @@
+diff -urp -x '*~' -x '*.orig' man.c man.c
+--- man.c 2009-10-16 14:39:48.000000000 -0700
++++ man.c 2011-01-28 20:32:24.173179002 -0800
+@@ -31,7 +31,8 @@ from the X Consortium.
*/
/* $XFree86: xc/programs/xman/man.c,v 1.8 2003/04/09 20:31:31 herrb Exp $ */
@@ -162,7 +495,7 @@
#include "globals.h"
#include "vendor.h" /* vendor-specific defines and data */
-@@ -171,7 +172,7 @@
+@@ -171,7 +172,7 @@ Man(void)
manual = (Manual *) XtRealloc ( (char *) manual,
(sizeof(Manual) * num_alloced));
if (manual == NULL)
@@ -171,7 +504,7 @@
}
InitManual( manual + sect, list->label );
manual[sect].flags = list->flags;
-@@ -198,10 +199,10 @@
+@@ -198,10 +199,10 @@ Man(void)
*/
if (sect == 0)
@@ -184,7 +517,7 @@
return(sect); /* return the number of man sections. */
}
-@@ -223,7 +224,7 @@
+@@ -223,7 +224,7 @@ SortList(SectionList ** list)
SectionList *head, *last, *inner, *old;
if (*list == NULL)
@@ -193,7 +526,7 @@
/*
* First step
-@@ -426,7 +427,7 @@
+@@ -426,7 +427,7 @@ ReadCurrentSection(Manual * local_manual
if((dir = opendir(path)) == NULL) {
#ifdef DEBUG
@@ -202,7 +535,7 @@
PopupWarning(NULL, error_buf);
#endif /* DEBUG */
return;
-@@ -496,7 +497,7 @@
+@@ -512,7 +513,7 @@ ReadCurrentSection(Manual * local_manual
local_manual->entries_less_paths[nentries] =
rindex(local_manual->entries[nentries], '/');
if ( local_manual->entries_less_paths[nentries] == NULL )
@@ -211,7 +544,7 @@
++ nentries;
}
-@@ -524,7 +525,7 @@
+@@ -540,7 +541,7 @@ SortAndRemove(Manual *man, int number)
register int i2 = 0;
#ifdef DEBUG
@@ -220,7 +553,7 @@
#endif /* DEBUG */
s1 = (char **)malloc(man->nentries * sizeof(char *));
-@@ -555,14 +556,14 @@
+@@ -571,14 +572,14 @@ SortAndRemove(Manual *man, int number)
j = 0;
l2 = man->entries_less_paths[j++];
if ( l2 == NULL )
@@ -238,7 +571,7 @@
if ( streq(l1,l2) )
{
j2 = j-1;
-@@ -964,7 +965,7 @@
+@@ -980,7 +981,7 @@ DumpManual(int number)
register int i,j;
for ( i = 0; i < number; i++) {
@@ -247,342 +580,10 @@
for (j = 0; j < manual[i].nentries; j++)
printf("%s\n", manual[i].entries[j]);
}
-
---- help.c Fri Aug 10 07:14:12 2007
-+++ help.c Fri Aug 10 07:14:12 2007
-@@ -36,6 +36,8 @@
- * Created: January 19, 1988
- */
-
-+#include <libintl.h>
-+#include <X11/Xlocale.h>
- #include "globals.h"
-
- extern Atom wm_delete_window; /* in main.c */
-@@ -68,7 +70,7 @@
- return(FALSE);
- }
-
-- ChangeLabel(man_globals->label, "Xman Help");
-+ ChangeLabel(man_globals->label, gettext("Xman Help"));
-
- XtManageChild( man_globals->manpagewidgets.manpage );
- XtRealizeWidget( help_widget );
-@@ -101,7 +103,7 @@
-
- if( (help_file_ptr = fopen(resources.help_file, "r")) == NULL ) {
- PopupWarning(man_globals,
-- "Could not open help file, NO HELP WILL BE AVALIABLE.");
-+ gettext("Could not open help file, NO HELP WILL BE AVALIABLE."));
- return(FALSE);
- }
-
---- handler.c Fri Aug 10 07:14:12 2007
-+++ handler.c Tue Apr 15 16:15:43 2008
-@@ -40,6 +40,8 @@
- #include <sys/stat.h>
- #include "globals.h"
- #include "vendor.h"
-+#include <libintl.h>
-+#include <X11/Xlocale.h>
- #ifdef INCLUDE_XPRINT_SUPPORT
- #include "printdialog.h"
- #include "print.h"
-@@ -300,8 +302,10 @@
- char cmdbuf[BUFSIZ], error_buf[BUFSIZ];
-
- if (*num_params != 1) {
-- XtAppWarning(XtWidgetToApplicationContext(w),
-- "Xman - SaveFormattedPage: This action routine requires one argument.");
-+ snprintf(error_buf, sizeof(error_buf),
-+ gettext("%s This action routine requires one argument."),
-+ "Xman - SaveFormattedPage:");
-+ XtAppWarning(XtWidgetToApplicationContext(w), error_buf);
- return;
- }
-
-@@ -338,12 +342,12 @@
- /* make sure the formatted man page is fully accessible by the world */
- if (chmod(man_globals->save_file, CHMOD_MODE) != 0) {
- sprintf(error_buf,
-- "Couldn't set permissions on formatted man page '%s'.\n",
-+ gettext("Couldn't set permissions on formatted man page '%s'.\n"),
- man_globals->save_file);
- PopupWarning( man_globals, error_buf);
- }
- } else {
-- sprintf(error_buf, "Error while executing the command '%s'.\n",
-+ sprintf(error_buf, gettext("Error while executing the command '%s'.\n"),
- cmdbuf);
- PopupWarning( man_globals, error_buf);
- }
-@@ -353,7 +357,7 @@
- break;
- default:
- sprintf(error_buf,"%s %s", "Xman - SaveFormattedPagee:",
-- "Unknown argument must be either 'Save' or 'Cancel'.");
-+ gettext("Unknown argument must be either 'Save' or 'Cancel'."));
- PopupWarning(man_globals, error_buf);
- return;
- }
-@@ -388,8 +392,10 @@
- Boolean sensitive;
-
- if (*num_params != 1) {
-- XtAppWarning(XtWidgetToApplicationContext(w),
-- "Xman - GotoPage: This action routine requires one argument.");
-+ snprintf(error_buf, sizeof(error_buf),
-+ gettext("%s This action routine requires one argument."),
-+ gettext("Xman - GotoPage:"));
-+ XtAppWarning(XtWidgetToApplicationContext(w), error_buf);
- return;
- }
-
-@@ -422,8 +428,8 @@
- man_globals->dir_shown = TRUE;
- break;
- default:
-- sprintf(error_buf,"%s %s", "Xman - GotoPage: Unknown argument must be",
-- "either Manpage or Directory.");
-+ sprintf(error_buf,"%s %s", gettext("Xman - GotoPage: Unknown argument must be"),
-+ gettext("either Manpage or Directory."));
- XtAppWarning(XtWidgetToApplicationContext(w), error_buf);
- return;
- }
-@@ -541,13 +547,16 @@
- Search(Widget w, XEvent * event, String * params, Cardinal * num_params)
- {
- ManpageGlobals * man_globals = GetGlobals(w);
-+ char error_buf[BUFSIZ];
- FILE * file = NULL;
-
- XtPopdown( XtParent(XtParent(w)) ); /* popdown the search widget */
-
- if ( (*num_params < 1) || (*num_params > 2) ) {
-- XtAppWarning(XtWidgetToApplicationContext(w),
-- "Xman - Search: This action routine requires one or two arguments.");
-+ snprintf(error_buf, sizeof(error_buf),
-+ gettext("%s This action routine requires one or two arguments."),
-+ gettext("Xman - Search:"));
-+ XtAppWarning(XtWidgetToApplicationContext(w), error_buf);
- return;
- }
-
-@@ -565,8 +574,10 @@
- file = NULL;
- break;
- default:
-- XtAppWarning(XtWidgetToApplicationContext(w),
-- "Xman - Search: First parameter unknown.");
-+ snprintf(error_buf, sizeof(error_buf),
-+ gettext("%s First parameter unknown."),
-+ gettext("Xman - Search:"));
-+ XtAppWarning(XtWidgetToApplicationContext(w), error_buf);
- file = NULL;
- break;
- }
-@@ -591,8 +602,9 @@
- }
- break;
- default:
-- XtAppWarning(XtWidgetToApplicationContext(w),
-- "Xman - Search: Second parameter unknown.");
-+ snprintf(error_buf, sizeof(error_buf),
-+ gettext("%s Second parameter unknown."), "Xman - Search:");
-+ XtAppWarning(XtWidgetToApplicationContext(w), error_buf);
- break;
- }
- else {
-
---- buttons.c Fri Aug 10 07:14:12 2007
-+++ buttons.c Tue Apr 15 14:17:59 2008
-@@ -36,6 +36,8 @@
- * Created: October 27, 1987
- */
-
-+#include <libintl.h>
-+#include <X11/Xlocale.h>
- #include "globals.h"
- #include "vendor.h"
-
-@@ -47,6 +49,7 @@
-
- static void CreateOptionMenu(ManpageGlobals * man_globals, Widget parent);
- static void CreateSectionMenu(ManpageGlobals * man_globals, Widget parent);
-+static void CreateMoreMenu(ManpageGlobals * man_globals, Widget parent);
- static void StartManpage(ManpageGlobals * man_globals, Boolean help, Boolean page);
- static Widget * ConvertNamesToWidgets(Widget parent, char ** names);
-
-@@ -57,6 +60,7 @@
- */
-
- #define TOPARGS 5
-+#define MAX_MENU 30
-
- extern Atom wm_delete_window; /* in main.c */
-
-@@ -215,7 +219,7 @@
- {
- Arg arglist[MANPAGEARGS]; /* An argument list for widget creation */
- Cardinal num_args; /* The number of arguments in the list. */
-- Widget mytop, pane, hpane, mysections; /* Widgets */
-+ Widget mytop, pane, hpane, mysections, sect1; /* Widgets */
- ManPageWidgets * mpw = &(man_globals->manpagewidgets);
-
- num_args = (Cardinal) 0;
-@@ -242,8 +246,13 @@
- num_args++;
- XtSetValues(mytop, arglist, num_args);
-
-+#ifdef SUNSOFT
-+ pane = XtCreateManagedWidget("Manpage_Vpane", panedWidgetClass, mytop, NULL,
-+ (Cardinal) 0);
-+#else
- pane = XtCreateManagedWidget("vertPane", panedWidgetClass, mytop, NULL,
- (Cardinal) 0);
-+#endif
-
- /* Create menu bar. */
-
-@@ -261,6 +270,13 @@
- mysections = XtCreateManagedWidget("sections", menuButtonWidgetClass,
- hpane, arglist, num_args);
-
-+ if(sections > MAX_MENU){
-+ num_args = 0;
-+ XtSetArg(arglist[num_args], XtNmenuName, MORE_MENU); num_args++;
-+ sect1 = XtCreateManagedWidget("More...", menuButtonWidgetClass,
-+ hpane, arglist, num_args);
-+ }
-+
- XtSetArg(arglist[0], XtNlabel, SHOW_BOTH);
- XtSetValues(man_globals->both_screens_entry, arglist, (Cardinal) 1);
-
-@@ -267,9 +283,11 @@
- if (full_instance) {
- MakeSearchWidget(man_globals, mytop);
- CreateSectionMenu(man_globals, mytop);
-+ if(sections > MAX_MENU) CreateMoreMenu(man_globals, mytop);
- MakeSaveWidgets(man_globals, mytop);
- } else {
- XtSetSensitive(mysections, FALSE);
-+ if(sections > MAX_MENU) XtSetSensitive(sect1, FALSE);
- XtSetArg(arglist[0], XtNsensitive, FALSE);
- XtSetValues(man_globals->dir_entry, arglist, ONE);
- XtSetValues(man_globals->manpage_entry, arglist, ONE);
-@@ -283,8 +301,13 @@
- XtSetValues(man_globals->print_entry, arglist, ONE);
- #endif /* INCLUDE_XPRINT_SUPPORT */
-
-+#ifdef SUNSOFT
-+ man_globals->label = XtCreateManagedWidget(MANNAME, labelWidgetClass,
-+ hpane, NULL, (Cardinal) 0);
-+#else
- man_globals->label = XtCreateManagedWidget("manualTitle", labelWidgetClass,
- hpane, NULL, (Cardinal) 0);
-+#endif
-
- /* Create Directory */
-
-@@ -332,7 +355,7 @@
-
- if (page || help) {
- if (help)
-- strcpy(man_globals->manpage_title, "Xman Help");
-+ strcpy(man_globals->manpage_title, gettext("Xman Help"));
-
- if (man_globals->both_shown) {
- XtManageChild(dir);
-@@ -521,7 +544,7 @@
- menu = XtCreatePopupShell(SECTION_MENU, simpleMenuWidgetClass, parent,
- NULL, (Cardinal) 0);
-
-- for (i = 0 ; i < sections ; i ++) {
-+ for (i = 0 ; i < ((sections <= MAX_MENU) ? sections:sections/2) ; i ++) {
- num_args = 0;
- XtSetArg(args[num_args], XtNlabel, manual[i].blabel); num_args++;
- sprintf(entry_name, "section%d", i);
-@@ -537,6 +560,37 @@
- }
- }
-
-+static void
-+CreateMoreMenu(man_globals, parent)
-+ManpageGlobals * man_globals;
-+Widget parent;
-+{
-+ Widget menu, entry;
-+ int i;
-+ MenuStruct * menu_struct;
-+ Arg args[1];
-+ Cardinal num_args;
-+ char entry_name[BUFSIZ];
-+
-+ menu = XtCreatePopupShell(MORE_MENU, simpleMenuWidgetClass, parent,
-+ NULL, (Cardinal) 0);
-+
-+ for (i = sections/2-1 ; i < sections ; i ++) {
-+ num_args = 0;
-+ XtSetArg(args[num_args], XtNlabel, manual[i].blabel); num_args++;
-+ sprintf(entry_name, "section%d", i);
-+
-+ entry = XtCreateManagedWidget(entry_name, smeBSBObjectClass,
-+ menu, args, num_args);
-+ menu_struct = (MenuStruct *) XtMalloc(sizeof(MenuStruct));
-+ menu_struct->data = (caddr_t) man_globals;
-+ menu_struct->number = i;
-+ XtAddCallback(entry, XtNcallback, DirPopupCallback, (caddr_t) menu_struct);
-+ XtAddCallback(entry, XtNdestroyCallback,MenuDestroy, (caddr_t)menu_struct);
-+
-+ }
-+}
-+
- /* Function Name: CreateList
- * Description: this function prints a label in the directory list
- * Arguments: section - the manual section.
-@@ -581,7 +635,7 @@
- return;
-
- name = manual[section].blabel; /* Set the section name */
-- sprintf(label_name,"Directory of: %s",name);
-+ snprintf(label_name, sizeof(label_name), gettext("Directory of: %s"),name);
- man_globals->section_name[section] = StrAlloc(label_name);
-
- num_args = 0;
-@@ -679,7 +733,7 @@
-
- if (long_widget == (Widget) NULL) { /* Make sure we found one. */
- PopupWarning(GetGlobals(parent),
-- "Could not find longest widget, aborting...");
-+ gettext("Could not find longest widget, aborting..."));
- XtFree((char *)full_widgets);
- XtFree((char *)half_widgets);
- return;
-@@ -747,7 +801,8 @@
- if (*temp_ids == NULL) {
- char error_buf[BUFSIZ];
-
-- sprintf(error_buf, "Could not find widget named '%s'", *names);
-+ snprintf(error_buf, sizeof(error_buf),
-+ gettext("Could not find widget named '%s'"), *names);
- PrintError(error_buf);
- XtFree((char *)ids);
- return(NULL);
-
---- defs.h Fri Aug 10 07:14:12 2007
-+++ defs.h Tue Apr 15 15:46:28 2008
-@@ -51,6 +51,7 @@
-
- #define OPTION_MENU "optionMenu" /* Name of the Option Menu. */
- #define SECTION_MENU "sectionMenu" /* Name of the Section Menu. */
-+#define MORE_MENU "moreMenu" /* Name of the More... Menu. */
-
- #define HELP_BUTTON "helpButton" /* Name of top help button */
- #define QUIT_BUTTON "quitButton" /* Name of top quit button */
-
---- misc.c Fri Aug 10 07:14:12 2007
-+++ misc.c Tue Apr 15 16:24:49 2008
-@@ -41,6 +41,8 @@
+diff -urp -x '*~' -x '*.orig' misc.c misc.c
+--- misc.c 2009-10-16 14:39:48.000000000 -0700
++++ misc.c 2011-01-28 20:32:24.196139861 -0800
+@@ -41,6 +41,8 @@ from the X Consortium.
# include "config.h"
#endif
@@ -591,7 +592,7 @@
#include "globals.h"
#include "vendor.h"
#include <X11/Xos.h> /* sys/types.h and unistd.h included in here */
-@@ -99,7 +101,7 @@
+@@ -98,7 +100,7 @@ PopupWarning(ManpageGlobals * man_global
char buffer[BUFSIZ];
Boolean hasPosition;
@@ -600,7 +601,7 @@
hasPosition = FALSE;
if (top)
{
-@@ -141,7 +143,7 @@
+@@ -140,7 +142,7 @@ PopupWarning(ManpageGlobals * man_global
void
PrintError(char * string)
{
@@ -609,7 +610,7 @@
exit(EXIT_FAILURE);
}
-@@ -203,7 +205,7 @@
+@@ -202,7 +204,7 @@ FindManualFile(ManpageGlobals * man_glob
temp = CreateManpageName(entry, 0, 0);
snprintf(man_globals->manpage_title, sizeof(man_globals->manpage_title),
@@ -618,7 +619,7 @@
XtFree(temp);
ParseEntry(entry, path, section, page);
-@@ -306,14 +308,14 @@
+@@ -328,14 +330,14 @@ Uncompress(ManpageGlobals * man_globals,
return(NULL);
else if ((file = fopen(tmp_file, "r")) == NULL) {
@@ -637,7 +638,7 @@
PopupWarning(man_globals, error_buf);
return(NULL);
}
-@@ -351,7 +353,7 @@
+@@ -373,7 +375,7 @@ UncompressNamed(ManpageGlobals * man_glo
if (stat(filename, &junk) != 0) { /* Check for existance of the file. */
if (errno != ENOENT) {
snprintf(error_buf, sizeof(error_buf),
@@ -646,7 +647,7 @@
PopupWarning(man_globals, error_buf);
}
return(FALSE);
-@@ -368,7 +370,7 @@
+@@ -390,7 +392,7 @@ UncompressNamed(ManpageGlobals * man_glo
#else
fd = mkstemp(tmp);
if (fd < 0) {
@@ -655,7 +656,7 @@
return FALSE;
}
*output_fd = fdopen(fd, "r");
-@@ -386,7 +388,7 @@
+@@ -420,7 +422,7 @@ UncompressNamed(ManpageGlobals * man_glo
return(TRUE);
snprintf(error_buf, sizeof(error_buf),
@@ -664,7 +665,7 @@
PopupWarning(man_globals, error_buf);
return(FALSE);
}
-@@ -482,7 +484,7 @@
+@@ -516,7 +518,7 @@ Format(ManpageGlobals * man_globals, cha
#endif
/* We Really could not find it, this should never happen, yea right. */
snprintf(error_buf, sizeof(error_buf),
@@ -673,13 +674,13 @@
PopupWarning(man_globals, error_buf);
XtPopdown( XtParent(man_globals->standby) );
return(NULL);
-@@ -539,7 +541,20 @@
+@@ -573,6 +575,19 @@ Format(ManpageGlobals * man_globals, cha
ParseEntry(entry, path, sect, NULL);
#ifndef HANDLE_ROFFSEQ
+#ifdef SFORMAT /* Handle Solaris SGML pages */
+ if (sect[0] == 's') {
- #ifndef HAS_MKSTEMP
++#ifndef HAS_MKSTEMP
+ snprintf(cmdbuf, sizeof(cmdbuf), "cd %s ; %s %s | %s %s > %s %s",
+ path, SFORMAT, filename, TBL, FORMAT, man_globals->tempfile,
+ "2> /dev/null");
@@ -690,11 +691,10 @@
+#endif
+ } else {
+#endif /* SFORMAT */
-+#ifndef HAS_MKSTEMP
+ #ifndef HAS_MKSTEMP
snprintf(cmdbuf, sizeof(cmdbuf), "cd %s ; %s %s %s > %s %s", path, TBL,
filename, FORMAT, man_globals->tempfile, "2> /dev/null");
- #else
-@@ -546,10 +561,13 @@
+@@ -580,10 +595,13 @@ Format(ManpageGlobals * man_globals, cha
snprintf(cmdbuf, sizeof(cmdbuf), "cd %s ; %s %s %s >> %s %s", path, TBL,
filename, FORMAT, man_globals->tempfile, "2> /dev/null");
#endif
@@ -709,7 +709,7 @@
PopupWarning(man_globals, error_buf);
file = NULL;
}
-@@ -558,7 +576,7 @@
+@@ -592,15 +610,15 @@ Format(ManpageGlobals * man_globals, cha
if(system(cmdbuf) != 0) { /* execute search. */
snprintf(error_buf, sizeof(error_buf),
@@ -718,7 +718,6 @@
PopupWarning(man_globals, error_buf);
file = NULL;
}
-@@ -565,8 +583,8 @@
else {
#ifndef HAS_MKSTEMP
if ((file = fopen(man_globals->tempfile,"r")) == NULL) {
@@ -729,7 +728,7 @@
PopupWarning(man_globals, error_buf);
}
else {
-@@ -962,7 +980,7 @@
+@@ -1071,7 +1089,7 @@ AddCursor(Widget w, Cursor cursor)
Colormap c_map;
if (!XtIsRealized(w)) {
@@ -738,7 +737,7 @@
return;
}
-@@ -1073,7 +1091,7 @@
+@@ -1182,14 +1200,14 @@ ParseEntry(char *entry, char *path, char
c = rindex(temp, '/');
if (c == NULL)
@@ -747,7 +746,6 @@
*c++ = '\0';
if (page != NULL)
strcpy(page, c);
-@@ -1080,7 +1098,7 @@
c = rindex(temp, '/');
if (c == NULL)
@@ -756,7 +754,7 @@
*c++ = '\0';
#if defined(SFORMAT) && defined(SMAN)
/* sgmltoroff sometimes puts an extra ./ in the path to .so entries */
-@@ -1127,12 +1145,12 @@
+@@ -1236,12 +1254,12 @@ GetGlobals(Widget w)
if (temp == NULL)
XtAppError(XtWidgetToApplicationContext(w),
@@ -771,7 +769,7 @@
return( (ManpageGlobals *) data);
}
-@@ -1154,7 +1172,7 @@
+@@ -1263,7 +1281,7 @@ SaveGlobals(Widget w, ManpageGlobals * g
if (XSaveContext(XtDisplay(w), XtWindow(w), manglobals_context,
(caddr_t) globals) != XCSUCCESS)
XtAppError(XtWidgetToApplicationContext(w),
@@ -780,17 +778,17 @@
}
/* Function Name: RemoveGlobals
-@@ -1172,5 +1190,5 @@
+@@ -1281,5 +1299,5 @@ RemoveGlobals(Widget w)
if (XDeleteContext(XtDisplay(w), XtWindow(w),
manglobals_context) != XCSUCCESS)
XtAppError(XtWidgetToApplicationContext(w),
- "Xman: Could not remove global data?");
+ gettext("Xman: Could not remove global data?"));
}
-
---- search.c Fri Aug 10 07:14:12 2007
-+++ search.c Mon Apr 14 13:05:13 2008
-@@ -30,7 +30,8 @@
+diff -urp -x '*~' -x '*.orig' search.c search.c
+--- search.c 2009-10-16 14:39:48.000000000 -0700
++++ search.c 2011-01-28 20:32:24.196499890 -0800
+@@ -30,7 +30,8 @@ from the X Consortium.
*/
/* $XFree86: xc/programs/xman/search.c,v 1.5 2001/01/27 17:24:27 herrb Exp $ */
@@ -800,7 +798,7 @@
#include "globals.h"
#include "vendor.h"
-@@ -70,7 +71,7 @@
+@@ -70,7 +71,7 @@ MakeSearchWidget(ManpageGlobals * man_gl
arglist, num_args);
if ( (text = XtNameToWidget(dialog, "value")) == (Widget) NULL)
@@ -809,7 +807,7 @@
else
XtSetKeyboardFocus(dialog, text);
-@@ -86,7 +87,7 @@
+@@ -86,7 +87,7 @@ MakeSearchWidget(ManpageGlobals * man_gl
if ( ((command = XtNameToWidget(dialog, MANUALSEARCH)) == (Widget) NULL) ||
((cancel = XtNameToWidget(dialog, CANCEL)) == (Widget) NULL) )
PopupWarning(NULL,
@@ -818,7 +816,7 @@
else {
static char * half_size[] = {
MANUALSEARCH, APROPOSSEARCH, NULL
-@@ -121,7 +122,7 @@
+@@ -121,7 +122,7 @@ ManpageGlobals * man_globals)
return(XawDialogGetValueString(dialog));
PopupWarning(man_globals,
@@ -827,7 +825,7 @@
return(NULL);
}
-@@ -165,16 +166,16 @@
+@@ -165,16 +166,16 @@ DoSearch(ManpageGlobals * man_globals, i
/* If the string is empty or starts with a space then do not search */
if ( streq(search_string,"") ) {
@@ -847,7 +845,7 @@
return(NULL);
}
-@@ -210,7 +211,7 @@
+@@ -210,7 +211,7 @@ DoSearch(ManpageGlobals * man_globals, i
}
snprintf(label, sizeof(label),
@@ -856,7 +854,7 @@
#ifdef NO_MANPATH_SUPPORT /* not quite correct, but the best I can do. */
snprintf(cmdbuf, sizeof(cmdbuf), APROPOS_FORMAT, search_string, mantmp);
-@@ -219,7 +220,7 @@
+@@ -219,7 +220,7 @@ DoSearch(ManpageGlobals * man_globals, i
#endif
if(system(cmdbuf) != 0) { /* execute search. */
@@ -865,7 +863,7 @@
PopupWarning(man_globals, error_buf);
}
-@@ -228,7 +229,7 @@
+@@ -228,7 +229,7 @@ DoSearch(ManpageGlobals * man_globals, i
#else
if((file = fopen(mantmp,"r")) == NULL)
#endif
@@ -874,7 +872,7 @@
/*
* Since we keep the FD open we can unlink the file safely, this
-@@ -237,7 +238,7 @@
+@@ -237,7 +238,7 @@ DoSearch(ManpageGlobals * man_globals, i
unlink(mantmp);
@@ -883,7 +881,7 @@
/*
* Check first LOOKLINES lines for "nothing appropriate".
-@@ -276,7 +277,7 @@
+@@ -276,7 +277,7 @@ DoSearch(ManpageGlobals * man_globals, i
else { /* MANUAL SEACH */
file = DoManualSearch(man_globals, search_string);
if (file == NULL) {
@@ -892,7 +890,7 @@
ChangeLabel(man_globals->label, string_buf);
if (man_globals->label == NULL)
PopupWarning(man_globals, string_buf);
-@@ -290,7 +291,7 @@
+@@ -290,7 +291,7 @@ DoSearch(ManpageGlobals * man_globals, i
dialog = XtNameToWidget(man_globals->search_widget, DIALOG);
if (dialog == NULL)
@@ -901,7 +899,7 @@
XtSetArg(arglist[0], XtNvalue, "");
XtSetValues(dialog, arglist, (Cardinal) 1);
-@@ -377,7 +378,7 @@
+@@ -377,7 +378,7 @@ int number)
head = rindex(first[ global_number + check ], '/');
if (head == NULL)
@@ -910,10 +908,10 @@
head++;
tail = rindex(head, '.');
-
---- vendor.c Fri Aug 10 07:14:12 2007
-+++ vendor.c Wed May 28 11:33:51 2008
-@@ -34,6 +34,8 @@
+diff -urp -x '*~' -x '*.orig' vendor.c vendor.c
+--- vendor.c 2009-10-16 14:39:48.000000000 -0700
++++ vendor.c 2011-01-28 20:32:24.196781956 -0800
+@@ -34,6 +34,8 @@ from the X Consortium.
#include "globals.h"
#include "vendor.h"
@@ -922,7 +920,7 @@
typedef struct sectionName {
char * name;
-@@ -100,21 +102,74 @@
+@@ -100,21 +102,74 @@ static SectionNameRec SectionNames[] = {
{"(1m) Maintenance Commands", "1m"},
{"(1s) SunOS Specific Commands", "1s"},
{"(2) System Calls", "2"},
@@ -1003,7 +1001,7 @@
{"(4) File Formats", "4"},
{"(4b) Misc. Reference Manual Pages", "4b"},
{"(5) Environments, Tables, and TROFF Macros", "5"},
-@@ -133,6 +188,7 @@
+@@ -133,6 +188,7 @@ static SectionNameRec SectionNames[] = {
{"(9s) DDI and DKI Data Structures", "9s"},
{"(l) Local", "l"},
{"(n) New", "n"},
@@ -1011,7 +1009,7 @@
};
#else
-@@ -188,10 +244,10 @@
+@@ -188,10 +244,10 @@ char * path)
for (i=0; i < numSections; i++) {
sprintf(file, "%s%s", SEARCHDIR, SectionNames[i].suffix);
@@ -1024,7 +1022,7 @@
#endif
}
#endif
-@@ -252,7 +308,7 @@
+@@ -252,7 +308,7 @@ char *path)
int flags = (int) *p++;
while (*p != NULL) {
sprintf(file, "%s%s", SEARCHDIR, *p++);
--- a/open-src/app/xman/COPYING Mon Jan 31 13:13:15 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-Copyright (c) 1987, 1988, 1989, 1991 X Consortium
-
-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 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 X CONSORTIUM 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.
-
-Except as contained in this notice, the name of the X Consortium shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from the X Consortium.
-
-Copyright 2004 Roland Mainz <[email protected]>
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice 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
-OPEN GROUP 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.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
--- a/open-src/app/xman/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xman/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xman 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -29,11 +29,11 @@
MODULE_NAME=xman
# Version number (used in path names)
-MODULE_VERSION=1.1.0
+MODULE_VERSION=1.1.1
# Checksums for upstream tarball
-TARBALL_MD5 = 5e5b3351bac26cc1f8490faf1c1402bb
-TARBALL_SHA1 = 645d8910f0febd0c4f00fee964221883a12d4af3
+TARBALL_MD5 = 56a00ccb38996c3518f14bb87c03a03e
+TARBALL_SHA1 = c8e1170e837da4bc280ee907030b3f9245608ef2
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES = 6708109.patch
--- a/open-src/app/xmodmap/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xmodmap/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xmodmap 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -33,17 +33,17 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.4
+MODULE_VERSION=1.0.5
# Checksums for upstream tarball
-TARBALL_MD5 = bbe021f812e0014a8ee3692317788119
-TARBALL_SHA1 = 9b49388bb527a8f7b7e86c4aa4c75a83372f6baa
+TARBALL_MD5 = b18850d373f3717dca569377c449d091
+TARBALL_SHA1 = c97fb42f40b094868f6ef445f25c600f326b1942
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
# Man pages to apply Sun footer to & attributes to list
-SUNTOUCHED_MANPAGES=*.man
+SUNTOUCHED_MANPAGES=man/xmodmap.man
MODULE_STABILITY=Committed
# Compatibility links from /usr/X11/bin to /usr/bin
--- a/open-src/app/xprop/COPYING Mon Jan 31 13:13:15 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-Copyright 1990, 1998 The Open Group
-Copyright (c) 2000 The XFree86 Project, Inc.
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice 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 OPEN GROUP 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.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-Copyright 2007 Kim woelders
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting documentation, and
-that the name of the copyright holders not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission. The copyright holders make no representations
-about the suitability of this software for any purpose. It is provided "as
-is" without express or implied warranty.
-
-THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR 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.
--- a/open-src/app/xprop/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xprop/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xprop 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -29,11 +29,11 @@
MODULE_NAME=xprop
# Version number (used in path names)
-MODULE_VERSION=1.1.0
+MODULE_VERSION=1.2.0
# Checksums for upstream tarball
-TARBALL_MD5 = f0bacbd30f0dd1c1e9ccafe97687b7a4
-TARBALL_SHA1 = 16b377c76a4a010200063a056e7a5e244ab6ff00
+TARBALL_MD5 = e6d0673a1e1e469f0a6220a6868fb94b
+TARBALL_SHA1 = 278f83c5077eed1d96c180bdc0a6f22ba5279a66
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
@@ -45,6 +45,8 @@
# ARC cases that covered this module
# LSARC/2008/048 xprop -set
MODULE_ARC_CASES = LSARC/2008/048
+# PSARC/2011/033 X11R7.6 application updates
+MODULE_ARC_CASES += PSARC/2011/033
# Man pages to apply Sun footer to & attributes to list
SUNTOUCHED_MANPAGES=*.man
--- a/open-src/app/xrandr/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xrandr/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xrandr 1.x Makefile
#
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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"),
@@ -29,11 +29,11 @@
MODULE_NAME=xrandr
# Version number (used in path names)
-MODULE_VERSION=1.3.3
+MODULE_VERSION=1.3.4
# Checksums for upstream tarball
-TARBALL_MD5 = 5b2dcfb0d9b736afaf78f6ce7651259c
-TARBALL_SHA1 = dada3eb30fead3334d954dc4dad9f0ffd7a8ff95
+TARBALL_MD5 = d6d20038257eba5178b523e10239d51c
+TARBALL_SHA1 = 637949501b8a45d32d9cab809e8822ee45b69414
# pkg(5) name we deliver the files in (override default)
MODULE_PKGNAME=x11/x11-server-utilities
--- a/open-src/app/xrdb/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xrdb/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xrdb 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -33,11 +33,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.6
+MODULE_VERSION=1.0.7
# Checksums for upstream tarball
-TARBALL_MD5 = 8dd881cd5a7dcb6e456549817f0fb475
-TARBALL_SHA1 = e4faff5e02b3027298dc589e318a6dc7eb30a6d5
+TARBALL_MD5 = 93f54f04e0b531b5fb77d3f051cbf22a
+TARBALL_SHA1 = ab9f79e736c61c7c8d5bbb6841c291e877e368a9
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/xrefresh/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xrefresh/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xrefresh 1.x Makefile
#
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 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"),
@@ -33,11 +33,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.3
+MODULE_VERSION=1.0.4
# Checksums for upstream tarball
-TARBALL_MD5 = 8f4fafcfb77b3c6972cc44bb3f1c899c
-TARBALL_SHA1 = 3f34ceca9509f47e60ddfe14a98225eaffeba705
+TARBALL_MD5 = 2f63f88ad0dcecd33c8cf000f38e9250
+TARBALL_SHA1 = 5e85ee14ea9a357c1d4372bbc068a8d452a134aa
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/xrx/COPYING Mon Jan 31 13:13:15 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-*****************************************************************************
-* Copyright 1996 Netscape Communications. All rights reserved.
-*****************************************************************************
-
-Copyright 1996, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice 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 OPEN GROUP 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.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
--- a/open-src/app/xrx/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xrx/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xrx 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -42,11 +42,11 @@
'value="http://www.broadwayinfo.com/"' >> $@
# Version number (used in path names)
-MODULE_VERSION=1.0.3
+MODULE_VERSION=1.0.4
# Checksums for upstream tarball
-TARBALL_MD5 = c121945afcfc84e99af17158fda68be9
-TARBALL_SHA1 = 76265c2046b637701c4b61cbfe532ed542640950
+TARBALL_MD5 = c93be22d20658ac5ff60469207dec118
+TARBALL_SHA1 = ff5b8c329ed255138eb78e6b9c034add2b02de94
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES=
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/xscope/COPYING.patch Wed Feb 02 11:28:42 2011 -0800
@@ -0,0 +1,25 @@
+From 7392f2b780ab3346014634d2532f3b8ca99101a6 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <[email protected]>
+Date: Wed, 2 Feb 2011 10:27:18 -0800
+Subject: [PATCH:xscope] Add Intel copyright to COPYING for glx additions in xscope 1.3
+
+Signed-off-by: Alan Coopersmith <[email protected]>
+---
+ COPYING | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/COPYING b/COPYING
+index 4331a50..1351a95 100644
+--- a/COPYING
++++ b/COPYING
+@@ -86,6 +86,7 @@ PERFORMANCE OF THIS SOFTWARE.
+ ------------------------------------------------------------
+
+ Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
++Copyright � 2010 Intel Corporation
+
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+--
+1.7.3.2
+
--- a/open-src/app/xscope/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xscope/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xscope 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -29,14 +29,14 @@
MODULE_NAME=xscope
# Version number (used in path names)
-MODULE_VERSION=1.2
+MODULE_VERSION=1.3
# Checksums for upstream tarball
-TARBALL_MD5 = 1a9df0ac0dd5a2c2a7948dcf48d126c3
-TARBALL_SHA1 = 3952f381c3f8ee81cd602e6f025304c2322a06a0
+TARBALL_MD5 = 4198c875ebc4808b73fa5468e009f14b
+TARBALL_SHA1 = 228773993bf1e5b4b4a772205e550e81f41e8fd9
# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES =
+SOURCE_PATCHES = COPYING.patch,-p1
# pkg(5) name we deliver the files in (override default)
MODULE_PKGNAME=x11/diagnostic/$(MODULE_NAME)
--- a/open-src/app/xset/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xset/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xset 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -29,14 +29,14 @@
MODULE_NAME=xset
# Version number (used in path names)
-MODULE_VERSION=1.2.0
+MODULE_VERSION=1.2.1
# Checksums for upstream tarball
-TARBALL_MD5 = 88ff2d390695366fa53e5d746fe86ad5
-TARBALL_SHA1 = 0aa0fa0b7620a7bee846e5cd7847c20095a7d654
+TARBALL_MD5 = 4e0ce390394416c9e2c5cd4d7413ba87
+TARBALL_SHA1 = 9b1eb8835637dd70eea1a1365df5d909a306cc2c
# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = xsetfbpm.patch xsetman.patch
+SOURCE_PATCHES = xsetfbpm.patch
# pkg(5) name we deliver the files in (override default)
MODULE_PKGNAME=x11/x11-server-utilities
--- a/open-src/app/xset/xsetfbpm.patch Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xset/xsetfbpm.patch Wed Feb 02 11:28:42 2011 -0800
@@ -1,4 +1,4 @@
-# Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 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"),
@@ -21,9 +21,9 @@
Adds support for Sun's Frame Buffer Power Management (fbpm) extension
diff -urp -x '*~' -x '*.orig' xset.c xset.c
---- xset.c 2008-03-06 14:28:40.000000000 -0800
-+++ xset.c 2008-03-19 09:53:30.880805000 -0700
-@@ -74,6 +74,10 @@ in this Software without prior written a
+--- xset.c 2010-11-09 18:15:26.000000000 -0800
++++ xset.c 2011-01-28 20:59:48.793243393 -0800
+@@ -65,6 +65,10 @@ in this Software without prior written a
#endif
#ifdef DPMSExtension
# include <X11/extensions/dpms.h>
@@ -34,7 +34,7 @@
# ifdef WIN32
# define BOOL wBOOL
# ifdef Status
-@@ -650,6 +654,62 @@ main(int argc, char *argv[])
+@@ -639,6 +643,62 @@ main(int argc, char *argv[])
}
}
#endif /* DPMSExtension */
@@ -97,7 +97,7 @@
else if (strcmp(arg, "s") == 0) {
if (i >= argc) {
set_saver(dpy, ALL, 0); /* Set everything to default */
-@@ -1421,6 +1481,46 @@ query(Display *dpy)
+@@ -1522,6 +1582,46 @@ query(Display *dpy)
}
}
#endif
@@ -144,7 +144,7 @@
#ifdef FONTCACHE
{
int dummy;
-@@ -1551,6 +1651,16 @@ usage(char *fmt, ...)
+@@ -1652,6 +1752,16 @@ usage(char *fmt, ...)
fprintf(stderr, "\t (also implicitly enables DPMS features) \n");
fprintf(stderr, "\t a timeout value of zero disables the mode \n");
#endif
@@ -161,3 +161,67 @@
#ifdef FONTCACHE
fprintf(stderr, " To control font cache:\n");
fprintf(stderr, "\t fc [hi-mark [low-mark [balance]]]\n");
+diff -urp -x '*~' -x '*.orig' xset.man xset.man
+--- xset.man 2010-11-09 18:15:26.000000000 -0800
++++ xset.man 2011-01-28 20:59:48.793541415 -0800
+@@ -1,4 +1,5 @@
+ .\" Copyright 1988, 1998 The Open Group
++.\" Copyright (c) 1997, 1999, Oracle and/or its affiliates. All rights reserved.
+ .\"
+ .\" Permission to use, copy, modify, distribute, and sell this software and its
+ .\" documentation for any purpose is hereby granted without fee, provided that
+@@ -40,6 +41,10 @@ xset - user preference utility for X
+ [dpms \fIstandby\fP [\fI suspend\fP [\fI off\fP]]]
+ [dpms force {standby|suspend|off|on}]
+ .br
++[+fbpm] [-fbpm]
++.br
++ [fbpm force {standby|suspend|off|on}]
++.br
+ [fp=\fIpathlist\fP]
+ [-fp=\fIpathlist\fP]
+ [+fp=\fIpathlist\fP]
+@@ -121,7 +126,9 @@ the volume to the nearest value that the
+ The \fB\-dpms\fP option disables DPMS (Energy Star) features.
+ .TP 8
+ .B +dpms
+-The \fB+dpms\fP option enables DPMS (Energy Star) features.
++Enable Energy Star mode. Default times are standby = 1440, suspend = 1620, and
++off = 1800 seconds.
++.PP
+ .TP 8
+ .B dpms \fIflags...\fP
+ The \fBdpms\fP option allows the DPMS (Energy Star) parameters to be
+@@ -136,6 +143,32 @@ The first value given is for the `standb
+ `suspend' mode, and the third is for the `off' mode. Setting these
+ values implicitly enables the DPMS features. A value of zero disables
+ a particular mode.
++Note that standby is less than suspend is less than off, if this condition is not met, an error is produced.
++.PP
++.TP 8
++.B +fbpm
++Enable frame buffer power management. NOTE: FBPM timing is linked to DPMS, See DPMS for default timeout values.
++.PP
++.TP 8
++.B -fbpm
++Disable frame buffer power management. NOTE: Does not affect DPMS timeouts.
++.PP
++.TP 8
++.B fbpm force standby
++Force to standby power level.
++.PP
++.TP 8
++.B fbpm force suspend
++Force to suspend power level.
++.PP
++.TP 8
++.B fbpm force off
++Force power to off.
++.PP
++.TP 8
++.B fbpm force on
++Force power to on.
++.PP
+ .TP 8
+ .B fp= \fIpath,...\fP
+ The \fBfp=\fP sets the font path to the entries given in the path argument.
--- a/open-src/app/xset/xsetman.patch Mon Jan 31 13:13:15 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-# Copyright (c) 2008, 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.
-Adds support for Sun's Frame Buffer Power Management (fbpm) extension
-
-diff -urp -x '*~' -x '*.orig' xset.man xset.man
---- xset.man 2008-03-06 14:28:40.000000000 -0800
-+++ xset.man 2008-03-19 10:00:11.190603000 -0700
-@@ -1,5 +1,6 @@
- .\" $Xorg: xset.man,v 1.4 2001/02/09 02:05:59 xorgcvs Exp $
- .\" Copyright 1988, 1998 The Open Group
-+.\" Copyright (c) 1997, 1999, Oracle and/or its affiliates. All rights reserved.
- .\"
- .\" Permission to use, copy, modify, distribute, and sell this software and its
- .\" documentation for any purpose is hereby granted without fee, provided that
-@@ -43,6 +44,10 @@ xset - user preference utility for X
- [dpms \fIstandby\fP [\fI suspend\fP [\fI off\fP]]]
- [dpms force {standby|suspend|off|on}]
- .br
-+[+fbpm] [-fbpm]
-+.br
-+ [fbpm force {standby|suspend|off|on}]
-+.br
- [fp=\fIpathlist\fP]
- [-fp=\fIpathlist\fP]
- [+fp=\fIpathlist\fP]
-@@ -124,7 +129,9 @@ the volume to the nearest value that the
- The \fB\-dpms\fP option disables DPMS (Energy Star) features.
- .TP 8
- .B +dpms
--The \fB+dpms\fP option enables DPMS (Energy Star) features.
-+Enable Energy Star mode. Default times are standby = 1440, suspend = 1620, and
-+off = 1800 seconds.
-+.PP
- .TP 8
- .B dpms \fIflags...\fP
- The \fBdpms\fP option allows the DPMS (Energy Star) parameters to be
-@@ -139,6 +146,32 @@ The first value given is for the `standb
- `suspend' mode, and the third is for the `off' mode. Setting these
- values implicitly enables the DPMS features. A value of zero disables
- a particular mode.
-+Note that standby is less than suspend is less than off, if this condition is not met, an error is produced.
-+.PP
-+.TP 8
-+.B +fbpm
-+Enable frame buffer power management. NOTE: FBPM timing is linked to DPMS, See DPMS for default timeout values.
-+.PP
-+.TP 8
-+.B -fbpm
-+Disable frame buffer power management. NOTE: Does not affect DPMS timeouts.
-+.PP
-+.TP 8
-+.B fbpm force standby
-+Force to standby power level.
-+.PP
-+.TP 8
-+.B fbpm force suspend
-+Force to suspend power level.
-+.PP
-+.TP 8
-+.B fbpm force off
-+Force power to off.
-+.PP
-+.TP 8
-+.B fbpm force on
-+Force power to on.
-+.PP
- .TP 8
- .B fp= \fIpath,...\fP
- The \fBfp=\fP sets the font path to the entries given in the path argument.
--- a/open-src/app/xsetroot/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xsetroot/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xsetroot 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -33,15 +33,20 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.3
+MODULE_VERSION=1.1.0
# Checksums for upstream tarball
-TARBALL_MD5 = cbda9b9b8da5af4614110883d5a276b8
-TARBALL_SHA1 = 56ed1df9834627a107550475629df51275cd0c44
+TARBALL_MD5 = b78a2da4cf128775031a5a3422fc0b78
+TARBALL_SHA1 = 1ef9ddd80c7013dc6d33e5c421537eb8b0427da4
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
+# ARC cases that covered this module
+# Original integration predates ARC
+# PSARC/2011/033 X11R7.6 application updates
+MODULE_ARC_CASES = PSARC/2011/033
+
# Man pages to apply Sun footer to & attributes to list
SUNTOUCHED_MANPAGES=*.man
MODULE_STABILITY=Committed
--- a/open-src/app/xstdcmap/6661101.patch Mon Jan 31 13:13:15 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
---- xstdcmap.c.orig Thu Feb 7 13:18:40 2008
-+++ xstdcmap.c Thu Feb 7 13:22:03 2008
-@@ -107,6 +107,15 @@
- };
- #define NOPTIONS (sizeof optionTable / sizeof optionTable[0])
-
-+#ifdef __sun
-+/* we don't define this on the command line */
-+#define SUNSOFT_BUYBACK 1
-+#endif
-+
-+#ifdef SUNSOFT_BUYBACK
-+static void maybeDeleteDefaultGrayMap();
-+#endif
-+
- static void usage(Status status);
-
- static void
-@@ -283,6 +292,22 @@
- for (i=0; i < NPROPERTIES; i++) {
-
- if (propertyTable[i].delete) {
-+#ifdef SUNSOFT_BUYBACK
-+ if (i == DEFAULT) {
-+ /*
-+ * REMIND: We are deleting the RGB_DEFAULT_MAPs
-+ * these might have been set up by a DPS client.
-+ * If so there may be a DEFAULT_GRAY map with
-+ * the same kilid. So if we kill that client to
-+ * delete the color ramps, we delete the pixels
-+ * of the grayramp but not the property.
-+ * See if this is going to happen and if so,
-+ * delete the DEFAULT_GRAY property. (1195388)
-+ */
-+ maybeDeleteDefaultGrayMap();
-+ }
-+#endif /* SUNSOFT_BUYBACK */
-+
- XmuDeleteStandardColormap(dpy, screen, propertyTable[i].property);
- if (verbose)
- fprintf(stderr, "%s: %s was deleted or did not exist.\n",
-@@ -373,3 +398,45 @@
- /* Muffle compiler */
- return 0;
- }
-+
-+#ifdef SUNSOFT_BUYBACK
-+static void
-+maybeDeleteDefaultGrayMap()
-+{
-+ Atom atom = XInternAtom(dpy, "DEFAULT_GRAY", True);
-+ int i, count;
-+ XStandardColormap *defaultMaps;
-+ XStandardColormap *pGray;
-+
-+ if (atom == None)
-+ return;
-+
-+ if (!XGetRGBColormaps(dpy, DefaultRootWindow(dpy), &pGray, &count,
-+ atom)) {
-+ return;
-+ }
-+ /* We found DEFAULT_GRAY property */
-+ if (XGetRGBColormaps(dpy, DefaultRootWindow(dpy), &defaultMaps, &count,
-+ XA_RGB_DEFAULT_MAP)) {
-+ /*
-+ * we found some XA_RGB_DEFAULT_MAPs, see if any of them have
-+ * the same killid as the gray ramp we found above
-+ */
-+ for (i=0; i<count; i++) {
-+ if (pGray->killid == defaultMaps[i].killid) {
-+ /*
-+ * Got one.
-+ * Delete the property, deleting the rgb map will free
-+ * the pixels (it calls XKillClient())
-+ */
-+ XDeleteProperty(dpy, DefaultRootWindow(dpy), atom);
-+ break;
-+ }
-+ }
-+ XFree(defaultMaps);
-+ }
-+
-+ XFree(pGray);
-+}
-+#endif /* SUNSOFT_BUYBACK */
-+
--- a/open-src/app/xstdcmap/COPYING Mon Jan 31 13:13:15 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-Copyright 1989, 1994, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice 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
-OPEN GROUP 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.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
--- a/open-src/app/xstdcmap/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xstdcmap/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xstdcmap 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -33,14 +33,14 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION=1.0.2
# Checksums for upstream tarball
-TARBALL_MD5 = 86ab558441edfb86f853639e4290a754
-TARBALL_SHA1 = cb222bca38c5f739bdda9f2d66a023b531c51f93
+TARBALL_MD5 = ee97f0cbb80e321c914dc7bc5d49960a
+TARBALL_SHA1 = 32374e671e5cdd4d55bd7f3f6619cc5b5267fda8
# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = 6661101.patch
+SOURCE_PATCHES =
# Man pages to apply Sun footer to & attributes to list
SUNTOUCHED_MANPAGES=*.man
--- a/open-src/app/xvinfo/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xvinfo/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xvinfo 1.x Makefile
#
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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"),
@@ -29,11 +29,11 @@
MODULE_NAME=xvinfo
# Version number (used in path names)
-MODULE_VERSION=1.1.0
+MODULE_VERSION=1.1.1
# Checksums for upstream tarball
-TARBALL_MD5 = 8cc299b2cb636b5f7fe672610789d3d4
-TARBALL_SHA1 = 8695bfb597dbf3ed8e3277fddda4722da21baaa3
+TARBALL_MD5 = c88feb501083951a8f47a21aaeb1529d
+TARBALL_SHA1 = dc326464748fa608da50386112a89024804c1910
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/xwd/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xwd/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xwd 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -29,11 +29,11 @@
MODULE_NAME=xwd
# Version number (used in path names)
-MODULE_VERSION=1.0.3
+MODULE_VERSION=1.0.4
# Checksums for upstream tarball
-TARBALL_MD5 = 007cea1f389abde5c93162dcd5541351
-TARBALL_SHA1 = f6708d14040630d1d3255987c28efcbf7aee05aa
+TARBALL_MD5 = ecd9167fbfdfc3cfef7e0bb089edd25b
+TARBALL_SHA1 = 4ef4fd9072a507e9a1ee88ba1d28b314006cc109
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/xwud/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/app/xwud/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -2,7 +2,7 @@
#
# xwud 1.x Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -29,11 +29,11 @@
MODULE_NAME=xwud
# Version number (used in path names)
-MODULE_VERSION=1.0.2
+MODULE_VERSION=1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = 20bc5d85634964d4ceee77cdfcd131ed
-TARBALL_SHA1 = 15a6c5e3ffc03b7e8e597947061940fee6c0a9fc
+TARBALL_MD5 = a37020053e8ee32c6fd1145242d53ee3
+TARBALL_SHA1 = 2e706d50c7039e3daa4963d36ab703e48aa652ed
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/data/xbitmaps/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/data/xbitmaps/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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"),
@@ -27,11 +27,11 @@
MODULE_NAME=xbitmaps
# Version number (used in path names)
-MODULE_VERSION=1.1.0
+MODULE_VERSION=1.1.1
# Checksums for upstream tarball
-TARBALL_MD5 = f9ddd4e70a5375508b3acaf17be0d0ab
-TARBALL_SHA1 = 845b825f7e6d193d47db8b67ae8332d87ef8c2b3
+TARBALL_MD5 = 7444bbbd999b53bec6a60608a5301f4c
+TARBALL_SHA1 = 578afff7e4912192b524c25254cf7f54c16e57d8
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES=
--- a/open-src/data/xcursor-themes/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/data/xcursor-themes/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 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"),
@@ -26,11 +26,11 @@
MODULE_NAME=xcursor-themes
# Version number (used in path names)
-MODULE_VERSION=1.0.2
+MODULE_VERSION=1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = e8929a1bb4d98d1a3991fd340d0b5f09
-TARBALL_SHA1 = 12b865c17c65e70a6bc20300dfa660fe8faaa0a4
+TARBALL_MD5 = ba21aad0b353f1881f5069e423a44587
+TARBALL_SHA1 = d65dd5cb931bf4a9722e64b5a265eb14dcc6ec09
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES=
--- a/open-src/util/imake/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/util/imake/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -27,11 +27,11 @@
MODULE_NAME=imake
# Version number (used in path names)
-MODULE_VERSION=1.0.3
+MODULE_VERSION=1.0.4
# Checksums for upstream tarball
-TARBALL_MD5 = ff553c4646edcc9e76b7308991ad421a
-TARBALL_SHA1 = 625a974dd0fe4c4e9d7ec036fc7b079ec05185f1
+TARBALL_MD5 = 48133c75bd77c127c7eff122e08ebbf6
+TARBALL_SHA1 = 23400fa4f5fa7601ccb00d11d17a58df473c8979
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES=
--- a/open-src/util/lndir/COPYING Mon Jan 31 13:13:15 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-Copyright (c) 1990, 1993, 1994, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice 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
-OPEN GROUP 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.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
--- a/open-src/util/makedepend/MAXFILES.patch Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/util/makedepend/MAXFILES.patch Wed Feb 02 11:28:42 2011 -0800
@@ -23,9 +23,10 @@
#
#
---- def.orig Fri May 21 17:08:56 2010
-+++ def.h Fri May 21 17:09:11 2010
-@@ -50,7 +50,7 @@
+diff -urp -x '*~' -x '*.orig' def.h def.h
+--- def.h 2009-10-16 14:45:45.000000000 -0700
++++ def.h 2011-01-28 21:21:24.851745310 -0800
+@@ -40,7 +40,7 @@ in this Software without prior written a
#include <sys/stat.h>
#define MAXDEFINES 512
--- a/open-src/util/makedepend/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/util/makedepend/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -31,11 +31,11 @@
MODULE_PKGCLASS_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.2
+MODULE_VERSION=1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = 62e58330fe8d1e3e28c7a45779833a48
-TARBALL_SHA1 = 57e092856580d9984e47c4b1433b69391de07df3
+TARBALL_MD5 = 4e6cb97bbecfbb34f3f644a75e513093
+TARBALL_SHA1 = 9a2ea514c0e52b59712678be1f9a33a74a4e0b8e
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES= MAXFILES.patch
--- a/open-src/util/xorg-cf-files/Makefile Mon Jan 31 13:13:15 2011 -0800
+++ b/open-src/util/xorg-cf-files/Makefile Wed Feb 02 11:28:42 2011 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -31,11 +31,11 @@
MODULE_PKGTAIL_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.3
+MODULE_VERSION=1.0.4
# Checksums for upstream tarball
-TARBALL_MD5 = 10546b5ddda3cdda7950bb56bf98e0ea
-TARBALL_SHA1 = 0c63edf6ceeb78fe32dd88bfce8d71c85e311bb0
+TARBALL_MD5 = 700c6d040d36a569e657a3ba5e1d8b24
+TARBALL_SHA1 = c58b7252df481572ec1ccd77b9f1ab561ed89e45
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES=
--- a/pkg/manifests/x11-session-xinit.mf Mon Jan 31 13:13:15 2011 -0800
+++ b/pkg/manifests/x11-session-xinit.mf Wed Feb 02 11:28:42 2011 -0800
@@ -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"),
@@ -24,19 +24,19 @@
value="xinit and startx are used to start the X Window System server and clients when a display manager or other startup methods are not in use."
set name=pkg.summary \
value="xinit & startx - X Window System manual session startup"
+dir path=etc
+dir path=etc/X11
+dir path=etc/X11/xinit
dir path=usr
dir path=usr/X11
dir path=usr/X11/bin
dir path=usr/bin
-dir path=usr/lib
-dir path=usr/lib/X11
-dir path=usr/lib/X11/xinit
dir path=usr/share
dir path=usr/share/man
dir path=usr/share/man/man1
+file path=etc/X11/xinit/xinitrc preserve=renamenew
file path=usr/bin/startx
file path=usr/bin/xinit
-file path=usr/lib/X11/xinit/xinitrc
file path=usr/share/man/man1/startx.1
file path=usr/share/man/man1/xinit.1
link path=usr/X11/bin/startx target=../../bin/startx