[pkgsrc/trunk]: pkgsrc/sysutils/apcupsd Allow this to build on DragonFly. Com...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/sysutils/apcupsd Allow this to build on DragonFly. Com...
From: joerg <joerg%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 04:39:46 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/bb2bc4779451
branches:  trunk
changeset: 526324:bb2bc4779451
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Mar 07 20:47:05 2007 +0000

description:
Allow this to build on DragonFly. Complete untested, feedback is welcome.
If it is provided, it might be worth to fix the distribution name :-)

diffstat:

 sysutils/apcupsd/Makefile         |     4 +-
 sysutils/apcupsd/distinfo         |    10 +-
 sysutils/apcupsd/patches/patch-ae |    49 +-
 sysutils/apcupsd/patches/patch-aj |  1261 +++++++++++++++++++-----------------
 4 files changed, 700 insertions(+), 624 deletions(-)

diffs (truncated from 4693 to 300 lines):

diff -r c386e38ba5f3 -r bb2bc4779451 sysutils/apcupsd/Makefile
--- a/sysutils/apcupsd/Makefile Wed Mar 07 19:18:39 2007 +0000
+++ b/sysutils/apcupsd/Makefile Wed Mar 07 20:47:05 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2006/12/20 20:49:12 bouyer Exp $
+# $NetBSD: Makefile,v 1.48 2007/03/07 20:47:05 joerg Exp $
 
 DISTNAME=              apcupsd-3.12.4
 CATEGORIES=            sysutils
@@ -9,7 +9,7 @@
 HOMEPAGE=              http://www.apcupsd.org/
 COMMENT=               UPS power management for APCC Products
 
-USE_TOOLS+=            gmake msgfmt sh
+USE_TOOLS+=            gmake msgfmt sh makedepend
 USE_LANGUAGES=         c c++
 
 GNU_CONFIGURE=         yes
diff -r c386e38ba5f3 -r bb2bc4779451 sysutils/apcupsd/distinfo
--- a/sysutils/apcupsd/distinfo Wed Mar 07 19:18:39 2007 +0000
+++ b/sysutils/apcupsd/distinfo Wed Mar 07 20:47:05 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2006/11/15 21:46:25 bouyer Exp $
+$NetBSD: distinfo,v 1.9 2007/03/07 20:47:05 joerg Exp $
 
 SHA1 (apcupsd-3.12.4.tar.gz) = a36212d9634d36beda2318d85b882209763f2473
 RMD160 (apcupsd-3.12.4.tar.gz) = a54c2f6d71c902d7963a1c65a3850f657aabaa88
@@ -7,8 +7,12 @@
 SHA1 (patch-ab) = 38ca41df0d96130f5c2202cb85d61f3202ec17ad
 SHA1 (patch-ac) = 98e8853dd030e09d5a487e57a277ff1269baa517
 SHA1 (patch-ad) = 48818f95966f5c9f742e333614b0ab5387886e62
-SHA1 (patch-ae) = 96f3fc1645577b9f5558c112133d4bff06c37cd5
+SHA1 (patch-ae) = 27ec597c42e2484e4441eea3f5891eb94659d1ab
 SHA1 (patch-af) = c4a52226d83ac50adcd9296afd786b42867a7a6d
 SHA1 (patch-ag) = 2b77e969d6cbe8ed06797cd753eb443bd6a3881b
-SHA1 (patch-aj) = 5dd8f244698d44ccb77a97ca305e3f2961b858b8
+SHA1 (patch-aj) = 1786e22d520520b066c0155315c48def2827eb90
 SHA1 (patch-ak) = c3069d2b8d9059b383874989cde2edaecd35d49b
+SHA1 (patch-al) = a41cb4ee8d896fc633d8869f24e548fda0761340
+SHA1 (patch-am) = a2c060519748cf95f0f9aaa284f783f086c1d7d4
+SHA1 (patch-an) = 518ed5d1b7c5e20e8f5b5aa0025a8c5f1c908dc0
+SHA1 (patch-ao) = 62576f181dd8e5352221f2079ee4c2e34d64c20a
diff -r c386e38ba5f3 -r bb2bc4779451 sysutils/apcupsd/patches/patch-ae
--- a/sysutils/apcupsd/patches/patch-ae Wed Mar 07 19:18:39 2007 +0000
+++ b/sysutils/apcupsd/patches/patch-ae Wed Mar 07 20:47:05 2007 +0000
@@ -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 @@
  fi
  
  dnl
-@@ -161,7 +154,7 @@
+@@ -161,7 +154,7 @@ else
      WIN32=
      WINLIBS=
      APCACCESS=apcaccess
@@ -25,7 +25,44 @@
      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 \
diff -r c386e38ba5f3 -r bb2bc4779451 sysutils/apcupsd/patches/patch-aj
--- a/sysutils/apcupsd/patches/patch-aj Wed Mar 07 19:18:39 2007 +0000
+++ b/sysutils/apcupsd/patches/patch-aj Wed Mar 07 20:47:05 2007 +0000
@@ -1,9 +1,7 @@
-$NetBSD: patch-aj,v 1.5 2006/11/15 21:46:25 bouyer Exp $
+$NetBSD: patch-aj,v 1.6 2007/03/07 20:47:05 joerg Exp $
 
-Note that the test -x -> test -f change is done by hand after running autoconf
-
---- configure.orig     2006-04-08 00:42:15.000000000 +0200
-+++ configure  2006-11-15 20:22:52.000000000 +0100
+--- configure.orig     2006-04-07 22:42:15.000000000 +0000
++++ configure
 @@ -1,8 +1,9 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -16,7 +14,7 @@
  # This configure script is free software; the Free Software Foundation
  # gives unlimited permission to copy, distribute and modify it.
  ## --------------------- ##
-@@ -16,11 +17,35 @@
+@@ -16,11 +17,35 @@ if test -n "${ZSH_VERSION+set}" && (emul
    # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
    # is contrary to our usage.  Disable this feature.
    alias -g '${1+"$@"}'='"$@"'
@@ -54,7 +52,7 @@
  # Support unset when possible.
  if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
    as_unset=unset
-@@ -29,8 +54,43 @@
+@@ -29,8 +54,43 @@ else
  fi
  
  
@@ -99,7 +97,7 @@
  PS1='$ '
  PS2='> '
  PS4='+ '
-@@ -44,18 +104,19 @@
+@@ -44,18 +104,19 @@ do
    if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
      eval $as_var=C; export $as_var
    else
@@ -122,7 +120,7 @@
    as_basename=basename
  else
    as_basename=false
-@@ -63,157 +124,386 @@
+@@ -63,157 +124,386 @@ fi
  
  
  # Name of the executable.
@@ -608,7 +606,7 @@
  
  if mkdir -p . 2>/dev/null; then
    as_mkdir_p=:
-@@ -222,7 +512,19 @@
+@@ -222,7 +512,19 @@ else
    as_mkdir_p=false
  fi
  
@@ -629,7 +627,7 @@
  
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -231,39 +533,27 @@
+@@ -231,39 +533,27 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
  
@@ -672,7 +670,7 @@
  # Identity of this package.
  PACKAGE_NAME=
  PACKAGE_TARNAME=
-@@ -302,17 +592,219 @@
+@@ -302,17 +592,219 @@ ac_includes_default="\
  #endif
  #if HAVE_INTTYPES_H
  # include <inttypes.h>
@@ -898,7 +896,7 @@
  
  # Initialize some variables set by options.
  ac_init_help=
-@@ -339,34 +831,48 @@
+@@ -339,34 +831,48 @@ x_libraries=NONE
  # and all the variables that are supposed to be based on exec_prefix
  # by default will actually change.
  # Use braces instead of parens because sh, perl, etc. also accept them.
@@ -954,7 +952,7 @@
  
    -bindir | --bindir | --bindi | --bind | --bin | --bi)
      ac_prev=bindir ;;
-@@ -388,12 +894,18 @@
+@@ -388,12 +894,18 @@ do
    --config-cache | -C)
      cache_file=config.cache ;;
  
