Update of /cvsroot/fink/experimental/rangerrick/finkinfo/x11-system
In directory sc8-pr-cvs1:/tmp/cvs-serv26799

Added Files:
        system-xfree86-4.2-12.info 
Removed Files:
        system-xfree86-4.2-11.info 
Log Message:
updated to warn about updating to a new system-xfree86 if it fails


--- NEW FILE: system-xfree86-4.2-12.info ---
Package: system-xfree86
Version: 4.2
Revision: 12
Provides: x11, rman, libgl, libgl-shlibs
Conflicts: x11, system-libgl
Replaces: system-libgl
Type: bundle
Shlibs: <<
   /usr/X11R6/lib/libdps.1.dylib 1.0.0 xfree86-base-shlibs (>= 4.2.1.1-1) | 
system-free86 (>= 4.2-1)
   /usr/X11R6/lib/libdpstk.1.dylib 1.0.0 xfree86-base-shlibs (>= 4.2.1.1-1) | 
system-free86 (>= 4.2-1)
   /usr/X11R6/lib/libfreetype.6.dylib 6.2.0 xfree86-base-shlibs (>= 4.2.1.1-1) | 
system-free86 (>= 4.2-1)
   /usr/X11R6/lib/libICE.6.dylib 6.3.0 xfree86-base-shlibs (>= 4.2.1.1-1) | 
system-free86 (>= 4.2-1)
   /usr/X11R6/lib/liboldX.6.dylib 6.0.0 xfree86-base-shlibs (>= 4.2.1.1-1) | 
system-free86 (>= 4.2-1)
   /usr/X11R6/lib/libpsres.1.dylib 1.0.0 xfree86-base-shlibs (>= 4.2.1.1-1) | 
system-free86 (>= 4.2-1)
   /usr/X11R6/lib/libSM.6.dylib 6.0.0 xfree86-base-shlibs (>= 4.2.1.1-1) | 
system-free86 (>= 4.2-1)
   /usr/X11R6/lib/libX11.6.dylib 6.2.0 xfree86-base-shlibs (>= 4.2.1.1-1) | 
system-free86 (>= 4.2-1)
   /usr/X11R6/lib/libXaw.6.dylib 6.1.0 xfree86-base-shlibs (>= 4.2.1.1-1) | 
system-free86 (>= 4.2-1)
   /usr/X11R6/lib/libXaw.7.dylib 7.0.0 xfree86-base-shlibs (>= 4.2.1.1-1) | 
system-free86 (>= 4.2-1)
   /usr/X11R6/lib/libXext.6.dylib 6.4.0 xfree86-base-shlibs (>= 4.2.1.1-1) | 
system-free86 (>= 4.2-1)
   /usr/X11R6/lib/libXfont.1.dylib 1.4.0 xfree86-base-shlibs (>= 4.2.1.1-1) | 
system-free86 (>= 4.2-1)
   /usr/X11R6/lib/libXft.1.dylib 1.1.0 xfree86-base-shlibs (>= 4.2.1.1-1) | 
system-free86 (>= 4.2-1)
   /usr/X11R6/lib/libXi.6.dylib 6.0.0 xfree86-base-shlibs (>= 4.2.1.1-1) | 
system-free86 (>= 4.2-1)
   /usr/X11R6/lib/libXmu.6.dylib 6.2.0 xfree86-base-shlibs (>= 4.2.1.1-1) | 
system-free86 (>= 4.2-1)
   /usr/X11R6/lib/libXmuu.1.dylib 1.0.0 xfree86-base-shlibs (>= 4.2.1.1-1) | 
system-free86 (>= 4.2-1)
   /usr/X11R6/lib/libXp.6.dylib 6.2.0 xfree86-base-shlibs (>= 4.2.1.1-1) | 
system-free86 (>= 4.2-1)
   /usr/X11R6/lib/libXpm.4.dylib 4.11.0 xfree86-base-shlibs (>= 4.2.1.1-1) | 
system-free86 (>= 4.2-1)
   /usr/X11R6/lib/libXrandr.1.dylib 1.0.0 xfree86-base-shlibs (>= 4.2.1.1-1) | 
system-free86 (>= 4.2-1)
   /usr/X11R6/lib/libXrender.1.dylib 1.1.0 xfree86-base-shlibs (>= 4.2.1.1-1) | 
system-free86 (>= 4.2-1)
   /usr/X11R6/lib/libXt.6.dylib 6.0.0 xfree86-base-shlibs (>= 4.2.1.1-1) | 
system-free86 (>= 4.2-1)
   /usr/X11R6/lib/libXTrap.6.dylib 6.4.0 xfree86-base-shlibs (>= 4.2.1.1-1) | 
system-free86 (>= 4.2-1)
   /usr/X11R6/lib/libXtst.6.dylib 6.1.0 xfree86-base-shlibs (>= 4.2.1.1-1) | 
system-free86 (>= 4.2-1)
  /usr/X11R6/lib/libGL.1.dylib 1.2.0 xfree86-rootless-shlibs (>= 4.2.1.1-1) | 
system-free86 (>= 4.2-1)
  /usr/X11R6/lib/libGLU.1.dylib 1.3.0 xfree86-rootless-shlibs (>= 4.2.1.1-1) | 
system-free86 (>= 4.2-1)
<<
Description: Placeholder package for manually installed XFree86
DescDetail: <<
Install this package if you have XFree86 4.2.x (or equivalent) installed
manually.  It will check whether the installation is okay and provide
the 'x11' virtual package.

