[Lunar-commits] r23208 - in moonbase/trunk: x11/XOrg zbeta
Auke Kok
sofar at lunar-linux.org
Fri Feb 9 20:23:27 CET 2007
Author: sofar
Date: 2007-02-09 20:23:27 +0100 (Fri, 09 Feb 2007)
New Revision: 23208
Removed:
moonbase/trunk/zbeta/XOrg-test/
Modified:
moonbase/trunk/x11/XOrg/BUILD
moonbase/trunk/x11/XOrg/CONFLICTS
moonbase/trunk/x11/XOrg/DEPENDS
moonbase/trunk/x11/XOrg/DETAILS
moonbase/trunk/x11/XOrg/POST_INSTALL
moonbase/trunk/x11/XOrg/PRE_BUILD
Log:
Rename XOrg-test to XOrg, XOrg itself disappears in the merge.
Modified: moonbase/trunk/x11/XOrg/BUILD
===================================================================
--- moonbase/trunk/x11/XOrg/BUILD 2007-02-09 16:32:26 UTC (rev 23207)
+++ moonbase/trunk/x11/XOrg/BUILD 2007-02-09 19:23:27 UTC (rev 23208)
@@ -17,6 +17,9 @@
if module_installed Linux-PAM ; then
echo "#define HasPam YES"
echo "#define HasPamMisc YES"
+ else
+ echo "#define HasPam NO"
+ echo "#define HasPamMisc NO"
fi
if [ -n "$XORG_DRIVERS" ]; then
@@ -52,50 +55,52 @@
cp -rL /usr/src/linux/include/linux/{autoconf.h,config.h} /usr/include/linux &&
invoke_installwatch
fi
-
+
patch_it $SOURCE_CACHE/$SOURCE4 1 &&
+ patch_it $SOURCE_CACHE/$SOURCE5 1 &&
# explicitly exit here now and not later on
make World || exit 1
- prepare_install &&
- cd $SOURCE_DIRECTORY &&
- make install &&
- make install.man &&
- mkdir -p /usr/X11R6/include/GL &&
- rm -f /usr/X11R6/lib/libz.a &&
- rm -f /usr/X11R6/include/zlib.h &&
- rm -f /usr/X11R6/include/zconf.h &&
- rm -f /usr/X11R6/lib/libz.a &&
+ prepare_install &&
+ cd $SOURCE_DIRECTORY &&
+ make install &&
+ make install.man &&
+ mkdir -p /usr/X11R6/include/GL &&
+ rm -f /usr/X11R6/lib/libz.a &&
+ rm -f /usr/X11R6/include/zlib.h &&
+ rm -f /usr/X11R6/include/zconf.h &&
+ rm -f /usr/X11R6/lib/X11/fonts &&
+ rm -f /usr/X11R6/lib/libz.a &&
if [ ! -e /etc/skel/.xsession ]; then
cp $SCRIPT_DIRECTORY/xsession /etc/skel/.xsession
fi &&
- ln -sf /usr/X11R6/bin /usr/bin/X11 &&
- ln -sf /usr/X11R6 /usr/X11 &&
- ln -sf /usr/X11R6/include/X11 /usr/include/X11 &&
- ln -sf /usr/X11R6/lib/X11 /usr/lib/X11 &&
- ln -sf /usr/share/fonts /usr/X11R6/lib/X11/fonts &&
- ln -sf /usr/X11R6/lib/libGLU.so.1.3 /usr/lib/libMesaGLU.so &&
- ln -sf /usr/X11R6/lib/libGL.so.1.2 /usr/X11R6/lib/libMesaGL.so &&
- ln -sf /usr/X11R6/lib/pkgconfig/xft.pc /usr/lib/pkgconfig/xft.pc &&
+ ln -sf /usr/X11R6/bin /usr/bin/X11 &&
+ ln -sf /usr/X11R6 /usr/X11 &&
+ ln -sf /usr/X11R6/include/X11 /usr/include/X11 &&
+ ln -sf /usr/X11R6/lib/X11 /usr/lib/X11 &&
+ ln -sf /usr/share/fonts /usr/X11R6/lib/X11/fonts &&
+ ln -sf /usr/X11R6/lib/libGLU.so.1.3 /usr/lib/libMesaGLU.so &&
+ ln -sf /usr/X11R6/lib/libGL.so.1.2 /usr/X11R6/lib/libMesaGL.so &&
+ ln -sf /usr/X11R6/lib/pkgconfig/xft.pc /usr/lib/pkgconfig/xft.pc &&
- install -g0 -m0 -m0700 $SCRIPT_DIRECTORY/init.d/ICE,X11-unix /etc/init.d/ &&
- ln -sf /etc/init.d/ICE,X11-unix /etc/rc2.d/S20ICE,X11-unix &&
- ln -sf /etc/init.d/ICE,X11-unix /etc/rc3.d/S20ICE,X11-unix &&
- ln -sf /etc/init.d/ICE,X11-unix /etc/rc4.d/S20ICE,X11-unix &&
- ln -sf /etc/init.d/ICE,X11-unix /etc/rc5.d/S20ICE,X11-unix &&
- /etc/init.d/ICE,X11-unix start &&
+ install -g0 -m0 -m0700 $SCRIPT_DIRECTORY/init.d/ICE,X11-unix /etc/init.d/ &&
+ ln -sf /etc/init.d/ICE,X11-unix /etc/rc2.d/S20ICE,X11-unix &&
+ ln -sf /etc/init.d/ICE,X11-unix /etc/rc3.d/S20ICE,X11-unix &&
+ ln -sf /etc/init.d/ICE,X11-unix /etc/rc4.d/S20ICE,X11-unix &&
+ ln -sf /etc/init.d/ICE,X11-unix /etc/rc5.d/S20ICE,X11-unix &&
+ /etc/init.d/ICE,X11-unix start &&
if [ -e /etc/X11/xinit/xinitrc.orig ]; then
cp /etc/X11/xinit/xinitrc.orig /etc/X11/xinit/xinitrc
message "${MESSAGE_COLOR}Your master xinitrc file has been restored from /etc/X11/xinit/xinitrc.orig${DEFAULT_COLOR}"
- fi &&
+ fi &&
# cosmetic but needed adjustments:
if ! grep -q 'XTerm*loginShell:' /etc/X11/app-defaults/XTerm ; then
- echo 'XTerm*loginShell: true' >> /etc/X11/app-defaults/XTerm &&
+ echo 'XTerm*loginShell: true' >> /etc/X11/app-defaults/XTerm &&
echo 'XTerm*loginShell: true' >> /etc/X11/app-defaults/XTerm-color
fi
Modified: moonbase/trunk/x11/XOrg/CONFLICTS
===================================================================
--- moonbase/trunk/x11/XOrg/CONFLICTS 2007-02-09 16:32:26 UTC (rev 23207)
+++ moonbase/trunk/x11/XOrg/CONFLICTS 2007-02-09 19:23:27 UTC (rev 23208)
@@ -1,4 +1 @@
-conflicts xfree86 &&
-conflicts xfree86-beta &&
-conflicts XOrg-test &&
conflicts XOrg7
Modified: moonbase/trunk/x11/XOrg/DEPENDS
===================================================================
--- moonbase/trunk/x11/XOrg/DEPENDS 2007-02-09 16:32:26 UTC (rev 23207)
+++ moonbase/trunk/x11/XOrg/DEPENDS 2007-02-09 19:23:27 UTC (rev 23208)
@@ -1,6 +1,7 @@
-depends perl &&
-depends libpng &&
-depends libxml2 &&
+depends perl &&
+depends libpng &&
+depends libxml2 &&
+depends freetype2 &&
depends XOrg-fonts-base &&
optional_depends "XOrg-fonts-extra" "" "" "for even more fonts" &&
Modified: moonbase/trunk/x11/XOrg/DETAILS
===================================================================
--- moonbase/trunk/x11/XOrg/DETAILS 2007-02-09 16:32:26 UTC (rev 23207)
+++ moonbase/trunk/x11/XOrg/DETAILS 2007-02-09 19:23:27 UTC (rev 23208)
@@ -1,24 +1,30 @@
MODULE=XOrg
- VERSION=6.8.2
+ VERSION=6.9.0
SOURCE=X11R${VERSION}-src1.tar.gz
SOURCE2=X11R${VERSION}-src2.tar.gz
SOURCE3=X11R${VERSION}-src3.tar.gz
- SOURCE4=$MODULE-$VERSION-gcc4.patch.bz2
+ SOURCE4=XOrg-xrender-mitri.patch.bz2
+ SOURCE5=XOrg-luit_race-1.patch.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/xc
- SOURCE_URL[0]=ftp://x.mirrors.skynet.be/pub/x.org/pub/X11R${VERSION}/src/
- SOURCE_URL[1]=ftp://ftp.freedesktop.org/pub/xorg/X11R${VERSION}/src/
- SOURCE2_URL[0]=ftp://x.mirrors.skynet.be/pub/x.org/pub/X11R${VERSION}/src/
- SOURCE2_URL[1]=ftp://ftp.freedesktop.org/pub/xorg/X11R${VERSION}/src/
- SOURCE3_URL[0]=ftp://x.mirrors.skynet.be/pub/x.org/pub/X11R${VERSION}/src/
- SOURCE3_URL[1]=ftp://ftp.freedesktop.org/pub/xorg/X11R${VERSION}/src/
+ SOURCE_URL[0]=http://xorg.freedesktop.org/X11R${VERSION}/src/
+ SOURCE_URL[1]=http://ftp.skynet.be/pub/ftp.x.org/pub/X11R${VERSION}/src/
+ SOURCE_URL[2]=http://www.mirrormonster.com/ftp.x.org/pub/X11R${VERSION}/src/
+ SOURCE2_URL[0]=http://xorg.freedesktop.org/X11R${VERSION}/src/
+ SOURCE2_URL[1]=http://ftp.skynet.be/pub/ftp.x.org/pub/X11R${VERSION}/src/
+ SOURCE2_URL[2]=http://www.mirrormonster.com/ftp.x.org/pub/X11R${VERSION}/src/
+ SOURCE3_URL[0]=http://xorg.freedesktop.org/X11R${VERSION}/src/
+ SOURCE3_URL[1]=http://ftp.skynet.be/pub/ftp.x.org/pub/X11R${VERSION}/src/
+ SOURCE3_URL[2]=http://www.mirrormonster.com/ftp.x.org/pub/X11R${VERSION}/src/
SOURCE4_URL[0]=$PATCH_URL
- SOURCE_VFY=sha1:23c60680274062a1db17f646a8388149309dc45c
- SOURCE2_VFY=sha1:af6190fd2619cc60e70c0a8c00dee6826e1fb726
- SOURCE3_VFY=sha1:de1569856b8023c58fc92bd0b3c8406214451fce
- SOURCE4_VFY=sha1:cace4f15fcbbdc26c68e719af9f5e6feae4716e5
+ SOURCE5_URL[0]=$PATCH_URL
+ SOURCE_VFY=sha1:a6c077ed8fdeee5fe1956a427c4cb0bc266e1bef
+ SOURCE2_VFY=sha1:9aa8f222c141c735656305945da3cad3b7f33101
+ SOURCE3_VFY=sha1:0c8a0d6f9471ec022e12e2688d1991c985a1efb2
+ SOURCE4_VFY=sha1:fb64d5375e8ac206e2401a6399be2871e8ad1d92
+ SOURCE5_VFY=sha1:31ae5b964da97f344ea71b2fc100911a6d78e26d
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20040325
- UPDATED=20050411
+ UPDATED=20060521
SHORT="Open Source Public Implementation of X11"
PSAFE=no
Modified: moonbase/trunk/x11/XOrg/POST_INSTALL
===================================================================
--- moonbase/trunk/x11/XOrg/POST_INSTALL 2007-02-09 16:32:26 UTC (rev 23207)
+++ moonbase/trunk/x11/XOrg/POST_INSTALL 2007-02-09 19:23:27 UTC (rev 23208)
@@ -16,7 +16,7 @@
ldconfig
fi
-message "${MESSAGE_COLOR}${BOLD}Some things are different from XFree86:'${DEFAULT_COLOR}"
+message "${MESSAGE_COLOR}${BOLD}Some things are different from XFree86:${DEFAULT_COLOR}"
message "${MESSAGE_COLOR} - The console config utility 'xf86config' is now 'xorgconfig'${DEFAULT_COLOR}"
message "${MESSAGE_COLOR} - The graphical config utility 'xf86cfg' is now 'xorgcfg'${DEFAULT_COLOR}"
message "${MESSAGE_COLOR} - The configuration file '/etc/X11/XF86Config' is now '/etc/X11/xorg.conf'${DEFAULT_COLOR}"
Modified: moonbase/trunk/x11/XOrg/PRE_BUILD
===================================================================
--- moonbase/trunk/x11/XOrg/PRE_BUILD 2007-02-09 16:32:26 UTC (rev 23207)
+++ moonbase/trunk/x11/XOrg/PRE_BUILD 2007-02-09 19:23:27 UTC (rev 23208)
@@ -1,5 +1,5 @@
-validate_source_dir $SOURCE_DIRECTORY &&
-mk_source_dir $SOURCE_DIRECTORY &&
-unpack $SOURCE
-unpack $SOURCE2 &&
-unpack $SOURCE3
+validate_source_dir $SOURCE_DIRECTORY &&
+mk_source_dir $SOURCE_DIRECTORY &&
+unpack $SOURCE &&
+unpack $SOURCE2 &&
+unpack $SOURCE3
More information about the Lunar-commits
mailing list