system/numlockx: Updated for version 1.1

6 files changed, 94 insertions, 71 deletions

diff --git a/system/numlockx/README b/system/numlockx/README
index a0832aa8d0..43609c8ace 100644
--- a/system/numlockx/README
+++ b/system/numlockx/README
@@ -1,30 +1,6 @@
-This little thingy allows you to start X with NumLock turned on (which is
-a feature that a lot of people seem to miss and nobody really knew how to 
-achieve this ).
+This little thingy allows you to start X with NumLock turned on
+( which is a feature that a lot of people seem to miss and nobody
+really knew how to achieve this ).  If you use KDE or slim, you
+don't need this.
 
-Depending on how you start X, you might/will want to modify both 
-/etc/X11/xdm/Xsetup_0 and your $HOME/.xinitrc files.
-
-Add this to the END of /etc/X11/xdm/Xsetup_0
-
-  # Turn NumLock on (using numlockx)
-  if [ -x /usr/bin/numlockx ]; then
-    /usr/bin/numlockx
-  fi
-
-Add this to the BEGINNING of $HOME/.xinitrc
-
-  # Turn NumLock on (using numlockx)
-  if [ -x /usr/bin/numlockx ]; then
-    /usr/bin/numlockx
-  fi
-
-Note that $HOME/.xinitrc is just a copy of /etc/X11/xinit/xinitrc.$SOMETHING,
-where $SOMETHING is your preferred window manager.  The xwmconfig(1) binary
-makes this copy when it is run.  To summarize, if you use xwmconfig(1) to
-change your window manager/desktop environment after editing it for numlockx,
-you will need to make the edits again.  Alternatively, you can make the 
-numlockx edit to the "master" files in /etc/X11/xinit/ for each of the 
-installed window managers, and this will allow you to change window managers
-without losing the numlockx functionality.  However, be aware that an upgrade
-to any of the window managers involved might/will overwrite your changes.
+See README.SLACKWARE for configuration information.
diff --git a/system/numlockx/README.SLACKWARE b/system/numlockx/README.SLACKWARE
new file mode 100644
index 0000000000..ec9d49da0c
--- /dev/null
+++ b/system/numlockx/README.SLACKWARE
@@ -0,0 +1,29 @@
+numlockx README.SLACKWARE
+
+Depending on how you start X, you might/will want to modify both
+/etc/X11/xdm/Xsetup_0 and your $HOME/.xinitrc files.
+
+Add this to the END of /etc/X11/xdm/Xsetup_0
+
+  # Turn NumLock on (using numlockx)
+  if [ -x /usr/bin/numlockx ]; then
+    /usr/bin/numlockx
+  fi
+
+Add this to the BEGINNING of $HOME/.xinitrc
+
+  # Turn NumLock on (using numlockx)
+  if [ -x /usr/bin/numlockx ]; then
+    /usr/bin/numlockx
+  fi
+
+Note that $HOME/.xinitrc is just a copy of /etc/X11/xinit/xinitrc.$SOMETHING,
+where $SOMETHING is your preferred window manager.  The xwmconfig(1) binary
+makes this copy when it is run.  To summarize, if you use xwmconfig(1) to
+change your window manager/desktop environment after editing it for numlockx,
+you will need to make the edits again.  Alternatively, you can make the
+numlockx edit to the "master" files in /etc/X11/xinit/ for each of the
+installed window managers, and this will allow you to change window managers
+without losing the numlockx functionality.  However, be aware that an upgrade
+to any of the window managers involved might/will overwrite your changes.
+
diff --git a/system/numlockx/numlockx.1 b/system/numlockx/numlockx.1
new file mode 100644
index 0000000000..176dc86c76
--- /dev/null
+++ b/system/numlockx/numlockx.1
@@ -0,0 +1,21 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
+.TH NUMLOCKX "1" "December 2008" "NumLockX 1.1" "User Commands"
+.SH NAME
+NumLockX \- manual page for NumLockX 1.1
+.SH DESCRIPTION
+NumLockX 1.1
+(C) 2000\-2001 Lubos Lunak <l.lunak@kde.org>
+(C) 2001      Oswald Buddenhagen <ossi@kde.org>
+.PP
+Usage : numlockx [on|off]
+on     \- turns NumLock on in X ( default )
+off    \- turns NumLock off in X
+toggle \- toggles the NumLock on and off in X
+.PP
+(C) 2000\-2001 Lubos Lunak <l.lunak@kde.org>
+(C) 2001      Oswald Buddenhagen <ossi@kde.org>
+.PP
+Usage : numlockx [on|off]
+on     \- turns NumLock on in X ( default )
+off    \- turns NumLock off in X
+toggle \- toggles the NumLock on and off in X
diff --git a/system/numlockx/numlockx.SlackBuild b/system/numlockx/numlockx.SlackBuild
index e81e4fbdfa..99d96d551a 100644
--- a/system/numlockx/numlockx.SlackBuild
+++ b/system/numlockx/numlockx.SlackBuild
@@ -2,71 +2,68 @@
 
 # Slackware build script for NumLockX
 
