wadptr: Update to 3.8

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: wadptr: Update to 3.8
From: Michael Baeuerle (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Wed, 1 Jul 2026 13:22:21 +0000
Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Wed Jul 1 15:21:44 2026 +0200
Changeset:	e8a1265280e9ac4a89ba2a558c29960cd174201b

Modified Files:
	wadptr/COMMIT_MSG
	wadptr/Makefile
	wadptr/distinfo
	wadptr/patches/patch-Makefile
Added Files:
	wadptr/patches/patch-main.c

Log Message:
wadptr: Update to 3.8

- Remove existing pkgsrc patch (merged upstream)
- Add pkgsrc patch for tolower() parameter of type char
- Add pkgsrc patch to install files with desired permissions
- Force C standard to C99
- Enable testsuite
- Take maintainership

 * The `-u` ("uncompress") option was renamed to `-d` ("decompress", the
   usual terminology used by almost every other compression tool).
 * A bug was fixed that made the Windows version for the previous release not
   work properly; a dependency was unintentionally added on the pthreads API,
   the DLL for which was not included in the release. That dependency has now
   been removed. Thanks to Anonysussy and happygreenfairy for the bug report.
 * A special sector tag range (9700-9799) is now recognized for special
   effects. There are some cases where level authors may deliberately want
   sidedefs to be merged even when they are attached to special lines, and
   this allows that. Thanks to kitchen-ace for the suggestion.
 * The manpage has been expanded somewhat.

 * A new option, `-wipesides`, cleans upper and lower textures from
   one-sided lines where they are not used. This allows some sidedefs
   to be merged that would not otherwise be merged.
 * Textures are now compared in a case-insensitive manner, matching the
   logic of Doom itself. This won't make a lot of difference since most
   editors store texture names in allcaps, but there may be corner-case
   WADs where it helps improve compression slightly.
 * The progress counter now uses wall time instead of CPU time (thanks Jan
   Engelhardt).
 * The `make install` target has been fixed to work correctly with the BSD
   version of `install`.
 * A `make uninstall` target has been added.
 * URLs in the manpage are now shown correctly on BSD systems.
 * The codebase has been refactored to use include-what-you-use.

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

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

diffstat:
 wadptr/COMMIT_MSG             |  2 +-
 wadptr/Makefile               | 22 +++++++++-------------
 wadptr/distinfo               |  9 +++++----
 wadptr/patches/patch-Makefile | 26 ++++++++++++--------------
 wadptr/patches/patch-main.c   | 15 +++++++++++++++
 5 files changed, 42 insertions(+), 32 deletions(-)

diffs:
diff --git a/wadptr/COMMIT_MSG b/wadptr/COMMIT_MSG
index 55423c0bf5..02cddfb498 100644
--- a/wadptr/COMMIT_MSG
+++ b/wadptr/COMMIT_MSG
@@ -1,3 +1,3 @@
-games/wadptr: Import wadptr.
+games/wadptr: Import wadptr 3.8
 
 wadptr is a command-line tool for compressing Doom WAD files.
diff --git a/wadptr/Makefile b/wadptr/Makefile
index 1a269d23ba..6ba1856740 100644
--- a/wadptr/Makefile
+++ b/wadptr/Makefile
@@ -1,29 +1,25 @@
 # $NetBSD$
 
-DISTNAME=	wadptr-3.6
+DISTNAME=	wadptr-3.8
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GITHUB:=fragglet/}
-GITHUB_TAG=	${DISTNAME}
 GITHUB_PROJECT=	wadptr
+GITHUB_TAG=	${DISTNAME}
 EXTRACT_USING=	bsdtar
 
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=	micha%NetBSD.org@localhost
 HOMEPAGE=	https://soulsphere.org/projects/wadptr/
 COMMENT=	Command-line tool for compressing Doom WAD files
 LICENSE=	gnu-gpl-v2
 
 .include "../../mk/bsd.prefs.mk"
 
-USE_LANGUAGES=	c99
-MAKE_FLAGS+=	PREFIX=${PREFIX}
-USE_TOOLS+=	gmake
+FORCE_C_STD=	c99
+USE_TOOLS+=	bash gmake
+REPLACE_BASH=	run_tests.sh
 
-SUBST_CLASSES+=		man
-SUBST_STAGE.man=	pre-configure
-SUBST_MESSAGE.man=	Fixing man path
-SUBST_FILES.man=	Makefile
-SUBST_SED.man+=	-e 's,share/man,${PKGMANDIR},g'
-
-PLIST.bsd=		yes
+MAKE_FLAGS+=	PREFIX=${PREFIX}
+MAKE_FLAGS+=	MANPATH=${PREFIX}/${PKGMANDIR}
+TEST_TARGET=	check
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/wadptr/distinfo b/wadptr/distinfo
index 5bff32b9e5..915fa2358c 100644
--- a/wadptr/distinfo
+++ b/wadptr/distinfo
@@ -1,6 +1,7 @@
 $NetBSD$
 
