added wormux game + dependencies ;)

[hdw-linux/hdw-linux.git] / packages / x11 / xorg / xorg

diff --git a/packages/x11/xorg/xorg b/packages/x11/xorg/xorg
index 64a4b09..9aa6025 100644 (file)
--- a/packages/x11/xorg/xorg
+++ b/packages/x11/xorg/xorg
@@ -2,16 +2,16 @@
 
 # author: hackbard@hackdaworld.dyndns.org
 
-# [V] 6.7.0
+# [V] 6.9.0
 
 # [S] 3-3
-# [D] X11R6.7.0-src1.tar.gz http://freedesktop.org/~xorg/X11R6.7.0/src/
-# [D] X11R6.7.0-src2.tar.gz http://freedesktop.org/~xorg/X11R6.7.0/src/
-# [D] X11R6.7.0-src3.tar.gz http://freedesktop.org/~xorg/X11R6.7.0/src/
-# [D] X11R6.7.0-src4.tar.gz http://freedesktop.org/~xorg/X11R6.7.0/src/
-# [D] X11R6.7.0-src5.tar.gz http://freedesktop.org/~xorg/X11R6.7.0/src/
-# [D] X11R6.7.0-src6.tar.gz http://freedesktop.org/~xorg/X11R6.7.0/src/
-# [D] X11R6.7.0-src7.tar.gz http://freedesktop.org/~xorg/X11R6.7.0/src/
+# [D] X11R6.9.0-src1.tar.gz ftp://x.mirrors.skynet.be/pub/x.org/pub/X11R6.9.0/src/
+# [D] X11R6.9.0-src2.tar.gz ftp://x.mirrors.skynet.be/pub/x.org/pub/X11R6.9.0/src/
+# [D] X11R6.9.0-src3.tar.gz ftp://x.mirrors.skynet.be/pub/x.org/pub/X11R6.9.0/src/
+# [D] X11R6.9.0-src4.tar.gz ftp://x.mirrors.skynet.be/pub/x.org/pub/X11R6.9.0/src/
+# [D] X11R6.9.0-src5.tar.gz ftp://x.mirrors.skynet.be/pub/x.org/pub/X11R6.9.0/src/
+# [D] X11R6.9.0-src6.tar.gz ftp://x.mirrors.skynet.be/pub/x.org/pub/X11R6.9.0/src/
+# [D] X11R6.9.0-src7.tar.gz ftp://x.mirrors.skynet.be/pub/x.org/pub/X11R6.9.0/src/
 
 custmain="1"
 custmain()     {
@@ -32,23 +32,36 @@ custmain()  {
                        patch -Nfp1 < $i
                done
        fi
-       for file in `grep '<linux/config.h>' -r ./programs/Xserver/hw | \
-                                               awk -F: '{ print $1 }'`; do
+       for file in `grep '<linux/config.h>' -lr ./`; do
                echo "patching file $file ..."
-               sed 's%#include <linux/config.h>%%g' $file > ${file}.tmp
+               sed "s%#include <linux/config.h>%/* & */%g" $file > ${file}.tmp
                mv ${file}.tmp $file
        done
+
+       # need types.h for agp
+       file="programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c"
+       sed "s@*/@*/\n#include <linux/types.h>\n@" $file > tmp~
+       mv tmp~ $file
+
+       # no init scripts in /etc
+       file="programs/Xserver/Xprint/Imakefile"
+       sed "/^SUBDIRS =/s/ etc$//" $file > tmp~
+       mv tmp~ $file
+
+       # copy host.def
+       cp -v $confdir/host.def config/cf/host.def
        
-       # build $ install
+       # build & install
        make World && make install && make install.man &&
        
        # add entry to /etc/ld.so.conf
        [ -z `grep 'X11' $root/etc/ld.so.conf` ] && \
        echo "/usr/X11R6/lib" >> $root/etc/ld.so.conf
 
-       # add xdm + default config file (yes "" | xf86config ??)
-       
        # symlink
        ln -svf X11R6 $root/usr/X11
+       ln -svf ../X11R6/bin $prefix/bin/X11
+       ln -svf ../X11R6/lib/X11 $prefix/lib/X11
+       ln -svf ../X11R6/include/X11 $prefix/include/X11
                }