3 files changed, 19 insertions, 36 deletions
diff --git a/source/ap/jed/jed.SlackBuild b/source/ap/jed/jed.SlackBuild
index 68c851ff8..d6da7b486 100755
--- a/source/ap/jed/jed.SlackBuild
+++ b/source/ap/jed/jed.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,11 +20,21 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=0.99-18
-PKGVER=0.99_18
-ARCH=${ARCH:-x86_64}
+VERSION=0.99-19
+PKGVER=0.99_19
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
-BUILD=${BUILD:-3}
 
 if [ "$ARCH" = "i386" ]; then
   SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
@@ -34,6 +44,8 @@ elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
 fi
 
 CWD=$(pwd)
@@ -45,8 +57,6 @@ cd $TMP
 rm -rf jed-$VERSION
 tar xvf $CWD/jed-$VERSION.tar.bz2 || exit 1
 cd jed-$VERSION
-zcat $CWD/jed.mouse.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
-zcat $CWD/jed.multibyte.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
 
 chown -R root:root .
 find . \
@@ -59,13 +69,14 @@ JED_ROOT=/usr/share/jed \
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --mandir=/usr/man \
   --with-slang=/usr \
   --build=$ARCH-slackware-linux
 
 make clean
 make all rgrep $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
-cp src/objs/rgrep $PKG/usr/bin
+cp src/*objs/rgrep $PKG/usr/bin
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
diff --git a/source/ap/jed/jed.mouse.diff b/source/ap/jed/jed.mouse.diff
deleted file mode 100644
index 4ff607169..000000000
--- a/source/ap/jed/jed.mouse.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./src/Makefile.in.orig	2006-02-15 21:09:50.000000000 -0600
-+++ ./src/Makefile.in	2006-06-25 23:10:19.000000000 -0500
-@@ -52,10 +52,10 @@
- #---------------------------------------------------------------------------
- # 1. Linux GPM Mouse support
- #    Uncomment next FOUR lines for GPM mouse support
--#MOUSEFLAGS = -DUSE_GPM_MOUSE
--#MOUSELIB = -lgpm
--#GPMMOUSEO = gpmmouse.o
--#OBJGPMMOUSEO = $(OBJDIR)/$(GPMMOUSEO)
-+MOUSEFLAGS = -DUSE_GPM_MOUSE
-+MOUSELIB = -lgpm
-+GPMMOUSEO = gpmmouse.o
-+OBJGPMMOUSEO = $(OBJDIR)/$(GPMMOUSEO)
- 
-  
- # 2. XFree86 XRENDERFONT (Anti-aliased font) support for XJED
diff --git a/source/ap/jed/jed.multibyte.diff b/source/ap/jed/jed.multibyte.diff
deleted file mode 100644
index 266fece72..000000000
--- a/source/ap/jed/jed.multibyte.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/misc.c.orig	2006-03-04 01:55:05.000000000 -0600
-+++ ./src/misc.c	2006-06-25 23:14:32.000000000 -0500
-@@ -741,7 +741,7 @@
- 
- void jed_ungetkey_wchar (SLwchar_Type wc)
- {
--   SLuchar_Type *b, buf[SLUTF8_MAX_MBLEN];
-+   SLuchar_Type *b, buf[JED_MAX_MULTIBYTE_SIZE];
- 
-    if (NULL == (b = jed_wchar_to_multibyte (wc, buf)))
-      return;