2 files changed, 17 insertions, 3 deletions
diff --git a/academic/jpicedt/jpicedt.SlackBuild b/academic/jpicedt/jpicedt.SlackBuild
index fb9095710d..11e8668137 100644
--- a/academic/jpicedt/jpicedt.SlackBuild
+++ b/academic/jpicedt/jpicedt.SlackBuild
@@ -22,7 +22,7 @@
 
 PRGNAM=jpicedt
 VERSION=${VERSION:-1.4.1_03}
-ARCH=i486
+ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -31,6 +31,17 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 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
 
 rm -rf $PKG
@@ -43,7 +54,8 @@ unzip $CWD/jpicedt-install_1_4_1_03_20071021.jar -d $PKG/opt/$PRGNAM-$VERSION
 
 # Install a wrapper script to start jpicedit
 mkdir -p $PKG/usr/bin
-cp $CWD/jpicedt.sh $PKG/usr/bin/jpicedt
+sed -e "s|/usr/lib/java|/usr/lib$LIBDIRSUFFIX/java|"  \
+  $CWD/jpicedt.sh > $PKG/usr/bin/jpicedt
 chmod 755 $PKG/usr/bin/jpicedt
 
 # Remove META-INF/, installer/, windows addons from the package
@@ -62,4 +74,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
 chown -R root:root .
-/sbin/makepkg -c n -l y $OUTPUT/${PRGNAM}-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -c n -l y $OUTPUT/${PRGNAM}-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/academic/jpicedt/jpicedt.info b/academic/jpicedt/jpicedt.info
index 2f4a12a665..583baecce9 100644
--- a/academic/jpicedt/jpicedt.info
+++ b/academic/jpicedt/jpicedt.info
@@ -2,7 +2,9 @@ PRGNAM="jpicedt"
 VERSION="1.4.1_03_20071021"
 HOMEPAGE="http://jpicedt.sourceforge.net/"
 DOWNLOAD="http://downloads.sourceforge.net/jpicedt/jpicedt-install_1_4_1_03_20071021.jar"
+DOWNLOAD_x86_64=""
 MD5SUM="bc1894efbe41c87e5767fb17c8a21d20"
+MD5SUM_x86_64=""
 MAINTAINER="Robert Allen"
 EMAIL="slacker@slaphappygeeks.com"
 APPROVED="rworkman"