-# Copyright 2007  Frank Caraballo <fecaraballo[AT]gmail.com>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Written by Menno Duursma <druiloor@zonnet.nl>
 
-# Modified by the SlackBuilds.org project
-
-set -e
+# This program is free software. It comes without any warranty.
+# Granted WTFPLv2, as published by Sam Hocevar dec'04.
+# For details see http://sam.zoy.org/wtfpl/COPYING
 
 PRGNAM=numlockx
-VERSION=1.1
+VERSION=${VERSION:-1.1}
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-PDOCS="AUTHORS ChangeLog INSTALL LICENSE README TODO"
-
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
 fi
 
+set -e # Exit on most errors
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
 
-#CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --x-includes=/usr/include \
-  --x-libraries=/usr/lib
+  --mandir=/usr/man \
+  --x-libraries="/usr/lib/X11" \
+  --x-includes="/usr/include/X11" \
+  --build=$ARCH-slackware-linux
 
 make
-make install-strip DESTDIR=$PKG
+make install DESTDIR=$PKG
+
+# help2man --no-info numlockx > numlockx.1
+mkdir -p $PKG/usr/man/man1
+gzip -9c $CWD/numlockx.1 > $PKG/usr/man/man1/numlockx.1.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $PDOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS ChangeLog INSTALL LICENSE README TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/system/numlockx/numlockx.info b/system/numlockx/numlockx.info
index 11c9633ca4..f61b42b8c0 100644
--- a/system/numlockx/numlockx.info
+++ b/system/numlockx/numlockx.info
@@ -3,6 +3,6 @@ VERSION="1.1"
 HOMEPAGE="http://ktown.kde.org/~seli/numlockx/"
 DOWNLOAD="http://ktown.kde.org/~seli/numlockx/numlockx-1.1.tar.gz"
 MD5SUM="127d9dfbbbe6dbec62cc78db340f913c"
-MAINTAINER="Frank Caraballo"
-EMAIL="fecaraballo[AT]gmail.com"
+MAINTAINER="Menno Duursma"
+EMAIL="druiloor@zonnet.nl"
 APPROVED="rworkman"
diff --git a/system/numlockx/slack-desc b/system/numlockx/slack-desc
index e88373cd91..908bcb1949 100644
--- a/system/numlockx/slack-desc
+++ b/system/numlockx/slack-desc
@@ -1,16 +1,16 @@
 # HOW TO EDIT THIS FILE:
 # The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
+# up the first '|' above the ':' following the base package name, and the '|' on
+# the right side marks the last column you can put a character in.  You must make
+# exactly 11 lines for the formatting to be correct.  It's also customary to
+# leave one space after the ':'.
 
         |-----handy-ruler------------------------------------------------------|
 numlockx: NumLockX (Start X with NumLock Turned On)
 numlockx:
-numlockx: This little thingy allows you to start X with NumLock turned
-numlockx: on ( which is a feature that a lot of people seem to miss and
-numlockx: nobody really knew how to achieve this ).
+numlockx: This little thingy allows you to start X with NumLock turned on
+numlockx: ( which is a feature that a lot of people seem to miss and nobody
+numlockx: really knew how to achieve this ).
 numlockx:
 numlockx: Homepage: http://ktown.kde.org/~seli/numlockx/
 numlockx: