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

    branches/magellan-next/include/xorg.sminc revision 6654 by niro, Tue Sep 14 16:46:32 2010 UTC trunk/include/xorg.sminc revision 18713 by niro, Wed Aug 14 09:42:36 2013 UTC
    # Line 1  Line 1 
    1  # $Header: /magellan-cvs/smage/include/xorg.sminc,v 1.18 2008/02/16 11:26:47 niro Exp $  # $Id$
    2  # xorg global smage2 functions  # xorg global smage2 functions
    3    
    4  # must: X11_dir (defaults to /usr in sminc)  # must: X11_dir (defaults to /usr in sminc)
    # 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 87  X11_DIR="/usr" Line 59  X11_DIR="/usr"
    59  INHERITS="${INHERITS} xorg"  INHERITS="${INHERITS} xorg"
    60    
    61  # pkg setup  # pkg setup
    62  SRCFILE="${PNAME}-${PVER}.tar.bz2"  : ${SRCFILE="${PNAME}-${PVER}.tar.bz2"}
    63  SRCDIR="${BUILDDIR}/${PNAME}-${PVER}"  : ${SRCDIR="${BUILDDIR}/${PNAME}-${PVER}"}
    64    
    65  #XORG_MIRROR="http://ftp.x.org/pub"  #XORG_MIRROR="http://ftp.x.org/pub"
    66  XORG_MIRROR="http://xorg.freedesktop.org/archive"  XORG_MIRROR="http://xorg.freedesktop.org/archive"
    67    
    68  # get the right subdir  # get the right subdir
    69  case ${PCATEGORIE} in  case ${PCAT} in
    70   app-doc) URISUBDIR="doc" ;;   app-doc) URISUBDIR="doc" ;;
    71   media-fonts) URISUBDIR="font" ;;   media-fonts) URISUBDIR="font" ;;
    72   x11-apps) URISUBDIR="app" ;;   x11-apps) URISUBDIR="app" ;;
    # Line 102  case ${PCATEGORIE} in Line 74  case ${PCATEGORIE} in
    74   x11-drivers) URISUBDIR="driver" ;;   x11-drivers) URISUBDIR="driver" ;;
    75   x11-libs) URISUBDIR="lib" ;;   x11-libs) URISUBDIR="lib" ;;
    76   x11-misc) case ${PNAME} in   x11-misc) case ${PNAME} in
    77   xbitmaps|xkbdata|xkeyboard-config) URISUBDIR="data" ;;   xbitmaps|xkbdata) URISUBDIR="data" ;;
    78     xkeyboard-config) URISUBDIR="data/xkeyboard-config" ;;
    79   *)  URISUBDIR="util" ;;   *)  URISUBDIR="util" ;;
    80   esac   esac
    81   ;;   ;;
    # Line 112  case ${PCATEGORIE} in Line 85  case ${PCATEGORIE} in
    85  esac  esac
    86    
    87  SRC_URI=(  SRC_URI=(
    88     ${SRC_URI[*]}
    89  # ${XORG_MIRROR}/individual/app/${SRCFILE}  # ${XORG_MIRROR}/individual/app/${SRCFILE}
    90  # ${XORG_MIRROR}/individual/data/${SRCFILE}  # ${XORG_MIRROR}/individual/data/${SRCFILE}
    91  # ${XORG_MIRROR}/individual/doc/${SRCFILE}  # ${XORG_MIRROR}/individual/doc/${SRCFILE}
    # Line 128  SRC_URI=( Line 102  SRC_URI=(
    102    
    103  # add default deps  # add default deps
    104  DEPEND="${DEPEND}  DEPEND="${DEPEND}
    105   >= sys-apps/man-1.6"   >= virtual/man"
    106    
    107  SDEPEND="${SDEPEND}  SDEPEND="${SDEPEND}
    108   >= dev-util/pkgconfig-0.20   >= dev-util/pkgconfig-0.20
    # Line 245  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.6654  
    changed lines
      Added in v.18713