CVS: packages/dists/stable/main/finkinfo/x11-system system-libgl-1.2-2.info,NONE,1.1 system-xfree86-4.1-4.info,NONE,1.1 system-xtools-1.0-6.info,NONE,1.1

[Christoph P. <ch...@us...>]

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

Added Files:
	system-libgl-1.2-2.info system-xfree86-4.1-4.info 
	system-xtools-1.0-6.info 
Log Message:
Moved to stable.


--- NEW FILE: system-libgl-1.2-2.info ---
Package: system-libgl
Version: 1.2
Revision: 2
Provides: libgl
Conflicts: libgl
Type: bundle
Maintainer: Christoph Pfisterer <ch...@us...>
Description: OpenGL library placeholder package
DescDetail: <<
Install this package if you have manually installed an OpenGL library
in /usr/X11R6/lib. You can use this if you have installed a recent CVS
version (or binary test release) of XFree86.

If you have Xtools, you do not need this package. Just install
system-xtools, it already checks for libGL.
<<
#
PreInstScript: <<

echo

# check for needed files
if [ -f /usr/X11R6/lib/libGL.dylib -a -f /usr/X11R6/include/GL/gl.h ]; then
  echo "Valid OpenGL library found."
  echo
else
  echo "ERROR: No libGL.dylib or no OpenGL include files found."
  echo
  echo "Press Return to continue."
  read
  exit 1
fi

<<

--- NEW FILE: system-xfree86-4.1-4.info ---
Package: system-xfree86
Version: 4.1
Revision: 4
Provides: x11, rman
Conflicts: x11
Type: bundle
Maintainer: Christoph Pfisterer <ch...@us...>
Description: XFree86 placeholder package
DescDetail: <<
Install this package if you have XFree86 installed manually. It will check
whether the installation is okay and provide the 'x11' virtual package.
<<
#
PreInstScript: <<

echo

# check for Xtools
if [ -d /usr/X11R6/lib/tenon ]; then
  echo "It looks like you have Xtools installed, not XFree86. You should install"
  echo "the system-xtools package instead. There are some subtle differences"
  echo "between the two. If you installed XFree86 on top of Xtools, you may want"
  echo "to wipe it out and do a clean install of XFree86 to avoid some potential"
  echo "problems."
  echo
  echo "Press Return to continue."
  read
  exit 1
fi

# check for needed files
missing=
mcount=0
for file in bin/xterm bin/xrdb bin/rman \
	    lib/libX11.dylib lib/libXpm.dylib lib/libXaw.dylib \
	    include/X11/Xlib.h ; do
  if [ ! -f "/usr/X11R6/$file" ]; then
    missing="$missing /usr/X11R6/$file"
    mcount=$(($mcount+1))
  fi
done
if [ $mcount -ge 7 ]; then
  echo "You don't have XFree86 installed. Install the xfree86-base package instead"
  echo "or install a recent XFree86 version manually and retry installing the"
  echo "system-xfree86 package."
  echo
  echo "Press Return to continue."
  read
  exit 1
fi
if [ -n "$missing" ]; then
  echo "Your XFree86 installation is incomplete. The following files are missing:"
  echo "$missing"
  echo "You may have an old version without shared libraries. That is not sufficient"
  echo "to run downloaded binary packages. Please install XFree86 4.1.0 or later"
  echo "manually or consider installing the xfree86-base package."
  echo
  echo "Press Return to continue."
  read
  exit 1
fi

echo "Valid XFree86 installation detected."
echo

# check imake config files for 10.1 flags
if grep 'undefined suppress' /usr/X11R6/lib/X11/config/darwinLib.rules >/dev/null 2>&1; then
  if ! grep 'flat_namespace' /usr/X11R6/lib/X11/config/darwinLib.rules >/dev/null 2>&1; then
    echo "Adding Mac OS X 10.1 compatibility option to imake configuration file"
    echo "/usr/X11R6/lib/X11/config/darwinLib.rules ..."
    sed 's/-undefined suppress/-flat_namespace -undefined suppress/g' </usr/X11R6/lib/X11/config/darwinLib.rules >/usr/X11R6/lib/X11/config/darwinLib.rules.tmp
    mv -f /usr/X11R6/lib/X11/config/darwinLib.rules.tmp /usr/X11R6/lib/X11/config/darwinLib.rules
    echo
  fi
fi

<<

--- NEW FILE: system-xtools-1.0-6.info ---
Package: system-xtools
Version: 1.0
Revision: 6
Provides: x11, libgl
Conflicts: x11, libgl
Type: bundle
Maintainer: Christoph Pfisterer <ch...@us...>
Description: Xtools placeholder package
DescDetail: <<
Install this package if you have Tenon's Xtools installed. It will
check whether the installation is okay and provide the 'x11' virtual
package.
<<
#
PreInstScript: <<

echo

# check for needed files
missing=
mcount=0
for file in bin/xterm bin/xrdb \
            lib/libX11.dylib lib/libXpm.dylib lib/libXaw.dylib \
	    include/X11/Xlib.h \
	    lib/libGL.dylib include/GL/gl.h ; do
  if [ ! -f "/usr/X11R6/$file" ]; then
    missing="$missing /usr/X11R6/$file"
    mcount=$(($mcount+1))
  fi
done
if [ $mcount -ge 8 ]; then
  echo "You don't have Xtools installed. Install Xtools and retry installing the"
  echo "system-xtools package."
  echo
  echo "Press Return to continue."
  read
  exit 1
fi
if [ ! -d /usr/X11R6/lib/tenon ]; then
  echo "It looks like you have XFree86 installed, not Xtools. You should install"
  echo "the system-xfree86 package instead. There are some subtle differences"
  echo "between the two."
  echo
  echo "Press Return to continue."
  read
  exit 1
fi
if [ -n "$missing" ]; then
  echo "Your Xtools installation is incomplete. The following files are missing:"
  echo "$missing"
  echo "You may have to reinstall Xtools."
  echo
  echo "Press Return to continue."
  read
  exit 1
fi

echo "Valid Xtools installation detected."
echo

# check imake config files for 10.1 flags
if grep 'undefined suppress' /usr/X11R6/lib/X11/config/darwinLib.rules >/dev/null 2>&1; then
  if ! grep 'flat_namespace' /usr/X11R6/lib/X11/config/darwinLib.rules >/dev/null 2>&1; then
    echo "Adding Mac OS X 10.1 compatibility option to imake configuration file"
    echo "/usr/X11R6/lib/X11/config/darwinLib.rules ..."
    sed 's/-undefined suppress/-flat_namespace -undefined suppress/g' </usr/X11R6/lib/X11/config/darwinLib.rules >/usr/X11R6/lib/X11/config/darwinLib.rules.tmp
    mv -f /usr/X11R6/lib/X11/config/darwinLib.rules.tmp /usr/X11R6/lib/X11/config/darwinLib.rules
    echo
  fi
fi

# check for malloc.h
if [ -f /usr/local/include/malloc.h ]; then
  echo "You have a /usr/local/include/malloc.h file on your system. It was likely"
  echo "installed by Xtools' SSH package. It is unnecessary and may even prevent"
  echo "some packages from compiling. It can be safely removed, and you should do"
  echo "so, e.g.:  sudo rm /usr/local/include/malloc.h"
  echo
  echo "Press Return to continue."
  read
fi

<<