Hi! This diff updates xdotool from our ancient version to the latest release.
I've disabled the regression tests, since now they require a Whole Lotta Love of dependencies like ruby, openbox, Xephyr and gnome-session... ok? cheers, David Index: Makefile =================================================================== RCS file: /cvs/ports/x11/xdotool/Makefile,v retrieving revision 1.7 diff -u -p -r1.7 Makefile --- Makefile 14 Mar 2011 09:15:34 -0000 1.7 +++ Makefile 22 Sep 2011 11:43:57 -0000 @@ -2,8 +2,12 @@ COMMENT= fake keyboard and mouse input -DISTNAME= xdotool-20090126 -REVISION= 1 +DISTNAME= xdotool-2.20110530.1 +EPOCH= 0 + +SHARED_ONLY= Yes + +SHARED_LIBS= xdo 0.0 # 2.1 CATEGORIES= x11 @@ -17,11 +21,18 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= http://semicomplete.googlecode.com/files/ -USE_GROFF = Yes -WANTLIB= X11 Xau Xdmcp Xext Xtst c \ - pthread-stubs xcb -REGRESS_IS_INTERACTIVE= Yes +USE_GMAKE= Yes + +WANTLIB= X11 Xau Xdmcp Xext Xinerama \ + Xtst c m pthread-stubs xcb + +MAKE_FLAGS= LIBVER=${LIBxdo_VERSION} + +FAKE_FLAGS= PREFIX="${PREFIX}" \ + INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ + INSTALL_DATA="${INSTALL_DATA}" \ + INSTALL_MAN="${INSTALL_MAN}" + +NO_REGRESS= Yes -do-regress: - cd ${WRKSRC} && /bin/sh ./t/no_crashes_please.sh .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/x11/xdotool/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo 1 Feb 2009 13:38:19 -0000 1.2 +++ distinfo 22 Sep 2011 11:43:57 -0000 @@ -1,5 +1,5 @@ -MD5 (xdotool-20090126.tar.gz) = pSDWoxdcO1VYKZjL7vgWiA== -RMD160 (xdotool-20090126.tar.gz) = cV3dryvVkX8efyBaKThm6uKrd4Y= -SHA1 (xdotool-20090126.tar.gz) = IN0uYb2yefctELqr+0+GnpzMNSQ= -SHA256 (xdotool-20090126.tar.gz) = /Cz99LwlCxeDKM26hw8MIMxJnBa3fT1AWT/CAwpE39E= -SIZE (xdotool-20090126.tar.gz) = 17299 +MD5 (xdotool-2.20110530.1.tar.gz) = YtDCFYu6+IKhz1gEIUN7Lw== +RMD160 (xdotool-2.20110530.1.tar.gz) = GuvNg1pHQanneqSJo73OGVxYIgQ= +SHA1 (xdotool-2.20110530.1.tar.gz) = v4NysudujuOIR2PO5uiz9mvymqY= +SHA256 (xdotool-2.20110530.1.tar.gz) = 57Qsix05GXDhwQCbJWAz8w5X2OCio94in9Yez8J7r2c= +SIZE (xdotool-2.20110530.1.tar.gz) = 107204 Index: patches/patch-Makefile =================================================================== RCS file: /cvs/ports/x11/xdotool/patches/patch-Makefile,v retrieving revision 1.2 diff -u -p -r1.2 patch-Makefile --- patches/patch-Makefile 1 Feb 2009 13:38:19 -0000 1.2 +++ patches/patch-Makefile 22 Sep 2011 11:43:57 -0000 @@ -1,15 +1,119 @@ $OpenBSD: patch-Makefile,v 1.2 2009/02/01 13:38:19 landry Exp $ ---- Makefile.orig Mon Jan 26 11:54:16 2009 -+++ Makefile Sun Feb 1 14:32:51 2009 -@@ -6,9 +6,9 @@ WARNFLAGS+=-pedantic -Wall -W -Wundef \ +--- Makefile.orig Mon May 30 09:29:58 2011 ++++ Makefile Thu Sep 22 13:19:11 2011 +@@ -11,29 +11,28 @@ 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 \ ++WARNFLAGS+=-pedantic -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)) + -Wdisabled-optimization ++LIBSUFFIX=$(shell sh platform.sh libsuffix $(LIBVER)) + DYNLIBFLAG=$(shell sh platform.sh dynlibflag) +-LIBNAMEFLAG=$(shell sh platform.sh libnameflag $(MAJOR) $(INSTALLLIB)) + LIBS=$(shell sh platform.sh extralibs) + +-CFLAGS?=-pipe -O2 $(WARNFLAGS) +-CFLAGS+=-g # TODO(sissel): Comment before release ++CFLAGS?=-pipe -O2 -Wall + +-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 -lX11 -lXtst -lXinerama ++DEFAULT_INC=-I${X11BASE}/include + + LIBS+=$(shell pkg-config --libs x11 xtst xinerama 2> /dev/null || echo "$(DEFAULT_LIBS)") + INC=$(shell pkg-config --cflags x11 xtst xinerama 2> /dev/null || echo "$(DEFAULT_INC)") +-CFLAGS+=-std=c99 $(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 \ +@@ -51,7 +50,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 + + .PHONY: static + static: xdotool.static +@@ -83,23 +82,22 @@ post-install: + .PHONY: installprog + installprog: xdotool + install -d $(DINSTALLBIN) +- install -m 755 xdotool $(DINSTALLBIN)/ ++ ${INSTALL_PROGRAM} xdotool $(DINSTALLBIN)/ + + .PHONY: installlib + installlib: libxdo.$(LIBSUFFIX) + install -d $(DINSTALLLIB) +- 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 +@@ -109,12 +107,11 @@ uninstall: + rm -f $(DINSTALLBIN)/xdotool + rm -f $(DINSTALLMAN)/xdotool.1 + rm -f $(DINSTALLLIB)/libxdo.$(LIBSUFFIX) +- rm -f $(DINSTALLLIB)/libxdo.$(VERLIBSUFFIX) + + .PHONY: clean + clean: + rm -f *.o xdotool xdotool.static xdotool.1 xdotool.html \ +- libxdo.$(LIBSUFFIX) libxdo.$(VERLIBSUFFIX) libxdo.a || true ++ libxdo.$(LIBSUFFIX) libxdo.a || true + + xdo.o: xdo.c xdo_version.h + $(CC) $(CFLAGS) -fPIC -c xdo.c +@@ -130,14 +127,11 @@ 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 $@ $(LIBS) ++ $(CC) $(LDFLAGS) $(DYNLIBFLAG) xdo.o xdo_search.o -o $@ $(LIBS) + + libxdo.a: xdo.o xdo_search.o + ar qv $@ xdo.o xdo_search.o + +-libxdo.$(VERLIBSUFFIX): libxdo.$(LIBSUFFIX) +- ln -s $< $@ +- + # xdotool the binary requires libX11 now for XSelectInput and friends. + # This requirement will go away once more things are refactored into + # libxdo. +@@ -165,7 +159,7 @@ package: test-package-build create-package create-pack + package-deb: test-package-build create-package-deb --CFLAGS=-pipe -std=c99 $(WARNFLAGS) -+CFLAGS+=-pipe -std=c99 $(WARNFLAGS) + .PHONY: test +-test: xdotool libxdo.$(VERLIBSUFFIX) ++test: xdotool libxdo.$(LIBSUFFIX) + $(MAKE) -C t - DEFAULT_LIBS=-L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXtst - DEFAULT_INC=-I/usr/X11R6/include -I/usr/local/include + xdo_version.h: Index: patches/patch-t_no_crashes_please_sh =================================================================== RCS file: patches/patch-t_no_crashes_please_sh diff -N patches/patch-t_no_crashes_please_sh --- patches/patch-t_no_crashes_please_sh 13 Jun 2008 05:33:52 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,18 +0,0 @@ -$OpenBSD: patch-t_no_crashes_please_sh,v 1.1.1.1 2008/06/13 05:33:52 landry Exp $ ---- t/no_crashes_please.sh.orig Tue Jun 3 23:43:52 2008 -+++ t/no_crashes_please.sh Thu Jun 12 22:58:20 2008 -@@ -10,13 +10,7 @@ try () { - fi - } - --make -C ../ clean xdotool --if [ $? -ne 0 ] ; then -- echo "Failure building xdotool." -- exit 1 --fi -- --xdotool="../xdotool" -+xdotool="./xdotool" - - xterm -T xdotool_test_window -e 'sleep 300' & - xterm_pid="$!" Index: patches/patch-version_sh =================================================================== RCS file: patches/patch-version_sh diff -N patches/patch-version_sh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-version_sh 22 Sep 2011 11:43:57 -0000 @@ -0,0 +1,11 @@ +$OpenBSD$ +--- 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_" Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/x11/xdotool/pkg/PLIST,v retrieving revision 1.2 diff -u -p -r1.2 PLIST --- pkg/PLIST 1 Feb 2009 13:38:19 -0000 1.2 +++ pkg/PLIST 22 Sep 2011 11:43:57 -0000 @@ -1,3 +1,5 @@ @comment $OpenBSD: PLIST,v 1.2 2009/02/01 13:38:19 landry Exp $ @bin bin/xdotool +include/xdo.h +@lib lib/libxdo.so.${LIBxdo_VERSION} @man man/man1/xdotool.1
