3 files changed, 64 insertions, 39 deletions
diff --git a/source/n/lynx/lynx.SlackBuild b/source/n/lynx/lynx.SlackBuild
index 109c8962..5a298547 100755
--- a/source/n/lynx/lynx.SlackBuild
+++ b/source/n/lynx/lynx.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
@@ -21,16 +21,33 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-SRCVER=2.8.6rel.5
-PKGVER=2.8.6rel.5
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-2}
+SRCVER=2.8.7
+PKGVER=2.8.7
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-if [ "$ARCH" = "x86_64" ]; then
+# 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
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
 else
+  SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 fi
 
@@ -39,24 +56,13 @@ TMP=${TMP:-/tmp}
 PKG=$TMP/package-lynx
 
 rm -rf $PKG
-mkdir -p $PKG
-# Add libdir to package:
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/lynx
-
+mkdir -p $TMP $PKG/usr/lib${LIBDIRSUFFIX}/lynx
 cd $TMP
-rm -rf lynx2-8-6
-tar xvf $CWD/lynx${SRCVER}.tar.bz2 || exit 1
-cd lynx2-8-6
-# Fix /usr/local paths:
-zcat $CWD/lynx.path.diff.gz | sed -e "s#usr/lib/#usr/lib${LIBDIRSUFFIX}/#g" | patch -p1 --verbose || exit 1
-# Apply recolorizing patch:
-zcat $CWD/lynx.cfg.diff.gz | patch -p1 --verbose --backup || exit 1
+rm -rf lynx2-8-7
+tar xvf $CWD/lynx${SRCVER}.tar.?z* || exit 1
+cd lynx2-8-7
 
-## Apply official patches:
-#zcat $CWD/2.8.5rel.4.patch.gz | patch -p1 --verbose || exit
-#zcat $CWD/2.8.5rel.5.patch.gz | patch -p1 --verbose || exit
-
-find . -name "*~" | xargs rm
+find . -name "*~" -exec rm -f {} \;
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -64,6 +70,15 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
+# Fix /usr/local paths and libdir paths
+zcat $CWD/lynx.path.diff.gz | \
+  sed -e "s#@SLACK_LIBDIR@#/usr/lib${LIBDIRSUFFIX}/#g" | \
+  patch -p1 --verbose || exit 1
+
+# Apply recolorizing patch:
+zcat $CWD/lynx.cfg.diff.gz | patch -p1 --verbose --backup || exit 1
+
+CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --sysconfdir=/etc \
@@ -121,6 +136,14 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   ln -sf /usr/share/lynx/lynx_help .
 )
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r CHANGES ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+  cat CHANGES | head -n 1000 > $DOCSDIR/CHANGES
+  touch -r CHANGES $DOCSDIR/CHANGES
+fi
+
 gzip -9 $PKG/usr/man/man?/*.?
 
 mkdir -p $PKG/install
diff --git a/source/n/lynx/lynx.cfg.diff b/source/n/lynx/lynx.cfg.diff
index 4a52fcc5..c7ab6257 100644
--- a/source/n/lynx/lynx.cfg.diff
+++ b/source/n/lynx/lynx.cfg.diff
@@ -1,6 +1,7 @@
---- ./lynx.cfg.orig	Tue Feb 26 23:18:35 2002
-+++ ./lynx.cfg	Tue Feb 26 23:24:09 2002
-@@ -2841,8 +2841,18 @@
+diff -Nur lynx2-8-7.orig/lynx.cfg lynx2-8-7/lynx.cfg
+--- lynx2-8-7.orig/lynx.cfg	2009-06-23 18:53:58.000000000 -0500
++++ lynx2-8-7/lynx.cfg	2009-12-03 15:35:18.744461098 -0600
+@@ -3025,8 +3025,18 @@
  #COLOR:4:magenta:white
  #COLOR:5:blue:white
  #COLOR:6:red:white
@@ -19,4 +20,4 @@
 +COLOR:7:magenta:cyan
  
  
- .h2 ASSUMED_COLOR
+ .h2 COLOR_STYLE
diff --git a/source/n/lynx/lynx.path.diff b/source/n/lynx/lynx.path.diff
index 1ee216ed..045405c9 100644
--- a/source/n/lynx/lynx.path.diff
+++ b/source/n/lynx/lynx.path.diff
@@ -1,6 +1,7 @@
---- ./userdefs.h.orig	Tue Feb 26 22:32:08 2002
-+++ ./userdefs.h	Tue Feb 26 22:39:53 2002
-@@ -277,7 +277,7 @@
+diff -Nur lynx2-8-7.orig/userdefs.h lynx2-8-7/userdefs.h
+--- lynx2-8-7.orig/userdefs.h	2009-06-06 19:30:35.000000000 -0500
++++ lynx2-8-7/userdefs.h	2009-12-03 15:47:54.596486242 -0600
+@@ -289,7 +289,7 @@
  #ifdef DOSPATH
  #define LYNX_CFG_FILE "./lynx.cfg"
  #else
@@ -9,30 +10,30 @@
  #endif /* DOSPATH */
  #endif /* LYNX_CFG_FILE */
  #endif /* HAVE_CONFIG_H */
-@@ -289,7 +289,7 @@
+@@ -305,7 +305,7 @@
   * Mappings in these global and personal files override any SUFFIX
   * definitions in lynx.cfg and built-in defaults from src/HTInit.c.
   */
--#define GLOBAL_EXTENSION_MAP "/usr/local/lib/mosaic/mime.types"
-+#define GLOBAL_EXTENSION_MAP "/usr/lib/lynx/mime.types"
- #define PERSONAL_EXTENSION_MAP ".mime.types"
+-#define GLOBAL_EXTENSION_MAP MIME_LIBDIR "mime.types"
++#define GLOBAL_EXTENSION_MAP "@SLACK_LIBDIR@/lynx/mime.types"
+ #define PERSONAL_EXTENSION_MAP "~/.mime.types"
  
  /**************************
-@@ -299,7 +299,7 @@
+@@ -315,7 +315,7 @@
   * Mappings in these global and personal files override any VIEWER
   * definitions in lynx.cfg and built-in defaults from src/HTInit.c.
   */
--#define GLOBAL_MAILCAP "/usr/local/lib/mosaic/mailcap"
-+#define GLOBAL_MAILCAP "/usr/lib/lynx/mailcap"
- #define PERSONAL_MAILCAP ".mailcap"
+-#define GLOBAL_MAILCAP MIME_LIBDIR "mailcap"
++#define GLOBAL_MAILCAP MIME_LIBDIR "/etc/mailcap"
+ #define PERSONAL_MAILCAP "~/.mailcap"
  
  /**************************
-@@ -434,7 +434,7 @@
+@@ -445,7 +445,7 @@
   * -lss command line switch will override these definitions.
   */
  #ifndef LYNX_LSS_FILE
 -#define LYNX_LSS_FILE "/usr/local/lib/lynx.lss"
-+#define LYNX_LSS_FILE "/usr/lib/lynx/lynx.lss"
++#define LYNX_LSS_FILE "/etc/lynx.lss"
  #endif /* LYNX_LSS_FILE */
  
  #endif /* VMS OR UNIX */