Hi ports@,
Here is a diff to update vbam to 2.1.4.
We can remove the patch for src/gba/GBAcpu.h as the regparm function
attribute is now only defined on i386 and amd64, even if it is only
useful on i386.
While there, update HOMEPAGE to HTTPS.
Comments? OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/emulators/vbam/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- Makefile 12 Jul 2019 20:46:10 -0000 1.32
+++ Makefile 8 Nov 2019 21:59:09 -0000
@@ -7,13 +7,12 @@ COMMENT = emulator for Nintendo Game Bo
GH_ACCOUNT = visualboyadvance-m
GH_PROJECT = ${GH_ACCOUNT}
-GH_TAGNAME = v2.1.1
-REVISION = 1
+GH_TAGNAME = v2.1.4
PKGNAME = vbam-${GH_TAGNAME:S/v//}
CATEGORIES = emulators
-HOMEPAGE = http://www.vba-m.com
+HOMEPAGE = https://www.vba-m.com
# GPLv2+ (see doc/License.txt)
PERMIT_PACKAGE = Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/emulators/vbam/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 1 Apr 2019 06:39:22 -0000 1.5
+++ distinfo 8 Nov 2019 21:59:09 -0000
@@ -1,2 +1,2 @@
-SHA256 (visualboyadvance-m-2.1.1.tar.gz) =
L/suYHOqOIA6K1kxnSOw7Mp/HhKE74S7HRBtnRp1ncI=
-SIZE (visualboyadvance-m-2.1.1.tar.gz) = 3758035
+SHA256 (visualboyadvance-m-2.1.4.tar.gz) =
g0LgFyEoQt5msNhrx2EMgjSa8tTlmVHZaaM//5VsObo=
+SIZE (visualboyadvance-m-2.1.4.tar.gz) = 3891574
Index: patches/patch-src_common_Patch_cpp
===================================================================
RCS file: /cvs/ports/emulators/vbam/patches/patch-src_common_Patch_cpp,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_common_Patch_cpp
--- patches/patch-src_common_Patch_cpp 24 Apr 2018 12:04:00 -0000 1.2
+++ patches/patch-src_common_Patch_cpp 8 Nov 2019 21:59:09 -0000
@@ -1,11 +1,12 @@
$OpenBSD: patch-src_common_Patch_cpp,v 1.2 2018/04/24 12:04:00 jasper Exp $
+
Index: src/common/Patch.cpp
--- src/common/Patch.cpp.orig
+++ src/common/Patch.cpp
-@@ -13,7 +13,7 @@
- #if defined(BSD) || defined(__NetBSD__)
- #include <sys/param.h>
- #endif
+@@ -15,7 +15,7 @@
+ #ifndef __LIBRETRO__
+
+ #ifdef __GNUC__
-#if defined(__APPLE__) || defined(BSD) || defined(__NetBSD__)
+#if defined(__APPLE__) || defined(BSD) || defined(__NetBSD__) ||
defined(__OpenBSD__)
typedef off_t __off64_t; /* off_t is 64 bits on BSD. */
Index: patches/patch-src_gba_GBALink_cpp
===================================================================
RCS file: /cvs/ports/emulators/vbam/patches/patch-src_gba_GBALink_cpp,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_gba_GBALink_cpp
--- patches/patch-src_gba_GBALink_cpp 24 Apr 2018 12:04:35 -0000 1.1
+++ patches/patch-src_gba_GBALink_cpp 8 Nov 2019 21:59:09 -0000
@@ -6,9 +6,9 @@ Index: src/gba/GBALink.cpp
@@ -4,7 +4,7 @@
#include <string.h>
- // malloc.h does not seem to exist on Mac OS 10.7
--#ifdef __APPLE__
-+#if defined(__APPLE__) || defined(__OpenBSD__)
+ // malloc.h does not seem to exist on Mac OS 10.7 and is an error on FreeBSD
+-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) ||
defined(__OpenBSD__)
#include <stdlib.h>
#else
#include <malloc.h>
Index: patches/patch-src_gba_GBAcpu_h
===================================================================
RCS file: patches/patch-src_gba_GBAcpu_h
diff -N patches/patch-src_gba_GBAcpu_h
--- patches/patch-src_gba_GBAcpu_h 4 Mar 2019 13:00:48 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_gba_GBAcpu_h,v 1.1 2019/03/04 13:00:48 jca Exp $
-
-Index: src/gba/GBAcpu.h
---- src/gba/GBAcpu.h.orig
-+++ src/gba/GBAcpu.h
-@@ -5,7 +5,7 @@ extern int armExecute();
- extern int thumbExecute();
-
- #ifdef __GNUC__
--#ifndef __APPLE__
-+#if defined(__i386__) && !defined(__APPLE__)
- #define INSN_REGPARM __attribute__((regparm(1)))
- #else
- #define INSN_REGPARM /*nothing*/
