Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/dwz/Makefile,v
diff -u -p -r1.8 Makefile
--- Makefile	21 Sep 2023 09:49:52 -0000	1.8
+++ Makefile	19 Aug 2025 21:40:17 -0000
@@ -1,6 +1,6 @@
 COMMENT =	DWARF optimization and duplicate removal tool
-PKGNAME =	dwz-0.15
-XXHASH_V =	0.8.1
+PKGNAME =	dwz-0.16
+XXHASH_V =	0.8.3
 DISTFILES =	${PKGNAME}.tar.gz
 DISTFILES.h= 	xxhash-${XXHASH_V}{xxhash}.h
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/dwz/distinfo,v
diff -u -p -r1.3 distinfo
--- distinfo	11 Jun 2023 15:40:22 -0000	1.3
+++ distinfo	19 Aug 2025 21:40:17 -0000
@@ -1,4 +1,4 @@
-SHA256 (dwz-0.15.tar.gz) = 7VnGEuIEFeaX+8RRH1J+91cAe8VvoalU5JrKHans+0Q=
-SHA256 (xxhash-0.8.1.h) = 1PK5G1R8eQYWSRhnIaazMWCfK/hZVIWiHqYxyC7D75M=
-SIZE (dwz-0.15.tar.gz) = 192777
-SIZE (xxhash-0.8.1.h) = 209646
+SHA256 (dwz-0.16.tar.gz) = R1hT4bSebtjMLQqQnHpPwcxXHrzPxmJ4/UM0Lb4n1Q4=
+SHA256 (xxhash-0.8.3.h) = F5c8DcSdmFTKJsqhkfDhL3pCS2iFjZp43jhg2VnYXks=
+SIZE (dwz-0.16.tar.gz) = 188638
+SIZE (xxhash-0.8.3.h) = 268319
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/devel/dwz/patches/patch-Makefile,v
diff -u -p -r1.4 patch-Makefile
--- patches/patch-Makefile	11 Jun 2023 15:40:22 -0000	1.4
+++ patches/patch-Makefile	19 Aug 2025 21:40:17 -0000
@@ -17,7 +17,7 @@ Index: Makefile
 -DWZ_VERSION := $(shell cat $(srcdir)/VERSION)
 -CFLAGS_VERSION = -DDWZ_VERSION='"$(DWZ_VERSION)"'
 -CFLAGS_COPYRIGHT = $(shell cat $(srcdir)/COPYRIGHT_YEARS)
