xdotool: Update to 3.20210804.2

mrkooll · Aug 11, 2021 · ce3322d · ce3322d
1 parent 4a3cb38
commit ce3322d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 42 deletions.
diff --git 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
diff --git 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)")