Update of /cvsroot/fink/dists/10.2/unstable/main/finkinfo/x11-system
In directory usw-pr-cvs1:/tmp/cvs-serv23942
Added Files:
xfree86-base-4.2.1.1-1.info
xfree86-base-threaded-4.2.1.1-1.info
xfree86-base-threaded-4.2.1.1-1.patch
Log Message:
New upstream version.
--- NEW FILE: xfree86-base-4.2.1.1-1.info ---
Package: xfree86-base
Version: 4.2.1.1
Revision: 1
Depends: xfree86-base-shlibs (= %v-%r)
Provides: x11, rman
Conflicts: x11, xfree86-base-threaded
Replaces: x11
Suggests: xfree86-rootless (= %v-%r)
GCC: 3.1
Source: mirror:sourceforge:fink/X4211src.tar.bz2
Source-MD5: 2a91409e284793ee5e18ac1204f174e4
SourceDirectory: xc
PatchScript: <<
echo '#define ExtraIncDir %p/include' > config/cf/host.def
echo '#define EtcX11Directory ProjectRoot/etc' >> config/cf/host.def
echo '#define CppCmd cpp' >> config/cf/host.def
echo '#define CcCmd cc' >> config/cf/host.def
echo '#define CplusplusCmd c++' >> config/cf/host.def
<<
CompileScript: <<
make MAKE=/usr/bin/gnumake World WORLDOPTS=-S
<<
SplitOff: <<
Package: xfree86-base-shlibs
Depends: dlcompat
Replaces: xfree86-base (<= 4.2.0.1-2)
Files: <<
/usr/X11R6/lib/libdps.*.dylib
/usr/X11R6/lib/libdpstk.*.dylib
/usr/X11R6/lib/libfreetype.*.dylib
/usr/X11R6/lib/libICE.*.dylib
/usr/X11R6/lib/liboldX.*.dylib
/usr/X11R6/lib/libpsres.*.dylib
/usr/X11R6/lib/libSM.*.dylib
/usr/X11R6/lib/libX11.*.dylib
/usr/X11R6/lib/libXaw.*.dylib
/usr/X11R6/lib/libXext.*.dylib
/usr/X11R6/lib/libXfont.*.dylib
/usr/X11R6/lib/libXft.*.dylib
/usr/X11R6/lib/libXi.*.dylib
/usr/X11R6/lib/libXmu.*.dylib
/usr/X11R6/lib/libXmuu.*.dylib
/usr/X11R6/lib/libXp.*.dylib
/usr/X11R6/lib/libXpm.*.dylib
/usr/X11R6/lib/libXrandr.*.dylib
/usr/X11R6/lib/libXrender.*.dylib
/usr/X11R6/lib/libXt.*.dylib
/usr/X11R6/lib/libXTrap.*.dylib
/usr/X11R6/lib/libXtst.*.dylib
<<
Shlibs: <<
/usr/X11R6/lib/libdps.1.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libdpstk.1.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libfreetype.6.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libICE.6.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/liboldX.6.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libpsres.1.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libSM.6.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libX11.6.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libXaw.6.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libXaw.7.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libXext.6.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libXfont.1.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libXft.1.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libXi.6.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libXmu.6.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libXmuu.1.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libXp.6.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libXpm.4.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libXrandr.1.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libXrender.1.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libXt.6.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libXTrap.6.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libXtst.6.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
<<
<<
SplitOff2: <<
Package: xfree86-rootless
Depends: xfree86-base (= %v-%r), xfree86-rootless-shlibs (= %v-%r)
Files: <<
/Applications
/usr/X11R6/bin/X
/usr/X11R6/bin/XDarwin
/usr/X11R6/bin/XDarwinQuartz
/usr/X11R6/bin/XDarwinStartup
/usr/X11R6/bin/dumpkeymap
/usr/X11R6/bin/glxgears
/usr/X11R6/bin/glxinfo
/usr/X11R6/include/GL
/usr/X11R6/lib/libGL*.a
/usr/X11R6/lib/libGL.dylib
/usr/X11R6/lib/libGLU.dylib
/usr/X11R6/lib/X11/doc/html/XDarwin.1.html
/usr/X11R6/lib/X11/doc/html/XFree86.1.html
/usr/X11R6/lib/X11/doc/html/dumpkeymap.1.html
/usr/X11R6/lib/X11/doc/html/GL*.html
/usr/X11R6/lib/X11/doc/html/gl*.html
/usr/X11R6/man/man1/XDarwin.1
/usr/X11R6/man/man1/XFree86.1
/usr/X11R6/man/man1/dumpkeymap.1
/usr/X11R6/man/man1/glx*.1
/usr/X11R6/man/man3/GL*.3
/usr/X11R6/man/man3/gl*.3
<<
<<
SplitOff3: <<
Package: xfree86-rootless-shlibs
Depends: xfree86-base-shlibs (= %v-%r)
Conflicts: xfree86-rootless-threaded
Provides: libgl
Files: <<
/usr/X11R6/lib/libGL*.*.dylib
<<
Shlibs: <<
/usr/X11R6/lib/libGL.1.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libGLU.1.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
<<
<<
InstallScript: <<
make MAKE=/usr/bin/gnumake install install.man WORLDOPTS=-S DESTDIR=%d
<<
#
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.
<<
License: BSD
Homepage: http://www.xfree86.org/
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
--- NEW FILE: xfree86-base-threaded-4.2.1.1-1.info ---
Package: xfree86-base-threaded
Version: 4.2.1.1
Revision: 1
Depends: xfree86-base-threaded-shlibs (= %v-%r)
Provides: x11, rman
Conflicts: x11, xfree86-base
Replaces: x11
Suggests: xfree86-rootless-threaded (= %v-%r)
GCC: 3.1
Source: mirror:sourceforge:fink/X4211src.tar.bz2
Source-MD5: 2a91409e284793ee5e18ac1204f174e4
Patch: %f.patch
SourceDirectory: xc
PatchScript: <<
echo '#define ExtraIncDir %p/include' > config/cf/host.def
echo '#define EtcX11Directory ProjectRoot/etc' >> config/cf/host.def
echo '#define HasPosixThreads YES' >>config/cf/host.def
echo '#define HasThreadSafeAPI NO' >>config/cf/host.def
echo '#define CppCmd cpp' >> config/cf/host.def
echo '#define CcCmd cc' >> config/cf/host.def
echo '#define CplusplusCmd c++' >> config/cf/host.def
<<
CompileScript: <<
make MAKE=/usr/bin/gnumake World WORLDOPTS=-S
<<
SplitOff: <<
Package: xfree86-base-threaded-shlibs
Depends: dlcompat
Replaces: xfree86-base-threaded (<= 4.2.0.1-3)
Files: <<
/usr/X11R6/lib/libdps.*.dylib
/usr/X11R6/lib/libdpstk.*.dylib
/usr/X11R6/lib/libfreetype.*.dylib
/usr/X11R6/lib/libICE.*.dylib
/usr/X11R6/lib/liboldX.*.dylib
/usr/X11R6/lib/libpsres.*.dylib
/usr/X11R6/lib/libSM.*.dylib
/usr/X11R6/lib/libX11.*.dylib
/usr/X11R6/lib/libXaw.*.dylib
/usr/X11R6/lib/libXext.*.dylib
/usr/X11R6/lib/libXfont.*.dylib
/usr/X11R6/lib/libXft.*.dylib
/usr/X11R6/lib/libXi.*.dylib
/usr/X11R6/lib/libXmu.*.dylib
/usr/X11R6/lib/libXmuu.*.dylib
/usr/X11R6/lib/libXp.*.dylib
/usr/X11R6/lib/libXpm.*.dylib
/usr/X11R6/lib/libXrandr.*.dylib
/usr/X11R6/lib/libXrender.*.dylib
/usr/X11R6/lib/libXt.*.dylib
/usr/X11R6/lib/libXTrap.*.dylib
/usr/X11R6/lib/libXtst.*.dylib
<<
Shlibs: <<
/usr/X11R6/lib/libdps.1.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libdpstk.1.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libfreetype.6.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libICE.6.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/liboldX.6.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libpsres.1.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libSM.6.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libX11.6.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libXaw.6.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libXaw.7.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libXext.6.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libXfont.1.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libXft.1.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libXi.6.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libXmu.6.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libXmuu.1.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libXp.6.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libXpm.4.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libXrandr.1.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libXrender.1.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libXt.6.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libXTrap.6.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libXtst.6.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
<<
<<
SplitOff2: <<
Package: xfree86-rootless-threaded
Depends: xfree86-base-threaded (= %v-%r), xfree86-rootless-threaded-shlibs (= %v-%r)
Files: <<
/Applications
/usr/X11R6/bin/X
/usr/X11R6/bin/XDarwin
/usr/X11R6/bin/XDarwinQuartz
/usr/X11R6/bin/XDarwinStartup
/usr/X11R6/bin/dumpkeymap
/usr/X11R6/bin/glxgears
/usr/X11R6/bin/glxinfo
/usr/X11R6/include/GL
/usr/X11R6/lib/libGL*.a
/usr/X11R6/lib/libGL.dylib
/usr/X11R6/lib/libGLU.dylib
/usr/X11R6/lib/X11/doc/html/XDarwin.1.html
/usr/X11R6/lib/X11/doc/html/XFree86.1.html
/usr/X11R6/lib/X11/doc/html/dumpkeymap.1.html
/usr/X11R6/lib/X11/doc/html/GL*.html
/usr/X11R6/lib/X11/doc/html/gl*.html
/usr/X11R6/man/man1/XDarwin.1
/usr/X11R6/man/man1/XFree86.1
/usr/X11R6/man/man1/dumpkeymap.1
/usr/X11R6/man/man1/glx*.1
/usr/X11R6/man/man3/GL*.3
/usr/X11R6/man/man3/gl*.3
<<
<<
SplitOff3: <<
Package: xfree86-rootless-threaded-shlibs
Depends: xfree86-base-threaded-shlibs (= %v-%r)
Conflicts: xfree86-rootless
Provides: libgl
Files: <<
/usr/X11R6/lib/libGL*.*.dylib
<<
Shlibs: <<
/usr/X11R6/lib/libGL.1.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
/usr/X11R6/lib/libGLU.1.dylib %n (>= %v-%r) | system-free86 (>= 4.2-1)
<<
<<
InstallScript: <<
make MAKE=/usr/bin/gnumake install install.man WORLDOPTS=-S DESTDIR=%d
<<
#
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.
If you already have xfree86-base installed, you must remove it
manually first using "sudo dpkg -r --force-depends".
<<
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.
This version is patched to use threads.
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.
<<
License: BSD
Homepage: http://www.xfree86.org/
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
--- NEW FILE: xfree86-base-threaded-4.2.1.1-1.patch ---
--- xc/include/Xos_r.h.orig Sun Jan 20 13:06:48 2002
+++ xc/include/Xos_r.h Sun Jan 20 12:55:07 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: See the NEW Palm
Tungsten T handheld. Power & Color in a compact size!
http://ads.sourceforge.net/cgi-bin/redirect.pl?palm0001en
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