--CFLAGS_COMMON = -Wall -W -D_FILE_OFFSET_BITS=64
+-CFLAGS_COMMON = -Wall -W -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
 -XXH_PROG = "\#define XXH_INLINE_ALL 1\n\#include <xxhash.h>\n"
 -XXH_INLINE_ALL_WORKS = $(shell printf $(XXH_PROG) \
 -		| $(CC) -xc -c - -o /dev/null 2>/dev/null \
Index: patches/patch-args_c
===================================================================
RCS file: /cvs/ports/devel/dwz/patches/patch-args_c,v
diff -u -p -r1.1 patch-args_c
--- patches/patch-args_c	11 Jun 2023 15:40:22 -0000	1.1
+++ patches/patch-args_c	19 Aug 2025 21:40:17 -0000
@@ -3,7 +3,7 @@ Correctly get processors online.
 Index: args.c
 --- args.c.orig
 +++ args.c
-@@ -25,14 +25,15 @@
+@@ -26,14 +26,15 @@
  #include <stdio.h>
  #include <string.h>
  #include <stdlib.h>
@@ -21,7 +21,7 @@ Index: args.c
  #if DEVEL
  int tracing;
  int ignore_size;
-@@ -735,7 +736,7 @@ parse_args (int argc, char *argv[], bool *hardlink, co
+@@ -737,7 +738,7 @@ parse_args (int argc, char *argv[], bool *hardlink, co
  
    if (max_forks == -1)
      {
Index: patches/patch-dwz_c
===================================================================
RCS file: /cvs/ports/devel/dwz/patches/patch-dwz_c,v
diff -u -p -r1.4 patch-dwz_c
--- patches/patch-dwz_c	11 Jun 2023 15:40:22 -0000	1.4
+++ patches/patch-dwz_c	19 Aug 2025 21:40:17 -0000
@@ -6,7 +6,7 @@ xxhash is not a system header
 Index: dwz.c
 --- dwz.c.orig
 +++ dwz.c
-@@ -20,13 +20,13 @@
+@@ -21,13 +21,13 @@
  
  #include <assert.h>
  #include <errno.h>
@@ -21,20 +21,16 @@ Index: dwz.c
  #include <inttypes.h>
  #include <stdlib.h>
  #include <unistd.h>
-@@ -36,10 +36,10 @@
- #include <sys/times.h>
+@@ -38,7 +38,7 @@
  #include <sys/wait.h>
  
--#include <obstack.h>
-+#include "obstack.h"
- 
  #include <gelf.h>
 -#include <xxhash.h>
 +#include "xxhash.h"
  
  #include "dwarf2.h"
  #include "hashtab.h"
-@@ -216,6 +216,29 @@ report_progress (void)
+@@ -213,6 +213,29 @@ report_progress (void)
  /* Where to longjmp on OOM.  */
  static jmp_buf oom_buf;
  
@@ -64,7 +60,7 @@ Index: dwz.c
  /* Handle OOM situation.  If handling more than one file, we might
     just fail to handle some large file due to OOM, but could very well
     handle other smaller files after it.  */
-@@ -13675,7 +13698,7 @@ fdopen_dso (int fd, const char *name)
+@@ -13777,7 +13800,7 @@ fdopen_dso (int fd, const char *name)
    int i;
    DSO *dso = NULL;
  
@@ -73,7 +69,7 @@ Index: dwz.c
    if (elf == NULL)
      {
        error (0, 0, "cannot open ELF file: %s", elf_errmsg (-1));
-@@ -13713,7 +13736,7 @@ fdopen_dso (int fd, const char *name)
+@@ -13815,7 +13838,7 @@ fdopen_dso (int fd, const char *name)
        goto error_out;
      }
  
@@ -82,7 +78,7 @@ Index: dwz.c
  
    memset (dso, 0, sizeof(DSO));
    dso->elf = elf;
-@@ -14210,7 +14233,7 @@ write_dso (DSO *dso, const char *file, struct stat *st
+@@ -14312,7 +14335,7 @@ write_dso (DSO *dso, const char *file, struct stat *st
        free (shstrtab);
        return 1;
      }
@@ -91,7 +87,7 @@ Index: dwz.c
    for (i = 0; i < ehdr.e_phnum; ++i)
      {
        GElf_Phdr *phdr, phdr_mem;
-@@ -14283,7 +14306,7 @@ write_dso (DSO *dso, const char *file, struct stat *st
+@@ -14385,7 +14408,7 @@ write_dso (DSO *dso, const char *file, struct stat *st
  	}
      }
  
@@ -100,7 +96,7 @@ Index: dwz.c
      {
        error (0, 0, "%s: elf_update failed", dso->filename);
        unlink (file);
-@@ -15902,7 +15925,7 @@ optimize_multifile (unsigned int *die_count)
+@@ -16004,7 +16027,7 @@ optimize_multifile (unsigned int *die_count)
        error (0, 0, "Could not create new ELF headers");
        goto fail;
      }
@@ -109,7 +105,7 @@ Index: dwz.c
  
    sha1_init_ctx (&ctx);
    for (i = 0; debug_sections[i].name; i++)
-@@ -15995,7 +16018,7 @@ optimize_multifile (unsigned int *die_count)
+@@ -16097,7 +16120,7 @@ optimize_multifile (unsigned int *die_count)
    data->d_off = 0;
    data->d_align = 1;
  
Index: patches/patch-obstack-wrapper_h
===================================================================
RCS file: patches/patch-obstack-wrapper_h
diff -N patches/patch-obstack-wrapper_h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-obstack-wrapper_h	19 Aug 2025 21:40:17 -0000
@@ -0,0 +1,14 @@
+Fix include invocation
+
+Index: obstack-wrapper.h
+--- obstack-wrapper.h.orig
++++ obstack-wrapper.h
+@@ -21,7 +21,7 @@
+    also nullify object.  Since that breaks obstack_free (obstack_ptr, NULL), a
+    new function obstack_destroy is added to support that functionaliy.  */
+ 
+-#include <obstack.h>
++#include "obstack.h"
+ 
+ /* Required definitions for obstack use.  */
+ #define obstack_chunk_alloc malloc