For a compatible X11 package, try XonX (from the XFree86 Project) at
http://sourceforge.net/project/showfiles.php?group_id=18034 or Apple's
X11 at http://www.apple.com/macosx/x11/ .
<<
#
PreInstScript: <<

die_with_warning() {
  echo "Note: update your package descriptions before sending bug reports"
  echo "about this package not working, it may have been updated to support"
  echo "the X11 release you are trying to use."
  echo ""
  echo "You can do this by running 'sudo apt-get update' (if you are"
  echo "installing binaries), or 'fink selfupdate-cvs' (if you are building"
  echo "from source)."
  echo ""
  echo "Press a key to quit."
  read -n1 -s
  exit 1
}

##############################################################################
# Phase 1: Interrogate the system for X11-like thingies
##############################################################################

# Apple X11 -- http://www.apple.com/macosx/x11/

LIBAPPLE="false"
XPINC="false"
LIBTENON="false"

if [ -e /usr/lib/libXplugin.1.dylib ]; then
  echo "- found apple library"
  LIBAPPLE="true"
elif [ -e /usr/X11R6/lib/libapplexp.1.dylib ]; then
  echo "- found old apple library"
  echo ""
  echo "Previous Apple X11 releases had a number of bugs that make compiling"
  echo "some Fink packages problematic."
  echo ""
  echo "Please install the Apple X11 beta 3 (released 17 March 2003) or"
  echo "later, including the SDK, and then install system-xfree86 again."
  echo ""
  die_with_warning
fi
if [ -d /usr/X11R6/lib/tenon ]; then
  echo "- found lib/tenon"
  LIBTENON="true"
fi
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
    mcount=$(($mcount+1))
    echo "- missing /usr/X11R6/$file"
  else
    echo "- found /usr/X11R6/$file"
  fi
done
if [ -x /usr/X11R6/bin/XDarwin ]; then
  XF_VERSION=`/usr/X11R6/bin/XDarwin -version 2>&1 | grep "XFree86 Version" | awk '{ 
print $3 }'`
  XF_MAJOR=`echo $XF_VERSION | cut -d. -f1`
  XF_MINOR=`echo $XF_VERSION | cut -d. -f2`
fi

##############################################################################
# Phase 2: 
##############################################################################

##############################################################################
# Phase 3: Profit!  Err... I mean, make sure this X11 is OK.   =)
##############################################################################

if [ "$LIBAPPLE" = "true" ] || [ "$XPINC" = "true" ]; then
  GOODAPPLE="true"
  if [ "$LIBAPPLE" = "false" ] || [ ! -e /usr/X11R6/bin/Xquartz ]; then
    echo "- Apple X11 userland is missing"
    GOODAPPLE="false"
  elif [ ! -e /usr/X11R6/include/X11/X.h ]; then
    echo "- Apple X11 SDK is missing"
    GOODAPPLE="false"
  fi
  if [ "$GOODAPPLE" = "false" ]; then
    echo ""
    echo "** ERROR! **"
    echo "It appears you have a partially-installed version of the Apple X11"
    echo "release.  To use Apple's X11 with Fink, you must download both the"
    echo "main X11 installer, as well as the SDK (there are actually 2 separate"
    echo "downloads for the Apple X11 release).  Please go to"
    echo "http://www.apple.com/macosx/x11/ and download and install the missing"
    echo "files, and re-attempt your install of system-xfree86."
    echo ""
    die_with_warning
  fi

fi

# Tenon XTools
if [ "$LIBTENON" = "true" ]; then
  echo ""
  echo "It looks like you have Xtools installed, not XFree86.  Try installing"
  echo "system-xtools instead."
  echo ""
  echo "It is possible that you have installed an XonX or Apple X11 release over"
  echo "your Xtools release.  If that is the case, delete the directory"
  echo "'/usr/X11R6/lib/tenon' and try this install again."
  echo ""
  die_with_warning
fi

if [ "$mcount" -ge 1 ]; then
  echo ""
  echo "Your XFree86 installation is missing or incomplete.  Please make sure you have"
  echo "an XFree86 release installed and retry the installation of the system-xfree86"
  echo "package."
  echo ""
  echo "The following XFree86 software is compatible with system-xfree86:"
  echo ""
  echo "  XonX (from the XFree86 Project):"
  echo "    http://sourceforge.net/project/showfiles.php?group_id=18034";
  echo ""
  echo "  Apple X11:"
  echo "    http://www.apple.com/macosx/x11/";
  echo ""
  die_with_warning
fi

if [ "$GOODAPPLE" = "true" ]; then
  echo ""
  echo "Valid Apple X11 detected.  Thank you, have a nice day."
  echo ""
  exit 0
else
  if [ -z "$XF_VERSION" ] || [ -z "$XF_MAJOR" ] || [ -z "$XF_MINOR" ]; then

    echo "An error occurred trying to find your XFree86 installation's"
    echo "version.  This really shouldn't happen, so I'm bailing.  :("
    echo ""
    die_with_warning
  else
    if [ "$XF_MAJOR" != "4" ] || [ "$XF_MINOR" -lt 2 ]; then
      echo "This package requires XFree86 version 4.2 or equivalent, but your have"
      echo "version $XF_VERSION installed!  Please upgrade your XFree86 installation"
      echo "and try again."
      echo ""
      die_with_warning
    fi
  fi
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

<<
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>

--- system-xfree86-4.2-11.info DELETED ---




-------------------------------------------------------
This SF.net email is sponsored by: ValueWeb: 
Dedicated Hosting for just $79/mo with 500 GB of bandwidth! 
No other company gives more support or power for your dedicated server
http://click.atdmt.com/AFF/go/sdnxxaff00300020aff/direct/01/
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to