From 3c3ef8bf04639e01423dd9e82aa363dd8980cdb0 Mon Sep 17 00:00:00 2001
From: Robby Workman <rw@rlworkman.net>
Date: Thu, 13 May 2010 00:22:44 +0200
Subject: desktop/icewm: Updated for version 1.2.37

---
 desktop/icewm/icewm.SlackBuild | 11 ++++++++---
 desktop/icewm/icewm.info       |  2 ++
 desktop/icewm/xinitrc.icewm    |  4 ++--
 3 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'desktop/icewm')

diff --git a/desktop/icewm/icewm.SlackBuild b/desktop/icewm/icewm.SlackBuild
index db0c3a9685..971781421f 100644
--- a/desktop/icewm/icewm.SlackBuild
+++ b/desktop/icewm/icewm.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for icewm
 
-# Copyright 2006-2008  Robby Workman  Northport, Alabama, USA
+# Copyright 2006-2009  Robby Workman  Northport, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -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
@@ -61,6 +64,7 @@ CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --with-x \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
   --sysconfdir=/etc \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
@@ -87,7 +91,8 @@ gzip -9c doc/icewm.1.man > $PKG/usr/man/man1/icewm.1.gz
 
 # Add xinitrc for xwmconfig(1)
 mkdir -p $PKG/etc/X11/xinit
-cat $CWD/xinitrc.icewm > $PKG/etc/X11/xinit/xinitrc.icewm
+sed "s%@LIBDIR@%/usr/lib${LIBDIRSUFFIX}%g" $CWD/xinitrc.icewm \
+  > $PKG/etc/X11/xinit/xinitrc.icewm
 chmod 0755 $PKG/etc/X11/xinit/xinitrc.icewm
 
 mkdir -p $PKG/install
@@ -95,4 +100,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/desktop/icewm/icewm.info b/desktop/icewm/icewm.info
index 14ad4dbed6..d941383d86 100644
--- a/desktop/icewm/icewm.info
+++ b/desktop/icewm/icewm.info
@@ -2,7 +2,9 @@ PRGNAM="icewm"
 VERSION="1.2.37"
 HOMEPAGE="http://icewm.org"
 DOWNLOAD="http://downloads.sourceforge.net/icewm/icewm-1.2.37.tar.gz"
+DOWNLOAD_x86_64=""
 MD5SUM="970a21588d26eb361020fd60a61a482c"
+MD5SUM_x86_64=""
 MAINTAINER="Robby Workman"
 EMAIL="rw@rlworkman.net"
 APPROVED="Erik Hanson"
diff --git a/desktop/icewm/xinitrc.icewm b/desktop/icewm/xinitrc.icewm
index a2fdacc78a..825c128463 100644
--- a/desktop/icewm/xinitrc.icewm
+++ b/desktop/icewm/xinitrc.icewm
@@ -2,8 +2,8 @@
 
 userresources=$HOME/.Xresources
 usermodmap=$HOME/.Xmodmap
-sysresources=/usr/lib/X11/xinit/.Xresources
-sysmodmap=/usr/lib/X11/xinit/.Xmodmap
+sysresources=@LIBDIR@/X11/xinit/.Xresources
+sysmodmap=@LIBDIR@/X11/xinit/.Xmodmap
 
 # Merge in defaults and keymaps
 [ -f $sysresources ] && /usr/bin/xrdb -merge $sysresources
-- 
cgit v1.2.3