diff options
Diffstat (limited to 'sysutils/apcupsd/patches/patch-ae')
| -rw-r--r-- | sysutils/apcupsd/patches/patch-ae | 49 |
1 files changed, 43 insertions, 6 deletions
diff --git a/sysutils/apcupsd/patches/patch-ae b/sysutils/apcupsd/patches/patch-ae index c87a27cd577..38755762df1 100644 --- a/sysutils/apcupsd/patches/patch-ae +++ b/sysutils/apcupsd/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.4 2006/11/15 21:46:25 bouyer Exp $ +$NetBSD: patch-ae,v 1.5 2007/03/07 20:47:05 joerg Exp $ ---- autoconf/configure.in.orig 2006-04-08 00:42:15.000000000 +0200 -+++ autoconf/configure.in 2006-11-15 20:21:48.000000000 +0100 -@@ -63,13 +63,6 @@ +--- autoconf/configure.in.orig 2006-04-07 22:42:15.000000000 +0000 ++++ autoconf/configure.in +@@ -63,13 +63,6 @@ dnl if test x$sysconfdir = x'${prefix}/etc' ; then sysconfdir='/etc/apcupsd' fi @@ -16,7 +16,7 @@ $NetBSD: patch-ae,v 1.4 2006/11/15 21:46:25 bouyer Exp $ fi dnl -@@ -161,7 +154,7 @@ +@@ -161,7 +154,7 @@ else WIN32= WINLIBS= APCACCESS=apcaccess @@ -25,7 +25,44 @@ $NetBSD: patch-ae,v 1.4 2006/11/15 21:46:25 bouyer Exp $ APCTEST=apctest fi AC_SUBST(WIN32) -@@ -1355,6 +1348,7 @@ +@@ -468,7 +461,7 @@ else + AM_CONDITIONAL(HAVE_LINUX_OS, $FALSEPRG) + fi + +-if test $HAVE_UNAME=yes -a x`uname -s` = xFreeBSD ++if test $HAVE_UNAME=yes -a x`uname -s` = xFreeBSD || test $HAVE_UNAME=yes -a x`uname -s` = xDragonFly + then + AM_CONDITIONAL(HAVE_FREEBSD_OS, $TRUEPRG) + AC_DEFINE(HAVE_FREEBSD_OS) +@@ -750,7 +743,8 @@ AC_HELP_STRING([--disable-usb], [No USB + AC_SUBST(USB_TYPE) + elif test $HAVE_UNAME=yes -a x`uname -s` = xFreeBSD -o \ + $HAVE_UNAME=yes -a x`uname -s` = xOpenBSD -o \ +- $HAVE_UNAME=yes -a x`uname -s` = xNetBSD ; then ++ $HAVE_UNAME=yes -a x`uname -s` = xNetBSD -o \ ++ $HAVE_UNAME=yes -a x`uname -s` = xDragonFly; then + AC_DEFINE(HAVE_USB_DRIVER) + USB_DRIVER="usb" + USB_TYPE="bsd" +@@ -1156,7 +1150,7 @@ then + elif test $HAVE_UNAME=yes -a x`uname -s` = xFreeBSD + then + DISTNAME=freebsd +-elif test $HAVE_UNAME=yes -a x`uname -s` = xNetBSD ++elif test $HAVE_UNAME=yes -a x`uname -s` = xNetBSD || test $HAVE_UNAME=yes -a x`uname -s` = xDragonFly + then + DISTNAME=netbsd + elif test $HAVE_UNAME=yes -a x`uname -s` = xOpenBSD +@@ -1316,7 +1310,7 @@ debian) + platforms/debian/ups-monitor \ + " + ;; +-freebsd) ++freebsd|dragonfly) + DISTVER=`uname -a |awk '{print $3}'` + SERIALDEV=/dev/cuaa0 + nologdir=/var/run +@@ -1355,6 +1349,7 @@ netbsd) DFILES="\ platforms/netbsd/Makefile \ platforms/netbsd/apcupsd \ |