Untested, but you can try this diff.


On [26/09/17] [03:15P], Dell Sanders wrote:
; Hello,
; I want to install xdotool but the version in my mirror appears to be out of 
date -
; 
https://ftp.nluug.nl/pub/OpenBSD/snapshots/packages/amd64/xdotool-3.20150503.1v0.tgz
; 
; According to the developer, the latest version is v3.20160805.1 -
; https://github.com/jordansissel/xdotool/releases
; 
; Has this tool been superseded by another package?Is anyone working on a 
update?(If not, I am willing to contribute)
; -Dell

-- 
Sending from my toaster.
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/xdotool/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile    16 Mar 2016 16:46:33 -0000      1.14
+++ Makefile    26 Sep 2017 19:40:19 -0000
@@ -2,13 +2,11 @@
 
 COMMENT=       fake keyboard and mouse input
 
-GH_TAGNAME=    v3.20150503.1
+GH_TAGNAME=    v3.20160805.1
 GH_PROJECT=    xdotool
 GH_ACCOUNT=    jordansissel
 EPOCH=         0
 
-SHARED_LIBS=   xdo 0.1 # 1.1
-
 CATEGORIES=    x11
 
 HOMEPAGE=      http://www.semicomplete.com/projects/xdotool/
@@ -18,9 +16,7 @@ PERMIT_PACKAGE_CDROM= Yes
 
 USE_GMAKE=     Yes
 
-WANTLIB += X11 Xinerama Xtst c m xkbcommon
-
-LIB_DEPENDS=   x11/xkbcommon
+WANTLIB += X11 c m
 
 MAKE_FLAGS=    LIBVER=${LIBxdo_VERSION}
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/xdotool/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo    6 Jan 2016 09:49:42 -0000       1.5
+++ distinfo    26 Sep 2017 19:40:19 -0000
@@ -1,2 +1,2 @@
-SHA256 (xdotool-3.20150503.1.tar.gz) = 
sJfvDjiX0aJOP0Xw+u1YMpdC09lDS5tG65frEED5mb8=
-SIZE (xdotool-3.20150503.1.tar.gz) = 103128
+SHA256 (xdotool-3.20160805.1.tar.gz) = 
3a/KEjkHXCA3acF6WhhFh3MeVvvgQ4wJ0I+K8XBOEXo=
+SIZE (xdotool-3.20160805.1.tar.gz) = 106026
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/x11/xdotool/patches/patch-Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 patch-Makefile
--- patches/patch-Makefile      6 Jan 2016 09:49:43 -0000       1.5
+++ patches/patch-Makefile      26 Sep 2017 19:40:19 -0000
@@ -1,46 +1,8 @@
 $OpenBSD: patch-Makefile,v 1.5 2016/01/06 09:49:43 jasper Exp $
