Magellan Linux

  • Back to homepage
    • /[smage]/branches/R11-unstable/include/xorg.sminc

    Diff of /branches/R11-unstable/include/xorg.sminc

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 9880 by niro, Sat Jan 14 01:48:34 2012 UTC revision 18713 by niro, Wed Aug 14 09:42:36 2013 UTC
    # Line 52  is_xorg_driver() Line 52  is_xorg_driver()
    52   return 1   return 1
    53  }  }
    54    
     # check if old <=Xorg-6.9 is installed; aborts installation  
     is_old_xorg_installed()  
     {  
      local RED="\033[1;6m\033[31m"  
      local DEF="\033[0m"  
       
      if [ -e /usr/X11R6 ] && [[ $(readlink /usr/X11R6) != ../usr ]]  
      then  
      echo  
      echo -e ${RED}" !!! Remove all old <=xorg-6.9 installations first."${DEF}  
      echo -e ${RED}" !!! You also need to check all packages which are installed to /usr/X11R6"${DEF}  
      echo  
       
      # print a pkg list if magequery supports this  
      if [[ -n $(/sbin/magequery -h | grep -- -f) ]]  
      then  
      echo "Please check following packages:"  
      /sbin/magequery -f /usr/X11R6 | while read pkg  
      do  
      echo -e " ${RED}*${DEF} ${pkg}"  
      done  
      echo  
      fi  
       
      die "/usr/X11R6 directory exists ..."  
      fi  
     }  
       
    55  # default vars  # default vars
    56  X11_DIR="/usr"  X11_DIR="/usr"
    57    
    # Line 247  xorg_src_install() Line 219  xorg_src_install()
    219    
    220  xorg_preinstall()  xorg_preinstall()
    221  {  {
      # check for old xorg installations  
      is_old_xorg_installed  
       
    222  # run this in postinstall to cover --src-install builds  # run this in postinstall to cover --src-install builds
    223  # ( the is now package-dir at this moment, cause its not already builded :)  # ( the is now package-dir at this moment, cause its not already builded :)
    224  # if [[ -n ${XORG_FONT_PKG} ]]  # if [[ -n ${XORG_FONT_PKG} ]]
    225  # then  # then
    226  # xorg_discover_font_dirs  # xorg_discover_font_dirs
    227  # fi  # fi
    228     return 0
    229  }  }
    230    
    231  export_inherits xorg src_prepare src_compile src_install preinstall  export_inherits xorg src_prepare src_compile src_install preinstall
    Legend:
    Removed from v.9880  
    changed lines
      Added in v.18713