5 files changed, 37 insertions, 20 deletions
diff --git a/development/codeblocks/README b/development/codeblocks/README
index 9efb46beb56f..2cc9f004c51a 100644
--- a/development/codeblocks/README
+++ b/development/codeblocks/README
@@ -1,7 +1,6 @@
 Code::Blocks is a free C++ IDE built to meet the most demanding needs of its
-users. It is designed to be very extensible and fully configurable.
-
+users.  It is designed to be very extensible and fully configurable.
 Built around a plugin framework, Code::Blocks can be extended with plugins.
 Any kind of functionality can be added by installing/coding a plugin.
 
-Requires libmspack, wxGTK or wxPython, available at SlackBuilds.org
+This requires libmspack and either wxGTK or wxPython.
diff --git a/development/codeblocks/codeblocks.SlackBuild b/development/codeblocks/codeblocks.SlackBuild
index e1bf469e08dd..4275dffd03fe 100644
--- a/development/codeblocks/codeblocks.SlackBuild
+++ b/development/codeblocks/codeblocks.SlackBuild
@@ -4,31 +4,30 @@
 # Written by Jeanne-Kamikaze (AKA SlackerJeanne) (jeannekamikaze@gmail.com)
 # Modified by Erik Hanson <erik@slackbuilds.org>
 
-# The software belongs and is copyrighted by the Code::Blocks team.
-# The proper license can be found along with the software source code.
-
-set -eu
-
 PRGNAM=codeblocks
 VERSION=8.02
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-CWD=`pwd`
+
+CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOC="AUTHORS BUGS BUILD COMPILERS COPYING NEWS README TODO"
-
 if [ "$ARCH" = "i486" ]; then
-   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-   SLKCFLAGS="-O2 -fPIC"
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
+set -eu
+
 rm -rf $PKG
 mkdir -p $TMP $PKG
 rm -rf $TMP/$PRGNAM-$VERSION
@@ -42,13 +41,13 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
   ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var/lib \
   --mandir=/usr/man \
   --disable-static \
   --with-contrib-plugins=all \
-  --build=$ARCH-slackware-linux \
-  --host=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux
 
 make
 make install-strip DESTDIR=$PKG
@@ -56,11 +55,14 @@ make install-strip DESTDIR=$PKG
 gzip -9 $PKG/usr/man/man?/*.?
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOC $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS BUGS BUILD COMPILERS COPYING NEWS README TODO \
+    $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/codeblocks/codeblocks.info b/development/codeblocks/codeblocks.info
index c6a9584dba2a..b65f906389f7 100644
--- a/development/codeblocks/codeblocks.info
+++ b/development/codeblocks/codeblocks.info
@@ -3,6 +3,8 @@ VERSION="8.02"
 HOMEPAGE="http://www.codeblocks.org"
 DOWNLOAD="http://downloads.sourceforge.net/codeblocks/codeblocks-8.02-src.tar.bz2"
 MD5SUM="ac15b4b3de50d7650c2f7a8dbcb30f88"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Jeanne-Kamikaze"
 EMAIL="jeannekamikaze@gmail.com"
 APPROVED="Erik Hanson"
diff --git a/development/codeblocks/doinst.sh b/development/codeblocks/doinst.sh
new file mode 100644
index 000000000000..38e5e51fc52e
--- /dev/null
+++ b/development/codeblocks/doinst.sh
@@ -0,0 +1,14 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/gnome/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/gnome >/dev/null 2>&1
+  fi
+fi
+
diff --git a/development/codeblocks/slack-desc b/development/codeblocks/slack-desc
index d5b19a27b3f6..cc06e3ca6e02 100644
--- a/development/codeblocks/slack-desc
+++ b/development/codeblocks/slack-desc
@@ -5,15 +5,15 @@
 # exactly 11 lines for the formatting to be correct.  It's also customary to
 # leave one space after the ':'.
 
-       |-----handy-ruler------------------------------------------------------|
+          |-----handy-ruler------------------------------------------------------|
 codeblocks: Code::Blocks (a free C++ IDE)
 codeblocks:
 codeblocks: Code::Blocks is a free C++ IDE built to meet the most demanding
 codeblocks: needs of its users. It is designed to be very extensible and fully
 codeblocks: configurable.
 codeblocks:
+codeblocks: Homepage: http://www.codeblocks.org/
 codeblocks:
 codeblocks:
 codeblocks:
-codeblocks: http://www.codeblocks.org/
 codeblocks: