Update of /cvsroot/fink/packages/dists/unstable/main/finkinfo/x11-system
In directory usw-pr-cvs1:/tmp/cvs-serv26681
Added Files:
xfree86-rootless-4.2.0-3.info xfree86-rootless-4.2.0-3.patch
Removed Files:
xfree86-rootless-4.2.0-2.info xfree86-rootless-4.2.0-2.patch
Log Message:
fixes for april dev tools and jag
--- NEW FILE: xfree86-rootless-4.2.0-3.info ---
Package: xfree86-rootless
Version: 4.2.0
Revision: 3
Depends: xfree86-base (>= 4.2.0-4)
Pre-Depends: xfree86-base (>= 4.2.0-4)
Provides: libgl
Conflicts: xfree86-server, xfree86, libgl
Source: mirror:sourceforge:fink/X420src-1.tgz
SourceDirectory: xc
Patch: %f.patch
PatchScript: <<
echo '#define BuildServersOnly YES' >config/cf/host.def
echo '#define BuildGLXLibrary YES' >>config/cf/host.def
echo '#define BuildGLULibrary YES' >>config/cf/host.def
echo '#define EtcX11Directory ProjectRoot/etc' >>config/cf/host.def
echo '#define HasShm 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 WORLDOPTS=-S DESTDIR=%d
rm -rf %d/etc %d/usr/X11R6/etc
rm -rf %d/usr/X11R6/include/X11
(cd %d/usr/X11R6/lib/; rm -rf X11; rm -f lib[A-FH-Za-fh-z]*)
(cd %d/usr/X11R6/bin/; rm -f [abce-wyz]* xmkmf Xnest Xprt Xvfb)
cd programs/Xserver/hw/darwin && make MAKE=/usr/bin/gnumake install.man DESTDIR=%d
<<
#
PreInstScript: <<
case "$1" in
install)
if [ -e /Applications/XDarwin.app -o -e /usr/X11R6/bin/XDarwin -o \
-e /usr/X11R6/bin/X -o -L /usr/X11R6/bin/X -o \
-e /usr/X11R6/lib/libGL.dylib ]; then
echo
echo "You have an existing X server installation in /usr/X11R6 and
/Applications."
echo "This package refuses to overwrite these. Remove them, then tell Fink to"
echo "install xfree86-rootless again."
echo
echo "Press Return to continue."
read
exit 1
fi
;;
esac
<<
#
Description: MacOS X/Darwin XFree86 display server.
DescDetail: <<
XFree86 is a free X11 distribution that supports Darwin and Mac OS
X. This will let you run X11 applications and desktop environments.
This is the server from the standard, stable XFree86 4.2.0 release. It
supports both full-screen and rootless operation, and has OpenGL support.
<<
DescPackaging: <<
This package contains the XDarwin and XDarwin.app servers. The
libraries, headers and general infrastructure (except openGL stuff)
are provided by the xfree86-base package.
(Note: Actually the X11 build system still
builds various binaries and libraries. This can't be easily
avoided. All files but the servers, openGL stuff, and dumpkeymap utils are
deleted after the make install.)
WARNING: This package will not honor the prefix you installed Fink
in. It will always install into /usr/X11R6 and /Applications. This is
by design. The preinst script checks to make sure it doesn't
overwrite existing files.
Previous versions by Christoph Pfisterer.
<<
DescPort: <<
Natively supports Darwin and Mac OS X. This package will only build on
Mac OS X because it uses Quartz and Cocoa.
MIT-SHM support is disabled in the server since it is crippled by a
kernel bug.
Patched to use pthreads.
<<
License: BSD
Homepage: http://www.xfree86.org/
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
--- NEW FILE: xfree86-rootless-4.2.0-3.patch ---
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 12:28:11 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));
diff -uNbr xc/programs/Xserver/hw/darwin/bundle/XDarwin.pbproj/project.pbxproj
xc.new/programs/Xserver/hw/darwin/bundle/XDarwin.pbproj/project.pbxproj
--- xc/programs/Xserver/hw/darwin/bundle/XDarwin.pbproj/project.pbxproj Mon Jan 14
02:12:22 2002
+++ xc.new/programs/Xserver/hw/darwin/bundle/XDarwin.pbproj/project.pbxproj Wed
+Jul 24 12:29:07 2002
@@ -324,7 +324,7 @@
0A79E1A4004499A1CE6F79C2,
);
buildSettings = {
- INSTALL_PATH = "";
+ INSTALL_PATH = /;
OPTIMIZATION_CFLAGS = "";
OTHER_CFLAGS = "";
OTHER_LDFLAGS = "";
@@ -338,7 +338,7 @@
);
isa = PBXApplicationTarget;
name = XDarwin;
- productInstallPath = "";
+ productInstallPath = /;
productName = XDarwin;
productReference = 0A79E19E004499A1CE6F79C2;
productSettingsXML = "<?xml version=\"1.0\"
encoding=\"UTF-8\"?>
--- xfree86-rootless-4.2.0-2.info DELETED ---
--- xfree86-rootless-4.2.0-2.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