dMagnetic: update to 0.24.

Changes not found, but pkgsrc patch and test target were integrated
upstream.

3 files changed, 8 insertions, 56 deletions

diff --git a/games/dMagnetic/Makefile b/games/dMagnetic/Makefile
index abd99bdf05a..a63392bda9c 100644
--- a/games/dMagnetic/Makefile
+++ b/games/dMagnetic/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2020/06/08 08:49:58 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2020/07/13 09:49:09 wiz Exp $
 
-DISTNAME=		dMagnetic_0.23
+DISTNAME=		dMagnetic_0.24
 PKGNAME=		${DISTNAME:S/_/-/}
 CATEGORIES=		games
 MASTER_SITES=		https://www.dettus.net/dMagnetic/
@@ -25,40 +25,6 @@ do-install:
 ## for this, the md5sum is being compared.
 ## dMagnetic has several output modes, each one of them is tested.
 do-test:
-	 cd ${WRKSRC}/testcode;  if [ true \
-		-a `${ECHO} Hello | ../dMagnetic -ini ../dMagnetic.ini \
-			-mag minitest.mag -gfx minitest.gfx \
-			-vmode none -vcols 300 -vrows 300 \
-		| md5 `==0f919919290698aef854df8c75119aa8 \
-		-a `${ECHO} Hello | ../dMagnetic -ini ../dMagnetic.ini \
-			-mag minitest.mag -gfx minitest.gfx \
-			-vmode monochrome -vcols 300 -vrows 300 \
-		| md5 `==dece45b2dcc499bd4e4f4daa0d87fca5 \
-		-a `${ECHO} Hello | ../dMagnetic -ini ../dMagnetic.ini \
-			-mag minitest.mag -gfx minitest.gfx \
-			-vmode monochrome_inv -vcols 300 -vrows 300 \
-		| md5 `==0ababd938093714b51006831f6790379 \
-		-a `${ECHO} Hello | ../dMagnetic -ini ../dMagnetic.ini \
-			-mag minitest.mag -gfx minitest.gfx \
-			-vmode low_ansi -vcols 300 -vrows 300 \
-		| md5 `==54fedb8291eafbc756686ad5d0e069ee \
-		-a `${ECHO} Hello | ../dMagnetic -ini ../dMagnetic.ini \
-			-mag minitest.mag -gfx minitest.gfx \
-			-vmode low_ansi2 -vcols 300 -vrows 300 \
-		| md5 `==214055394c710d3919b44fc7822cc9b6 \
-		-a `${ECHO} Hello | ../dMagnetic -ini ../dMagnetic.ini \
-			-mag minitest.mag -gfx minitest.gfx \
-			-vmode high_ansi -vcols 300 -vrows 300 \
-		| md5 `==84608708bfa3ff2dc4964b255766dd81 \
-		-a `${ECHO} Hello | ../dMagnetic -ini ../dMagnetic.ini \
-			-mag minitest.mag -gfx minitest.gfx \
-			-vmode high_ansi2 -vcols 300 -vrows 300 \
-		| md5 `==07c938bd0d77523d1be8e971d8610591 \
-		-a `${ECHO} Hello | ../dMagnetic -ini ../dMagnetic.ini \
-			-mag minitest.mag -gfx minitest.gfx \
-			-vmode sixel -vcols 300 -vrows 300 \
-		| md5 `==d3708a8ddf81f504b86c767648dbacb0 \
-		]; \
-		then ${ECHO} ok; else ${ECHO} expected output not seen; exit 1; fi
+	cd ${WRKSRC} && ${MAKE} SHA256_CMD=sha256 do-test
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/dMagnetic/distinfo b/games/dMagnetic/distinfo
index f9df9bcdcd8..f3b35390e09 100644
--- a/games/dMagnetic/distinfo
+++ b/games/dMagnetic/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.2 2020/06/08 08:49:58 wiz Exp $
+$NetBSD: distinfo,v 1.3 2020/07/13 09:49:09 wiz Exp $
 
-SHA1 (dMagnetic_0.23.tar.bz2) = 23d777477eb6944bdfa7301387df0579bbd72f99
-RMD160 (dMagnetic_0.23.tar.bz2) = 23205e417300f6e799ef47bed945cd77e4bafd8c
-SHA512 (dMagnetic_0.23.tar.bz2) = 380b5f5f2353eb9ad78ea6b5321dfe4cd24f6e2713d1da03490f5dc27641b4e65f023be0158eed80a08a9a61e838c6b924eb905d5e0cdfffcbeacc31707ea675
-Size (dMagnetic_0.23.tar.bz2) = 60820 bytes
-SHA1 (patch-Makefile) = bfadc0dca8def5467b286743331de3bd85d82535
+SHA1 (dMagnetic_0.24.tar.bz2) = ae6334141a3cd4496824e8a9bb3dcb35c91a6009
+RMD160 (dMagnetic_0.24.tar.bz2) = 594f7d5af76e36b66a9b638b13861baa9de990e2
+SHA512 (dMagnetic_0.24.tar.bz2) = d5e575d132105586613be783a82527efd6719b580ae244ae1676191d50016379b9e2d5f0112c54d8d81e7b66c9f3faf2692e6f394dbf5b44bdea2a95cd049560
+Size (dMagnetic_0.24.tar.bz2) = 66358 bytes
diff --git a/games/dMagnetic/patches/patch-Makefile b/games/dMagnetic/patches/patch-Makefile
deleted file mode 100644
index 23c2f05dfb7..00000000000
--- a/games/dMagnetic/patches/patch-Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-Makefile,v 1.2 2020/06/08 08:49:58 wiz Exp $
-
---- Makefile.orig	2020-06-06 20:57:40.000000000 +0000
-+++ Makefile
-@@ -93,7 +93,7 @@ install: all dMagnetic.1 dMagneticini.5
- 
- 
- dMagnetic:	$(OBJ_LOADER) $(OBJ_LINEA) $(OBJ_VM68K) $(OBJ_GUI) $(OBJ_TOPLEVEL)
--	$(LINK) -o $@ $(OBJ_LOADER) $(OBJ_LINEA) $(OBJ_VM68K) $(OBJ_GUI) $(OBJ_TOPLEVEL)
-+	$(LINK) -o $@ $(LDFLAGS) $(OBJ_LOADER) $(OBJ_LINEA) $(OBJ_VM68K) $(OBJ_GUI) $(OBJ_TOPLEVEL)
- 
- .c.o:
- 	$(CC) $(CFLAGS) $(CFLAGS_EXTRA) $(INCFLAGS) -c -o $@ $<