cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to xdotool-3.20160805.1

Browse Source
This commit is contained in:
sthen 2018-03-05 14:31:37 +00:00
parent c96a20c61d
commit fcba3da26a
3 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
x11/xdotool/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.16 2018/03/04 12:10:32 rsadowski Exp $
# $OpenBSD: Makefile,v 1.17 2018/03/05 14:31:37 sthen Exp $
COMMENT= fake keyboard and mouse input
V = 3.20150503.1
V = 3.20160805.1
DISTNAME = xdotool-${V}
REVISION = 2
EPOCH= 0
SHARED_LIBS= xdo 0.1 # 1.1
@ -22,8 +21,6 @@ WANTLIB += X11 Xinerama Xtst c m xkbcommon
MASTER_SITES = https://github.com/jordansissel/xdotool/releases/download/v${V}/
DISTFILES = ${DISTNAME}_1{${DISTNAME}}${EXTRACT_SUFX}
LIB_DEPENDS= x11/xkbcommon
MAKE_FLAGS= LIBVER=${LIBxdo_VERSION}

4
x11/xdotool/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (xdotool-3.20150503.1_1.tar.gz) = 6DJog71ekb7eczbL7hhubpFD9As/thyEr8m7Mbh+ltE=
SIZE (xdotool-3.20150503.1_1.tar.gz) = 102125
SHA256 (xdotool-3.20160805.1.tar.gz) = 3a/KEjkHXCA3acF6WhhFh3MeVvvgQ4wJ0I+K8XBOEXo=
SIZE (xdotool-3.20160805.1.tar.gz) = 106026

31
x11/xdotool/patches/patch-Makefile
View File

@ -1,7 +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)
$OpenBSD: patch-Makefile,v 1.6 2018/03/05 14:31:37 sthen Exp $
Index: Makefile
--- Makefile.orig
+++ Makefile
@@ -12,26 +12,25 @@ DINSTALLLIB=$(DESTDIR)$(INSTALLLIB)
DINSTALLMAN=$(DESTDIR)$(INSTALLMAN)
DINSTALLINCLUDE=$(DESTDIR)$(INSTALLINCLUDE)
@ -25,22 +26,16 @@ $OpenBSD: patch-Makefile,v 1.5 2016/01/06 09:49:43 jasper Exp $
CFLAGS?=-pipe -O2 $(WARNFLAGS)
-CFLAGS+=-g # TODO(sissel): Comment before release
CFLAGS+=$(CPPFLAGS)
CFLAGS+=$(shell sh cflags.sh)
-DEFAULT_LIBS=-L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXtst -lXinerama
-DEFAULT_LIBS=-L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXtst -lXinerama -lxkbcommon
-DEFAULT_INC=-I/usr/X11R6/include -I/usr/local/include
+DEFAULT_LIBS=-L${X11BASE}/lib -L${PREFIX}/lib -lX11 -lXtst -lXinerama
+DEFAULT_LIBS=-L${X11BASE}/lib -L${PREFIX}/lib -lX11 -lXtst -lXinerama -lxkbcommon
+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
LIBXDO_LIBS=$(shell pkg-config --libs x11 xtst xinerama xkbcommon 2> /dev/null || echo "$(DEFAULT_LIBS)")
@@ -55,7 +54,7 @@ CMDOBJS= cmd_click.o cmd_mousemove.o cmd_mousemove_rel
cmd_sleep.o cmd_get_display_geometry.o
.PHONY: all
@ -49,7 +44,7 @@ $OpenBSD: patch-Makefile,v 1.5 2016/01/06 09:49:43 jasper Exp $
.PHONY: static
static: xdotool.static
@@ -84,23 +83,22 @@ post-install:
@@ -87,23 +86,22 @@ post-install:
.PHONY: installprog
installprog: xdotool
install -d $(DINSTALLBIN)
@ -77,7 +72,7 @@ $OpenBSD: patch-Makefile,v 1.5 2016/01/06 09:49:43 jasper Exp $
.PHONY: deinstall
deinstall: uninstall
@@ -131,7 +129,7 @@ xdo.c: xdo.h
@@ -134,7 +132,7 @@ xdo.c: xdo.h
xdotool.c: xdo.h
libxdo.$(LIBSUFFIX): xdo.o xdo_search.o
@ -86,7 +81,7 @@ $OpenBSD: patch-Makefile,v 1.5 2016/01/06 09:49:43 jasper Exp $
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 +173,7 @@ package-deb: test-package-build create-package-deb
.PHONY: test
test: WITH_SHELL=/bin/bash