This commit was manufactured by cvs2svn to create tag 'RELEASE_6_4_0'.release/6.4.0

6 files changed, 0 insertions, 158 deletions

diff --git a/sysutils/nut22/files/nut.sh.in b/sysutils/nut22/files/nut.sh.in
deleted file mode 100644
index 9cd40c1430b5..000000000000
--- a/sysutils/nut22/files/nut.sh.in
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: nut
-# REQUIRE: NETWORKING
-# BEFORE: LOGIN
-# KEYWORD: shutdown
-
-# Define these nut_* variables in one of these files:
-#       /etc/rc.conf
-#       /etc/rc.conf.local
-#       /etc/rc.conf.d/nut
-#
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
-#
-nut_enable=${nut_enable-"NO"}
-nut_prefix=${nut_prefix-"%%PREFIX%%"}
-
-. %%RC_SUBR%%
-
-name="nut"
-rcvar=`set_rcvar`
-
-load_rc_config $name
-
-required_dirs="%%STATEDIR%%"
-required_files="${nut_prefix}/etc/nut/ups.conf ${nut_prefix}/etc/nut/upsd.conf ${nut_prefix}/etc/nut/upsd.users"
-command="${nut_prefix}/sbin/upsd"
-pidfile="%%STATEDIR%%/upsd.pid"
-
-start_precmd="nut_prestart"
-stop_postcmd="nut_poststop"
-
-nut_prestart() {
-	${nut_prefix}/libexec/nut/upsdrvctl start
-}
-
-nut_poststop() {
-	${nut_prefix}/libexec/nut/upsdrvctl stop
-}
-
-run_rc_command "$1"
diff --git a/sysutils/nut22/files/nut_upslog.sh.in b/sysutils/nut22/files/nut_upslog.sh.in
deleted file mode 100644
index 908451b9c331..000000000000
--- a/sysutils/nut22/files/nut_upslog.sh.in
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: nut_upslog
-# REQUIRE: NETWORKING nut
-# BEFORE: LOGIN
-# KEYWORD: shutdown
-
-# Define these nut_upslog* variables in one of these files:
-#       /etc/rc.conf
-#       /etc/rc.conf.local
-#       /etc/rc.conf.d/nut_upslog
-#
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
-#
-nut_upslog_enable=${nut_upslog_enable-"NO"}
-nut_upslog_prefix=${nut_upslog_prefix-"%%PREFIX%%"}
-nut_upslog_logfile=${nut_upslog_logfile-"/var/log/ups.log"}
-nut_upslog_interval=${nut_upslog_interval-"300"}
-nut_upslog_ups=${nut_upslog_ups-"myups@localhost"}
-
-. %%RC_SUBR%%
-
-name="nut_upslog"
-rcvar=`set_rcvar`
-
-load_rc_config $name
-
-required_dirs="%%STATEDIR%%"
-command="${nut_upslog_prefix}/bin/upslog"
-pidfile="%%STATEDIR%%/upslog.pid"
-nut_upslog_flags=${nut_upslog_flags-"-s ${nut_upslog_ups} -l ${nut_upslog_logfile} -i ${nut_upslog_interval}"}
-
-run_rc_command "$1"
diff --git a/sysutils/nut22/files/nut_upsmon.sh.in b/sysutils/nut22/files/nut_upsmon.sh.in
deleted file mode 100644
index 5d5449dc3204..000000000000
--- a/sysutils/nut22/files/nut_upsmon.sh.in
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: nut_upsmon
-# REQUIRE: NETWORKING nut
-# BEFORE: LOGIN
-# KEYWORD: shutdown
-
-# Define these nut_upsmon* variables in one of these files:
-#       /etc/rc.conf
-#       /etc/rc.conf.local
-#       /etc/rc.conf.d/nut_upsmon
-#
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
-#
-nut_upsmon_enable=${nut_upsmon_enable-"NO"}
-nut_upsmon_prefix=${nut_upsmon_prefix-"%%PREFIX%%"}
-
-. %%RC_SUBR%%
-
-name="nut_upsmon"
-rcvar=`set_rcvar`
-
-load_rc_config $name
-
-required_dirs="%%STATEDIR%%"
-required_files="${nut_upsmon_prefix}/etc/nut/upsmon.conf"
-command="${nut_upsmon_prefix}/sbin/upsmon"
-pidfile="%%STATEDIR%%/upsmon.pid"
-nut_upsmon_flags=${nut_upsmon_flags-"localhost"}
-
-run_rc_command "$1"
diff --git a/sysutils/nut22/files/patch-clients-Makefile.in b/sysutils/nut22/files/patch-clients-Makefile.in
deleted file mode 100644
index 5f1ff8b9b730..000000000000
--- a/sysutils/nut22/files/patch-clients-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- clients/Makefile.in.orig	2007-07-05 15:21:22.000000000 +0200
-+++ clients/Makefile.in	2007-08-28 15:25:39.000000000 +0200
-@@ -440,7 +440,7 @@
- 	done
- install-cgiexecPROGRAMS: $(cgiexec_PROGRAMS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(cgiexecdir)" || $(MKDIR_P) "$(DESTDIR)$(cgiexecdir)"
-+	test -z "$(cgiexec_PROGRAMS)" -o -z "$(cgiexecdir)" || $(MKDIR_P) "$(DESTDIR)$(cgiexecdir)"
- 	@list='$(cgiexec_PROGRAMS)'; for p in $$list; do \
- 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- 	  if test -f $$p \
diff --git a/sysutils/nut22/files/patch-data-html-Makefile.in b/sysutils/nut22/files/patch-data-html-Makefile.in
deleted file mode 100644
index da43f2a417c5..000000000000
--- a/sysutils/nut22/files/patch-data-html-Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- data/html/Makefile.in.orig	2007-07-05 15:21:23.000000000 +0200
-+++ data/html/Makefile.in	2007-08-28 15:25:08.000000000 +0200
-@@ -285,7 +285,7 @@
- uninstall-info-am:
- install-dist_htmlDATA: $(dist_html_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
-+	test -z "$(dist_html_DATA)" -o -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
- 	@list='$(dist_html_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -302,7 +302,7 @@
- 	done
- install-nodist_htmlDATA: $(nodist_html_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
-+	test -z "$(nodist_html_DATA)" -o -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
- 	@list='$(nodist_html_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
diff --git a/sysutils/nut22/files/patch-m4-nut_check_ipv6.m4 b/sysutils/nut22/files/patch-m4-nut_check_ipv6.m4
deleted file mode 100644
index fa12e98b55d3..000000000000
--- a/sysutils/nut22/files/patch-m4-nut_check_ipv6.m4
+++ /dev/null
@@ -1,13 +0,0 @@
---- m4/nut_check_ipv6.m4.orig	2007-03-15 21:19:05.000000000 +0100
-+++ m4/nut_check_ipv6.m4	2007-10-15 11:42:02.000000000 +0200
-@@ -22,7 +22,9 @@
- 		   struct in6_addr],
-                   [:],
-                   [nut_have_ipv6=no],
--		  [#include <netdb.h>])
-+		  [#include <netdb.h>
-+		   #include <sys/socket.h>
-+		   #include <netinet/in.h>])
- 
- dnl AC_CHECK_MEMBERS([struct in6_addr.s6_addr32],
- dnl               [:],