@@ -976,7 +974,7 @@
    -disable-* | --disable-*)
      ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
      # Reject names that are not valid shell variable names.
-@@ -401,7 +913,17 @@
+@@ -401,7 +913,17 @@ do
        { echo "$as_me: error: invalid feature name: $ac_feature" >&2
     { (exit 1); exit 1; }; }
      ac_feature=`echo $ac_feature | sed 's/-/_/g'`
@@ -995,7 +993,7 @@
  
    -enable-* | --enable-*)
      ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-@@ -410,11 +932,7 @@
+@@ -410,11 +932,7 @@ do
        { echo "$as_me: error: invalid feature name: $ac_feature" >&2
     { (exit 1); exit 1; }; }
      ac_feature=`echo $ac_feature | sed 's/-/_/g'`
@@ -1008,7 +1006,7 @@
  
    -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
    | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -441,6 +959,12 @@
+@@ -441,6 +959,12 @@ do
    -host=* | --host=* | --hos=* | --ho=*)
      host_alias=$ac_optarg ;;
  
@@ -1021,7 +1019,7 @@
    -includedir | --includedir | --includedi | --included | --include \
    | --includ | --inclu | --incl | --inc)
      ac_prev=includedir ;;
-@@ -465,13 +989,16 @@
+@@ -465,13 +989,16 @@ do
    | --libexe=* | --libex=* | --libe=*)
      libexecdir=$ac_optarg ;;
  
@@ -1042,7 +1040,7 @@
      localstatedir=$ac_optarg ;;
  
    -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-@@ -536,6 +1063,16 @@
+@@ -536,6 +1063,16 @@ do
    | --progr-tra=* | --program-tr=* | --program-t=*)
      program_transform_name=$ac_optarg ;;
  
@@ -1059,7 +1057,7 @@
    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
    | -silent | --silent | --silen | --sile | --sil)
      silent=yes ;;
-@@ -592,11 +1129,7 @@
+@@ -592,11 +1129,7 @@ do
        { echo "$as_me: error: invalid package name: $ac_package" >&2
     { (exit 1); exit 1; }; }
      ac_package=`echo $ac_package| sed 's/-/_/g'`
@@ -1072,7 +1070,7 @@
  
    -without-* | --without-*)
      ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-@@ -605,7 +1138,7 @@
+@@ -605,7 +1138,7 @@ do
        { echo "$as_me: error: invalid package name: $ac_package" >&2
     { (exit 1); exit 1; }; }
      ac_package=`echo $ac_package | sed 's/-/_/g'`
@@ -1081,7 +1079,7 @@
  
    --x)
      # Obsolete; use --with-x.
-@@ -636,8 +1169,7 @@
+@@ -636,8 +1169,7 @@ Try \`$0 --help' for more information." 
      expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
        { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
     { (exit 1); exit 1; }; }
@@ -1091,7 +1089,7 @@
      export $ac_envvar ;;
  
    *)
-@@ -657,27 +1189,19 @@
+@@ -657,27 +1189,19 @@ if test -n "$ac_prev"; then
     { (exit 1); exit 1; }; }
  fi
  
@@ -1129,7 +1127,7 @@
  done
  
  # There might be people who depend on the old broken behavior: `$host'
-@@ -704,82 +1228,76 @@
+@@ -704,82 +1228,76 @@ test -n "$host_alias" && ac_tool_prefix=
  test "$silent" = yes && exec 6>/dev/null
Prev by Date: [pkgsrc/trunk]: pkgsrc/sysutils/apcupsd/patches Bah, not my day. Add the Drag...
Next by Date: [pkgsrc/trunk]: pkgsrc/cad/spice Replaced sed(1) and mv(1) with the SUBST fra...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/sysutils/apcupsd/patches Bah, not my day. Add the Drag...
Next by Thread: [pkgsrc/trunk]: pkgsrc/cad/spice Replaced sed(1) and mv(1) with the SUBST fra...
Indexes:
Home | Main Index | Thread Index | Old Index