[Lunar-commits] <moonbase> XOrg6: move it to crater. it's obsolete for a long time.
Florin Braescu
florin at lunar-linux.org
Sun Feb 7 16:50:01 CET 2010
commit 8cb5a7489961a1629856e4d7432bd23af1751c5b
Author: Florin Braescu <florin at lunar-linux.org>
Date: Sun Feb 7 17:50:01 2010 +0200
XOrg6: move it to crater. it's obsolete for a long time.
---
x11/XOrg-fonts-base/BUILD | 13 -----
x11/XOrg-fonts-base/CONFLICTS | 1 -
x11/XOrg-fonts-base/DEPENDS | 1 -
x11/XOrg-fonts-base/DETAILS | 11 ----
x11/XOrg-fonts-extra/BUILD | 13 -----
x11/XOrg-fonts-extra/CONFLICTS | 1 -
x11/XOrg-fonts-extra/DEPENDS | 1 -
x11/XOrg-fonts-extra/DETAILS | 11 ----
x11/XOrg6/BUILD | 107 ----------------------------------------
x11/XOrg6/CONFIGURE | 30 -----------
x11/XOrg6/CONFLICTS | 1 -
x11/XOrg6/DEPENDS | 9 ---
x11/XOrg6/DETAILS | 35 -------------
x11/XOrg6/POST_INSTALL | 22 --------
x11/XOrg6/POST_REMOVE | 9 ---
x11/XOrg6/PRE_BUILD | 5 --
x11/XOrg6/drivers | 28 ----------
x11/XOrg6/init.d/ICE,X11-unix | 11 ----
x11/XOrg6/pam.d/xdm | 7 ---
x11/XOrg6/pam.d/xserver | 7 ---
x11/XOrg6/xsession | 28 ----------
21 files changed, 0 insertions(+), 351 deletions(-)
diff --git a/x11/XOrg-fonts-base/BUILD b/x11/XOrg-fonts-base/BUILD
deleted file mode 100644
index e10c887..0000000
--- a/x11/XOrg-fonts-base/BUILD
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-
- prepare_install &&
- mkdir -p /usr/share/fonts &&
- for fonts in $SOURCE_DIRECTORY/*; do
- cp -rf $fonts /usr/share/fonts;
- done;
-
- # Rerun fc-cache so the new fonts are recognized
- message "Running fc-cache ..."
- /usr/bin/fc-cache -f
-
-) > $C_FIFO 2>&1
diff --git a/x11/XOrg-fonts-base/CONFLICTS b/x11/XOrg-fonts-base/CONFLICTS
deleted file mode 100644
index 593502e..0000000
--- a/x11/XOrg-fonts-base/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts XOrg7
diff --git a/x11/XOrg-fonts-base/DEPENDS b/x11/XOrg-fonts-base/DEPENDS
deleted file mode 100644
index e53c980..0000000
--- a/x11/XOrg-fonts-base/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends fontconfig
diff --git a/x11/XOrg-fonts-base/DETAILS b/x11/XOrg-fonts-base/DETAILS
deleted file mode 100644
index 0add1c8..0000000
--- a/x11/XOrg-fonts-base/DETAILS
+++ /dev/null
@@ -1,11 +0,0 @@
- MODULE=XOrg-fonts-base
- VERSION=0.1
- SOURCE=$MODULE-$VERSION.tar.bz2
- SOURCE_URL=http://download.lunar-linux.org/lunar/mirrors/
- SOURCE_VFY=sha1:f357db3170bccc94e2b692b1058f7fbf5d683b80
- ENTERED=20041122
- UPDATED=20041122
- SHORT="Basic fonts for the XOrg X11 implementation"
-cat << EOF
-Basic fonts for the XOrg X11 implementation
-EOF
diff --git a/x11/XOrg-fonts-extra/BUILD b/x11/XOrg-fonts-extra/BUILD
deleted file mode 100644
index e10c887..0000000
--- a/x11/XOrg-fonts-extra/BUILD
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-
- prepare_install &&
- mkdir -p /usr/share/fonts &&
- for fonts in $SOURCE_DIRECTORY/*; do
- cp -rf $fonts /usr/share/fonts;
- done;
-
- # Rerun fc-cache so the new fonts are recognized
- message "Running fc-cache ..."
- /usr/bin/fc-cache -f
-
-) > $C_FIFO 2>&1
diff --git a/x11/XOrg-fonts-extra/CONFLICTS b/x11/XOrg-fonts-extra/CONFLICTS
deleted file mode 100644
index bd5e2f2..0000000
--- a/x11/XOrg-fonts-extra/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts XOrg7
diff --git a/x11/XOrg-fonts-extra/DEPENDS b/x11/XOrg-fonts-extra/DEPENDS
deleted file mode 100644
index e53c980..0000000
--- a/x11/XOrg-fonts-extra/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends fontconfig
diff --git a/x11/XOrg-fonts-extra/DETAILS b/x11/XOrg-fonts-extra/DETAILS
deleted file mode 100644
index 5e829e7..0000000
--- a/x11/XOrg-fonts-extra/DETAILS
+++ /dev/null
@@ -1,11 +0,0 @@
- MODULE=XOrg-fonts-extra
- VERSION=0.1
- SOURCE=$MODULE-$VERSION.tar.bz2
- SOURCE_URL=http://download.lunar-linux.org/lunar/mirrors/
- SOURCE_VFY=sha1:283186343ad02df6243def63d8255e4711debc7d
- ENTERED=20041122
- UPDATED=20041122
- SHORT="Extra fonts for the XOrg X11 implementation"
-cat << EOF
-Extra fonts for the XOrg X11 implementation
-EOF
diff --git a/x11/XOrg6/BUILD b/x11/XOrg6/BUILD
deleted file mode 100644
index 31c19d0..0000000
--- a/x11/XOrg6/BUILD
+++ /dev/null
@@ -1,107 +0,0 @@
-(
-
- if [ -e /etc/X11/xinit/xinitrc ]; then
- cp /etc/X11/xinit/xinitrc /etc/X11/xinit/xinitrc.orig
- message "Your master xinitrc file has been backed up as /etc/X11/xinit/xinitrc.orig"
- fi
-
- bad_flags '-funroll-loops' '-ffast-math'
-
- # Here we go for our host.def
- (
- echo "#define InstallXdmConfig YES"
- echo "#define InstallXinitConfig YES"
- echo "#define InstallXserverSetUID YES"
- echo "#define BuildServersOnly NO"
-
- 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
- echo "#define XF86CardDrivers $XORG_DRIVERS"
- fi
-
- echo "#define DefaultCCOptions $CFLAGS"
- echo "#define LibraryCDebugFlags $CFLAGS"
- echo "#define DefaultCDebugFlags $CFLAGS"
- echo "#define OptimizedCDebugFlags $CFLAGS"
- echo "#define XVendorString \"Lunar-Linux.org (xorg.freedesktop.org $VERSION)\""
- echo "#define HasZlib YES"
- echo "#define HasFreetype2 YES"
- echo "#define ForceNormalLib YES"
- echo "#define HasExpat YES"
- echo "#define UseExpat YES"
- echo "#define HasLibpng YES"
- echo "#define BuildDocs NO"
- echo "#define HasLibxml2 YES"
- echo "#define InstallFontconfigLibrary NO"
- echo "#define SharedLibXft YES"
- echo "#define PreferXdmcpIPv6 YES"
- echo "#define BuildFontServer NO"
- echo "#define BuildFonts NO"
- echo "#define MakeLocalFontDir NO"
- echo "#define InstallFSConfig NO"
- ) >> config/cf/host.def
-
- if grep -q "Compilation aborted" /usr/include/linux/config.h ; then
- # This must happen or it will cause the module to break
- # claiming "Kernel only header included in userspace"
- devoke_installwatch &&
- 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/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 &&
-
- 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 &&
-
- # 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-color
- fi
-
-) > $C_FIFO 2>&1
diff --git a/x11/XOrg6/CONFIGURE b/x11/XOrg6/CONFIGURE
deleted file mode 100644
index 29e73ba..0000000
--- a/x11/XOrg6/CONFIGURE
+++ /dev/null
@@ -1,30 +0,0 @@
-# only lin -r will trigger the driver chooser
-
-if [ -n "$RECONFIGURE" ] || query "Select specific video drivers to build?" n ; then
- ALL_XORG_DRIVERS=$(cat $SCRIPT_DIRECTORY/drivers | cut -d: -f1)
- XORG_DRIVERS=$(get_module_config XORG_DRIVERS)
- if [ -z "$XORG_DRIVERS" ]; then
- XORG_DRIVERS=$(grep ':on$' $SCRIPT_DIRECTORY/drivers | cut -d: -f1)
- fi
-
- # if it's empty we just enable all
- list_xorg_drivers()
- {
- (
- unset IFS
- for DRIVER in $ALL_XORG_DRIVERS; do
- echo $DRIVER
- echo $(grep ^$DRIVER: $SCRIPT_DIRECTORY/drivers | cut -d: -f2)
- if echo $XORG_DRIVERS | grep -qw $DRIVER; then
- echo on
- else
- echo off
- fi
- done
- )
- }
-
- IFS="$TAB_ENTER_IFS" XORG_DRIVERS=`dialog --backtitle "XOrg video driver selection" --stdout --separate-output --checklist "Key: [X] = on, [ ] = off" 0 0 0 $(list_xorg_drivers)`
- # hack to strip newlines
- set_module_config XORG_DRIVERS "$(echo $XORG_DRIVERS)"
-fi
diff --git a/x11/XOrg6/CONFLICTS b/x11/XOrg6/CONFLICTS
deleted file mode 100644
index bd5e2f2..0000000
--- a/x11/XOrg6/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts XOrg7
diff --git a/x11/XOrg6/DEPENDS b/x11/XOrg6/DEPENDS
deleted file mode 100644
index e893fa4..0000000
--- a/x11/XOrg6/DEPENDS
+++ /dev/null
@@ -1,9 +0,0 @@
-depends perl &&
-depends libpng &&
-depends libxml2 &&
-depends freetype2 &&
-depends XOrg-fonts-base &&
-
-optional_depends "XOrg-fonts-extra" "" "" "for even more fonts" &&
-optional_depends "Linux-PAM" "" "" "for Linux-PAM Support" &&
-optional_depends "tcl" "" "" "for tcl support"
diff --git a/x11/XOrg6/DETAILS b/x11/XOrg6/DETAILS
deleted file mode 100644
index 979fa93..0000000
--- a/x11/XOrg6/DETAILS
+++ /dev/null
@@ -1,35 +0,0 @@
- MODULE=XOrg6
- MOD=XOrg
- VERSION=6.9.0
- SOURCE=X11R${VERSION}-src1.tar.gz
- SOURCE2=X11R${VERSION}-src2.tar.gz
- SOURCE3=X11R${VERSION}-src3.tar.gz
- SOURCE4=XOrg-xrender-mitri.patch.bz2
- SOURCE5=XOrg-luit_race-1.patch.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/xc
- 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
- 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=20060521
- SHORT="Open Source Public Implementation of X11"
- PSAFE=no
-
-cat << EOF
-The XOrg Foundation, (a.k.a. X.org) has changed to an Open Source model
-to maintain the official Public Implementation of X11.
-EOF
diff --git a/x11/XOrg6/POST_INSTALL b/x11/XOrg6/POST_INSTALL
deleted file mode 100644
index ba1bf50..0000000
--- a/x11/XOrg6/POST_INSTALL
+++ /dev/null
@@ -1,22 +0,0 @@
-if module_installed NVIDIA; then lin -c NVIDIA; fi
-if module_installed fontconfig; then lin -c fontconfig; fi
-if module_installed glut; then lin -c glut; fi
-if module_installed openMotif; then lin -c openMotif; fi
-
-if ! grep -q '. /etc/profile' /etc/X11/xdm/Xsession; then
- sedit 2s:#:.\ /etc/profile: /etc/X11/xdm/Xsession
-fi
-
-if ! [ -d /usr/lib/pkgconfig ]; then
- mkdir -p /usr/lib/pkgconfig
-fi
-
-if ! grep -q /usr/X11R6/lib /etc/ld.so.conf ; then
- echo "/usr/X11R6/lib" >> /etc/ld.so.conf
- ldconfig
-fi
-
-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}"
diff --git a/x11/XOrg6/POST_REMOVE b/x11/XOrg6/POST_REMOVE
deleted file mode 100644
index bbd1adf..0000000
--- a/x11/XOrg6/POST_REMOVE
+++ /dev/null
@@ -1,9 +0,0 @@
-# Remove xserver
-if module_installed xserver; then lrm xserver; fi
-
-# Remove broken symlinks
-rm -Rf /usr/lib/pkgconfig/fontconfig.pc
-rm -Rf /usr/lib/pkgconfig/xft.pc
-
-# Reinstall fontconfig since its broken now
-if module_installed fontconfig; then lin -c fontconfig; fi
diff --git a/x11/XOrg6/PRE_BUILD b/x11/XOrg6/PRE_BUILD
deleted file mode 100644
index 96d53cc..0000000
--- a/x11/XOrg6/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-validate_source_dir $SOURCE_DIRECTORY &&
-mk_source_dir $SOURCE_DIRECTORY &&
-unpack $SOURCE &&
-unpack $SOURCE2 &&
-unpack $SOURCE3
diff --git a/x11/XOrg6/drivers b/x11/XOrg6/drivers
deleted file mode 100644
index e8a4df3..0000000
--- a/x11/XOrg6/drivers
+++ /dev/null
@@ -1,28 +0,0 @@
-vga:Generic VGA:on
-vesa:Generic VESA:on
-fbdev:Generic FrameBuffer:on
-v4l:Video for linux devices support:on
-ati:Almost any ATI based card:on
-i810:Intel(R) i810/IGP:on
-mga:Matrox based cards:on
-nv:NVidia (Non-accelerated):on
-vmware:VMWare virtual video cards:on
-apm:Alliance Promotion video cards:off
-ark:Ark Logic devices:off
-chips:Chips and Technologies video processors:off
-cirrus:Cirrus Logic based cards:off
-cyrix:Cyrix Logic MediaGX cards:off
-GlideDriver:Glide capable video boards (3Dfx Voodoo mostly):off
-glint:3Dlabs Permedia based cards:off
-i128:Imagine 128 based cards:off
-i740:Intel(R) 740 based cards:off
-neomagic:Neomagic based integrated cards:off
-rendition:Micron Verite based cards (V1000,V2x00):off
-s3virge:S3 ViRGE and Trio3D(/2x) based cards:off
-savage:S3 Savage based cards:off
-siliconmotion:Silicon Motion based video cards:off
-sis:SiS based cards:off
-tdfx:3Dfx based video cards:off
-tga:TGA1(!) based cards (DEC 21030):off
-trident:Trident based video cards:off
-tseng:Tseng Labs cased cards:off
diff --git a/x11/XOrg6/init.d/ICE,X11-unix b/x11/XOrg6/init.d/ICE,X11-unix
deleted file mode 100755
index b41ab6b..0000000
--- a/x11/XOrg6/init.d/ICE,X11-unix
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-#
-# ICE,X11-unix - create the X11 tmp directories
-#
-
-case $1 in
- start)
- /usr/bin/install -d /tmp/.{ICE,X11}-unix -m1777 -g0 -o0
- ;;
-esac
-
diff --git a/x11/XOrg6/pam.d/xdm b/x11/XOrg6/pam.d/xdm
deleted file mode 100644
index 1e16b2c..0000000
--- a/x11/XOrg6/pam.d/xdm
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# The PAM configuration file for the `xdm' service
-#
-auth required pam_unix.so
-account required pam_unix.so
-password required pam_unix.so shadow md5 nullok
-session required pam_unix.so
diff --git a/x11/XOrg6/pam.d/xserver b/x11/XOrg6/pam.d/xserver
deleted file mode 100644
index ab5b999..0000000
--- a/x11/XOrg6/pam.d/xserver
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# The PAM configuration file for xserver
-#
-
-auth required pam_permit.so
-account required pam_permit.so
-session required pam_permit.so
diff --git a/x11/XOrg6/xsession b/x11/XOrg6/xsession
deleted file mode 100755
index 8ca93b1..0000000
--- a/x11/XOrg6/xsession
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-if [ -e /usr/bin/xscreensaver ]; then
- xscreensaver -no-splash &
-fi
-
-if [ -x /usr/bin/enlightenment ]
- then exec enlightenment
-
- elif [ -x $KDEDIR/bin/startkde ]
- then exec $KDEDIR/bin/startkde
-
- elif [ -x /usr/bin/wmaker ]
- then [ -d ~/GNUstep ] || wmaker.inst
- exec wmaker
-
- elif [ -x /usr/bin/icewm ]
- then exec icewm
-
- elif [ -x /usr/bin/blackbox ]
- then exec blackbox
-
- elif [ -x /usr/bin/fvwm2 ]
- then exec fvwm2
-
- elif [ -x /usr/bin/gnome-session ]
- then exec gnome-session
-fi
More information about the Lunar-commits
mailing list