From ce3322d5e5b364840719ac6c496826c357ac13e2 Mon Sep 17 00:00:00 2001
From: Ryan Schmidt <ryandesign@macports.org>
Date: Tue, 10 Aug 2021 20:22:56 -0500
Subject: [PATCH] xdotool: Update to 3.20210804.2

---
 x11/xdotool/Portfile                  | 28 ++++++++++-----------------
 x11/xdotool/files/cflags.sh.patch     | 20 -------------------
 x11/xdotool/files/patch-Makefile.diff |  8 ++++----
 3 files changed, 14 insertions(+), 42 deletions(-)
 delete mode 100644 x11/xdotool/files/cflags.sh.patch

diff --git a/x11/xdotool/Portfile b/x11/xdotool/Portfile
index e8bd0c7972784..32abc7267079c 100644
--- a/x11/xdotool/Portfile
+++ b/x11/xdotool/Portfile
@@ -2,9 +2,14 @@
 
 PortSystem                  1.0
 PortGroup                   github 1.0
+PortGroup                   makefile 1.0
+
+github.setup                jordansissel xdotool 3.20210804.2 v
+revision                    0
+checksums                   rmd160  c64560bcc8962b8dcad94efdf33897eed1abe98a \
+                            sha256  fde6b15b5978c91e0ecb78cc541a9987752e724820722e479dcc2efc17466c89 \
+                            size    114644
 
-github.setup                jordansissel xdotool 3.20160805.1 v
-revision                    1
 categories                  x11 devel
 platforms                   darwin
 maintainers                 {ryandesign @ryandesign} openmaintainer
@@ -29,14 +34,11 @@ notes                       "To use xdotool (and avoid the error message\
 homepage                    http://www.semicomplete.com/projects/xdotool/
 github.tarball_from         releases
 
-checksums                   rmd160  33a99746cba56e7b8fdd151cc236326acf27057d \
-                            sha256  35be5ff6edf0c620a0e16f09ea5e101d5173280161772fca18657d83f20fcca8 \
-                            size    105388
-
 depends_build               port:pkgconfig \
                             path:bin/perl:perl5
 
 depends_lib                 port:libxkbcommon \
+                            port:xorg-libXi \
                             port:xorg-libXinerama \
                             port:xorg-libXtst
 
@@ -46,22 +48,12 @@ platform darwin {
 }
 
 patchfiles                  patch-Makefile.diff
-patchfiles-append           cflags.sh.patch
-
-use_configure               no
-
-variant universal {}
 
-build.env                   PREFIX=${prefix} \
-                            CC=${configure.cc} \
-                            "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
-                            "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
-destroot.env                PREFIX=${prefix} \
-                            INSTALLMAN=${prefix}/share/man
+destroot.env-append         INSTALLMAN=${prefix}/share/man
 
 post-destroot {
     set docdir ${prefix}/share/doc/${subport}
     xinstall -d ${destroot}${docdir} ${destroot}${prefix}/share/examples
-    xinstall -m 0644 -W ${worksrcpath} CHANGELIST COPYRIGHT README ${destroot}${docdir}
+    xinstall -m 0644 -W ${worksrcpath} CHANGELIST COPYRIGHT README.md ${destroot}${docdir}
     copy ${worksrcpath}/examples ${destroot}${prefix}/share/examples/${name}
 }
diff --git a/x11/xdotool/files/cflags.sh.patch b/x11/xdotool/files/cflags.sh.patch
deleted file mode 100644
index 22db67b18e6c1..0000000000000
--- a/x11/xdotool/files/cflags.sh.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Fix build on macOS 11 and later.
-https://github.com/jordansissel/xdotool/pull/312
---- cflags.sh.orig	2016-08-04 19:49:32.000000000 -0500
-+++ cflags.sh	2021-01-06 06:43:28.000000000 -0600
-@@ -1,10 +1,10 @@
- #!/bin/sh
- 
--osxver=`sw_vers -productVersion 2> /dev/null`
--if [ $? -eq 0 ] ; then
--  minor=`echo "$osxver" | cut -d. -f2`
--  if [ "$minor" -le 11 ] ; then
--    # Versions of OSX before 10.12 (aka "macOS Sierra") did not have clock_gettime()
-+system=`uname -s`
-+if [ "$system" = "Darwin" ] ; then
-+  major=`uname -r | cut -d. -f1`
-+  if [ "$major" -le 15 ] ; then
-+    # OS X 10.11 El Capitan (Darwin 15) and earlier did not have clock_gettime()
-     echo "-DMISSING_CLOCK_GETTIME"
-   fi
- fi
diff --git a/x11/xdotool/files/patch-Makefile.diff b/x11/xdotool/files/patch-Makefile.diff
index bb5796892b122..a4f804763573f 100644
--- a/x11/xdotool/files/patch-Makefile.diff
+++ b/x11/xdotool/files/patch-Makefile.diff
@@ -1,6 +1,6 @@
---- Makefile.orig	2016-08-05 12:37:12.000000000 -0500
-+++ Makefile	2016-10-19 20:40:06.000000000 -0500
-@@ -30,8 +30,8 @@
+--- Makefile.orig	2021-08-04 11:14:19.000000000 -0500
++++ Makefile	2021-08-10 18:50:25.000000000 -0500
+@@ -32,8 +32,8 @@
  CFLAGS+=$(CPPFLAGS)
  CFLAGS+=$(shell sh cflags.sh)
  
@@ -10,4 +10,4 @@
 +DEFAULT_INC=-I$(PREFIX)/include
  
  XDOTOOL_LIBS=$(shell pkg-config --libs x11 2> /dev/null || echo "$(DEFAULT_LIBS)")  $(shell sh platform.sh extralibs)
- LIBXDO_LIBS=$(shell pkg-config --libs x11 xtst xinerama xkbcommon 2> /dev/null || echo "$(DEFAULT_LIBS)")
+ LIBXDO_LIBS=$(shell pkg-config --libs xi x11 xtst xinerama xkbcommon 2> /dev/null || echo "$(DEFAULT_LIBS)")