Update lcdproc to 0.5.9 -

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: Update lcdproc to 0.5.9 -
From: Rui-Xiang Guo <rxg%lavabit.com@localhost>
Date: Sun, 28 Feb 2021 05:57:32 +0000
Module Name:	pkgsrc-wip
Committed By:	Rui-Xiang Guo <rxg%lavabit.com@localhost>
Pushed By:	rxg
Date:		Sun Feb 28 13:57:32 2021 +0800
Changeset:	6e5ae41b4aefad2b15ee055093e5acae6c3e5eea

Added Files:
	lcdproc/patches/patch-clients_lcdproc_machine__NetBSD.c
Removed Files:
	lcdproc/files/getopt.h
	lcdproc/patches/patch-aa
	lcdproc/patches/patch-ab
	lcdproc/patches/patch-ac
	lcdproc/patches/patch-ad

Log Message:
Update lcdproc to 0.5.9 -

lcdproc 0.5.9
Drivers supporting new hardware or additional functionality

     * HD44780 connection type "serial" supports Portwell EZIO-100 and
       EZIO-300
     * HD44780 connection type "gpio" supports dual controller displays.
       This connection type is now a full replacement for the obsolete
       "rpi"
       connection type.

emoved configure flags

     * enable-permissive-menu-goto is replaced by a setting in LCDd.conf
     * enable-seamless-hbars is now selected by drivers that need it
       automatically

Other important changes

     * The build system now specifies the language as C99.
     * API: drivers need to include "shared/report.h" instead of
       "report.h"
     * libftdi1 is used if it is available instead of obsolete libftdi
     * display update interval is selectable from LCDd.conf

lcdproc 0.5.8
New drivers

     * futaba: for Futaba TOSD-5711BB VFDisplay commonly used on Elonex
       Artisan,
       Fujitsu Scaleo E and FIC Spectra Media Centre PCs
     * linux_input: supporting event devices from the linux input
       subsystem
     * Olimex_MOD_LCD1x9: for Olimex MOD-LCD1x9
     * yard2LCD: for yard2

New connection types for hd44780 driver

     * lcm162 is a differently wired 8 bit connection type used on
       Nextgate NSA
       network appliances
     * gpio is using the linux sysfs gpio interface to control a display
       in
       4-bit mode. To build this sub-driver you need
       libugpio, which is a new dependency
       for lcdproc.

Obsolete connection types for hd44780 driver

   The following connection types are obsolete and probably won't get bug
   and security fixes:
     * raspberrypi: use the gpio connection type instead
     * piplate: use the gpio connection type together with the
       gpio-mcp23s08
       kernel module.
     * pifacecad: use the gpio connection type together with the
       gpio-mcp23s08
       kernel module.
     * i2c: support for this sub-driver might continue for the users of
       non-linux operating systems. On linux systems it is recommended to
       use the gpio connection type together with the gpio-pcf857x kernel
       module.

Drivers supporting new hardware or additional functionality

     * icp_a106 now also supports A125 displays
     * NoritakeVFD added some non-essential features

Other important changes

     * Development of lcdproc moved to github.
     * Some internal data structures have changed. If you have custom LCDd
       drivers, you will need to recompile them against the new version.
       Of
       course submitting such drivers in pull requests is appreciated.
     * For a detailed list of bug fixes, see the ChangeLog.md included in
       the
       distribution archive.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6e5ae41b4aefad2b15ee055093e5acae6c3e5eea

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 lcdproc/files/getopt.h                             | 169 ---------------------
 lcdproc/patches/patch-aa                           |  37 -----
 lcdproc/patches/patch-ab                           |  37 -----
 lcdproc/patches/patch-ac                           |  37 -----
 lcdproc/patches/patch-ad                           |  37 -----
 .../patch-clients_lcdproc_machine__NetBSD.c        |  18 +++
 6 files changed, 18 insertions(+), 317 deletions(-)

