summaryrefslogtreecommitdiff
path: root/system/apcupsd/apcupsd.SlackBuild
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2013-05-15 13:11:49 -0500
committerRobby Workman <rworkman@slackbuilds.org>2013-06-04 00:09:20 -0500
commit699843a16912442788d9c2b762ba049d50af7ecb (patch)
tree9e33d8715a807e5952c544c5b3f880e0b5ab8906 /system/apcupsd/apcupsd.SlackBuild
parent39e0617de045f99fb245b6c0006b53e1f5f62ac9 (diff)
downloadslackbuilds-699843a16912442788d9c2b762ba049d50af7ecb.tar.gz
system/apcupsd: Fix lockdir definition and usage
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'system/apcupsd/apcupsd.SlackBuild')
-rw-r--r--system/apcupsd/apcupsd.SlackBuild12
1 files changed, 9 insertions, 3 deletions
diff --git a/system/apcupsd/apcupsd.SlackBuild b/system/apcupsd/apcupsd.SlackBuild
index 95cbc123be..0e1993fb86 100644
--- a/system/apcupsd/apcupsd.SlackBuild
+++ b/system/apcupsd/apcupsd.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for apcupsd
-# Copyright 2006-2012 Robby Workman Northport, AL, USA
+# Copyright 2006-2013 Robby Workman Northport, AL, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -27,7 +27,7 @@
PRGNAM=apcupsd
VERSION=${VERSION:-3.14.10}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -70,7 +70,10 @@ chmod -R a-s,u+w,go+r-w .
# Create /var/lock/subsys in the init script (rc.apcupsd)
# These days, /var/lock may be on a tmpfs, so we can't assume the dir is there
-patch -p1 < $CWD/create_lockdir_in_init_script.diff
+patch -p1 < $CWD/patches/create_lockdir_in_init_script.diff
+
+# Use /var/lock/subsys as the LOCKDIR in apcupsd.conf
+patch -p1 < $CWD/patches/fix_lockdir_in_config_file.diff
# The "--disable-install-distdir" is important - don't remove it.
# If you enable the distribution-specific install, then apcupsd will attempt
@@ -129,6 +132,9 @@ for i in apccontrol apcupsd.conf apcupsd.css changeme commfailure \
mv $PKG/etc/apcupsd/$i $PKG/etc/apcupsd/$i.new;
done
+# Remove obsolete HAL stuff
+rm -rf $PKG/usr/share/hal
+
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \
COPYING ChangeLog DISCLAIMER Developers INSTALL ReleaseNotes \