xdo: use different workaround for netbsd header issue.

[Maya Rashish <maya%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Maya Rashish <maya%NetBSD.org@localhost>
Pushed By:	coypu
Date:		Sun Jun 28 14:59:41 2020 +0300
Changeset:	483ff993438b140b9c5bc8f1495ddcb32c5def1a

Modified Files:
	xdo/Makefile
	xdo/distinfo
Removed Files:
	xdo/patches/patch-Makefile

Log Message:
xdo: use different workaround for netbsd header issue.

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

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

diffstat:
 xdo/Makefile               |  3 +++
 xdo/distinfo               |  1 -
 xdo/patches/patch-Makefile | 15 ---------------
 3 files changed, 3 insertions(+), 16 deletions(-)

diffs:
diff --git a/xdo/Makefile b/xdo/Makefile
index 4fb4acb93c..4a32be273b 100644
--- a/xdo/Makefile
+++ b/xdo/Makefile
@@ -14,6 +14,9 @@ USE_LANGUAGES=	c99
 
 MAKE_ENV+=	MANPREFIX=${PREFIX}/${PKGMANDIR}
 
+# For some reason, not equivalent to  _POSIX_C_SOURCE = 200809L for the purpose of SA_RESTART.
+CFLAGS.NetBSD+=	-D_XOPEN_SOURCE=700
+
 .include "../../x11/libxcb/buildlink3.mk"
 .include "../../x11/xcb-util-wm/buildlink3.mk"
 .include "../../x11/xcb-util/buildlink3.mk"
diff --git a/xdo/distinfo b/xdo/distinfo
index 4c0966df8f..a10499392f 100644
--- a/xdo/distinfo
+++ b/xdo/distinfo
@@ -4,4 +4,3 @@ SHA1 (xdo-0.5.7.tar.gz) = 9daa84c47dd213fb3de6ac5ebec5ec4fc1be61a3
 RMD160 (xdo-0.5.7.tar.gz) = 4b0b661f00013d7b6154e88230f9e72bae72f298
 SHA512 (xdo-0.5.7.tar.gz) = 0978a8571a35899c916495c9d38458adb6c766db4d498dfacf2f0a46e373f7caa3c3e227096b3e60e03c67b972777cf7519e5b6eee7ebb91f82d4450ac0ff98d
 Size (xdo-0.5.7.tar.gz) = 7453 bytes
-SHA1 (patch-Makefile) = 26f5c3f13c04fd5938cb98b0ba6d8dd406fa93e3
diff --git a/xdo/patches/patch-Makefile b/xdo/patches/patch-Makefile
deleted file mode 100644
index 8d7f56b768..0000000000
--- a/xdo/patches/patch-Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Allow build, see MASTER_SITE issues/19 and pull/17
-
---- Makefile.orig	2017-09-18 12:00:07.000000000 +0000
-+++ Makefile
-@@ -2,7 +2,7 @@ NAME    := xdo
- VERCMD  ?= git describe 2> /dev/null
- VERSION := $(shell $(VERCMD) || cat VERSION)
- 
--CPPFLAGS += -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\"
-+CPPFLAGS += -DVERSION=\"$(VERSION)\"
- CFLAGS   += -std=c99 -pedantic -Wall -Wextra
- LDLIBS   := -lxcb -lxcb-util -lxcb-icccm -lxcb-ewmh -lxcb-xtest
-