libdivecomputer: Simpler patch recommended by upstream

[Charlotte Koch <charlotte%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Charlotte Koch <charlotte%NetBSD.org@localhost>
Pushed By:	cfkoch
Date:		Sun Nov 13 22:36:57 2022 -0800
Changeset:	2b2e514dafebf889ae2a2618ff61159610981ce9

Modified Files:
	libdivecomputer/distinfo
	libdivecomputer/patches/patch-src_serial_posix.c
Removed Files:
	libdivecomputer/patches/patch-configure.ac

Log Message:
libdivecomputer: Simpler patch recommended by upstream

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

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

diffstat:
 libdivecomputer/distinfo                         |  3 +--
 libdivecomputer/patches/patch-configure.ac       | 14 --------------
 libdivecomputer/patches/patch-src_serial_posix.c | 20 +++++++-------------
 3 files changed, 8 insertions(+), 29 deletions(-)

diffs:
diff --git a/libdivecomputer/distinfo b/libdivecomputer/distinfo
index b4509ab31f..301f4482f3 100644
--- a/libdivecomputer/distinfo
+++ b/libdivecomputer/distinfo
@@ -3,5 +3,4 @@ $NetBSD$
 RMD160 (libdivecomputer-0.7.0.tar.gz) = 0ca07ef31b2d0b6619326e11b8078cbaf150c54c
 SHA512 (libdivecomputer-0.7.0.tar.gz) = 205f8f659c426266e47c0979b8a7e0e1b06d6db2965ab67bc1e8638b48efb8854549f5fa23610570563b0464a204b6e811caccdc2ef692ea68b039939cb41635
 Size (libdivecomputer-0.7.0.tar.gz) = 751538 bytes
-SHA1 (patch-configure.ac) = a5bdde33c3a091cd0e9e80d9128564a720af7f07
-SHA1 (patch-src_serial_posix.c) = 4ac8c2a35df5e54fb63b06fe9bbe56d4282fce46
+SHA1 (patch-src_serial_posix.c) = e98b2f18f128e03b887ab1922c35003180641c17
diff --git a/libdivecomputer/patches/patch-configure.ac b/libdivecomputer/patches/patch-configure.ac
deleted file mode 100644
index f15baa2fa7..0000000000
--- a/libdivecomputer/patches/patch-configure.ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-Check for another header where select(2) might be located.
-
---- configure.ac.orig	2022-11-11 23:01:22.691676212 -0800
-+++ configure.ac	2022-11-11 23:02:22.872573912 -0800
-@@ -161,6 +161,7 @@
- AC_CHECK_HEADERS([sys/param.h])
- AC_CHECK_HEADERS([pthread.h])
- AC_CHECK_HEADERS([mach/mach_time.h])
-+AC_CHECK_HEADERS([sys/select.h])
- 
- # Checks for global variable declarations.
- AC_CHECK_DECLS([optreset])
diff --git a/libdivecomputer/patches/patch-src_serial_posix.c b/libdivecomputer/patches/patch-src_serial_posix.c
index 2f3b5d59c8..a5896d11cc 100644
--- a/libdivecomputer/patches/patch-src_serial_posix.c
+++ b/libdivecomputer/patches/patch-src_serial_posix.c
@@ -1,16 +1,10 @@
-$NetBSD$
-
-Check for another header where select(2) might be located.
-
---- src/serial_posix.c.orig	2021-05-07 12:23:36.000000000 -0700
-+++ src/serial_posix.c	2022-11-11 23:11:32.355847371 -0800
-@@ -33,6 +33,9 @@
+--- src/serial_posix.c.orig	2022-11-13 22:34:30.225666053 -0800
++++ src/serial_posix.c	2022-11-13 22:35:04.795132804 -0800
+@@ -30,6 +30,7 @@
+ #include <fcntl.h>	// fcntl
+ #include <termios.h>	// tcgetattr, tcsetattr, cfsetispeed, cfsetospeed, tcflush, tcsendbreak
+ #include <sys/ioctl.h>	// ioctl
++#include <sys/select.h>	// select
  #ifdef HAVE_LINUX_SERIAL_H
  #include <linux/serial.h>
  #endif
-+#ifdef HAVE_SYS_SELECT_H
-+#include <sys/select.h>
-+#endif
- #ifdef HAVE_IOKIT_SERIAL_IOSS_H
- #include <IOKit/serial/ioss.h>
- #endif