--- branches/magellan-next/core/mesa/mesa-7.10.2-r1.smage2	2011/05/30 13:32:28	7721
+++ branches/magellan-next/core/mesa/mesa-7.10.2-r1.smage2	2011/05/30 14:11:32	7722
@@ -45,9 +45,12 @@
 EMUL_LINUX_32=true
 sminclude xorg mtools multilib
 
+# not the same version anymore
+MESA_PROGS_PVER="8.0.1"
+
 # must be set *after* the include of xorg!
 SRCFILE="MesaLib-${PVER/_/-}.tar.bz2"
-PROGS_SRCFILE="MesaDemos-${PVER/_/-}.tar.bz2"
+MESA_PROGS_SRCFILE="mesa-demos-${PROGS_PVER}.tar.bz2"
 # libs + progs have the same SRCDIR
 SRCDIR="${BUILDDIR}/Mesa-${PVER/_/-}"
 
@@ -71,11 +74,11 @@
 
 SRC_URI=(
 	ftp://ftp.freedesktop.org/pub/mesa/${PVER}/${SRCFILE}
-	ftp://ftp.freedesktop.org/pub/mesa/${PVER}/${PROGS_SRCFILE}
+	ftp://ftp.freedesktop.org/pub/mesa/demos/${MESA_PROGS_PVER}/${MESA_PROGS_SRCFILE}
 	sourceforge://mesa3d/${SRCFILE}
-	sourceforge://mesa3d/${PROGS_SRCFILE}
+	sourceforge://mesa3d/${MESA_PROGS_SRCFILE}
 	mirror://${PNAME}/${SRCFILE}
-	mirror://${PNAME}/${PROGS_SRCFILE}
+	mirror://${PNAME}/${MESA_PROGS_SRCFILE}
 	mirror://${PNAME}/libGLU.la
 	mirror://${PNAME}/libGL.la
 )
@@ -100,6 +103,7 @@
 	DESCRIPTION="Mesa3D OpenGL graphics applications."
 	PCATEGORIE="x11-apps"
 
+	PVER="${MESA_PROGS_PVER}"
 	DEPEND="${MESA_PROGS_DEPEND}"
 
 	unset postinstall
@@ -198,7 +202,7 @@
 src_prepare()
 {
 	munpack ${SRCFILE} || die
-	all-abis "oldmunpack ${PROGS_SRCFILE} && cp -R ${SRCDIR}/* ${SRCDIR}-$(mabi)/" || die
+	all-abis "oldmunpack ${MESA_PROGS_SRCFILE} && cp -R ${SRCDIR}/* ${SRCDIR}-$(mabi)/" || die
 
 	# no debug code in the drives (gentoo)
 	all-abis 'find src/mesa/drivers/dri -name *.[hc] -exec egrep -l "\#define\W+DO_DEBUG\W+1" {} \; | xargs sed -i -re "s/\#define\W+DO_DEBUG\W+1/\#define DO_DEBUG 0/" ;'