Magellan Linux

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

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

revision 3321 by niro, Tue Nov 22 21:11:46 2011 UTC revision 3574 by niro, Mon Jul 9 17:41:43 2012 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 94  INHERITS="${INHERITS} xorg" Line 94  INHERITS="${INHERITS} xorg"
94  XORG_MIRROR="http://xorg.freedesktop.org/archive"  XORG_MIRROR="http://xorg.freedesktop.org/archive"
95    
96  # get the right subdir  # get the right subdir
97  case ${PCATEGORIE} in  case ${PCAT} in
98   app-doc) URISUBDIR="doc" ;;   app-doc) URISUBDIR="doc" ;;
99   media-fonts) URISUBDIR="font" ;;   media-fonts) URISUBDIR="font" ;;
100   x11-apps) URISUBDIR="app" ;;   x11-apps) URISUBDIR="app" ;;
# Line 129  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"   >= virtual/man"
134    
135  SDEPEND="${SDEPEND}  SDEPEND="${SDEPEND}
136   >= dev-util/pkgconfig-0.20   >= dev-util/pkgconfig-0.20
# Line 139  SDEPEND="${SDEPEND} Line 139  SDEPEND="${SDEPEND}
139  # font dependencies  # font dependencies
140  if is_xorg_font  if is_xorg_font
141  then  then
142   SDEPEND="${DEPEND}   DEPEND="${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   SDEPEND="${DEPEND}   DEPEND="${DEPEND}
150   >= media-fonts/encodings-1"   >= media-fonts/encodings-1"
151    
152   XORG_FONT_PKG=yes   XORG_FONT_PKG=yes
# Line 233  xorg_src_compile() Line 233  xorg_src_compile()
233   mmake || die   mmake || die
234  }  }
235    
236    xorg_src_check()
237    {
238     cd ${SRCDIR}
239     mmake -k check || die
240    }
241    
242  xorg_src_install()  xorg_src_install()
243  {  {
244   cd ${SRCDIR}   cd ${SRCDIR}
# Line 258  xorg_preinstall() Line 264  xorg_preinstall()
264  # fi  # fi
265  }  }
266    
267  export_inherits xorg src_prepare src_compile src_install preinstall  export_inherits xorg src_prepare src_compile src_check src_install preinstall

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