Update of /cvsroot/fink/experimental/rangerrick/common/main/finkinfo/x11-system
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv933/common/main/finkinfo/x11-system
Modified Files:
xfree86.info xorg.info
Log Message:
various packages in testing
Index: xorg.info
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/common/main/finkinfo/x11-system/xorg.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- xorg.info 12 Apr 2005 20:21:19 -0000 1.9
+++ xorg.info 12 May 2005 20:41:57 -0000 1.10
@@ -1,6 +1,6 @@
Package: xorg
Version: 6.8.2
-Revision: 13
+Revision: 14
BuildDepends: gcc3.1
Depends: %N-shlibs (>= %v-%r)
Provides: xserver, x11-dev, x11, rman, libgl-dev, libgl, xft2-dev, xft2,
fontconfig1-dev, fontconfig1
@@ -176,7 +176,9 @@
<<
InstallScript: <<
make install install.man DESTDIR=%d
- install -c -m 644 lib/Xcursor/Xcursor.h lib/Xfixes/Xfixes.h
lib/Xdamage/Xdamage.h lib/Xcomposite/Xcomposite.h
%d/usr/X11R6/include/X11/extensions/
+ install -d -m 755 %d/usr/X11R6/include/X11/Xcursor
+ install -c -m 644 lib/Xcursor/Xcursor.h %d/usr/X11R6/include/X11/Xcursor/
+ install -c -m 644 lib/Xfixes/Xfixes.h lib/Xdamage/Xdamage.h
lib/Xcomposite/Xcomposite.h %d/usr/X11R6/include/X11/extensions/
mkdir -p %d/private
mv %d/etc %d/private
rm -rf %d/private/etc/init.d
@@ -190,44 +192,46 @@
echo "X11 provided with Panther."
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/or
/etc/X11."
- echo "This package refuses to overwrite these. Remove them, then tell
Fink to"
- echo "install xfree86 again. (The package won't be recompiled.) If you
want"
- echo "to keep your X11 installation, please see the FAQ entry at"
- echo
"http://fink.sourceforge.net/faq/usage-packages.php#apple-x11-wants-xfree86";
- echo "for more information on how to configure your system."
- echo
- echo "Press Return to continue."
- read
- exit 1
- fi
- ;;
- upgrade)
+ 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/or /etc/X11."
+ echo "This package refuses to overwrite these. Remove
them, then tell Fink to"
+ echo "install xfree86 again. (The package won't be
recompiled.) If you want"
+ echo "to keep your X11 installation, please see the FAQ
entry at"
+ echo
"http://fink.sourceforge.net/faq/usage-packages.php#apple-x11-wants-xfree86";
+ echo "for more information on how to configure your
system."
+ echo
+ echo "Press Return to continue."
+ read
+ exit 1
+ fi
+ ;;
+ upgrade)
- # 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
- ;;
+ # 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: <<
+/usr/X11R6/bin/fc-cache
if [ -L /etc/X11 ]; then
- rm -f /etc/X11
+ 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
+ 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
mkdir -p /private/etc/fonts
for file in fonts.conf fonts.dtd; do
+ if ! [ -d /private/etc/fonts ]; then install -d -m 755 -g wheel
/private/etc/fonts; fi
if ! [ -f /private/etc/fonts/$file.bak ]; then
cp -f /private/etc/fonts/$file /private/etc/fonts/$file.bak
cp -f %p/share/x11/fonts/$file /private/etc/fonts/
@@ -240,6 +244,7 @@
if [ -L /etc/X11 ]; then
rm -f /etc/X11
fi
+ if ! [ -d /private/etc/fonts ]; then install -d -m 755 -g wheel
/private/etc/fonts; fi
for file in fonts.conf fonts.dtd; do
if [ -f /private/etc/fonts/$file.bak ]; then
mv -f /private/etc/fonts/$file
/private/etc/fonts/$file.saved
Index: xfree86.info
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/common/main/finkinfo/x11-system/xfree86.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- xfree86.info 9 May 2005 19:59:04 -0000 1.11
+++ xfree86.info 12 May 2005 20:41:57 -0000 1.12
@@ -200,41 +200,41 @@
echo "X11 provided with Panther."
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/or
/etc/X11."
- echo "This package refuses to overwrite these. Remove them, then tell
Fink to"
- echo "install xfree86 again. (The package won't be recompiled.) If you
want"
- echo "to keep your X11 installation, please see the FAQ entry at"
- echo
"http://fink.sourceforge.net/faq/usage-packages.php#apple-x11-wants-xfree86";
- echo "for more information on how to configure your system."
- echo
- echo "Press Return to continue."
- read
- exit 1
- fi
- ;;
- upgrade)
+ 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/or /etc/X11."
+ echo "This package refuses to overwrite these. Remove
them, then tell Fink to"
+ echo "install xfree86 again. (The package won't be
recompiled.) If you want"
+ echo "to keep your X11 installation, please see the FAQ
entry at"
+ echo
"http://fink.sourceforge.net/faq/usage-packages.php#apple-x11-wants-xfree86";
+ echo "for more information on how to configure your
system."
+ echo
+ echo "Press Return to continue."
+ read
+ exit 1
+ fi
+ ;;
+ upgrade)
- # 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
- ;;
+ # 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: <<
/usr/X11R6/bin/fc-cache
if [ -L /etc/X11 ]; then
- rm -f /etc/X11
+ 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
+ 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
mkdir -p /private/etc/fonts
-------------------------------------------------------
This SF.Net email is sponsored by Oracle Space Sweepstakes
Want to be the first software developer in space?
Enter now for the Oracle Space Sweepstakes!
http://ads.osdn.com/?ad_id=7393&alloc_id=16281&op=click
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