diffs:
diff --git a/lcdproc/files/getopt.h b/lcdproc/files/getopt.h
deleted file mode 100644
index c60d19996b..0000000000
--- a/lcdproc/files/getopt.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/* Declarations for getopt.
-   Copyright (C) 1989,90,91,92,93,94,96,97,98 Free Software Foundation, Inc.
-   NOTE: The canonical source of this file is maintained with the GNU C Library.
-   Bugs can be reported to bug-glibc%gnu.org@localhost.
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2, or (at your option) any
-   later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-   USA.  */
-
-#ifndef _GETOPT_H
-
-#ifndef __need_getopt
-# define _GETOPT_H 1
-#endif
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-/* For communication from `getopt' to the caller.
-   When `getopt' finds an option that takes an argument,
-   the argument value is returned here.
-   Also, when `ordering' is RETURN_IN_ORDER,
-   each non-option ARGV-element is returned here.  */
-
-extern char *optarg;
-
-/* Index in ARGV of the next element to be scanned.
-   This is used for communication to and from the caller
-   and for communication between successive calls to `getopt'.
-
-   On entry to `getopt', zero means this is the first call; initialize.
-
-   When `getopt' returns -1, this is the index of the first of the
-   non-option elements that the caller should itself scan.
-
-   Otherwise, `optind' communicates from one call to the next
-   how much of ARGV has been scanned so far.  */
-
-extern int optind;
-
-/* Callers store zero here to inhibit the error message `getopt' prints
-   for unrecognized options.  */
-
-extern int opterr;
-
-/* Set to an option character which was unrecognized.  */
-
-extern int optopt;
-
-#ifndef __need_getopt
-/* Describe the long-named options requested by the application.
-   The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
-   of `struct option' terminated by an element containing a name which is
-   zero.
-
-   The field `has_arg' is:
-   no_argument		(or 0) if the option does not take an argument,
-   required_argument	(or 1) if the option requires an argument,
-   optional_argument 	(or 2) if the option takes an optional argument.
-
-   If the field `flag' is not NULL, it points to a variable that is set
-   to the value given in the field `val' when the option is found, but
-   left unchanged if the option is not found.
-
-   To have a long-named option do something other than set an `int' to
-   a compiled-in constant, such as set a value from `optarg', set the
-   option's `flag' field to zero and its `val' field to a nonzero
-   value (the equivalent single-letter option character, if there is
-   one).  For long options that have a zero `flag' field, `getopt'
-   returns the contents of the `val' field.  */
-
-struct option
-{
-# if defined __STDC__ && __STDC__
-  const char *name;
-# else
-  char *name;
-# endif
-  /* has_arg can't be an enum because some compilers complain about
-     type mismatches in all the code that assumes it is an int.  */
-  int has_arg;
-  int *flag;
-  int val;
-};
-
-/* Names for the values of the `has_arg' field of `struct option'.  */
-
-# define no_argument		0
-# define required_argument	1
-# define optional_argument	2
-#endif	/* need getopt */
-
-
-/* Get definitions and prototypes for functions to process the
-   arguments in ARGV (ARGC of them, minus the program name) for
-   options given in OPTS.
-
-   Return the option character from OPTS just read.  Return -1 when
-   there are no more options.  For unrecognized options, or options
-   missing arguments, `optopt' is set to the option letter, and '?' is
-   returned.
-
-   The OPTS string is a list of characters which are recognized option
-   letters, optionally followed by colons, specifying that that letter
-   takes an argument, to be placed in `optarg'.
-
-   If a letter in OPTS is followed by two colons, its argument is
-   optional.  This behavior is specific to the GNU `getopt'.
-
-   The argument `--' causes premature termination of argument
-   scanning, explicitly telling `getopt' that there are no more
-   options.
-
-   If OPTS begins with `--', then non-option arguments are treated as
-   arguments to the option '\0'.  This behavior is specific to the GNU
-   `getopt'.  */
-
-#if (defined __STDC__ && __STDC__) || defined PROTOTYPES
-# ifdef __GNU_LIBRARY__
-/* Many other libraries have conflicting prototypes for getopt, with
-   differences in the consts, in stdlib.h.  To avoid compilation
-   errors, only prototype getopt for the GNU C library.  */
-extern int getopt (int __argc, char *const *__argv, const char *__shortopts);
-# else /* not __GNU_LIBRARY__ */
-extern int getopt ();
-# endif /* __GNU_LIBRARY__ */
-
-# ifndef __need_getopt
-extern int getopt_long (int __argc, char *const *__argv, const char *__shortopts,
-		        const struct option *__longopts, int *__longind);
-extern int getopt_long_only (int __argc, char *const *__argv,
-			     const char *__shortopts,
-		             const struct option *__longopts, int *__longind);
-
-/* Internal only.  Users should not call this directly.  */
-extern int _getopt_internal (int __argc, char *const *__argv,
-			     const char *__shortopts,
-		             const struct option *__longopts, int *__longind,
-			     int __long_only);
-# endif
-#else /* not ((defined __STDC__ && __STDC__) || defined PROTOTYPES) */
-extern int getopt ();
-# ifndef __need_getopt
-extern int getopt_long ();
-extern int getopt_long_only ();
-
-extern int _getopt_internal ();
-# endif
-#endif /* (defined __STDC__ && __STDC__) || defined PROTOTYPES */
-
-#ifdef	__cplusplus
-}
-#endif
-
-/* Make sure we later can get all the definitions and declarations.  */
-#undef __need_getopt
-
-#endif /* getopt.h */
diff --git a/lcdproc/patches/patch-aa b/lcdproc/patches/patch-aa
deleted file mode 100644
index 7869858b5b..0000000000
--- a/lcdproc/patches/patch-aa
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2009/11/05 19:40:07 christtrekker Exp $
---- Makefile.in.orig	2009-06-21 10:09:28.000000000 -0500
-+++ Makefile.in	2009-11-05 12:52:14.000000000 -0600
-@@ -198,6 +198,7 @@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
-+sysconfstagedir = @datadir@/examples/@PACKAGE@
- target_alias = @target_alias@
- AUTOMAKE_OPTIONS = foreign
- SUBDIRS = shared clients server docs scripts
-@@ -260,20 +261,20 @@
- uninstall-info-am:
- install-sysconfDATA: $(sysconf_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
-+	test -z "$(sysconfstagedir)" || $(mkdir_p) "$(DESTDIR)$(sysconfstagedir)"
- 	@list='$(sysconf_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
--	  echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
--	  $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
-+	  echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfstagedir)/$$f'"; \
-+	  $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfstagedir)/$$f"; \
- 	done
- 
- uninstall-sysconfDATA:
- 	@$(NORMAL_UNINSTALL)
- 	@list='$(sysconf_DATA)'; for p in $$list; do \
- 	  f=$(am__strip_dir) \
--	  echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \
--	  rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \
-+	  echo " rm -f '$(DESTDIR)$(sysconfstagedir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(sysconfstagedir)/$$f"; \
- 	done
- 
- # This directory's subdirectories are mostly independent; you can cd
diff --git a/lcdproc/patches/patch-ab b/lcdproc/patches/patch-ab
deleted file mode 100644
index e285fbb9a6..0000000000
--- a/lcdproc/patches/patch-ab
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2009/11/05 19:40:07 christtrekker Exp $
---- clients/lcdexec/Makefile.in.orig	2009-06-21 10:09:27.000000000 -0500
-+++ clients/lcdexec/Makefile.in	2009-11-05 13:26:36.000000000 -0600
-@@ -190,6 +190,7 @@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
-+sysconfstagedir = @datadir@/examples/@PACKAGE@
- target_alias = @target_alias@
- sysconf_DATA = lcdexec.conf
- lcdexec_SOURCES = lcdexec.c menu.c menu.h
-@@ -281,20 +282,20 @@
- uninstall-info-am:
- install-sysconfDATA: $(sysconf_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
-+	test -z "$(sysconfstagedir)" || $(mkdir_p) "$(DESTDIR)$(sysconfstagedir)"
- 	@list='$(sysconf_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
--	  echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
--	  $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
-+	  echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfstagedir)/$$f'"; \
-+	  $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfstagedir)/$$f"; \
- 	done
- 
- uninstall-sysconfDATA:
- 	@$(NORMAL_UNINSTALL)
- 	@list='$(sysconf_DATA)'; for p in $$list; do \
- 	  f=$(am__strip_dir) \
--	  echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \
--	  rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \
-+	  echo " rm -f '$(DESTDIR)$(sysconfstagedir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(sysconfstagedir)/$$f"; \
- 	done
- 
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
diff --git a/lcdproc/patches/patch-ac b/lcdproc/patches/patch-ac
deleted file mode 100644
index 5e2d709230..0000000000
--- a/lcdproc/patches/patch-ac
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2009/11/05 19:40:07 christtrekker Exp $
---- clients/lcdproc/Makefile.in.orig	2009-06-21 10:09:27.000000000 -0500
-+++ clients/lcdproc/Makefile.in	2009-11-05 13:27:16.000000000 -0600
-@@ -196,6 +196,7 @@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
-+sysconfstagedir = @datadir@/examples/@PACKAGE@
- target_alias = @target_alias@
- sysconf_DATA = lcdproc.conf
- lcdproc_SOURCES = main.c main.h mode.c mode.h batt.c batt.h chrono.c chrono.h cpu.c cpu.h cpu_smp.c cpu_smp.h disk.c disk.h load.c load.h mem.c mem.h eyebox.c eyebox.h machine.h machine_Linux.c machine_OpenBSD.c machine_FreeBSD.c machine_NetBSD.c machine_Darwin.c machine_SunOS.c util.c util.h iface.c iface.h
-@@ -304,20 +305,20 @@
- uninstall-info-am:
- install-sysconfDATA: $(sysconf_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
-+	test -z "$(sysconfstagedir)" || $(mkdir_p) "$(DESTDIR)$(sysconfstagedir)"
- 	@list='$(sysconf_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
--	  echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
--	  $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
-+	  echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfstagedir)/$$f'"; \
-+	  $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfstagedir)/$$f"; \
- 	done
- 
- uninstall-sysconfDATA:
- 	@$(NORMAL_UNINSTALL)
- 	@list='$(sysconf_DATA)'; for p in $$list; do \
- 	  f=$(am__strip_dir) \
--	  echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \
--	  rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \
-+	  echo " rm -f '$(DESTDIR)$(sysconfstagedir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(sysconfstagedir)/$$f"; \
- 	done
- 
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
diff --git a/lcdproc/patches/patch-ad b/lcdproc/patches/patch-ad
deleted file mode 100644
index 657c0e0d07..0000000000
--- a/lcdproc/patches/patch-ad
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2009/11/05 19:40:07 christtrekker Exp $
---- clients/lcdvc/Makefile.in.orig	2009-06-21 10:09:27.000000000 -0500
-+++ clients/lcdvc/Makefile.in	2009-11-05 13:27:57.000000000 -0600
-@@ -191,6 +191,7 @@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
-+sysconfstagedir = @datadir@/examples/@PACKAGE@
- target_alias = @target_alias@
- sysconf_DATA = lcdvc.conf
- lcdvc_SOURCES = lcdvc.c lcdvc.h lcd_link.c lcd_link.h vc_link.c vc_link.h 
-@@ -287,20 +288,20 @@
- uninstall-info-am:
- install-sysconfDATA: $(sysconf_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
-+	test -z "$(sysconfstagedir)" || $(mkdir_p) "$(DESTDIR)$(sysconfstagedir)"
- 	@list='$(sysconf_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
--	  echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
--	  $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
-+	  echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfstagedir)/$$f'"; \
-+	  $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfstagedir)/$$f"; \
- 	done
- 
- uninstall-sysconfDATA:
- 	@$(NORMAL_UNINSTALL)
- 	@list='$(sysconf_DATA)'; for p in $$list; do \
- 	  f=$(am__strip_dir) \
--	  echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \
--	  rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \
-+	  echo " rm -f '$(DESTDIR)$(sysconfstagedir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(sysconfstagedir)/$$f"; \
- 	done
- 
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
diff --git a/lcdproc/patches/patch-clients_lcdproc_machine__NetBSD.c b/lcdproc/patches/patch-clients_lcdproc_machine__NetBSD.c
new file mode 100644
index 0000000000..734636d1bb
--- /dev/null
+++ b/lcdproc/patches/patch-clients_lcdproc_machine__NetBSD.c
@@ -0,0 +1,18 @@
+$NetBSD$
+
+Builds on amd64.
+
+--- clients/lcdproc/machine_NetBSD.c.orig	2021-01-24 06:10:24.774432154 +0000
++++ clients/lcdproc/machine_NetBSD.c
+@@ -54,7 +54,11 @@
+ #include <sys/dkstat.h>
+ #include <sched.h>
+ #include <uvm/uvm_extern.h>
++#ifdef __x86_64__
++#include <i386/apmvar.h>
++#else
+ #include <machine/apmvar.h>
++#endif
+ #include <errno.h>
+ #include <sys/socket.h>
+ #include <net/if.h>
Prev by Date: catpoint-git: Adjust COMMENT (probably a copypasto from pointtools-git)
Next by Date: Update wip/py-rich to new version: 9.12.2
Previous by Thread: catpoint-git: Adjust COMMENT (probably a copypasto from pointtools-git)
Next by Thread: Update wip/py-rich to new version: 9.12.2
Indexes:
Home | Main Index | Thread Index | Old Index