6 files changed, 28 insertions, 13 deletions
diff --git a/development/rapidsvn/README b/development/rapidsvn/README
index aa1b0e4834..502db6d254 100644
--- a/development/rapidsvn/README
+++ b/development/rapidsvn/README
@@ -2,5 +2,4 @@ RapidSVN is a cross-platform GUI front-end for the Subversion revision
 system written in C++ using the wxWidgets framework.
 It also includes a Subversion client C++ API.
 
-RapidSVN relies on wxWidgets (essentially wxGTK), which can also be
-found at SlackBuilds.org.
+This requires wxGTK.
diff --git a/development/rapidsvn/doinst.sh b/development/rapidsvn/doinst.sh
index 22d4849bce..65fd352418 100644
--- a/development/rapidsvn/doinst.sh
+++ b/development/rapidsvn/doinst.sh
@@ -1,5 +1,4 @@
-
-if [ -x usr/bin/update-desktop-database ]; then
-  usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
 fi
 
diff --git a/development/rapidsvn/rapidsvn.SlackBuild b/development/rapidsvn/rapidsvn.SlackBuild
index 0b1f845f56..ae5fbbd281 100644
--- a/development/rapidsvn/rapidsvn.SlackBuild
+++ b/development/rapidsvn/rapidsvn.SlackBuild
@@ -10,6 +10,7 @@ VERSION=0.9.6
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -17,8 +18,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e	 # Exit on most errors
@@ -36,10 +42,12 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --with-apr-config=apr-1-config \
-  --with-apu-config=apu-1-config
+  --with-apu-config=apu-1-config \
+  --build=$ARCH-slackware-linux
 
 make
 make install-strip DESTDIR=$PKG
@@ -55,8 +63,9 @@ cat src/res/bitmaps/rapidsvn_128x128.png > $PKG/usr/share/pixmaps/rapidsvn.png
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS CHANGES COPYING ChangeLog FDL.txt GPL.txt HACKING.txt INSTALL \
-  LGPL.txt LICENSE.txt NEWS README TRANSLATIONS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS CHANGES COPYING ChangeLog FDL.txt GPL.txt HACKING.txt INSTALL \
+  LGPL.txt LICENSE.txt NEWS README TRANSLATIONS  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -64,4 +73,4 @@ 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/rapidsvn/rapidsvn.desktop b/development/rapidsvn/rapidsvn.desktop
index e517236162..800e94e66a 100644
--- a/development/rapidsvn/rapidsvn.desktop
+++ b/development/rapidsvn/rapidsvn.desktop
@@ -1,10 +1,9 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
 Name=RapidSVN
 GenericName=SVN Client
 Comment=A GUI Client for Subversion
 Type=Application
 Exec=rapidsvn
 Icon=rapidsvn
-Categories=GNOME;Application;Development
+Categories=GNOME;Development;
diff --git a/development/rapidsvn/rapidsvn.info b/development/rapidsvn/rapidsvn.info
index e509f14bc3..65688c3de8 100644
--- a/development/rapidsvn/rapidsvn.info
+++ b/development/rapidsvn/rapidsvn.info
@@ -2,7 +2,9 @@ PRGNAM="rapidsvn"
 VERSION="0.9.6"
 HOMEPAGE="http://www.rapidsvn.org/"
 DOWNLOAD="http://www.rapidsvn.org/download/release/0.9.6/rapidsvn-0.9.6.tar.gz"
-MD5SUM=d1465492e67998582e7c1767dc9e7352""
+MD5SUM="d1465492e67998582e7c1767dc9e7352"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Michael Johnson"
 EMAIL="youngmug@animeneko.net"
 APPROVED="rworkman"
diff --git a/development/rapidsvn/slack-desc b/development/rapidsvn/slack-desc
index 8881bbc7ec..335a40517d 100644
--- a/development/rapidsvn/slack-desc
+++ b/development/rapidsvn/slack-desc
@@ -1,4 +1,11 @@
-        |-----handy-ruler---------------------------------------------------|
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+        |-----handy-ruler------------------------------------------------------|
 rapidsvn: rapidsvn (Cross-Platform Subversion GUI Client)
 rapidsvn:
 rapidsvn: RapidSVN is a cross-platform GUI front-end for the