--- a/open-src/app/listres/COPYING Fri Apr 30 10:13:50 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
- 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.
-
-
- * $XConsortium: listres.c,v 1.32 94/04/17 20:43:22 dave Exp $
- *
- *
-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.
- * *
- * Author: Jim Fulton, MIT X Consortium
-
--- a/open-src/app/listres/Makefile Fri Apr 30 10:13:50 2010 -0700
+++ b/open-src/app/listres/Makefile Tue May 04 15:58:18 2010 -0700
@@ -29,11 +29,11 @@
MODULE_NAME=listres
# Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION=1.0.2
# Checksums for upstream tarball
-TARBALL_MD5 = 827a1ac5adf9aadd0c13b54a897e297b
-TARBALL_SHA1 = 389bd1dfa099746aeb7e31cb46dcfca18ad53c2e
+TARBALL_MD5 = 3c0d5d8d6abaf411cd0647bc7073ac38
+TARBALL_SHA1 = 4c1c9b16dbd9c442a76203b57a9fef33965415d9
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/luit/Makefile Fri Apr 30 10:13:50 2010 -0700
+++ b/open-src/app/luit/Makefile Tue May 04 15:58:18 2010 -0700
@@ -29,11 +29,11 @@
MODULE_NAME=luit
# Version number (used in path names)
-MODULE_VERSION=1.0.4
+MODULE_VERSION=1.0.5
# Checksums for upstream tarball
-TARBALL_MD5 = 4e45233e310d72dce307709761cf241b
-TARBALL_SHA1 = d5f1326017c0cebf62e7e7df2703b3b4998a39bd
+TARBALL_MD5 = fd8579a993c4480978e3504a4c53c189
+TARBALL_SHA1 = 7260feca7db48d8aa80d493b4cbcf6b7c5774d8d
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES = solaris-man.patch \
--- a/open-src/app/viewres/COPYING Fri Apr 30 10:13:50 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
- Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
- Free Software Foundation, Inc.
- This Makefile.in is free software; the Free Software Foundation
- gives unlimited permission to copy and/or distribute it,
- with or without modifications, as long as this notice is preserved.
-
-
- 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.
-
-
- * $XConsortium: viewres.c,v 1.74 94/04/17 20:43:24 converse Exp $
- *
- *
-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.
- * *
- * Author: Jim Fulton, MIT X Consortium
-
--- a/open-src/app/viewres/Makefile Fri Apr 30 10:13:50 2010 -0700
+++ b/open-src/app/viewres/Makefile Tue May 04 15:58:18 2010 -0700
@@ -29,11 +29,11 @@
MODULE_NAME=viewres
# Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION=1.0.2
# Checksums for upstream tarball
-TARBALL_MD5 = cdbed540daf7975b56000420c9aa5bf9
-TARBALL_SHA1 = 1dff013616ca56c363308a172b2283169f58d8a0
+TARBALL_MD5 = f35c4ad7e1aa1ee2b25373dcdc34345b
+TARBALL_SHA1 = 2ab60b6751c135a3bbb5a7f3f5a1fd711a4d233b
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/xbiff/COPYING Fri Apr 30 10:13:50 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-Copyright (c) 1988 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/xbiff/Makefile Fri Apr 30 10:13:50 2010 -0700
+++ b/open-src/app/xbiff/Makefile Tue May 04 15:58:18 2010 -0700
@@ -29,11 +29,11 @@
MODULE_NAME=xbiff
# Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION=1.0.2
# Checksums for upstream tarball
-TARBALL_MD5 = 404f5add4537d22dd109c33e518a5190
-TARBALL_SHA1 = 9a925f8565e79c9e24cca66b8e5d868a5670b08f
+TARBALL_MD5 = 1d4ad06725f9dc4b877ecd210b7b1607
+TARBALL_SHA1 = 9980a9f92b060168cfb46006f7c98c7f34459011
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/xcalc/Makefile Fri Apr 30 10:13:50 2010 -0700
+++ b/open-src/app/xcalc/Makefile Tue May 04 15:58:18 2010 -0700
@@ -29,11 +29,11 @@
MODULE_NAME=xcalc
# Version number (used in path names)
-MODULE_VERSION=1.0.2
+MODULE_VERSION=1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = d31a99795b9668f047aa11bf36df6df0
-TARBALL_SHA1 = 0bb9691201e403d294779e401a70f32d6d99cdd9
+TARBALL_MD5 = 0b981e360b54584fcb6dc2ec4658c406
+TARBALL_SHA1 = 0871efa12f0b28228457b898c3487bc8723d1ea8
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/xeyes/Makefile Fri Apr 30 10:13:50 2010 -0700
+++ b/open-src/app/xeyes/Makefile Tue May 04 15:58:18 2010 -0700
@@ -29,11 +29,11 @@
MODULE_NAME=xeyes
# Version number (used in path names)
-MODULE_VERSION=1.0.991
+MODULE_VERSION=1.1.0
# Checksums for upstream tarball
-TARBALL_MD5 = ba1b886bd6104018fe78ab431d83ce4d
-TARBALL_SHA1 = 8b30da0ca87aa10fefa9791bb636fdffa2049a0a
+TARBALL_MD5 = 933f6d2b132d14f707f1f3c87b39ebe2
+TARBALL_SHA1 = 3422f65b6c5b9480cf74f48df115a6c837b84dae
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/xinit/6714067.patch Fri Apr 30 10:13:50 2010 -0700
+++ b/open-src/app/xinit/6714067.patch Tue May 04 15:58:18 2010 -0700
@@ -1,7 +1,7 @@
diff -urp -x '*~' -x '*.orig' Makefile.am Makefile.am
---- Makefile.am 2008-08-05 14:58:52.000000000 -0700
-+++ Makefile.am 2009-07-30 18:11:28.517520000 -0700
-@@ -53,6 +53,7 @@ PROGCPPDEFS = \
+--- Makefile.am 2010-03-15 15:35:56.000000000 -0700
++++ Makefile.am 2010-05-03 16:23:32.292195265 -0700
+@@ -52,6 +52,7 @@ PROGCPPDEFS = \
-DXINIT=@XINIT@
CPP_FILES_FLAGS = \
@@ -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 2008-12-17 15:24:32.000000000 -0800
-+++ Makefile.in 2009-07-30 18:11:28.518046000 -0700
-@@ -307,6 +307,7 @@ PROGCPPDEFS = \
+--- 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 = \
-DXINIT=@XINIT@
CPP_FILES_FLAGS = \
@@ -21,9 +21,9 @@
-DSHELL_CMD=$(SHELL_CMD) $(STARTX_COOKIE_FLAGS) \
-D__libexecdir__="$(libexecdir)" \
diff -urp -x '*~' -x '*.orig' xinit.c xinit.c
---- xinit.c 2008-11-22 10:52:00.000000000 -0800
-+++ xinit.c 2009-07-30 18:11:28.522338000 -0700
-@@ -199,6 +199,11 @@ static void set_environment ( void );
+--- 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, ... );
@@ -35,7 +35,7 @@
#ifdef RETSIGTYPE /* autoconf AC_TYPE_SIGNAL */
# define SIGVAL RETSIGTYPE
#endif /* RETSIGTYPE */
-@@ -221,6 +226,14 @@ sigAlarm(int sig)
+@@ -196,6 +201,14 @@ sigAlarm(int sig)
static SIGVAL
sigUsr1(int sig)
{
@@ -50,7 +50,7 @@
#if defined(SYSV) || defined(SVR4) || defined(linux) || defined(__UNIXOS2__) || defined(__APPLE__)
signal (sig, sigUsr1);
#endif
-@@ -567,6 +580,12 @@ startServer(char *server[])
+@@ -533,6 +546,12 @@ startServer(char *server[])
sigaddset(&mask, SIGUSR1);
sigprocmask(SIG_BLOCK, &mask, &old);
@@ -63,7 +63,7 @@
serverpid = fork();
switch(serverpid) {
-@@ -654,6 +673,17 @@ startServer(char *server[])
+@@ -620,6 +639,17 @@ startServer(char *server[])
if (!sigismember(&pendings, SIGUSR1))
#endif /* __UNIXOS2__ */
sigsuspend(&old);
@@ -81,7 +81,7 @@
alarm (0);
sigprocmask(SIG_SETMASK, &old, NULL);
-@@ -820,7 +850,12 @@ shutdown(void)
+@@ -786,7 +816,12 @@ shutdown(void)
if (serverpid < 0)
return;
errno = 0;
@@ -94,7 +94,7 @@
if (errno == EPERM)
Fatal("Can't kill X server\r\n");
if (errno == ESRCH)
-@@ -844,6 +879,13 @@ shutdown(void)
+@@ -810,6 +845,13 @@ shutdown(void)
fprintf (stderr, "\r\n");
Fatal("Can't kill server\r\n");
}
@@ -109,9 +109,9 @@
return;
}
diff -urp -x '*~' -x '*.orig' xinitrc.cpp xinitrc.cpp
---- xinitrc.cpp 2008-04-08 17:25:11.000000000 -0700
-+++ xinitrc.cpp 2009-07-30 18:11:28.522525000 -0700
-@@ -97,7 +97,7 @@ fi
+--- 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 &
--- a/open-src/app/xinit/Makefile Fri Apr 30 10:13:50 2010 -0700
+++ b/open-src/app/xinit/Makefile Tue May 04 15:58:18 2010 -0700
@@ -29,11 +29,11 @@
MODULE_NAME=xinit
# Version number (used in path names)
-MODULE_VERSION=1.1.1
+MODULE_VERSION=1.2.1
# Checksums for upstream tarball
-TARBALL_MD5 = 93c73705ed9eb1e1a6b6938405672f2b
-TARBALL_SHA1 = 577a111efc9b5a8ec6cc294ae7c35048eebde704
+TARBALL_MD5 = 56f2d202b3dc10fcd21931a67bb270f7
+TARBALL_SHA1 = baf36374aa1632054816a8281e55e1539459664b
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES = 6714067.patch
--- a/open-src/app/xinput/Makefile Fri Apr 30 10:13:50 2010 -0700
+++ b/open-src/app/xinput/Makefile Tue May 04 15:58:18 2010 -0700
@@ -29,11 +29,11 @@
MODULE_NAME=xinput
# Version number (used in path names)
-MODULE_VERSION=1.4.99.3
+MODULE_VERSION=1.5.1
# Checksums for upstream tarball
-TARBALL_MD5 = cc2b98b561b6431bd1e06d13ad2c7b5e
-TARBALL_SHA1 = 472dc49cf4fe8aabdd16cc410005f48f67d99875
+TARBALL_MD5 = 82400f0ba63217df9b00d825532cea7d
+TARBALL_SHA1 = f8f45486de7d44b3d7274dfd24f988035fe05910
# Man pages to apply Sun footer to & attributes to list
--- a/open-src/app/xlogo/Makefile Fri Apr 30 10:13:50 2010 -0700
+++ b/open-src/app/xlogo/Makefile Tue May 04 15:58:18 2010 -0700
@@ -29,11 +29,11 @@
MODULE_NAME=xlogo
# Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION=1.0.2
# Checksums for upstream tarball
-TARBALL_MD5 = 4c5482552f38a7d42398a694cc9b2ee6
-TARBALL_SHA1 = c2ffec6ffdc3dec7e27ed58d1e25b2237d85e053
+TARBALL_MD5 = 7365c0852750134119734bc1879f60ca
+TARBALL_SHA1 = 79f0370e1944194cb6dcce9c4efd144be69e8657
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/xterm/COPYING Fri Apr 30 10:13:50 2010 -0700
+++ b/open-src/app/xterm/COPYING Tue May 04 15:58:18 2010 -0700
@@ -1,4 +1,4 @@
-Copyright 1996-2009 by Thomas E. Dickey
+Copyright 1996-2010 by Thomas E. Dickey
Copyright 1999-2000 by Steve Wall
All Rights Reserved
--- a/open-src/app/xterm/Makefile Fri Apr 30 10:13:50 2010 -0700
+++ b/open-src/app/xterm/Makefile Tue May 04 15:58:18 2010 -0700
@@ -29,11 +29,11 @@
MODULE_NAME=xterm
# Version number (used in path names)
-MODULE_VERSION=253
+MODULE_VERSION=258
# Checksums for upstream tarball
-TARBALL_MD5 = 363cc4865b7691bd0ae5eebb42cde9c9
-TARBALL_SHA1 = 4234376b43a0c60f2516df0c0abe26037671d50f
+TARBALL_MD5 = bcf4f0ba51f5f58fd5bef76b3d05e40e
+TARBALL_SHA1 = d3357fc88917e23210eea2db32b185799bb2d22e
# Source tarball
SOURCE_URL=ftp://invisible-island.net/xterm/$(SOURCE_TARBALL_NAME:.tar.gz=.tgz)
--- a/open-src/app/xvidtune/COPYING Fri Apr 30 10:13:50 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-
-Copyright (c) 1995 Kaleb S. KEITHLEY
-
-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 Kaleb S. KEITHLEY 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 Kaleb S. KEITHLEY
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-from Kaleb S. KEITHLEY.
-
--- a/open-src/app/xvidtune/Makefile Fri Apr 30 10:13:50 2010 -0700
+++ b/open-src/app/xvidtune/Makefile Tue May 04 15:58:18 2010 -0700
@@ -29,11 +29,11 @@
MODULE_NAME=xvidtune
# Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION=1.0.2
# Checksums for upstream tarball
-TARBALL_MD5 = e0744594f4e5969b20df28d897781318
-TARBALL_SHA1 = 63ec5ecff8bdef3988bf2612a3694ad7d87d3867
+TARBALL_MD5 = e40eeb4454f2a7cdde3a14f5dfd3aadd
+TARBALL_SHA1 = 2f3f821943018c07efd4547afa4313ac92718b1e
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/doc/xorg-sgml-doctools/Makefile Fri Apr 30 10:13:50 2010 -0700
+++ b/open-src/doc/xorg-sgml-doctools/Makefile Tue May 04 15:58:18 2010 -0700
@@ -27,11 +27,11 @@
MODULE_NAME=xorg-sgml-doctools
# Version number (used in path names)
-MODULE_VERSION=1.3
+MODULE_VERSION=1.4
# Checksums for upstream tarball
-TARBALL_MD5 = 1e3ee108688d1df91049a565813c973d
-TARBALL_SHA1 = ee9f308f1c5f11a8fc19f034a5599f1867e4bbe7
+TARBALL_MD5 = 20484c9d97800530616742cb14989ac2
+TARBALL_SHA1 = 629687695b367946575ee935727d26e621f25674
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES=
--- a/open-src/lib/libXt/6671721.patch Fri Apr 30 10:13:50 2010 -0700
+++ b/open-src/lib/libXt/6671721.patch Tue May 04 15:58:18 2010 -0700
@@ -1,17 +1,17 @@
diff -urp -x '*~' -x '*.orig' configure.ac configure.ac
---- configure.ac 2009-07-02 10:25:41.000000000 -0700
-+++ configure.ac 2009-07-30 17:37:25.016239000 -0700
-@@ -59,6 +59,7 @@ case $host_os in
- # darwin has poll() but can't be used to poll character devices
- # darwin10 (SnowLeopard) should be tested as well once released
- darwin7*) ;; darwin8*) ;; darwin9*) ;;
+--- configure.ac 2010-03-15 14:58:44.000000000 -0700
++++ configure.ac 2010-05-03 16:59:58.639038681 -0700
+@@ -63,6 +63,7 @@ AC_CHECK_HEADER([alloca.h], AC_DEFINE(IN
+ case $host_os in
+ # darwin has poll() but can't be used to poll character devices (atleast through SnowLeopard)
+ darwin*) ;;
+ solaris*) ;; # our changes to NextEvent.c break if poll() is used
*)
AC_CHECK_FUNC(poll, AC_DEFINE(USE_POLL,1,
[Define to 1 if you have the "poll" function.]))
diff -urp -x '*~' -x '*.orig' include/X11/Intrinsic.h include/X11/Intrinsic.h
---- include/X11/Intrinsic.h 2009-07-02 10:22:10.000000000 -0700
-+++ include/X11/Intrinsic.h 2009-07-30 17:37:25.040481000 -0700
+--- include/X11/Intrinsic.h 2009-09-10 01:56:41.000000000 -0700
++++ include/X11/Intrinsic.h 2010-05-03 16:59:58.639779286 -0700
@@ -128,6 +128,7 @@ typedef int XtCacheType;
#define XtCacheAll 0x002
#define XtCacheByDisplay 0x003
@@ -48,8 +48,8 @@
XtAppContext /* app_context */,
_Xconst _XtString /* from_type */,
diff -urp -x '*~' -x '*.orig' include/X11/IntrinsicI.h include/X11/IntrinsicI.h
---- include/X11/IntrinsicI.h 2009-07-02 10:22:10.000000000 -0700
-+++ include/X11/IntrinsicI.h 2009-07-30 17:37:25.040785000 -0700
+--- include/X11/IntrinsicI.h 2009-09-10 01:56:41.000000000 -0700
++++ include/X11/IntrinsicI.h 2010-05-03 16:59:58.640048253 -0700
@@ -120,6 +120,8 @@ SOFTWARE.
if ((char *)(dst) != (char *)(src)) { \
if (size == sizeof(int)) \
@@ -87,9 +87,9 @@
#define XtMemmove(dst, src, size) \
diff -urp -x '*~' -x '*.orig' src/Convert.c src/Convert.c
---- src/Convert.c 2009-07-02 10:22:11.000000000 -0700
-+++ src/Convert.c 2009-07-30 17:37:25.041925000 -0700
-@@ -79,6 +79,7 @@ typedef struct _ConverterRec {
+--- src/Convert.c 2010-03-15 14:51:18.000000000 -0700
++++ src/Convert.c 2010-05-03 16:59:58.641228651 -0700
+@@ -90,6 +90,7 @@ typedef struct _ConverterRec {
XrmRepresentation from, to;
XtTypeConverter converter;
XtDestructor destructor;
@@ -97,7 +97,7 @@
unsigned short num_args;
unsigned int do_ref_count:1;
unsigned int new_style:1;
-@@ -86,11 +87,25 @@ typedef struct _ConverterRec {
+@@ -97,11 +98,25 @@ typedef struct _ConverterRec {
char cache_type;
} ConverterRec;
@@ -124,7 +124,7 @@
void _XtSetDefaultConverterTable(
ConverterTable *table)
{
-@@ -109,13 +124,11 @@ void _XtSetDefaultConverterTable(
+@@ -120,13 +135,11 @@ void _XtSetDefaultConverterTable(
XtCacheType cache_type;
for (i = CONVERTHASHSIZE; --i >= 0; ) {
for (rec = *globalConverterTable++; rec; rec = rec->next) {
@@ -141,7 +141,7 @@
}
}
}
-@@ -147,10 +160,14 @@ typedef struct _CacheRec {
+@@ -158,10 +171,14 @@ typedef struct _CacheRec {
XtPointer tag;
int hash;
XtTypeConverter converter;
@@ -156,7 +156,7 @@
unsigned int must_be_freed:1;
unsigned int from_is_value:1;
unsigned int to_is_value:1;
-@@ -158,15 +175,7 @@ typedef struct _CacheRec {
+@@ -169,15 +186,7 @@ typedef struct _CacheRec {
XrmValue to;
} CacheRec;
@@ -173,7 +173,7 @@
#define CACHEHASHSIZE 256
#define CACHEHASHMASK 255
-@@ -175,6 +184,28 @@ typedef CachePtr CacheHashTable[CACHEHAS
+@@ -186,6 +195,28 @@ typedef CachePtr CacheHashTable[CACHEHAS
static CacheHashTable cacheHashTable;
void _XtTableAddConverter(
@@ -202,7 +202,7 @@
ConverterTable table,
XrmRepresentation from_type,
XrmRepresentation to_type,
-@@ -184,6 +215,7 @@ void _XtTableAddConverter(
+@@ -195,6 +226,7 @@ void _XtTableAddConverter(
_XtBoolean new_style,
XtCacheType cache_type,
XtDestructor destructor,
@@ -210,7 +210,7 @@
_XtBoolean global)
{
register ConverterPtr *pp;
-@@ -207,6 +239,7 @@ void _XtTableAddConverter(
+@@ -218,6 +250,7 @@ void _XtTableAddConverter(
p->to = to_type;
p->converter = converter;
p->destructor = destructor;
@@ -218,7 +218,7 @@
p->num_args = num_args;
p->global = global;
args = ConvertArgs(p);
-@@ -216,21 +249,21 @@ void _XtTableAddConverter(
+@@ -227,21 +260,21 @@ void _XtTableAddConverter(
p->do_ref_count = False;
if (destructor || (cache_type & 0xff)) {
p->cache_type = cache_type & 0xff;
@@ -247,7 +247,7 @@
)
{
ProcessContext process;
-@@ -245,21 +278,41 @@ void XtSetTypeConverter(
+@@ -256,21 +289,41 @@ void XtSetTypeConverter(
to = XrmStringToRepresentation(to_type);
if (!process->globalConverterTable) {
@@ -297,7 +297,7 @@
void XtAppSetTypeConverter(
XtAppContext app,
register _Xconst char* from_type,
-@@ -349,6 +402,7 @@ CacheEnter(
+@@ -360,6 +413,7 @@ CacheEnter(
Boolean do_ref,
Boolean do_free,
XtDestructor destructor,
@@ -305,7 +305,7 @@
XtPointer closure)
{
register CachePtr *pHashEntry;
-@@ -358,34 +412,22 @@ CacheEnter(
+@@ -369,34 +423,22 @@ CacheEnter(
LOCK_PROCESS;
pHashEntry = &cacheHashTable[hash & CACHEHASHMASK];
@@ -346,7 +346,7 @@
p->from.size = from->size;
if (from->size <= sizeof(p->from.addr)) {
p->from_is_value = True;
-@@ -408,14 +450,31 @@ CacheEnter(
+@@ -419,14 +461,31 @@ CacheEnter(
if (!succeeded) {
p->to_is_value = False;
p->to.addr = NULL;
@@ -384,7 +384,7 @@
UNLOCK_PROCESS;
return p;
}
-@@ -423,32 +482,39 @@ CacheEnter(
+@@ -434,32 +493,39 @@ CacheEnter(
static void FreeCacheRec(
XtAppContext app,
CachePtr p,
@@ -447,7 +447,7 @@
if (p->must_be_freed) {
register int i;
if (!p->from_is_value)
-@@ -472,18 +538,18 @@ void _XtCacheFlushTag(
+@@ -483,18 +549,18 @@ void _XtCacheFlushTag(
XtPointer tag)
{
int i;
@@ -472,7 +472,7 @@
}
UNLOCK_PROCESS;
}
-@@ -633,7 +699,12 @@ void XtDirectConvert(
+@@ -644,7 +710,12 @@ void XtDirectConvert(
LOCK_PROCESS;
/* Try to find cache entry for conversion */
hash = ((long) converter >> 2) + from->size + *((char *) from->addr);
@@ -486,7 +486,7 @@
for (p = cacheHashTable[hash & CACHEHASHMASK]; p; p = p->next) {
if ((p->hash == hash)
-@@ -677,7 +748,7 @@ void XtDirectConvert(
+@@ -688,7 +759,7 @@ void XtDirectConvert(
{
CacheEnter(&globalHeap, (XtTypeConverter)converter, args, num_args,
from, to, (to->addr != NULL), hash, False, False,
@@ -495,7 +495,7 @@
}
UNLOCK_PROCESS;
}
-@@ -718,6 +789,7 @@ CallConverter(
+@@ -729,6 +800,7 @@ CallConverter(
int hash;
Cardinal i;
Boolean retval;
@@ -503,7 +503,7 @@
if (!cP || ((cP->cache_type == XtCacheNone) && !cP->destructor)) {
XtPointer closure;
-@@ -730,7 +802,12 @@ CallConverter(
+@@ -741,7 +813,12 @@ CallConverter(
LOCK_PROCESS;
/* Try to find cache entry for conversion */
hash = ((long)(converter) >> 2) + from->size + *((char *) from->addr);
@@ -517,7 +517,7 @@
if (cP->cache_type != XtCacheNone) {
for (p = cacheHashTable[hash & CACHEHASHMASK]; p; p = p->next){
-@@ -762,14 +839,18 @@ CallConverter(
+@@ -773,14 +850,18 @@ CallConverter(
UNLOCK_PROCESS;
return False;
}
@@ -542,7 +542,7 @@
} else { /* old-style call */
to->size = p->to.size;
if (p->to_is_value)
-@@ -779,7 +860,7 @@ CallConverter(
+@@ -790,7 +871,7 @@ CallConverter(
}
}
if (p->is_refcounted) {
@@ -551,7 +551,7 @@
if (cache_ref_return)
*cache_ref_return = (XtCacheRef)p;
else
-@@ -802,7 +883,7 @@ CallConverter(
+@@ -813,7 +894,7 @@ CallConverter(
Heap *heap;
XtPointer closure = NULL;
unsigned int supplied_size = to->size;
@@ -560,7 +560,7 @@
Boolean do_free = False;
Boolean retval =
(*(XtTypeConverter)converter)(dpy, args, &num_args, from, to, &closure);
-@@ -815,6 +896,8 @@ CallConverter(
+@@ -826,6 +907,8 @@ CallConverter(
return False;
}
@@ -569,7 +569,7 @@
if ((cP->cache_type == XtCacheNone) || do_ref) {
heap = NULL;
do_free = True;
-@@ -826,8 +909,12 @@ CallConverter(
+@@ -837,8 +920,12 @@ CallConverter(
else
heap = &XtDisplayToApplicationContext(dpy)->heap;
@@ -584,7 +584,7 @@
if (do_ref)
*cache_ref_return = (XtCacheRef)p;
else if (cache_ref_return)
-@@ -1053,8 +1140,8 @@ void XtAppReleaseCacheRefs(
+@@ -1064,8 +1151,8 @@ void XtAppReleaseCacheRefs(
LOCK_APP(app);
LOCK_PROCESS;
for (r = (CachePtr*)refs; (p = *r); r++) {
@@ -595,7 +595,7 @@
}
}
UNLOCK_PROCESS;
-@@ -1070,7 +1157,6 @@ void XtCallbackReleaseCacheRefList(
+@@ -1081,7 +1168,6 @@ void XtCallbackReleaseCacheRefList(
{
XtAppReleaseCacheRefs( XtWidgetToApplicationContext(widget),
(XtCacheRef*)closure );
@@ -604,9 +604,9 @@
diff -urp -x '*~' -x '*.orig' src/Converters.c src/Converters.c
---- src/Converters.c 2009-07-02 10:22:11.000000000 -0700
-+++ src/Converters.c 2009-07-30 17:37:25.042566000 -0700
-@@ -1352,7 +1352,7 @@ Boolean XtCvtIntToPixmap(
+--- src/Converters.c 2010-03-15 14:51:18.000000000 -0700
++++ src/Converters.c 2010-05-03 16:59:58.641904182 -0700
+@@ -1363,7 +1363,7 @@ Boolean XtCvtIntToPixmap(
XtNwrongParameters,"cvtIntToPixmap",XtCXtToolkitError,
"Integer to Pixmap conversion needs no extra arguments",
(String *) NULL, (Cardinal *)NULL);
@@ -616,9 +616,9 @@
#ifdef MOTIFBC
diff -urp -x '*~' -x '*.orig' src/Create.c src/Create.c
---- src/Create.c 2009-07-02 10:22:11.000000000 -0700
-+++ src/Create.c 2009-07-30 17:37:25.042961000 -0700
-@@ -397,8 +397,7 @@ xtCreate(
+--- src/Create.c 2010-03-15 14:51:18.000000000 -0700
++++ src/Create.c 2010-05-03 16:59:58.642283089 -0700
+@@ -408,8 +408,7 @@ xtCreate(
CompileCallbacks(widget);
if (cache_refs != NULL) {
@@ -629,9 +629,9 @@
wsize = widget_class->core_class.widget_size;
diff -urp -x '*~' -x '*.orig' src/Display.c src/Display.c
---- src/Display.c 2009-07-02 10:22:11.000000000 -0700
-+++ src/Display.c 2009-07-30 17:37:25.043414000 -0700
-@@ -315,12 +315,15 @@ _XtAppInit(
+--- src/Display.c 2010-03-15 14:51:18.000000000 -0700
++++ src/Display.c 2010-05-03 16:59:58.642695753 -0700
+@@ -326,12 +326,15 @@ _XtAppInit(
* Save away argv and argc so we can set the properties later
*/
@@ -654,9 +654,9 @@
*app_context_return = XtCreateApplicationContext();
diff -urp -x '*~' -x '*.orig' src/Event.c src/Event.c
---- src/Event.c 2009-07-02 10:22:11.000000000 -0700
-+++ src/Event.c 2009-07-30 17:37:25.082739000 -0700
-@@ -555,6 +555,14 @@ void XtRegisterDrawable(
+--- src/Event.c 2010-03-15 14:51:18.000000000 -0700
++++ src/Event.c 2010-05-03 16:59:58.643382364 -0700
+@@ -566,6 +566,14 @@ void XtRegisterDrawable(
UNLOCK_APP(app);
}
@@ -671,7 +671,7 @@
void XtUnregisterDrawable(
Display* display,
Drawable drawable)
-@@ -605,6 +613,14 @@ void XtUnregisterDrawable(
+@@ -616,6 +624,14 @@ void XtUnregisterDrawable(
UNLOCK_APP(app);
}
@@ -687,9 +687,9 @@
register WWTable tab)
{
diff -urp -x '*~' -x '*.orig' src/Geometry.c src/Geometry.c
---- src/Geometry.c 2009-07-02 10:22:11.000000000 -0700
-+++ src/Geometry.c 2009-07-30 17:37:25.083304000 -0700
-@@ -322,6 +322,12 @@ _XtMakeGeometryRequest (
+--- src/Geometry.c 2010-03-15 14:51:18.000000000 -0700
++++ src/Geometry.c 2010-05-03 16:59:58.643755121 -0700
+@@ -333,6 +333,12 @@ _XtMakeGeometryRequest (
} else {
returnCode = (*manager)(widget, request, reply);
}
@@ -703,9 +703,9 @@
/*
diff -urp -x '*~' -x '*.orig' src/Initialize.c src/Initialize.c
---- src/Initialize.c 2009-07-02 10:22:11.000000000 -0700
-+++ src/Initialize.c 2009-07-30 17:37:25.106700000 -0700
-@@ -470,7 +470,7 @@ static String _XtDefaultLanguageProc(
+--- src/Initialize.c 2010-03-15 14:51:18.000000000 -0700
++++ src/Initialize.c 2010-05-03 16:59:58.644224699 -0700
+@@ -481,7 +481,7 @@ static String _XtDefaultLanguageProc(
if (! XSetLocaleModifiers(""))
XtWarning("X locale modifiers not supported, using default");
@@ -714,7 +714,7 @@
}
XtLanguageProc XtSetLanguageProc(
-@@ -991,8 +991,13 @@ Widget XtOpenApplication(XtAppContext *a
+@@ -1002,8 +1002,13 @@ Widget XtOpenApplication(XtAppContext *a
LOCK_APP(app_con);
XtSetArg(args[num], XtNscreen, DefaultScreenOfDisplay(dpy)); num++;
@@ -731,8 +731,8 @@
merged_args = XtMergeArgLists(args_in, num_args_in, args, num);
num += num_args_in;
diff -urp -x '*~' -x '*.orig' src/Makefile.am src/Makefile.am
---- src/Makefile.am 2009-07-02 10:22:11.000000000 -0700
-+++ src/Makefile.am 2009-07-30 17:37:25.106910000 -0700
+--- src/Makefile.am 2009-11-09 03:21:54.000000000 -0800
++++ src/Makefile.am 2010-05-03 16:59:58.644427695 -0700
@@ -74,7 +74,8 @@ DISTCLEANFILES = StringDefs.c
libXt_la_LIBADD = @XT_LIBS@
@@ -744,9 +744,9 @@
#
# The util directory contains a program that builds some of the sources.
diff -urp -x '*~' -x '*.orig' src/NextEvent.c src/NextEvent.c
---- src/NextEvent.c 2009-07-02 10:22:11.000000000 -0700
-+++ src/NextEvent.c 2009-07-30 17:37:25.107628000 -0700
-@@ -339,6 +339,51 @@ static void AdjustTimes (
+--- src/NextEvent.c 2010-03-15 14:51:18.000000000 -0700
++++ src/NextEvent.c 2010-05-03 16:59:58.645120044 -0700
+@@ -350,6 +350,51 @@ static void AdjustTimes (
#endif
}
@@ -798,7 +798,7 @@
static int IoWait (
wait_times_ptr_t wt,
-@@ -621,20 +666,56 @@ WaitLoop:
+@@ -632,20 +677,56 @@ WaitLoop:
/*
* interrupt occured recalculate time value and wait again.
*/
@@ -869,7 +869,7 @@
#ifdef USE_POLL
XtStackFree ((XtPointer) wf.fdlist, fdlist);
#endif
-@@ -679,17 +760,33 @@ WaitLoop:
+@@ -690,17 +771,33 @@ WaitLoop:
#endif
nfds = 0;
}
@@ -914,7 +914,7 @@
} /* timed out or input available */
break;
}
-@@ -735,6 +832,44 @@ WaitLoop:
+@@ -746,6 +843,44 @@ WaitLoop:
#define SeCallProc(ptr) \
(*ptr->se_proc) (ptr->se_closure, (XtSignalId*)&ptr);
@@ -960,9 +960,9 @@
* Public Routines
*/
diff -urp -x '*~' -x '*.orig' src/Resources.c src/Resources.c
---- src/Resources.c 2009-07-02 10:22:11.000000000 -0700
-+++ src/Resources.c 2009-07-30 17:37:25.108144000 -0700
-@@ -937,7 +937,7 @@ static XtCacheRef *GetResources(
+--- src/Resources.c 2010-03-15 14:51:18.000000000 -0700
++++ src/Resources.c 2010-05-03 16:59:58.645612118 -0700
+@@ -948,7 +948,7 @@ static XtCacheRef *GetResources(
register XtTypedArg* arg = typed_args + typed[j] - 1;
register int i;
@@ -972,9 +972,9 @@
}
num_typed_args--;
diff -urp -x '*~' -x '*.orig' src/Shell.c src/Shell.c
---- src/Shell.c 2009-07-02 10:22:11.000000000 -0700
-+++ src/Shell.c 2009-07-30 17:37:25.109405000 -0700
-@@ -2473,6 +2473,11 @@ static Boolean TopLevelSetValues(
+--- src/Shell.c 2010-03-15 14:51:18.000000000 -0700
++++ src/Shell.c 2010-05-03 16:59:58.646639717 -0700
+@@ -2484,6 +2484,11 @@ static Boolean TopLevelSetValues(
XFree((XPointer)icon_name.value);
}
}
--- a/open-src/lib/libXt/Makefile Fri Apr 30 10:13:50 2010 -0700
+++ b/open-src/lib/libXt/Makefile Tue May 04 15:58:18 2010 -0700
@@ -29,11 +29,11 @@
MODULE_NAME=libXt
# Version number (used in path names)
-MODULE_VERSION=1.0.7
+MODULE_VERSION=1.0.8
# Checksums for upstream tarball
-TARBALL_MD5 = 96f3c93434a93186d178b60d4a262496
-TARBALL_SHA1 = 3c285b9c04a393dec1cc3d60cf5582d798eb3272
+TARBALL_MD5 = fb7d2aa5b24cd5fe9b238a26d88030e7
+TARBALL_SHA1 = d5e3dfba90a12169771399b3e2ccae07243489c9
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES = 6671721.patch
--- a/open-src/util/makedepend/Makefile Fri Apr 30 10:13:50 2010 -0700
+++ b/open-src/util/makedepend/Makefile Tue May 04 15:58:18 2010 -0700
@@ -27,11 +27,11 @@
MODULE_NAME=makedepend
# Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION=1.0.2
# Checksums for upstream tarball
-TARBALL_MD5 = 54ab2549d723e51ff2b9cff4d8bf44d1
-TARBALL_SHA1 = c795cdc754d8c9c73e6a310e41eab37c5ab867bf
+TARBALL_MD5 = 62e58330fe8d1e3e28c7a45779833a48
+TARBALL_SHA1 = 57e092856580d9984e47c4b1433b69391de07df3
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES=
--- a/open-src/util/util-macros/Makefile Fri Apr 30 10:13:50 2010 -0700
+++ b/open-src/util/util-macros/Makefile Tue May 04 15:58:18 2010 -0700
@@ -27,21 +27,37 @@
MODULE_NAME=util-macros
# Version number (used in path names)
-MODULE_VERSION=1.3.0
+MODULE_VERSION=1.7.0
# Checksums for upstream tarball
-TARBALL_MD5 = 0837fe88af7d692308b25815457a3288
-TARBALL_SHA1 = 2c6396976af20bb0c7b3b27b229876fe67c6b9dc
+TARBALL_MD5 = 0c6d2cedcfc83d2f2d873d489d868230
+TARBALL_SHA1 = 82f832a47ab6ea6aca11f29161e88b14958d883d
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES=
+# Additional rules for generating sources
+MODULE_ADD_SOURCE_TARGETS=source_fix_pkgname
+
+# Need to autoreconf after running source_fix_pkgname
+AUTORECONF=yes
+
# Additional install rules beyond what upstream installs
MODULE_ADD_INSTALL_TARGETS=install_libtool_fix
+# xorg-macro pkg-config files are architecture independent, so install in share
+MODTYPE_PKGCONFIG_DIR=$(PKGCONFIG_DIR_SHARE)
+MODTYPE_PKGCONFIG_DIR_SET=yes
+
### Include common rulesets
include ../Makefile.inc
+# Install additional data files under xorg-macros instead of the
+# too-generic "util-macros"
+source_fix_pkgname: $(PATCHED_TARGET)
+ $(PERL) -i.orig -p -e 's{util-macros}{xorg-macros}g' \
+ $(SOURCE_DIR)/configure.ac
+
# Libtool versions before 2.2.2 fail to work with LD=cc in 64 bit builds,
# so install fixed libtool m4 macros here as well, so that modules that
# run autoreconf get the fixed sources
--- a/open-src/util/xorg-cf-files/Makefile Fri Apr 30 10:13:50 2010 -0700
+++ b/open-src/util/xorg-cf-files/Makefile Tue May 04 15:58:18 2010 -0700
@@ -27,11 +27,11 @@
MODULE_NAME=xorg-cf-files
# Version number (used in path names)
-MODULE_VERSION=1.0.2
+MODULE_VERSION=1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = 5f62dd5545b782c74f6e4e70d0e6552c
-TARBALL_SHA1 = a1182e1fd05a648e6282598a355b7c4be9339755
+TARBALL_MD5 = 10546b5ddda3cdda7950bb56bf98e0ea
+TARBALL_SHA1 = 0c63edf6ceeb78fe32dd88bfce8d71c85e311bb0
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES=
--- a/packages/SUNWxwinc/prototype_com Fri Apr 30 10:13:50 2010 -0700
+++ b/packages/SUNWxwinc/prototype_com Tue May 04 15:58:18 2010 -0700
@@ -536,6 +536,7 @@
# Data files & other miscellany
f none share/pkgconfig/xbitmaps.pc 0444 root bin
+f none share/pkgconfig/xorg-macros.pc 0444 root bin
# Libraries
@@ -623,3 +624,8 @@
d none share/aclocal 0755 root other
f none share/aclocal/xorg-macros.m4 0444 root bin
f none share/aclocal/xtrans.m4 0444 root bin
+
+# other xorg-macros datafiles
+!search $HOME/share/xorg-macros
+d none share/xorg-macros 0755 root bin
+f none share/xorg-macros/INSTALL 0444 root bin