3 files changed, 17 insertions, 4 deletions
diff --git a/games/pcsx-df/README b/games/pcsx-df/README
index 92f8c668ccb6e..e85d18708138c 100644
--- a/games/pcsx-df/README
+++ b/games/pcsx-df/README
@@ -3,4 +3,7 @@ interface and several improvements to stability and functionality.
 PCSX-df has a very capable Internal HLE BIOS that can run many games
 without problems. It is recommended that you use it. However, if you
 own a real Playstation, you may be able to use your own BIOS image
-placed under '~/.pcsx/bios'.
-\ No newline at end of file
+placed under '~/.pcsx/bios'.
+
+This package conflicts with pcsxr. Both cannot be installed at the same time!
+
diff --git a/games/pcsx-df/pcsx-df.SlackBuild b/games/pcsx-df/pcsx-df.SlackBuild
index 0a6b1bb5271eb..4368ba8d22134 100644
--- a/games/pcsx-df/pcsx-df.SlackBuild
+++ b/games/pcsx-df/pcsx-df.SlackBuild
@@ -35,10 +35,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
@@ -54,6 +57,11 @@ chmod -R u+w,go+r-w,a-s .
 
 patch -p1 -i $CWD/pcsx.pthread.patch
 
+for i in dfbinimage dfcdrom dfinput dfiso dfOpenGL dfsound dfxvideo; do
+  sed -i "s|\$(prefix)/lib/|\$(prefix)/lib$LIBDIRSUFFIX/|g" \
+    plugins/$i/Makefile.am
+done
+
 chmod +x ./autogen.sh
 
 ./autogen.sh
@@ -62,13 +70,13 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib$LIBDIRSUFFIX \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
   --disable-static \
   --disable-nautilusburn \
-  --build=$ARCH-slackware-linux \
-  --host=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux
 
 make
 make install-strip DESTDIR=$PKG
@@ -87,4 +95,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 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/games/pcsx-df/pcsx-df.info b/games/pcsx-df/pcsx-df.info
index d255dbc63c053..89272c74a7416 100644
--- a/games/pcsx-df/pcsx-df.info
+++ b/games/pcsx-df/pcsx-df.info
@@ -2,7 +2,9 @@ PRGNAM="pcsx-df"
 VERSION="1.9"
 HOMEPAGE="http://pcsx-df.sourceforge.net"
 DOWNLOAD="http://downloads.sourceforge.net/pcsx-df/pcsx-df-1.9.tar.gz"
+DOWNLOAD_x86_64=""
 MD5SUM="a7a52b38c3b425c0c7e7949102ab09d1"
+MD5SUM_x86_64=""
 MAINTAINER="ppr:kut"
 EMAIL="pprkut@liwjatan.at"
 APPROVED="David Somero"
 \ No newline at end of file