X-Git-Url: https://hackdaworld.org/gitweb/?a=blobdiff_plain;f=packages%2Fx11%2Fxorg%2Fxorg;h=9aa60250f1af111babf0ea2195b2afe5e40530f7;hb=41826666c2867e277bf8baca6991998c9976d187;hp=459d1c446449dea6d31e6df26d044198257a50d3;hpb=ca7ab55a9c818a03fe09b23f1c1c29af4679b249;p=hdw-linux%2Fhdw-linux.git

diff --git a/packages/x11/xorg/xorg b/packages/x11/xorg/xorg
index 459d1c4..9aa6025 100644
--- a/packages/x11/xorg/xorg
+++ b/packages/x11/xorg/xorg
@@ -2,16 +2,16 @@
 
 # author: hackbard@hackdaworld.dyndns.org
 
-# [V] 6.8.1
+# [V] 6.9.0
 
 # [S] 3-3
-# [D] X11R6.8.1-src1.tar.gz http://ftp.gwdg.de/pub/x11/x.org/pub/X11R6.8.1/src/
-# [D] X11R6.8.1-src2.tar.gz http://ftp.gwdg.de/pub/x11/x.org/pub/X11R6.8.1/src/
-# [D] X11R6.8.1-src3.tar.gz http://ftp.gwdg.de/pub/x11/x.org/pub/X11R6.8.1/src/
-# [D] X11R6.8.1-src4.tar.gz http://ftp.gwdg.de/pub/x11/x.org/pub/X11R6.8.1/src/
-# [D] X11R6.8.1-src5.tar.gz http://ftp.gwdg.de/pub/x11/x.org/pub/X11R6.8.1/src/
-# [D] X11R6.8.1-src6.tar.gz http://ftp.gwdg.de/pub/x11/x.org/pub/X11R6.8.1/src/
-# [D] X11R6.8.1-src7.tar.gz http://ftp.gwdg.de/pub/x11/x.org/pub/X11R6.8.1/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()	{
@@ -37,17 +37,31 @@ custmain()	{
 		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
 		}