Magellan Linux

Diff of /smage/trunk/include/xorg.sminc

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

smage/branches/alx-0_6_0/include/xorg.sminc revision 1665 by niro, Sat Jan 22 23:35:03 2011 UTC smage/trunk/include/xorg.sminc revision 3321 by niro, Tue Nov 22 21:11:46 2011 UTC
# Line 87  X11_DIR="/usr" Line 87  X11_DIR="/usr"
87  INHERITS="${INHERITS} xorg"  INHERITS="${INHERITS} xorg"
88    
89  # pkg setup  # pkg setup
90  SRCFILE="${PNAME}-${PVER}.tar.bz2"  : ${SRCFILE="${PNAME}-${PVER}.tar.bz2"}
91  SRCDIR="${BUILDDIR}/${PNAME}-${PVER}"  : ${SRCDIR="${BUILDDIR}/${PNAME}-${PVER}"}
92    
93  #XORG_MIRROR="http://ftp.x.org/pub"  #XORG_MIRROR="http://ftp.x.org/pub"
94  XORG_MIRROR="http://xorg.freedesktop.org/archive"  XORG_MIRROR="http://xorg.freedesktop.org/archive"
# Line 102  case ${PCATEGORIE} in Line 102  case ${PCATEGORIE} in
102   x11-drivers) URISUBDIR="driver" ;;   x11-drivers) URISUBDIR="driver" ;;
103   x11-libs) URISUBDIR="lib" ;;   x11-libs) URISUBDIR="lib" ;;
104   x11-misc) case ${PNAME} in   x11-misc) case ${PNAME} in
105   xbitmaps|xkbdata|xkeyboard-config) URISUBDIR="data" ;;   xbitmaps|xkbdata) URISUBDIR="data" ;;
106     xkeyboard-config) URISUBDIR="data/xkeyboard-config" ;;
107   *)  URISUBDIR="util" ;;   *)  URISUBDIR="util" ;;
108   esac   esac
109   ;;   ;;
# Line 112  case ${PCATEGORIE} in Line 113  case ${PCATEGORIE} in
113  esac  esac
114    
115  SRC_URI=(  SRC_URI=(
116     ${SRC_URI[*]}
117  # ${XORG_MIRROR}/individual/app/${SRCFILE}  # ${XORG_MIRROR}/individual/app/${SRCFILE}
118  # ${XORG_MIRROR}/individual/data/${SRCFILE}  # ${XORG_MIRROR}/individual/data/${SRCFILE}
119  # ${XORG_MIRROR}/individual/doc/${SRCFILE}  # ${XORG_MIRROR}/individual/doc/${SRCFILE}
# Line 127  SRC_URI=( Line 129  SRC_URI=(
129  )  )
130    
131  # add default deps  # add default deps
132  DEPEND="${DEPEND}  #DEPEND="${DEPEND}
133   >= sys-apps/man-1.6"  # >= sys-apps/man-1.6"
134    
135  SDEPEND="${SDEPEND}  SDEPEND="${SDEPEND}
136   >= dev-util/pkgconfig-0.20   >= dev-util/pkgconfig-0.20
# Line 137  SDEPEND="${SDEPEND} Line 139  SDEPEND="${SDEPEND}
139  # font dependencies  # font dependencies
140  if is_xorg_font  if is_xorg_font
141  then  then
142   DEPEND="${DEPEND}   SDEPEND="${DEPEND}
143   >= x11-apps/mkfontscale-1   >= x11-apps/mkfontscale-1
144   >= x11-apps/mkfontdir-1   >= x11-apps/mkfontdir-1
145   >= media-fonts/font-alias-1"   >= media-fonts/font-alias-1"
146    
147   # encodings are run-time needed to rebuild the font.dirs files !!   # encodings are run-time needed to rebuild the font.dirs files !!
148   # so don't use SDEPEND but DEPEND here!   # so don't use SDEPEND but DEPEND here!
149   DEPEND="${DEPEND}   SDEPEND="${DEPEND}
150   >= media-fonts/encodings-1"   >= media-fonts/encodings-1"
151    
152   XORG_FONT_PKG=yes   XORG_FONT_PKG=yes

Legend:
Removed from v.1665  
changed lines
  Added in v.3321