Update of /cvsroot/fink/experimental/rangerrick/x11-system
In directory usw-pr-cvs1:/tmp/cvs-serv30469
Added Files:
xfree86-base-4.2.0-7.info xfree86-base-4.2.0-7.patch
Log Message:
fix for missing xterm on jag
--- NEW FILE: xfree86-base-4.2.0-7.info ---
Package: xfree86-base
Version: 4.2.0
Revision: 7
Provides: x11, rman
Conflicts: x11
Replaces: x11
Suggests: xfree86-rootless (>=4.2.0-2)
Source: mirror:sourceforge:fink/X420src-1.tgz
Source2: mirror:sourceforge:fink/X420src-2.tgz
Source3: mirror:sourceforge:fink/X420src-3.tgz
SourceDirectory: xc
Patch: %f.patch
PatchScript: <<
echo '#define EtcX11Directory ProjectRoot/etc' >config/cf/host.def
echo '#define BuildGLXLibrary NO' >>config/cf/host.def
echo '#define BuildGLULibrary NO' >>config/cf/host.def
echo '#define HasPosixThreads YES' >>config/cf/host.def
echo '#define ThreadedX YES' >>config/cf/host.def
echo '#define HasThreadSafeAPI YES' >>config/cf/host.def
echo '#define SystemMTDefines -D_REENTRANT' >>config/cf/host.def
echo '#define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI'
>>config/cf/host.def
<<
CompileScript: <<
make MAKE=/usr/bin/gnumake World WORLDOPTS=-S
<<
InstallScript: <<
make MAKE=/usr/bin/gnumake install install.man WORLDOPTS=-S DESTDIR=%d
rm -rf %d/usr/X11R6/include/GL
rm -f %d/usr/X11R6/lib/libz.a
<<
#
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-7.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 Wed Jul 24 19:46:39 2002
@@ -62,7 +62,7 @@
#define MathLibrary /**/
/* we don't have a termcap library */
-#define TermcapLibrary /**/
+#define TermcapLibrary -lncurses
/* we don't have a dbm library */
#define DBMLibrary /**/
@@ -125,7 +125,7 @@
#define BuildServer YES
/* our custom X server */
-#define XDarwinServer YES
+#define XDarwinServer NO
/* Thanks to the IOKit, the X server does not have to be SetUID. */
#ifndef InstallXserverSetUID
diff -uNbr xc/include/Xos_r.h xc-new/include/Xos_r.h
--- xc/include/Xos_r.h Fri Dec 14 14:53:26 2001
+++ xc-new/include/Xos_r.h Wed Jul 24 19:45:02 2002
@@ -254,7 +254,7 @@
* fields.
*/
-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) ||
+defined(__APPLE__)
static __inline__ void _Xpw_copyPasswd(_Xgetpwparams p)
{
memcpy(&(p).pws, (p).pwp, sizeof(struct passwd));
-------------------------------------------------------
This sf.net email is sponsored by: Jabber - The world's fastest growing
real-time communications platform! Don't just IM. Build it in!
http://www.jabber.com/osdn/xim
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
