From 426429141792e4e5cd0c4a7a9c7f3cbb06a2c62d Mon Sep 17 00:00:00 2001 From: Alexander Verbovetsky Date: Sat, 22 Jul 2017 01:29:20 +0700 Subject: system/xbattmon: Updated for version 1.0 + new maintainer. Signed-off-by: Willy Sudiarto Raharjo --- system/xbattmon/README | 15 +++++++- system/xbattmon/slack-desc | 10 +++--- system/xbattmon/xbattmon.SlackBuild | 69 +++++++++++++++++++++++++------------ system/xbattmon/xbattmon.info | 10 +++--- 4 files changed, 71 insertions(+), 33 deletions(-) diff --git a/system/xbattmon/README b/system/xbattmon/README index 4319ef5504..3125528794 100644 --- a/system/xbattmon/README +++ b/system/xbattmon/README @@ -1 +1,14 @@ -xbattmon is a simple battery status bar. +xbattmon is a simple battery status bar for X. It draws a 2 pixels bar +at the edge of your screen, which shows battery status with different +colors. + +You can configure xbattmon at build time by passing the following +variables to the script (VAR=<...> ./xbattmon.SlackBuild): + +COLOR_CHARGED= (default: green) +COLOR_LEFT2CHARGE= (default: grey) +COLOR_DRAINED= (default: red) +COLOR_LEFT2DRAIN= (default: blue) +RAISE=yes|no (default: no), the bar to be raised on top of other windows +CRITICAL= (default: 5), the charge level at which starts blinking +TRANSPARENT=yes|no (default: no) diff --git a/system/xbattmon/slack-desc b/system/xbattmon/slack-desc index f01c1ffa2f..bee69cf587 100644 --- a/system/xbattmon/slack-desc +++ b/system/xbattmon/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -xbattmon: xbattmon (simple battery status bar) +xbattmon: xbattmon (simple battery monitor) xbattmon: -xbattmon: xbattmon is a simple battery status bar for X. It is similar to -xbattmon: xbattbar but simpler and works on modern Linux systems. -xbattmon: -xbattmon: http://git.2f30.org/xbattmon/ +xbattmon: xbattmon is a simple battery status bar for X. It draws a 2 pixels +xbattmon: bar at the edge of your screen, which shows battery status with +xbattmon: different colors. xbattmon: xbattmon: +xbattmon: Homepage: http://git.2f30.org/xbattmon/ xbattmon: xbattmon: xbattmon: diff --git a/system/xbattmon/xbattmon.SlackBuild b/system/xbattmon/xbattmon.SlackBuild index 8f83e68d30..2044d33c11 100644 --- a/system/xbattmon/xbattmon.SlackBuild +++ b/system/xbattmon/xbattmon.SlackBuild @@ -1,29 +1,36 @@ #!/bin/sh # Slackware build script for xbattmon + +# Copyright 2014 Dimitris Papastamos +# Copyright 2017, Alexander Verbovetsky, Moscow, Russia +# All rights reserved. # -# © 2014 Dimitris Papastamos +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: # -# Permission to use, copy, modify, and distribute this software for any -# purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. # -# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# 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. PRGNAM=xbattmon -VERSION=${VERSION:-0.4} +VERSION=${VERSION:-1.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -34,18 +41,14 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" - LIBDIRSUFFIX="" fi set -e @@ -58,25 +61,47 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION mv config.def.h config.h +[ "${COLOR_CHARGED:-green}" != "green" ] && \ + sed -i "s/\(COLOR_BAT_CHARGED.*\)green/\1$COLOR_CHARGED/" config.h +[ "${COLOR_LEFT2CHARGE:-grey}" != "grey" ] && \ + sed -i "s/\(COLOR_BAT_LEFT2CHARGE.*\)green/\1$COLOR_LEFT2CHARGE/" config.h +[ "${COLOR_DRAINED:-red}" != "red" ] && \ + sed -i "s/\(COLOR_BAT_DRAINED.*\)green/\1$COLOR_DRAINED/" config.h +[ "${COLOR_LEFT2DRAIN:-blue}" != "blue" ] && \ + sed -i "s/\(COLOR_BAT_LEFT2DRAIN.*\)green/\1$COLOR_LEFT2DRAIN/" config.h +[ "${RAISE:-no}" != "no" ] && \ + sed -i "s/\(raise[ ]\+=[ ]\+\)0;/\11;/" config.h +[ "${CRITICAL:-5}" != "5" ] && \ + sed -i "s/\(critical[ ]\+=[ ]\+\)5;/\1$CRITICAL;/" config.h +[ "${TRANSPARENT:-no}" != "no" ] && \ + sed -i "s/\(transparent[ ]\+=[ ]\+\)0;/\11;/" config.h + +chown -R root:root . +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + ./configure make \ CFLAGS="$SLKCFLAGS" \ PREFIX=/usr \ MANPREFIX=/usr/man - make install \ CFLAGS="$SLKCFLAGS" \ DESTDIR=$PKG \ PREFIX=/usr \ MANPREFIX=/usr/man -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp $CWD/README $PKG/usr/doc/$PRGNAM-$VERSION +cp -a README LICENSE $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/xbattmon/xbattmon.info b/system/xbattmon/xbattmon.info index 7a59bbf998..88b8160dee 100644 --- a/system/xbattmon/xbattmon.info +++ b/system/xbattmon/xbattmon.info @@ -1,10 +1,10 @@ PRGNAM="xbattmon" -VERSION="0.4" +VERSION="1.0" HOMEPAGE="http://git.2f30.org/xbattmon/" -DOWNLOAD="http://dl.2f30.org/releases/xbattmon-0.4.tar.gz" -MD5SUM="834eb8b9e9b1676d9296a20d13d2496f" +DOWNLOAD="http://dl.2f30.org/releases/xbattmon-1.0.tar.gz" +MD5SUM="8a8ed8b3f1e038d1aed077cac37b30ef" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libbsd" -MAINTAINER="Dimitris Papastamos" -EMAIL="sin@2f30.org" +MAINTAINER="Alexander Verbovetsky" +EMAIL="alik@ejik.org" -- cgit v1.2.3