Update of /cvsroot/fink/experimental/mrvacbob
In directory usw-pr-cvs1:/tmp/cvs-serv29334
Added Files:
xfree86-base-4.2.0-8.info xfree86-base-4.2.0-8.patch
xfree86-rootless-4.2.0-4.info xfree86-rootless-4.2.0-4.patch
Log Message:
New and improved and probably broken X11
--- NEW FILE: xfree86-base-4.2.0-8.info ---
Package: xfree86-base
Version: 4.2.0
Revision: 8
BuildDepends: gdbm
Depends: gdbm-shlibs
Provides: x11, rman
Conflicts: x11
Replaces: x11
Suggests: xfree86-rootless (>=4.2.0-3)
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
sed -e 's;@prefix@;%p;g' < config/cf/darwin.cf > config/cf/darwin-tmp
mv config/cf/darwin-tmp config/cf/darwin.cf
<<
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-8.patch ---
diff -Nu xc/config/cf/darwin.cf xc-patched/config/cf/darwin.cf
--- xc/config/cf/darwin.cf Tue Jan 15 16:22:31 2002
+++ xc-patched/config/cf/darwin.cf Mon Jul 29 01:49:39 2002
@@ -27,12 +27,12 @@
#define HasUsableFileMmap YES
#define HasZlib YES
#ifndef HasShm
-# define HasShm YES
+#define HasShm YES
#endif
#define HasNdbm YES
#ifndef HasGroff
-# define HasGroff YES
+#define HasGroff YES
#endif
/* Libtool on Darwin always uses minor numbers */
@@ -62,10 +62,10 @@
#define MathLibrary /**/
/* we don't have a termcap library */
-#define TermcapLibrary /**/
+#define TermcapLibrary -lncurses
/* we don't have a dbm library */
-#define DBMLibrary /**/
+#define DBMLibrary -lgdbm
#define MkdirHierCmd mkdir -p
@@ -83,9 +83,9 @@
# define DefaultCCOptions -Wall -Wpointer-arith -Wstrict-prototypes \
-Wmissing-prototypes -Wmissing-declarations \
-Wredundant-decls -Wnested-externs \
- -no-cpp-precomp
+ -no-cpp-precomp -I@prefix@/include
#else
-# define DefaultCCOptions -Wall -Wpointer-arith -no-cpp-precomp
+# define DefaultCCOptions -Wall -Wpointer-arith -no-cpp-precomp
+-I@prefix@/include
#endif
#endif
@@ -96,7 +96,7 @@
#ifdef PpcDarwinArchitecture
# define DarwinMachineDefines -D__powerpc__
-# define OptimizedCDebugFlags -O2
+# define OptimizedCDebugFlags -Os
# define ByteOrder X_BIG_ENDIAN
#endif /* PpcDarwinArchitecture */
@@ -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
@@ -142,7 +142,7 @@
/* no Display Power Management extension */
#define BuildDPMSExt NO
-#define BuildLibPathVar DYLD_LIBRARY_PATH
+#define BuildLibPathVar DYLD_LIBRARY_PATH -L@prefix@/lib
/* include rules to build shared libraries */
#include <darwinLib.rules>
diff -Nu xc/include/Xos_r.h xc-patched/include/Xos_r.h
--- xc/include/Xos_r.h Fri Dec 14 14:53:26 2001
+++ xc-patched/include/Xos_r.h Mon Jul 29 01:46:57 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));
--- NEW FILE: xfree86-rootless-4.2.0-4.info ---
Package: xfree86-rootless
Version: 4.2.0
Revision: 4
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 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
sed -e 's/@prefix@/%p/g' < config/cf/darwin.cf > config/cf/darwin-tmp
mv config/cf/darwin-tmp config/cf/darwin.cf
<<
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-4.patch ---
diff -Nu xc/config/cf/darwin.cf xc-patched/config/cf/darwin.cf
--- xc/config/cf/darwin.cf Tue Jan 15 16:22:31 2002
+++ xc-patched/config/cf/darwin.cf Mon Jul 29 01:49:39 2002
@@ -27,12 +27,12 @@
#define HasUsableFileMmap YES
#define HasZlib YES
#ifndef HasShm
-# define HasShm YES
+#define HasShm YES
#endif
#define HasNdbm YES
#ifndef HasGroff
-# define HasGroff YES
+#define HasGroff YES
#endif
/* Libtool on Darwin always uses minor numbers */
@@ -62,10 +62,10 @@
#define MathLibrary /**/
/* we don't have a termcap library */
-#define TermcapLibrary /**/
+#define TermcapLibrary -lncurses
/* we don't have a dbm library */
-#define DBMLibrary /**/
+#define DBMLibrary -lgdbm
#define MkdirHierCmd mkdir -p
@@ -83,9 +83,9 @@
# define DefaultCCOptions -Wall -Wpointer-arith -Wstrict-prototypes \
-Wmissing-prototypes -Wmissing-declarations \
-Wredundant-decls -Wnested-externs \
- -no-cpp-precomp
+ -no-cpp-precomp -I@prefix@/include
#else
-# define DefaultCCOptions -Wall -Wpointer-arith -no-cpp-precomp
+# define DefaultCCOptions -Wall -Wpointer-arith -no-cpp-precomp
+-I@prefix@/include
#endif
#endif
@@ -96,7 +96,7 @@
#ifdef PpcDarwinArchitecture
# define DarwinMachineDefines -D__powerpc__
-# define OptimizedCDebugFlags -O2
+# define OptimizedCDebugFlags -Os
# define ByteOrder X_BIG_ENDIAN
#endif /* PpcDarwinArchitecture */
@@ -125,7 +125,7 @@
#define BuildServer YES
/* our custom X server */
-#define XDarwinServer YES
+#define XDarwinServer YES
/* Thanks to the IOKit, the X server does not have to be SetUID. */
#ifndef InstallXserverSetUID
@@ -142,7 +142,7 @@
/* no Display Power Management extension */
#define BuildDPMSExt NO
-#define BuildLibPathVar DYLD_LIBRARY_PATH
+#define BuildLibPathVar DYLD_LIBRARY_PATH -L@prefix@/lib
/* include rules to build shared libraries */
#include <darwinLib.rules>
diff -Nu xc/include/Xos_r.h xc-patched/include/Xos_r.h
--- xc/include/Xos_r.h Fri Dec 14 14:53:26 2001
+++ xc-patched/include/Xos_r.h Mon Jul 29 01:46:57 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\"?>
-------------------------------------------------------
This sf.net email is sponsored by: Dice - The leading online job board
for high-tech professionals. Search and apply for tech jobs today!
http://seeker.dice.com/seeker.epl?rel_code=31
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