-BLAKE2s (wadptr-3.6.tar.gz) = efc45674be6d8d51420d18df20e034b0070b16f9d5d7794fd72c3ff958fa25b5
-SHA512 (wadptr-3.6.tar.gz) = 05261daf9cdaecc6367f4c6751b21fe0b8d5c35b4756ec5f147f3740320615c8fc24fa0ad8cb8f83f8a0f3c42004b4c1a243f7ba47622d6129c26f21c37b37ea
-Size (wadptr-3.6.tar.gz) = 17032146 bytes
-SHA1 (patch-Makefile) = 96fab720173f0c9b4f4f21bc3d7939b5dc266483
+BLAKE2s (wadptr-3.8.tar.gz) = 5a99fb4e77f0d2d2cadad78d852c58b57eb58a14fcb604fbf15c6f6c8f1e5691
+SHA512 (wadptr-3.8.tar.gz) = 1f2b88349f448401cdbffdc86bf5a46a8026adc14ea14511f4244c2192884081ff8ab2c74aecc009d45bff9ff42ae8cc73db2eb7408b41b86d315603053f126c
+Size (wadptr-3.8.tar.gz) = 17042847 bytes
+SHA1 (patch-Makefile) = d076ec775a6d61acdc3f9f336b2a0ef4f54b373f
+SHA1 (patch-main.c) = 470a7a381339f3656a85d58bf2ec74adb6ea56ca
diff --git a/wadptr/patches/patch-Makefile b/wadptr/patches/patch-Makefile
index fb9ef18d7d..3d0c543378 100644
--- a/wadptr/patches/patch-Makefile
+++ b/wadptr/patches/patch-Makefile
@@ -1,19 +1,17 @@
 $NetBSD$
 
-Patches Makefile to not use -D argument to install.
+Install files with defined permissions.
 
---- Makefile.orig	2024-04-29 11:26:30.346342899 -0400
-+++ Makefile	2024-04-29 11:26:49.024153733 -0400
-@@ -34,8 +34,10 @@
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS)
- 
+--- Makefile.orig	2025-10-14 23:02:24.000000000 +0000
++++ Makefile
+@@ -49,8 +49,8 @@ $(EXECUTABLE): $(OBJECTS)
  install:
--	install -D wadptr $(DESTDIR)$(PREFIX)/bin/wadptr
--	install -D wadptr.1 $(DESTDIR)$(PREFIX)/share/man/man1/wadptr.1
-+	mkdir -p $(DESTDIR)$(PREFIX)/bin
-+	mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1
-+	install wadptr $(DESTDIR)$(PREFIX)/bin/wadptr
-+	install wadptr.1 $(DESTDIR)$(PREFIX)/share/man/man1/wadptr.1
+ 	mkdir -p $(DESTDIR)$(PREFIX)/bin
+ 	mkdir -p $(DESTDIR)$(MANPATH)/man1
+-	install wadptr $(DESTDIR)$(PREFIX)/bin/wadptr
+-	install wadptr.1 $(DESTDIR)$(MANPATH)/man1/wadptr.1
++	install -m 755 wadptr $(DESTDIR)$(PREFIX)/bin/wadptr
++	install -m 644 wadptr.1 $(DESTDIR)$(MANPATH)/man1/wadptr.1
  
- clean:
- 	$(DELETE) $(EXECUTABLE)
+ uninstall:
+ 	rm -f $(DESTDIR)$(PREFIX)/bin/wadptr
diff --git a/wadptr/patches/patch-main.c b/wadptr/patches/patch-main.c
new file mode 100644
index 0000000000..376f195f4c
--- /dev/null
+++ b/wadptr/patches/patch-main.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Prevent undefined behaviour of tolower().
+
+--- main.c.orig	2026-07-01 12:11:48.956156567 +0000
++++ main.c
+@@ -1047,7 +1047,7 @@ static bool IwadWarning(const char *wadn
+                "change it (y/n)? ",
+                wadname);
+         fflush(stdout);
+-        response = tolower(ReadResponse());
++        response = tolower((unsigned char) ReadResponse());
+         if (response == 'y')
+         {
+             printf("\n");
Prev by Date: py-gguf: switch to pypi distfile
Next by Date: avr-gcc: Update to 16.1.0
Previous by Thread: py-gguf: switch to pypi distfile
Next by Thread: avr-gcc: Update to 16.1.0
Indexes:
Home | Main Index | Thread Index | Old Index