arduino-ctags: patched headers, corrected Makefile, successful build

[Chris Lasocki <krz.lasocki%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Chris Lasocki <krz.lasocki%gmail.com@localhost>
Pushed By:	klasocki
Date:		Wed Mar 27 16:48:59 2019 +0000
Changeset:	6f1e7e228c70e8b2d180fe902883ec13b80190cf

Modified Files:
	arduino-ctags/Makefile
	arduino-ctags/distinfo
	arduino-ctags/patches/patch-general.h
Added Files:
	arduino-ctags/patches/patch-debug.h
	arduino-ctags/patches/patch-options.h
	arduino-ctags/patches/patch-routines.h

Log Message:
arduino-ctags: patched headers, corrected Makefile, successful build

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

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

diffstat:
 arduino-ctags/Makefile                 |  9 ++++++---
 arduino-ctags/distinfo                 |  5 ++++-
 arduino-ctags/patches/patch-debug.h    | 13 +++++++++++++
 arduino-ctags/patches/patch-general.h  |  2 +-
 arduino-ctags/patches/patch-options.h  | 13 +++++++++++++
 arduino-ctags/patches/patch-routines.h | 13 +++++++++++++
 6 files changed, 50 insertions(+), 5 deletions(-)

diffs:
diff --git a/arduino-ctags/Makefile b/arduino-ctags/Makefile
index fa73acaf90..18b6b3b7e5 100644
--- a/arduino-ctags/Makefile
+++ b/arduino-ctags/Makefile
@@ -1,14 +1,17 @@
 # $NetBSD$
-
+# XXX: url2pkg has problems downloading
+# https://github.com/arduino/ctags/archive/5.8-arduino11.{zip|tar.gz}
+# hence the zip file is rehosted. This is a WIP package and this lets me work on the code
+# for the time being.
 DISTNAME=	ctags-5.8-arduino11
 CATEGORIES=	wip
 MASTER_SITES=	http://polprog.net/
 EXTRACT_SUFX=	.zip
 
-MAINTAINER=	asd@localhost
+MAINTAINER=	krz.lasocki%gmail.com@localhost
 HOMEPAGE=	http://polprog.net/
 COMMENT=	TODO: Short description of the package
-#LICENSE=	# TODO: (see mk/license.mk)
+LICENSE=	gnu-lgpl-v2
 
 GNU_CONFIGURE=	yes
 
diff --git a/arduino-ctags/distinfo b/arduino-ctags/distinfo
index 976fb3fed0..c585895353 100644
--- a/arduino-ctags/distinfo
+++ b/arduino-ctags/distinfo
@@ -5,12 +5,15 @@ RMD160 (ctags-5.8-arduino11.zip) = a4bc68c4ff05129f463fb17d2319239afc805a5d
 SHA512 (ctags-5.8-arduino11.zip) = c52ec982e843ab1b489168258619bb87825f7c413ea1c15389db6449572d30403199c840b1c0391b20387b3e22e9bffaaea8b11f4b124160b1fea9112f7c8aad
 Size (ctags-5.8-arduino11.zip) = 561013 bytes
 SHA1 (patch-c.c) = b4b8ca5c9a1004731b42bbcd68eb4d4ece642eb1
+SHA1 (patch-debug.h) = 6be59bdad9d9b3251164bf7db1ee56c4e6ace4f6
 SHA1 (patch-eiffel.c) = 3a3ddeff8d43f4c5ec28cd23720305615716f88f
-SHA1 (patch-general.h) = 33073c44c01c89101323f3f55346c63eba516c2c
+SHA1 (patch-general.h) = 6082d00536ec5f97823e136ba82b7fa7bfaf5529
 SHA1 (patch-lregex.c) = d2893d5d9d4bcccd3e16d7684f0b5ad1b095d4b4
 SHA1 (patch-lua.c) = e346b751c83d1661d1315031c8e25cf3df3f3c5d
 SHA1 (patch-main.c) = db5567f5499a340825d8fede941a5733f92a9681
 SHA1 (patch-options.c) = bfe6647b2234f5777b42e303fa3cb9c527b2b44a
+SHA1 (patch-options.h) = 8cc94d741249143ffcb0e1d541bbe2b5cf378ce9
 SHA1 (patch-parse.c) = d6e2d773dc024d2b63918745a1dd838c98cd8da0
 SHA1 (patch-python.c) = 6b1df1a558ed50aca1d67d7296f68146904f84d3
 SHA1 (patch-routines.c) = ea44717b9c94319cc57eb4c2dba8d61003d888b8
+SHA1 (patch-routines.h) = 5111c2b0d6f6c6803882e74f2e5058ab8d46ed38
diff --git a/arduino-ctags/patches/patch-debug.h b/arduino-ctags/patches/patch-debug.h
new file mode 100644
index 0000000000..7800bc8585
--- /dev/null
+++ b/arduino-ctags/patches/patch-debug.h
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- debug.h.orig	2019-03-27 16:23:18.924489230 +0000
++++ debug.h
+@@ -58,7 +58,7 @@ enum eDebugLevels {
+ *   Function prototypes
+ */
+ extern void lineBreak (void);
+-extern void debugPrintf (const enum eDebugLevels level, const char *const format, ...) __printf__ (2, 3);
++extern void debugPrintf (const enum eDebugLevels level, const char *const format, ...) CTAGS_PRINTF (2, 3);
+ extern void debugPutc (const int level, const int c);
+ extern void debugParseNest (const boolean increase, const unsigned int level);
+ extern void debugCppNest (const boolean begin, const unsigned int level);
diff --git a/arduino-ctags/patches/patch-general.h b/arduino-ctags/patches/patch-general.h
index 4e4596b0ee..88100e62f1 100644
--- a/arduino-ctags/patches/patch-general.h
+++ b/arduino-ctags/patches/patch-general.h
@@ -8,7 +8,7 @@ $NetBSD$
  #if (__GNUC__ > 2  ||  (__GNUC__ == 2  &&  __GNUC_MINOR__ >= 7)) && !defined (__GNUG__)
 -# define __unused__  __attribute__((unused))
 -# define __printf__(s,f)  __attribute__((format (printf, s, f)))
-+# define CTAGS_UNUSED __attribute__((unused))
++# define CTAGS_UNUSED  __attribute__((unused))
 +# define CTAGS_PRINTF(s,f)  __attribute__((format (printf, s, f)))
  #else
 -# define __unused__
diff --git a/arduino-ctags/patches/patch-options.h b/arduino-ctags/patches/patch-options.h
new file mode 100644
index 0000000000..08f02c3b5c
--- /dev/null
+++ b/arduino-ctags/patches/patch-options.h
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- options.h.orig	2019-03-27 16:23:18.943625075 +0000
++++ options.h
+@@ -123,7 +123,7 @@ extern CONST_OPTION optionValues		Option
+ /*
+ *   FUNCTION PROTOTYPES
+ */
+-extern void verbose (const char *const format, ...) __printf__ (1, 2);
++extern void verbose (const char *const format, ...) CTAGS_PRINTF (1, 2);
+ extern void freeList (stringList** const pString);
+ extern void setDefaultTagFileName (void);
+ extern void checkOptions (void);
diff --git a/arduino-ctags/patches/patch-routines.h b/arduino-ctags/patches/patch-routines.h
new file mode 100644
index 0000000000..f95095347e
--- /dev/null
+++ b/arduino-ctags/patches/patch-routines.h
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- routines.h.orig	2019-03-27 16:23:18.950796458 +0000
++++ routines.h
+@@ -85,7 +85,7 @@ extern void freeRoutineResources (void);
+ extern void setExecutableName (const char *const path);
+ extern const char *getExecutableName (void);
+ extern const char *getExecutablePath (void);
+-extern void error (const errorSelection selection, const char *const format, ...) __printf__ (2, 3);
++extern void error (const errorSelection selection, const char *const format, ...) CTAGS_PRINTF (2, 3);
+ 
+ /* Memory allocation functions */
+ #ifdef NEED_PROTO_MALLOC