Update of /cvsroot/fink/packages/dists/unstable/main/finkinfo/x11-system
In directory usw-pr-cvs1:/tmp/cvs-serv591

Added Files:
        xfree86-base-4.2.0-11.info xfree86-base-4.2.0-11.patch 
Removed Files:
        xfree86-base-4.2.0-10.info xfree86-base-4.2.0-10.patch 
Log Message:
updated xfree86 package that fixes the missing XShm symbols on 10.1


--- NEW FILE: xfree86-base-4.2.0-11.info ---
Package: xfree86-base
Version: 4.2.0
Revision: 11
Depends: dlcompat
Provides: x11
Conflicts: x11
Replaces: x11
Suggests: xfree86-rootless (= %v-%r)
Source: mirror:sourceforge:fink/X420src-1.tgz
Source2: mirror:sourceforge:fink/X420src-2.tgz
Source3: mirror:sourceforge:fink/X420src-3.tgz
SourceDirectory: xc
PatchScript: <<
 sed -e s,@FINKPREFIX@,%p, %a/%f.patch | patch -p1
 echo '#define ExtraIncDir      %p/include' > config/cf/host.def
 echo '#define EtcX11Directory  ProjectRoot/etc' >> config/cf/host.def
<<
CompileScript: <<
 make MAKE=/usr/bin/gnumake World WORLDOPTS=-S
<<
SplitOff: <<
 Package: xfree86-rootless
 Depends: xfree86-base (= %v-%r)
 Provides: libgl
 Files: <<
 ../Applications
 ../usr/X11R6/bin/X
 ../usr/X11R6/bin/XDarwin
 ../usr/X11R6/bin/XDarwinQuartz
 ../usr/X11R6/bin/XDarwinStartup
 ../usr/X11R6/bin/dumpkeymap
 ../usr/X11R6/bin/glxgears
 ../usr/X11R6/bin/glxinfo
 ../usr/X11R6/include/GL
 ../usr/X11R6/lib/libGL*
 ../usr/X11R6/lib/X11/doc/html/XDarwin.1.html
 ../usr/X11R6/lib/X11/doc/html/XFree86.1.html
 ../usr/X11R6/lib/X11/doc/html/dumpkeymap.1.html
 ../usr/X11R6/lib/X11/doc/html/GL*.html
 ../usr/X11R6/lib/X11/doc/html/gl*.html
 ../usr/X11R6/man/man1/XDarwin.1
 ../usr/X11R6/man/man1/XFree86.1
 ../usr/X11R6/man/man1/dumpkeymap.1
 ../usr/X11R6/man/man1/glx*.1
 ../usr/X11R6/man/man3/GL*.3
 ../usr/X11R6/man/man3/gl*.3
 <<
<<
InstallScript: <<
 make MAKE=/usr/bin/gnumake install install.man WORLDOPTS=-S DESTDIR=%d
<<
#
PreInstScript: <<
case "$1" in
  install)
    if [ -e /usr/X11R6/bin/xterm -o -e /usr/X11R6/bin/xrdb -o \
         -e /etc/X11 -o -L /etc/X11 ]; then
      echo
      echo "You have an existing X11 installation in /usr/X11R6 and /etc/X11."
      echo "This package refuses to overwrite these. Remove them, then tell Fink to"
      echo "install xfree86-base again. (The package won't be recompiled.) If you want"
      echo "to keep your X11 installation, install system-xfree86 resp. system-xtools"
      echo "instead to make this known to Fink's package system."
      echo
      echo "Press Return to continue."
      read
      exit 1
    fi
    ;;
  upgrade)
    # deal with a file that changed in case only
    rm -f /usr/X11R6/man/man3/XtAddTime?ut.3
    rm -f /usr/X11R6/lib/X11/doc/html/XtAddTime?ut.3.html

    # deal with font listings (we no longer use xfont-base, font
    #  packages install their fonts in the Fink directories)
    for dir in 100dpi 75dpi CID cyrillic local misc Speedo Type1 ; do
      rm -f /usr/X11R6/lib/X11/fonts/$dir/fonts.dir 
/usr/X11R6/lib/X11/fonts/$dir/fonts.scale /usr/X11R6/lib/X11/fonts/$dir/fonts.scale.bak
    done
    ;;
esac
<<
PostInstScript: <<
if [ -L /etc/X11 ]; then
  rm -f /etc/X11
else
  if [ -e /etc/X11 ]; then
    echo "ERROR: /etc/X11 exists, but is not a symlink to /usr/X11R6/etc."
    exit 1
  fi
fi
ln -s /usr/X11R6/etc /etc/X11
<<
PreRmScript: <<
case "$1" in
  remove|purge)
    if [ -L /etc/X11 ]; then
      rm -f /etc/X11
    fi
    ;;
esac
<<
#
Description: XFree86 libraries, utilities, clients and data.
DescDetail: <<
XFree86 is a free X11 implementation that supports Darwin and Mac OS X.
This will let you run X11 applications and desktop environments.
<<
DescPackaging: <<
This package builds the libraries, common clients (e.g. xterm), fonts
and other data, but not the X server. The server is in a separate
package (xfree86-rootless). You can install a server manually if you prefer.

WARNING: This package will not honor the prefix you installed Fink
in. It will always install into /usr/X11R6. This is by design. The
preinst script checks to make sure it doesn't overwrite existing
files.

Previous versions by Christoph Pfisterer.
<<
DescPort: <<
OpenGL stuff is disabled. "libgl" is provided by the xfree86-rootless package
in order to preserve an upgrade path from the xfree86 v4.1 packages.

Patched to use pthreads.
<<
License: BSD
Homepage: http://www.xfree86.org/
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>

--- NEW FILE: xfree86-base-4.2.0-11.patch ---
diff -uNbr xc/config/cf/darwin.cf xc-new/config/cf/darwin.cf
--- xc/config/cf/darwin.cf      Tue Jan 15 16:22:31 2002
+++ xc-new/config/cf/darwin.cf  Sun Aug 11 14:45:54 2002
@@ -1,4 +1,4 @@
-XCOMM platform:  $XFree86: xc/config/cf/darwin.cf,v 1.21 2002/01/15 21:22:31 keithp 
Exp $
+XCOMM platform:  $XFree86: xc/config/cf/darwin.cf,v 1.21.2.1 2002/05/03 00:36:17 
+torrey Exp $
 
 /* Darwin / Mac OS X configuration by John Carmack <[EMAIL PROTECTED]> */
 
@@ -21,15 +21,35 @@
 /*
  * Define the operating system's capabilities
  */
-#define HasSnprintf             YES
-#define HasPutenv               YES
+#define BuildGLXLibrary                YES
+#define BuildGLULibrary                YES
 #define HasBSD44Sockets         YES
+#define HasCplusplus           YES
[...1911 lines suppressed...]
 
 #include <data.h>
 #include <error.h>
-#include <menu.h>
+#include "menu.h"
 #include <xcharmouse.h>
 
 /* Event handlers */
diff -uNbr xc/programs/xterm/util.c xc-new/programs/xterm/util.c
--- xc/programs/xterm/util.c    Sat Jan  5 17:05:03 2002
+++ xc-new/programs/xterm/util.c        Sun Aug 11 14:45:33 2002
@@ -62,7 +62,7 @@
 
 #include <data.h>
 #include <error.h>
-#include <menu.h>
+#include "menu.h"
 #include <fontutils.h>
 
 #if OPT_WIDE_CHARS

--- xfree86-base-4.2.0-10.info DELETED ---

--- xfree86-base-4.2.0-10.patch DELETED ---



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to