aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sysutils/apcupsd/Makefile4
-rw-r--r--sysutils/apcupsd/distinfo4
-rw-r--r--sysutils/apcupsd/files/patch-autoconf-variables.mak.in19
-rw-r--r--sysutils/apcupsd/files/patch-src-drivers-usb-bsd-hidutils.c19
4 files changed, 4 insertions, 42 deletions
diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile
index 48cc1e68781b..5ffc6a4ca739 100644
--- a/sysutils/apcupsd/Makefile
+++ b/sysutils/apcupsd/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= apcupsd
-PORTVERSION= 3.10.17a
-PORTREVISION= 1
+PORTVERSION= 3.10.18
+#PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/sysutils/apcupsd/distinfo b/sysutils/apcupsd/distinfo
index a58f3319c794..0582c62b80cd 100644
--- a/sysutils/apcupsd/distinfo
+++ b/sysutils/apcupsd/distinfo
@@ -1,2 +1,2 @@
-MD5 (apcupsd-3.10.17a.tar.gz) = c39ac8d094fa5fd3916236c41a7d22fe
-SIZE (apcupsd-3.10.17a.tar.gz) = 5648670
+MD5 (apcupsd-3.10.18.tar.gz) = 64104a1fface0253e77318ca84948bac
+SIZE (apcupsd-3.10.18.tar.gz) = 5698299
diff --git a/sysutils/apcupsd/files/patch-autoconf-variables.mak.in b/sysutils/apcupsd/files/patch-autoconf-variables.mak.in
deleted file mode 100644
index b7cc967dd77d..000000000000
--- a/sysutils/apcupsd/files/patch-autoconf-variables.mak.in
+++ /dev/null
@@ -1,19 +0,0 @@
-*** autoconf/variables.mak.in.orig Thu Apr 1 22:32:21 2004
---- autoconf/variables.mak.in Sun Jul 3 13:00:08 2005
-***************
-*** 90,96 ****
-
- # Made INCFLAGS relative to the topdir and hardcoded into the Makefiles
- # For GDINCLUDE see src/cgi/Makefile.in
-! INCFLAGS = $(GDINCLUDE) -I$(topdir)/include
- CFLAGS = @CFLAGS@ $(CPPFLAGS) @PTHREAD_CFLAGS@ $(INCFLAGS)
- LDFLAGS = @LDFLAGS@
- LIBS = $(DRVLIBS) $(APCLIBS) $(INTLLIBS) @PTHREAD_LFLAGS@ @LIBS@
---- 90,96 ----
-
- # Made INCFLAGS relative to the topdir and hardcoded into the Makefiles
- # For GDINCLUDE see src/cgi/Makefile.in
-! INCFLAGS = $(GDINCLUDE) -I$(topdir)/include $(EXTRAINCS)
- CFLAGS = @CFLAGS@ $(CPPFLAGS) @PTHREAD_CFLAGS@ $(INCFLAGS)
- LDFLAGS = @LDFLAGS@
- LIBS = $(DRVLIBS) $(APCLIBS) $(INTLLIBS) @PTHREAD_LFLAGS@ @LIBS@
diff --git a/sysutils/apcupsd/files/patch-src-drivers-usb-bsd-hidutils.c b/sysutils/apcupsd/files/patch-src-drivers-usb-bsd-hidutils.c
deleted file mode 100644
index 681fbe6b89eb..000000000000
--- a/sysutils/apcupsd/files/patch-src-drivers-usb-bsd-hidutils.c
+++ /dev/null
@@ -1,19 +0,0 @@
-*** src/drivers/usb/bsd/hidutils.c.orig Fri Apr 22 02:28:40 2005
---- src/drivers/usb/bsd/hidutils.c Sun Jul 3 13:02:26 2005
-***************
-*** 327,333 ****
- req.ucr_actlen = 0;
- req.ucr_addr = 0;
- req.ucr_data = data;
-! req.ucr_request.bmRequestType = UT_WRITE_CLASS_ENDPOINT;
- req.ucr_request.bRequest = UR_SET_REPORT;
- USETW(req.ucr_request.wValue, ((item->kind+1) << 8) | item->report_ID);
- USETW(req.ucr_request.wIndex, 0);
---- 327,333 ----
- req.ucr_actlen = 0;
- req.ucr_addr = 0;
- req.ucr_data = data;
-! req.ucr_request.bmRequestType = UT_WRITE_CLASS_INTERFACE;
- req.ucr_request.bRequest = UR_SET_REPORT;
- USETW(req.ucr_request.wValue, ((item->kind+1) << 8) | item->report_ID);
- USETW(req.ucr_request.wIndex, 0);