--- trunk/include/xorg.sminc 2012/01/14 01:48:34 9880 +++ trunk/include/xorg.sminc 2013/08/14 09:42:36 18713 @@ -52,34 +52,6 @@ return 1 } -# 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 -} - # default vars X11_DIR="/usr" @@ -247,15 +219,13 @@ xorg_preinstall() { - # check for old xorg installations - is_old_xorg_installed - # run this in postinstall to cover --src-install builds # ( the is now package-dir at this moment, cause its not already builded :) # if [[ -n ${XORG_FONT_PKG} ]] # then # xorg_discover_font_dirs # fi + return 0 } export_inherits xorg src_prepare src_compile src_install preinstall