modular-xorg-server-devel: fix build

[Thomas Klausner <tk%giga.or.at@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Thu Apr 12 08:21:51 2018 +0200
Changeset:	956d60339a4472739705548be18ad15a1ec028c6

Modified Files:
	modular-xorg-server-devel/distinfo
	modular-xorg-server-devel/patches/patch-hw_xfree86_sdksyms.sh
Removed Files:
	modular-xorg-server-devel/TODO

Log Message:
modular-xorg-server-devel: fix build

From Adam Jackson <ajax%redhat.com@localhost>.

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

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

diffstat:
 modular-xorg-server-devel/TODO                          |  6 ------
 modular-xorg-server-devel/distinfo                      |  2 +-
 .../patches/patch-hw_xfree86_sdksyms.sh                 | 17 +++++++++++++++--
 3 files changed, 16 insertions(+), 9 deletions(-)

diffs:
diff --git a/modular-xorg-server-devel/TODO b/modular-xorg-server-devel/TODO
deleted file mode 100644
index 63a5571f3e..0000000000
--- a/modular-xorg-server-devel/TODO
+++ /dev/null
@@ -1,6 +0,0 @@
-gmake[4]: Entering directory '/scratch/wip/modular-xorg-server-devel/work/xorg-server-1.19.99.902/hw/xfree86'
-  CC       sdksyms.o
-sdksyms.c:1773:15: error: expected expression before ',' token
-     (void *) &,                                                  /* ../../dri3/dri3.h:110 */
-               ^
-Makefile:821: recipe for target 'sdksyms.o' failed
diff --git a/modular-xorg-server-devel/distinfo b/modular-xorg-server-devel/distinfo
index 9069842d9b..a6ed937c1c 100644
--- a/modular-xorg-server-devel/distinfo
+++ b/modular-xorg-server-devel/distinfo
@@ -15,5 +15,5 @@ SHA1 (patch-hw_xfree86_os-support_bus_Sbus.c) = 0035b970bdae1bab51b8ca6bfeed060e
 SHA1 (patch-hw_xfree86_os-support_solaris_solaris-amd64.S) = 088a3118deb7567194e08dd46e34cb6edba38400
 SHA1 (patch-hw_xfree86_os-support_xf86_OSproc.h) = e1c049857893d2f050d5fb297a3e8ef86f0b1d7e
 SHA1 (patch-hw_xfree86_os_support_bus_xf86Sbus.h) = 0e0a243b737f8f762c9f8f24a2265d1b6aefb544
-SHA1 (patch-hw_xfree86_sdksyms.sh) = c403149ad35ffb70ee44f70de94b4497b751c118
+SHA1 (patch-hw_xfree86_sdksyms.sh) = e7cd03a3bb55f757ff4b24d4377452f5f100ba40
 SHA1 (patch-os_xstrans.c) = 489a4f4b226ecd361b922895204fb9041b065d4e
diff --git a/modular-xorg-server-devel/patches/patch-hw_xfree86_sdksyms.sh b/modular-xorg-server-devel/patches/patch-hw_xfree86_sdksyms.sh
index 9f452d405b..5be460b148 100644
--- a/modular-xorg-server-devel/patches/patch-hw_xfree86_sdksyms.sh
+++ b/modular-xorg-server-devel/patches/patch-hw_xfree86_sdksyms.sh
@@ -5,9 +5,12 @@ It returns pid_t which on NetBSD is #define pid_t __pid_t
 This slightly alters the GCC preprocessor output which this fragile
 code could not deal with when using GCC 5+
 
---- hw/xfree86/sdksyms.sh.orig	2016-03-08 20:22:17.000000000 +0000
+
+Ignore empty symbols, from Adam Jackson <ajax%redhat.com@localhost>
+
+--- hw/xfree86/sdksyms.sh.orig	2018-04-10 19:46:09.000000000 +0000
 +++ hw/xfree86/sdksyms.sh
-@@ -357,6 +357,17 @@ BEGIN {
+@@ -373,6 +373,17 @@ BEGIN {
                 n = 1;
              }
          }
@@ -25,3 +28,13 @@ code could not deal with when using GCC 5+
  
  	# type specifier may not be set, as in
  	#   extern _X_EXPORT unsigned name(...)
+@@ -415,7 +426,8 @@ BEGIN {
+ 	sub(/[^a-zA-Z0-9_].*/, "", symbol);
+ 
+ 	#print;
+-	printf("    (void *) &%-50s /* %s:%s */\n", symbol ",", header, line);
++	if (symbol != "")
++	    printf("    (void *) &%-50s /* %s:%s */\n", symbol ",", header, line);
+     }
+ }
+