system/apcupsd: Updated for version 3.14.13.

Thanks to Sebastian Arcus, Ben Stern, and Marcos Tadeu for
gentle reminders with fixes for the new version :-)

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

6 files changed, 15 insertions, 31 deletions

diff --git a/system/apcupsd/README b/system/apcupsd/README
index f8afad550b..5e4534c3d9 100644
--- a/system/apcupsd/README
+++ b/system/apcupsd/README
@@ -13,6 +13,6 @@ the distribution-specific installation to prevent messing with files outside
 DESTDIR; however, this does make it require some manual configuration after 
 installation.
 
-After installing, see /usr/doc/apcupsd-3.14.10/README.SLACKWARE for more
+After installing, see /usr/doc/apcupsd-3.14.13/README.SLACKWARE for more
 information on how to modify rc.6 and how to start the apcupsd daemon 
 automatically at boot.
diff --git a/system/apcupsd/apcupsd.SlackBuild b/system/apcupsd/apcupsd.SlackBuild
index 13612a607a..a877d188cc 100644
--- a/system/apcupsd/apcupsd.SlackBuild
+++ b/system/apcupsd/apcupsd.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for apcupsd
 
-# Copyright 2006-2014  Robby Workman  Northport, AL, USA
+# Copyright 2006-2015  Robby Workman, Tuscaloosa, AL, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,7 +26,7 @@
 # * added log rotation
 
 PRGNAM=apcupsd
-VERSION=${VERSION:-3.14.12}
+VERSION=${VERSION:-3.14.13}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -72,13 +72,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# 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
+# Make sure /var/lock exists - create it in the rc.apcupsd
 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
-
 # Fixup up a couple of nitpicks in the init script
 patch -p1 < $CWD/patches/nitpicky-fixes-to-init-script.diff
 
diff --git a/system/apcupsd/apcupsd.info b/system/apcupsd/apcupsd.info
index 4873a857fe..58fa084422 100644
--- a/system/apcupsd/apcupsd.info
+++ b/system/apcupsd/apcupsd.info
@@ -1,8 +1,8 @@
 PRGNAM="apcupsd"
-VERSION="3.14.12"
+VERSION="3.14.13"
 HOMEPAGE="http://www.apcupsd.org"
-DOWNLOAD="http://downloads.sourceforge.net/apcupsd/apcupsd-3.14.12.tar.gz"
-MD5SUM="08bf201acea6b4dd69cf2fb0eecfd55e"
+DOWNLOAD="http://downloads.sourceforge.net/apcupsd/apcupsd-3.14.13.tar.gz"
+MD5SUM="c291d9d3923b4d9c0e600b755ad4f489"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/apcupsd/patches/create_lockdir_in_init_script.diff b/system/apcupsd/patches/create_lockdir_in_init_script.diff
index 0640544e53..024ac6d4cb 100644
--- a/system/apcupsd/patches/create_lockdir_in_init_script.diff
+++ b/system/apcupsd/patches/create_lockdir_in_init_script.diff
@@ -1,11 +1,11 @@
-diff -Nur apcupsd-3.14.12.orig/platforms/slackware/apcupsd.in apcupsd-3.14.12/platforms/slackware/apcupsd.in
---- apcupsd-3.14.12.orig/platforms/slackware/apcupsd.in	2005-03-03 11:18:09.000000000 -0600
-+++ apcupsd-3.14.12/platforms/slackware/apcupsd.in	2014-04-01 13:53:23.113153628 -0500
+diff -Nur apcupsd-3.14.13.orig/platforms/slackware/apcupsd.in apcupsd-3.14.13/platforms/slackware/apcupsd.in
+--- apcupsd-3.14.13.orig/platforms/slackware/apcupsd.in	2015-01-29 08:13:25.000000000 -0600
++++ apcupsd-3.14.13/platforms/slackware/apcupsd.in	2015-08-17 22:49:30.754638339 -0500
 @@ -20,6 +20,7 @@
  	if [ -f ${APCPID} ]; then
  		return="  Already running."
  	else
-+		mkdir -p @LOCKDIR@/subsys
- 		@sbindir@/apcupsd && touch @LOCKDIR@/subsys/apcupsd \
++		mkdir -p @LOCKDIR@
+ 		@sbindir@/apcupsd && touch @LOCKDIR@/apcupsd \
  		|| return="  Failed."
  	fi
diff --git a/system/apcupsd/patches/fix_lockdir_in_config_file.diff b/system/apcupsd/patches/fix_lockdir_in_config_file.diff
deleted file mode 100644
index 64ee7efa94..0000000000
--- a/system/apcupsd/patches/fix_lockdir_in_config_file.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur apcupsd-3.14.12.orig/platforms/etc/apcupsd.conf.in apcupsd-3.14.12/platforms/etc/apcupsd.conf.in
---- apcupsd-3.14.12.orig/platforms/etc/apcupsd.conf.in	2013-08-05 09:05:17.000000000 -0500
-+++ apcupsd-3.14.12/platforms/etc/apcupsd.conf.in	2014-04-01 13:54:06.786690735 -0500
-@@ -93,7 +93,7 @@
- 
- # LOCKFILE <path to lockfile>
- #   Path for device lock file. Not used on Win32.
--LOCKFILE @LOCKDIR@
-+LOCKFILE @LOCKDIR@/subsys
- 
- # SCRIPTDIR <path to script directory>
- #   Directory in which apccontrol and event scripts are located.
diff --git a/system/apcupsd/patches/nitpicky-fixes-to-init-script.diff b/system/apcupsd/patches/nitpicky-fixes-to-init-script.diff
index 30f901235e..0ba9058a5a 100644
--- a/system/apcupsd/patches/nitpicky-fixes-to-init-script.diff
+++ b/system/apcupsd/patches/nitpicky-fixes-to-init-script.diff
@@ -1,6 +1,6 @@
-diff -Nur apcupsd-3.14.12.orig/platforms/slackware/apcupsd.in apcupsd-3.14.12/platforms/slackware/apcupsd.in
---- apcupsd-3.14.12.orig/platforms/slackware/apcupsd.in	2014-04-01 13:54:37.822360814 -0500
-+++ apcupsd-3.14.12/platforms/slackware/apcupsd.in	2014-04-01 13:56:22.722239781 -0500
+diff -Nur apcupsd-3.14.13.orig/platforms/slackware/apcupsd.in apcupsd-3.14.13/platforms/slackware/apcupsd.in
+--- apcupsd-3.14.13.orig/platforms/slackware/apcupsd.in	2015-08-17 22:51:39.595562965 -0500
++++ apcupsd-3.14.13/platforms/slackware/apcupsd.in	2015-08-17 22:51:34.106608743 -0500
 @@ -9,14 +9,14 @@
  APCPID=@PIDDIR@/apcupsd.pid
  DISTVER="@DISTVER@"