3 files changed, 31 insertions, 27 deletions
diff --git a/development/mono/doinst.sh b/development/mono/doinst.sh
index 0b0ed88ec6..a272d5aea8 100644
--- a/development/mono/doinst.sh
+++ b/development/mono/doinst.sh
@@ -11,14 +11,16 @@ config() {
   # Otherwise, we leave the .new copy for the admin to consider...
 }
 
+config etc/mono/browscap.ini.new
 config etc/mono/config.new
 config etc/mono/mconfig/config.xml.new
-config etc/mono/1.0/machine.config.new
-config etc/mono/1.0/DefaultWsdlHelpGenerator.aspx.new
-config etc/mono/browscap.ini.new
-config etc/mono/2.0/settings.map.new
-config etc/mono/2.0/machine.config.new
 config etc/mono/2.0/Browsers/Compat.browser.new
-config etc/mono/2.0/web.config.new
 config etc/mono/2.0/DefaultWsdlHelpGenerator.aspx.new
+config etc/mono/2.0/machine.config.new
+config etc/mono/2.0/settings.map.new
+config etc/mono/2.0/web.config.new
+config etc/mono/4.0/DefaultWsdlHelpGenerator.aspx.new
+config etc/mono/4.0/machine.config.new
+config etc/mono/4.0/settings.map.new
+config etc/mono/4.0/web.config.new
 
diff --git a/development/mono/mono.SlackBuild b/development/mono/mono.SlackBuild
index 13e4a0724f..2ea676e849 100644
--- a/development/mono/mono.SlackBuild
+++ b/development/mono/mono.SlackBuild
@@ -4,7 +4,7 @@
 # Written by Sebastián Salazar Molina <ssalazar@orangepeople.cl>
 
 PRGNAM=mono
-VERSION=${VERSION:-2.6.7}
+VERSION=${VERSION:-2.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -64,24 +64,26 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-# There's still something braindead in here that doesn't grok --mandir
-mv $PKG/usr/share/man/man1/* $PKG/usr/man/man1 ; rm -rf $PKG/usr/share/man
-gzip -9 $PKG/usr/man/man?/*.?
+find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 # Don't clobber the config files
-mv $PKG/etc/mono/config $PKG/etc/mono/config.new
-mv $PKG/etc/mono/mconfig/config.xml $PKG/etc/mono/mconfig/config.xml.new
-mv $PKG/etc/mono/1.0/machine.config $PKG/etc/mono/1.0/machine.config.new
-mv $PKG/etc/mono/1.0/DefaultWsdlHelpGenerator.aspx \
-   $PKG/etc/mono/1.0/DefaultWsdlHelpGenerator.aspx.new
-mv $PKG/etc/mono/browscap.ini $PKG/etc/mono/browscap.ini.new
-mv $PKG/etc/mono/2.0/settings.map $PKG/etc/mono/2.0/settings.map.new
-mv $PKG/etc/mono/2.0/machine.config $PKG/etc/mono/2.0/machine.config.new
-mv $PKG/etc/mono/2.0/Browsers/Compat.browser \
-   $PKG/etc/mono/2.0/Browsers/Compat.browser.new
-mv $PKG/etc/mono/2.0/web.config $PKG/etc/mono/2.0/web.config.new
-mv $PKG/etc/mono/2.0/DefaultWsdlHelpGenerator.aspx \
-   $PKG/etc/mono/2.0/DefaultWsdlHelpGenerator.aspx.new
+( cd $PKG/etc/mono
+
+  mv config config.new
+  mv browscap.ini browscap.ini.new
+  mv mconfig/config.xml mconfig/config.xml.new
+
+  mv 2.0/settings.map 2.0/settings.map.new
+  mv 2.0/machine.config 2.0/machine.config.new
+  mv 2.0/web.config 2.0/web.config.new
+  mv 2.0/Browsers/Compat.browser 2.0/Browsers/Compat.browser.new
+  mv 2.0/DefaultWsdlHelpGenerator.aspx 2.0/DefaultWsdlHelpGenerator.aspx.new
+
+  mv 4.0/DefaultWsdlHelpGenerator.aspx 4.0/DefaultWsdlHelpGenerator.aspx.new
+  mv 4.0/machine.config 4.0/machine.config.new
+  mv 4.0/settings.map 4.0/settings.map.new
+  mv 4.0/web.config 4.0/web.config.new
+)
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/development/mono/mono.info b/development/mono/mono.info
index faac668e4e..e38f777516 100644
--- a/development/mono/mono.info
+++ b/development/mono/mono.info
@@ -1,10 +1,10 @@
 PRGNAM="mono"
-VERSION="2.6.7"
+VERSION="2.8"
 HOMEPAGE="http://www.mono-project.com/"
-DOWNLOAD="http://ftp.novell.com/pub/mono/sources/mono/mono-2.6.7.tar.bz2"
-MD5SUM="cc8b7bf061bd11fbd0fcc1c95eb79d34"
+DOWNLOAD="http://ftp.novell.com/pub/mono/sources/mono/mono-2.8.tar.bz2"
+MD5SUM="30b1180e20e5110d3fb36147137014a0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Sebastián Salazar Molina"
 EMAIL="ssalazar@orangepeople.cl"
-APPROVED="Erik Hanson"
+APPROVED="rworkman"