4 files changed, 3 insertions, 116 deletions

diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile
index fd1a58fa5dd2..dddc54da795c 100644
--- a/sysutils/apcupsd/Makefile
+++ b/sysutils/apcupsd/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	apcupsd
-PORTVERSION=	3.14.8
-PORTREVISION=	2
+PORTVERSION=	3.14.10
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20-%20Stable/${PORTVERSION}:src_sf \
 		http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/:src_bk \
diff --git a/sysutils/apcupsd/distinfo b/sysutils/apcupsd/distinfo
index 28ea9b577346..9a61fe999e85 100644
--- a/sysutils/apcupsd/distinfo
+++ b/sysutils/apcupsd/distinfo
@@ -1,3 +1,3 @@
-SHA256 (apcupsd-3.14.8.tar.gz) = 8e7f2574d3abaf6637da3e790860c3f9ba64fab1ec7e50bb080de4439441c5a7
-SIZE (apcupsd-3.14.8.tar.gz) = 1317601
+SHA256 (apcupsd-3.14.10.tar.gz) = 0707b5ec9916fbde9e44eb8d18037c8d8f75dfd6aeef51aba5487e189eef2032
+SIZE (apcupsd-3.14.10.tar.gz) = 1336852
 SHA256 (apcupsd.pdf) = IGNORE
diff --git a/sysutils/apcupsd/files/patch-configure b/sysutils/apcupsd/files/patch-configure
deleted file mode 100644
index d3c85b00fc08..000000000000
--- a/sysutils/apcupsd/files/patch-configure
+++ /dev/null
@@ -1,58 +0,0 @@
---- configure.orig	2009-03-12 00:42:12.000000000 +0300
-+++ configure	2009-03-12 00:43:17.000000000 +0300
-@@ -10623,53 +10623,8 @@
- echo "${ECHO_T}Using BSD USB driver." >&6
-             ;;
-          *)
--            # Extract the first word of "libusb-config", so it can be a program name with args.
--set dummy libusb-config; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_path_usbcfg+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  case $usbcfg in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_usbcfg="$usbcfg" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_path_usbcfg="$as_dir/$ac_word$ac_exec_ext"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--
--  ;;
--esac
--fi
--usbcfg=$ac_cv_path_usbcfg
--
--if test -n "$usbcfg"; then
--  echo "$as_me:$LINENO: result: $usbcfg" >&5
--echo "${ECHO_T}$usbcfg" >&6
--else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--
--            if test x$usbcfg = x ; then
--               { { echo "$as_me:$LINENO: error: Cannot find libusb-config" >&5
--echo "$as_me: error: Cannot find libusb-config" >&2;}
--   { (exit 1); exit 1; }; }
--            fi
--
--            LIBUSB=`$usbcfg --libs`
--            LIBUSBH=`$usbcfg --prefix`/include/usb.h
-+            LIBUSB=-lusb
-+            LIBUSBH="/usr/include/usb.h"
- 
- 
-             LIBUSBHIDINC="-I\$(topdir)/src/libusbhid"
diff --git a/sysutils/apcupsd/files/patch-src__apcaccess.c b/sysutils/apcupsd/files/patch-src__apcaccess.c
deleted file mode 100644
index f5c7afb4b858..000000000000
--- a/sysutils/apcupsd/files/patch-src__apcaccess.c
+++ /dev/null
@@ -1,54 +0,0 @@
---- ./src/apcaccess.c.orig	2008-01-27 18:22:58.000000000 +0200
-+++ ./src/apcaccess.c	2008-06-29 14:17:12.000000000 +0300
-@@ -68,11 +68,19 @@
- int main(int argc, char **argv)
- {
-    int mode = 0;
-+   UPSINFO *ups = NULL;
-+
-+   char *cfgfile = APCCONF;
-+   struct stat cfgstat;
- 
- #ifdef HAVE_MINGW
-    WSA_Init();                   /* init MS networking */
- #endif
- 
-+   ups = attach_ups(ups);
-+   if (!ups)
-+      Error_abort0(_("Cannot attach SYSV IPC.\n"));
-+
-    if (argc < 2) {
-       /* Assume user wants "status" */
-       mode = 2;
-@@ -94,8 +102,23 @@
-          *p++ = 0;
-          port = atoi(p);
-       }
-+   } else {
-+      /* check configuration so local NISIP and NISPORT variables can be used as
-+ defaults */
-+      if (!stat(cfgfile, &cfgstat)) {
-+         check_for_config(ups, cfgfile);
-+
-+         if (ups) {
-+            if (ups->nisip && ups->nisip[0])
-+               host = ups->nisip;
-+
-+            if (ups->statusport)
-+               port = ups->statusport;
-+         }
-+      }
-    }
- 
-+
-    if (!*host || strcmp(host, "0.0.0.0") == 0)
-       host = "localhost";
- 
-@@ -108,5 +131,7 @@
-       return 1;
-    }
- 
-+   detach_ups(ups);
-+
-    return 0;
- }