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

update to xdotool-3.20210804.2, simplify patching

Browse Source
This commit is contained in:
sthen 2021-08-05 11:26:20 +00:00
parent 09ee08fb24
commit bf16c761b1
5 changed files with 18 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
x11/xdotool/Makefile
View File

@ -1,17 +1,16 @@
# $OpenBSD: Makefile,v 1.19 2020/01/14 16:28:56 stsp Exp $
# $OpenBSD: Makefile,v 1.20 2021/08/05 11:26:20 sthen Exp $
COMMENT= fake keyboard and mouse input
V = 3.20160805.1
V = 3.20210804.2
DISTNAME = xdotool-${V}
EPOCH= 0
REVISION= 0
SHARED_LIBS= xdo 0.1 # 1.1
SHARED_LIBS= xdo 0.2
CATEGORIES= x11
HOMEPAGE= http://www.semicomplete.com/projects/xdotool/
HOMEPAGE= https://www.semicomplete.com/projects/xdotool/
# BSD
PERMIT_PACKAGE= Yes
@ -26,12 +25,10 @@ DEBUG_PACKAGES= ${BUILD_PACKAGES}
LIB_DEPENDS= x11/xkbcommon
MAKE_FLAGS= LIBVER=${LIBxdo_VERSION}
MAKE_FLAGS= VERLIBSUFFIX=so.${LIBxdo_VERSION} LIBNAMEFLAG=
FAKE_FLAGS= PREFIX="${PREFIX}" \
INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
INSTALL_DATA="${INSTALL_DATA}" \
INSTALL_MAN="${INSTALL_MAN}"
INSTALL_PROGRAM="${INSTALL_PROGRAM}"
# The regression test suite has way too many dependencies, so leave
# it disabled for now

4
x11/xdotool/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (xdotool-3.20160805.1.tar.gz) = Nb5f9u3wxiCg4W8J6l4QHVFzKAFhdy/KGGV9g/IPzKg=
SIZE (xdotool-3.20160805.1.tar.gz) = 105388
SHA256 (xdotool-3.20210804.2.tar.gz) = /eaxW1l4yR4Oy3jMVBqZh3Uuckggci5Hncwu/BdGbIk=
SIZE (xdotool-3.20210804.2.tar.gz) = 114644

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

@ -1,27 +1,9 @@
$OpenBSD: patch-Makefile,v 1.6 2018/03/05 14:31:37 sthen Exp $
$OpenBSD: patch-Makefile,v 1.7 2021/08/05 11:26:20 sthen Exp $
Index: Makefile
--- Makefile.orig
+++ Makefile
@@ -12,26 +12,25 @@ 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))
@@ -28,12 +28,11 @@ 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
@ -34,17 +16,17 @@ Index: Makefile
+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 x11 xtst xinerama xkbcommon 2> /dev/null || echo "$(DEFAULT_LIBS)")
@@ -55,7 +54,7 @@ CMDOBJS= cmd_click.o cmd_mousemove.o cmd_mousemove_rel
LIBXDO_LIBS=$(shell pkg-config --libs xi x11 xtst xinerama xkbcommon 2> /dev/null || echo "$(DEFAULT_LIBS)")
@@ -57,7 +56,7 @@ CMDOBJS= cmd_click.o cmd_mousemove.o cmd_mousemove_rel
cmd_sleep.o cmd_get_display_geometry.o
.PHONY: all
-all: xdotool.1 libxdo.$(LIBSUFFIX) libxdo.$(VERLIBSUFFIX) xdotool
+all: xdotool.1 libxdo.$(LIBSUFFIX) xdotool
+all: xdotool.1 libxdo.$(VERLIBSUFFIX) xdotool
.PHONY: static
static: xdotool.static
@@ -87,23 +86,22 @@ post-install:
@@ -88,13 +87,12 @@ post-install:
.PHONY: installprog
installprog: xdotool
install -d $(DINSTALLBIN)
@ -54,39 +36,8 @@ Index: Makefile
.PHONY: installlib
installlib: libxdo.$(LIBSUFFIX)
install -d $(DINSTALLLIB)
- install libxdo.$(LIBSUFFIX) $(DINSTALLLIB)/libxdo.$(VERLIBSUFFIX)
install libxdo.$(LIBSUFFIX) $(DINSTALLLIB)/libxdo.$(VERLIBSUFFIX)
- ln -sf libxdo.$(VERLIBSUFFIX) $(DINSTALLLIB)/libxdo.$(LIBSUFFIX)
+ ${INSTALL_DATA} libxdo.$(LIBSUFFIX) $(DINSTALLLIB)/
.PHONY: installheader
installheader: xdo.h
install -d $(DINSTALLINCLUDE)
- install xdo.h $(DINSTALLINCLUDE)/xdo.h
+ ${INSTALL_DATA} xdo.h $(DINSTALLINCLUDE)/xdo.h
.PHONY: installman
installman: xdotool.1
install -d $(DINSTALLMAN)/man1
- install -m 644 xdotool.1 $(DINSTALLMAN)/man1/
+ ${INSTALL_MAN} xdotool.1 $(DINSTALLMAN)/man1/
.PHONY: deinstall
deinstall: uninstall
@@ -134,7 +132,7 @@ xdo.c: xdo.h
xdotool.c: xdo.h
libxdo.$(LIBSUFFIX): xdo.o xdo_search.o
- $(CC) $(LDFLAGS) $(DYNLIBFLAG) $(LIBNAMEFLAG) xdo.o xdo_search.o -o $@ $(LIBXDO_LIBS)
+ $(CC) $(LDFLAGS) $(DYNLIBFLAG) xdo.o xdo_search.o -o $@ $(LIBXDO_LIBS)
libxdo.a: xdo.o xdo_search.o
ar qv $@ xdo.o xdo_search.o
@@ -175,7 +173,7 @@ package-deb: test-package-build create-package-deb
.PHONY: test
test: WITH_SHELL=/bin/bash
-test: xdotool libxdo.$(VERLIBSUFFIX)
+test: xdotool libxdo.$(LIBSUFFIX)
echo $(WITH_SHELL)
if [ "$(WITH_SHELL)" = "/bin/sh" ] ; then \
echo "Shell '$(WITH_SHELL)' fails on some Linux distros because it could"; \

11
x11/xdotool/patches/patch-version_sh
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-version_sh,v 1.1 2011/09/22 14:04:08 dcoppa Exp $
--- version.sh.orig Thu Sep 22 12:58:52 2011
+++ version.sh Thu Sep 22 12:59:17 2011
@@ -16,6 +16,7 @@ VERSION="$MAJOR.$RELEASE.$REVISION"
case $1 in
--major) echo "$MAJOR" ;;
+ --revision) echo "$REVISION" ;;
--header)
echo "#ifndef _VERSION_H_"
echo "#define _VERSION_H_"

3
x11/xdotool/pkg/PLIST
View File

@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST,v 1.3 2011/09/22 14:04:08 dcoppa Exp $
@comment $OpenBSD: PLIST,v 1.4 2021/08/05 11:26:20 sthen Exp $
@bin bin/xdotool
include/xdo.h
@lib lib/libxdo.so.${LIBxdo_VERSION}
lib/pkgconfig/libxdo.pc
@man man/man1/xdotool.1