[UPDATE] subsurface 4.8.2

diff -urNP /home/kristaps/checkedout/openbsd/ports/misc/subsurface/Makefile subsurface/Makefile
--- /home/kristaps/checkedout/openbsd/ports/misc/subsurface/Makefile Tue Aug 14 19:18:22 2018
+++ subsurface/Makefile Sat Sep 29 11:44:46 2018
@@ -5,7 +5,7 @@

COMMENT = divelog program for recreational, tech, and free-divers

-VER = 4.8.1
+VER = 4.8.2
PKGNAME = subsurface-${VER}
DISTNAME = Subsurface-${VER}

diff -urNP /home/kristaps/checkedout/openbsd/ports/misc/subsurface/distinfo subsurface/distinfo
--- /home/kristaps/checkedout/openbsd/ports/misc/subsurface/distinfo Tue Aug 14 19:18:22 2018
+++ subsurface/distinfo Sat Sep 29 11:45:04 2018
@@ -1,4 +1,4 @@
-SHA256 (Subsurface-4.8.1.tgz) = om2CG9U7XJ3RpBDcd9WvK04BV4WAYbUn08jLVwDXqBw=
-SHA256 (libdivecomputer-subsurface-branch-4.8.1.tgz) = fkvINhUM2CN40qiypC0eRNusmNSqabbPblSm6x4C3/Q=
-SIZE (Subsurface-4.8.1.tgz) = 14719334
-SIZE (libdivecomputer-subsurface-branch-4.8.1.tgz) = 316841
+SHA256 (Subsurface-4.8.2.tgz) = 3vEwhthhHf4Itocnzy5uCRTKRiEiq87N0P+ahbPB+bs=
+SHA256 (libdivecomputer-subsurface-branch-4.8.2.tgz) = HKSAHiZ2ivm7QTY7wXlx4knXcXvkFDZprCuqnIpV+Jg=
+SIZE (Subsurface-4.8.2.tgz) = 14852032
+SIZE (libdivecomputer-subsurface-branch-4.8.2.tgz) = 334792
diff -urNP /home/kristaps/checkedout/openbsd/ports/misc/subsurface/patches/patch-core_CMakeLists_txt subsurface/patches/patch-core_CMakeLists_txt
--- /home/kristaps/checkedout/openbsd/ports/misc/subsurface/patches/patch-core_CMakeLists_txt Tue Aug 14 19:18:22 2018
+++ subsurface/patches/patch-core_CMakeLists_txt Thu Jan 1 01:00:00 1970
@@ -1,14 +0,0 @@
-$OpenBSD: patch-core_CMakeLists_txt,v 1.1.1.1 2018/08/14 17:18:22 schwarze Exp $
-
-Index: core/CMakeLists.txt
---- core/CMakeLists.txt.orig
-+++ core/CMakeLists.txt
-@@ -12,6 +12,8 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
- set(PLATFORM_SRC macos.c)
- elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
- set(PLATFORM_SRC windows.c)
-+elseif(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
-+ set(PLATFORM_SRC linux.c)
- endif()
-
- if(FTDISUPPORT)
diff -urNP /home/kristaps/checkedout/openbsd/ports/misc/subsurface/patches/patch-core_downloadfromdcthread_cpp subsurface/patches/patch-core_downloadfromdcthread_cpp
--- /home/kristaps/checkedout/openbsd/ports/misc/subsurface/patches/patch-core_downloadfromdcthread_cpp Tue Aug 14 19:18:22 2018
+++ subsurface/patches/patch-core_downloadfromdcthread_cpp Thu Jan 1 01:00:00 1970
@@ -1,17 +0,0 @@
-$OpenBSD: patch-core_downloadfromdcthread_cpp,v 1.1.1.1 2018/08/14 17:18:22 schwarze Exp $
-
-Index: core/downloadfromdcthread.cpp
---- core/downloadfromdcthread.cpp.orig
-+++ core/downloadfromdcthread.cpp
-@@ -216,7 +216,11 @@ DCDeviceData::DCDeviceData()
- data.download_table = nullptr;
- data.diveid = 0;
- data.deviceid = 0;
-+#if defined(BT_SUPPORT)
- data.bluetooth_mode = true;
-+#else
-+ data.bluetooth_mode = false;
-+#endif
- data.force_download = false;
- data.create_new_trip = false;
- data.libdc_dump = false;
diff -urNP /home/kristaps/checkedout/openbsd/ports/misc/subsurface/patches/patch-core_linux_c subsurface/patches/patch-core_linux_c
--- /home/kristaps/checkedout/openbsd/ports/misc/subsurface/patches/patch-core_linux_c Tue Aug 14 19:18:22 2018
+++ subsurface/patches/patch-core_linux_c Thu Jan 1 01:00:00 1970
@@ -1,41 +0,0 @@
-$OpenBSD: patch-core_linux_c,v 1.1.1.1 2018/08/14 17:18:22 schwarze Exp $
-
-Index: core/linux.c
---- core/linux.c.orig
-+++ core/linux.c
-@@ -112,12 +112,19 @@ int enumerate_devices(device_callback_t callback, void
- if (dc_type != DC_TYPE_UEMIS) {
- const char *dirname = "/dev";
- const char *patterns[] = {
-+ "ttyU*",
-+ "ttyC*",
-+ NULL
-+ };
-+#if 0
-+ const char *patterns[] = {
- "ttyUSB*",
- "ttyS*",
- "ttyACM*",
- "rfcomm*",
- NULL
- };
-+#endif
-
- dp = opendir(dirname);
- if (dp == NULL) {
-@@ -143,6 +150,7 @@ int enumerate_devices(device_callback_t callback, void
- }
- closedir(dp);
- }
-+#if 0
- if (dc_type != DC_TYPE_SERIAL) {
- int num_uemis = 0;
- file = fopen("/proc/mounts", "r");
-@@ -177,6 +185,7 @@ int enumerate_devices(device_callback_t callback, void
- if (num_uemis == 1 && entries == 1) /* if we found only one and it's a mounted Uemis, pick it */
- index = 0;
- }
-+#endif
- return index;
- }
-
diff -urNP /home/kristaps/checkedout/openbsd/ports/misc/subsurface/patches/patch-scripts_get-version subsurface/patches/patch-scripts_get-version
--- /home/kristaps/checkedout/openbsd/ports/misc/subsurface/patches/patch-scripts_get-version Tue Aug 14 19:18:22 2018
+++ subsurface/patches/patch-scripts_get-version Sat Sep 29 12:15:17 2018
@@ -9,7 +9,7 @@
else
- cmd="git describe --abbrev=12"
- v0=$($cmd) || v0=$(cat .gitversion) || croak "odd; command '$cmd' failed"
-+ v0="v4.8.1-101-g3987038a2826"
++ v0="v4.8.2"
fi

# strip off the 'v' prefix, if any
The attached port updates Subsurface from 4.8.1 to 4.8.2, released just
this month. The update consists of removing some patches that have been
merged into the mainline.

I've also attached a diff from the current one.

Upstream version notes:

https://subsurface-divelog.org/2018/09/announcing-subsurface-4-8-2/

Best,

Kristaps