Update to rgbds-0.4.0.

devel/rgbds/Makefile

@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.5 2019/11/01 17:38:04 bentley Exp $
+# $OpenBSD: Makefile,v 1.6 2020/04/12 04:24:56 bentley Exp $
 
 FIX_EXTRACT_PERMISSIONS =	Yes
 
 COMMENT =	Game Boy development system
 
-V =		0.3.9
+V =		0.4.0
 DISTNAME =	rgbds-$V
 
 CATEGORIES =	devel
@@ -31,4 +31,6 @@ MAKE_FLAGS =	CFLAGS="${CFLAGS}" \
 # tests require network access, involve building software with unclear license
 NO_TEST =	Yes
 
+WRKDIST =	${WRKDIR}/rgbds
+
 .include <bsd.port.mk>

devel/rgbds/distinfo

@@ -1,2 +1,2 @@
-SHA256 (rgbds-0.3.9.tar.gz) = 5Yr0qlSLKm95najbbqlR4tu8enCla3U5oO6oDisNu/M=
-SIZE (rgbds-0.3.9.tar.gz) = 39946518
+SHA256 (rgbds-0.4.0.tar.gz) = vY7WmsOVsiTStV2yzVd5G/1rg2iR52kc2HQjRIc9M+U=
+SIZE (rgbds-0.4.0.tar.gz) = 200303

devel/rgbds/patches/patch-src_asm_main_c

@@ -1,9 +1,9 @@
-$OpenBSD: patch-src_asm_main_c,v 1.3 2019/11/01 17:38:04 bentley Exp $
+$OpenBSD: patch-src_asm_main_c,v 1.4 2020/04/12 04:24:56 bentley Exp $
 
 Index: src/asm/main.c
 --- src/asm/main.c.orig
 +++ src/asm/main.c
-@@ -28,6 +28,8 @@
+@@ -31,6 +31,8 @@
  #include "helpers.h"
  #include "version.h"
  
@@ -12,7 +12,7 @@ Index: src/asm/main.c
  extern int yyparse(void);
  
  size_t cldefines_index;
-@@ -313,6 +315,9 @@ int main(int argc, char *argv[])
+@@ -342,6 +344,9 @@ int main(int argc, char *argv[])
  	cldefines = malloc(cldefines_bufsize);
  	if (!cldefines)
  		fatalerror("No memory for command line defines");
@@ -20,5 +20,5 @@ Index: src/asm/main.c
 +	if (pledge("stdio rpath wpath cpath", NULL) == -1)
 +		fatalerror("pledge");
  
- 	if (argc == 1)
- 		print_usage();
+ #if defined(YYDEBUG) && YYDEBUG
+ 	yydebug = 1;

devel/rgbds/patches/patch-src_fix_main_c

@@ -1,18 +1,18 @@
-$OpenBSD: patch-src_fix_main_c,v 1.1.1.1 2018/04/03 05:31:41 bentley Exp $
+$OpenBSD: patch-src_fix_main_c,v 1.2 2020/04/12 04:24:56 bentley Exp $
 
 Index: src/fix/main.c
 --- src/fix/main.c.orig
 +++ src/fix/main.c
-@@ -17,6 +17,8 @@
- 
- #include "version.h"
+@@ -49,6 +49,8 @@ static struct option const longopts[] = {
+ 	{ NULL,               no_argument,       NULL, 0   }
+ };
  
 +int pledge(const char *, const char *);
 +
  static void print_usage(void)
  {
- 	printf(
-@@ -65,6 +67,9 @@ int main(int argc, char *argv[])
+ 	fputs(
+@@ -107,6 +109,9 @@ int main(int argc, char *argv[])
  	int ramsize = 0;   /* RAM size ID */
  	int version = 0;   /* mask ROM version number */
  	int padvalue = 0;  /* to pad the rom with if it changes size */
@@ -20,5 +20,5 @@ Index: src/fix/main.c
 +	if (pledge("stdio rpath wpath cpath", NULL) == -1)
 +		errx(1, "pledge");
  
- 	while ((ch = getopt(argc, argv, "Ccf:i:jk:l:m:n:p:sr:t:Vv")) != -1) {
- 		switch (ch) {
+ 	while ((ch = musl_getopt_long_only(argc, argv, optstring, longopts,
+ 					   NULL)) != -1) {

devel/rgbds/patches/patch-src_gfx_main_c

@@ -1,24 +1,24 @@
-$OpenBSD: patch-src_gfx_main_c,v 1.2 2019/11/01 17:38:04 bentley Exp $
+$OpenBSD: patch-src_gfx_main_c,v 1.3 2020/04/12 04:24:56 bentley Exp $
 
 Index: src/gfx/main.c
 --- src/gfx/main.c.orig
 +++ src/gfx/main.c
-@@ -15,6 +15,8 @@
- 
- #include "version.h"
+@@ -50,6 +50,8 @@ static struct option const longopts[] = {
+ 	{ NULL,              no_argument,       NULL, 0   }
+ };
  
 +int pledge(const char *, const char *);
 +
  static void print_usage(void)
  {
- 	printf(
-@@ -34,6 +36,9 @@ int main(int argc, char *argv[])
+ 	fputs(
+@@ -79,6 +81,9 @@ int main(int argc, char *argv[])
+ 	struct Mapfile tilemap = {0};
  	struct Mapfile attrmap = {0};
  	char *ext;
- 	const char *errmsg = "Warning: The PNG's %s setting is not the same as the setting defined on the command line.";
 +
 +	if (pledge("stdio rpath wpath cpath", NULL) == -1)
 +		errx(1, "pledge");
  
- 	if (argc == 1)
- 		print_usage();
+ 	opts.tilemapfile = "";
+ 	opts.attrmapfile = "";

devel/rgbds/patches/patch-src_link_main_c

@@ -1,24 +1,24 @@
-$OpenBSD: patch-src_link_main_c,v 1.1.1.1 2018/04/03 05:31:41 bentley Exp $
+$OpenBSD: patch-src_link_main_c,v 1.2 2020/04/12 04:24:56 bentley Exp $
 
 Index: src/link/main.c
 --- src/link/main.c.orig
 +++ src/link/main.c
-@@ -36,6 +36,8 @@ int32_t options;
- int32_t fillchar;
- char *smartlinkstartsymbol;
+@@ -51,6 +51,8 @@ FILE *openFile(char const *fileName, char const *mode)
+ /* Short options */
+ static char const *optstring = "dl:m:n:O:o:p:s:tVvw";
  
 +int pledge(const char *, const char *);
 +
  /*
-  * Print the usagescreen
-  */
-@@ -56,6 +58,9 @@ int main(int argc, char *argv[])
- {
- 	int ch;
- 	char *ep;
+  * Equivalent long options
+  * Please keep in the same order as short opts
+@@ -112,6 +114,9 @@ int main(int argc, char *argv[])
+ 	int optionChar;
+ 	char *endptr; /* For error checking with `strtol` */
+ 	unsigned long value; /* For storing `strtoul`'s return value */
 +
 +	if (pledge("stdio rpath wpath cpath", NULL) == -1)
 +		errx(1, "pledge");
  
- 	if (argc == 1)
- 		print_usage();
+ 	/* Parse options */
+ 	while ((optionChar = musl_getopt_long_only(argc, argv, optstring,