---- Makefile.orig      Mon May  4 04:54:46 2015
-+++ Makefile   Tue Jan  5 21:25:42 2016
-@@ -11,30 +11,29 @@ DINSTALLLIB=$(DESTDIR)$(INSTALLLIB)
- DINSTALLMAN=$(DESTDIR)$(INSTALLMAN)
- DINSTALLINCLUDE=$(DESTDIR)$(INSTALLINCLUDE)
- 
--MAJOR=$(shell sh version.sh --major)
-+MAJOR?=$(shell sh version.sh --major)
-+MINOR?=$(shell sh version.sh --revision)
- VERSION=$(shell sh version.sh)
-+LIBVER?=$(MAJOR).$(MINOR)
- 
- WARNFLAGS+=-pedantic -Wall -W -Wundef \
-            -Wendif-labels -Wshadow -Wpointer-arith -Wbad-function-cast \
-            -Wcast-align -Wwrite-strings -Wstrict-prototypes \
-            -Wmissing-prototypes -Wnested-externs -Winline \
-            -Wdisabled-optimization -Wno-missing-field-initializers
--LIBSUFFIX=$(shell sh platform.sh libsuffix)
--VERLIBSUFFIX=$(shell sh platform.sh libsuffix $(MAJOR))
-+LIBSUFFIX=$(shell sh platform.sh libsuffix $(LIBVER))
- DYNLIBFLAG=$(shell sh platform.sh dynlibflag)
--LIBNAMEFLAG=$(shell sh platform.sh libnameflag $(MAJOR) $(INSTALLLIB))
- 
- CFLAGS?=-pipe -O2 $(WARNFLAGS)
--CFLAGS+=-g # TODO(sissel): Comment before release
- CFLAGS+=$(CPPFLAGS)
- 
--DEFAULT_LIBS=-L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXtst -lXinerama
--DEFAULT_INC=-I/usr/X11R6/include -I/usr/local/include
-+DEFAULT_LIBS=-L${X11BASE}/lib -L${PREFIX}/lib -lX11 -lXtst -lXinerama
-+DEFAULT_INC=-I${X11BASE}/include -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 xtst xinerama xkbcommon 2> /dev/null || 
echo "$(DEFAULT_LIBS)")
--INC=$(shell pkg-config --cflags x11 xtst xinerama 2> /dev/null || echo 
"$(DEFAULT_INC)")
--CFLAGS+=-std=c99 $(INC)
-+INC=$(shell pkg-config --cflags x11 xtst xinerama xkbcommon 2> /dev/null || 
echo "$(DEFAULT_INC)")
-+CFLAGS+=-std=c99 $(WARNFLAGS) $(INC)
- 
- CMDOBJS= cmd_click.o cmd_mousemove.o cmd_mousemove_relative.o cmd_mousedown.o 
\
-          cmd_mouseup.o cmd_getmouselocation.o cmd_type.o cmd_key.o \
-@@ -52,7 +51,7 @@ CMDOBJS= cmd_click.o cmd_mousemove.o cmd_mousemove_rel
+Index: Makefile
+--- Makefile.orig
++++ Makefile
+@@ -55,7 +55,7 @@ CMDOBJS= cmd_click.o cmd_mousemove.o cmd_mousemove_rel
           cmd_sleep.o cmd_get_display_geometry.o
  
  .PHONY: all
@@ -49,7 +11,7 @@ $OpenBSD: patch-Makefile,v 1.5 2016/01/0
  
  .PHONY: static
  static: xdotool.static
-@@ -84,23 +83,22 @@ post-install:
+@@ -87,23 +87,22 @@ post-install:
  .PHONY: installprog
  installprog: xdotool
        install -d $(DINSTALLBIN)
@@ -77,7 +39,7 @@ $OpenBSD: patch-Makefile,v 1.5 2016/01/0
  
  .PHONY: deinstall
  deinstall: uninstall
-@@ -131,7 +129,7 @@ xdo.c: xdo.h
+@@ -134,7 +133,7 @@ xdo.c: xdo.h
  xdotool.c: xdo.h
  
  libxdo.$(LIBSUFFIX): xdo.o xdo_search.o
@@ -86,7 +48,7 @@ $OpenBSD: patch-Makefile,v 1.5 2016/01/0
  
  libxdo.a: xdo.o xdo_search.o
        ar qv $@ xdo.o xdo_search.o
-@@ -172,7 +170,7 @@ package-deb: test-package-build create-package-deb
+@@ -175,7 +174,7 @@ package-deb: test-package-build create-package-deb
  
  .PHONY: test
  test: WITH_SHELL=/bin/bash
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/xdotool/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   22 Sep 2011 14:04:08 -0000      1.3
+++ pkg/PLIST   26 Sep 2017 19:40:19 -0000
@@ -1,5 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.3 2011/09/22 14:04:08 dcoppa Exp $
 @bin bin/xdotool
 include/xdo.h
-@lib lib/libxdo.so.${LIBxdo_VERSION}
+lib/libxdo.so
 @man man/man1/xdotool.1

Reply via email to