+CC maintainer.
On 2021/07/31 15:12, Stefan Hagen wrote:
> Stefan Hagen wrote:
> > Stefan Hagen wrote:
> >> attached is a diff for x11/wmutils to update the core part to v1.5.
> >>
> >> Changes
> >> - new tool "slw" to select windows interactively (select window, get
> >> window ID back)
> >
> > *bump* after one week and patch inlined for easier review.
> >
>
> *ping*
>
> Still version 1.5, but new diff, because I noticed that the manpage for
> the wtp tool was missing.
>
>
> Index: x11/wmutils/Makefile.inc
> ===================================================================
> RCS file: /cvs/ports/x11/wmutils/Makefile.inc,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 Makefile.inc
> --- x11/wmutils/Makefile.inc 12 Jul 2019 20:51:24 -0000 1.2
> +++ x11/wmutils/Makefile.inc 31 Jul 2021 12:36:24 -0000
> @@ -9,9 +9,9 @@ GH_ACCOUNT ?= wmutils
> # ISC
> PERMIT_PACKAGE = Yes
>
> -WANTLIB += c xcb xcb-util
> +WANTLIB += c xcb xcb-cursor xcb-util
>
> -MAKE_FLAGS = LDFLAGS="-L${X11BASE}/lib -lxcb -lxcb-util" \
> +MAKE_FLAGS = LDFLAGS="-L${X11BASE}/lib -lxcb -lxcb-cursor -lxcb-util" \
> CFLAGS="${CFLAGS} -I${X11BASE}/include"
>
> NO_TEST ?= Yes
This changes WANTLIB in x11/wmutils/opt as well, so that needs a bump.
> Index: x11/wmutils/core/Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/wmutils/core/Makefile,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 Makefile
> --- x11/wmutils/core/Makefile 8 Jan 2018 19:24:31 -0000 1.1.1.1
> +++ x11/wmutils/core/Makefile 31 Jul 2021 12:36:24 -0000
> @@ -4,19 +4,19 @@ COMMENT = window manipulation tools
> DISTNAME = wmutils-core-${GH_TAGNAME:C/^v//}
>
> GH_PROJECT = core
> -GH_TAGNAME = v1.4
> +GH_TAGNAME = v1.5
>
> post-patch:
> sed -i -e 's/wtf/wintf/g' -e 's/lsw/lswin/g' ${WRKSRC}/man/*
>
> do-install:
> ${INSTALL_PROGRAM} \
> -
> ${WRKBUILD}/{chwb,chwso,ignw,killw,mapw,pfw,wattr,wmp,wmv,wrs,wtp} \
> +
> ${WRKBUILD}/{chwb,chwso,ignw,killw,mapw,pfw,slw,wattr,wmp,wmv,wrs,wtp} \
> ${PREFIX}/bin
> ${INSTALL_PROGRAM} ${WRKBUILD}/lsw ${PREFIX}/bin/lswin
> ${INSTALL_PROGRAM} ${WRKBUILD}/wtf ${PREFIX}/bin/wintf
> ${INSTALL_MAN} \
> -
> ${WRKSRC}/man/{chwb,chwso,ignw,killw,mapw,pfw,wattr,wmp,wmv,wrs,wmutils}.1 \
> +
> ${WRKSRC}/man/{chwb,chwso,ignw,killw,mapw,pfw,slw,wattr,wmp,wmutils,wmv,wrs,wtp}.1
> \
> ${PREFIX}/man/man1
> ${INSTALL_MAN} ${WRKSRC}/man/lsw.1 ${PREFIX}/man/man1/lswin.1
> ${INSTALL_MAN} ${WRKSRC}/man/wtf.1 ${PREFIX}/man/man1/wintf.1
Better to use upstream's install target and just deal with the renames
separately, that way new files don't get missed.
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/x11/wmutils/Makefile.inc,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile.inc
--- Makefile.inc 12 Jul 2019 20:51:24 -0000 1.2
+++ Makefile.inc 31 Jul 2021 15:17:44 -0000
@@ -9,9 +9,12 @@ GH_ACCOUNT ?= wmutils
# ISC
PERMIT_PACKAGE = Yes
-WANTLIB += c xcb xcb-util
+WANTLIB += c xcb xcb-cursor xcb-util
-MAKE_FLAGS = LDFLAGS="-L${X11BASE}/lib -lxcb -lxcb-util" \
+MAKE_FLAGS = LDFLAGS="-L${X11BASE}/lib -lxcb -lxcb-cursor -lxcb-util" \
CFLAGS="${CFLAGS} -I${X11BASE}/include"
+
+FAKE_FLAGS = PREFIX="${TRUEPREFIX}" \
+ MANPREFIX="${TRUEPREFIX}/man" \
NO_TEST ?= Yes
Index: core/Makefile
===================================================================
RCS file: /cvs/ports/x11/wmutils/core/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- core/Makefile 8 Jan 2018 19:24:31 -0000 1.1.1.1
+++ core/Makefile 31 Jul 2021 15:17:44 -0000
@@ -4,21 +4,15 @@ COMMENT = window manipulation tools
DISTNAME = wmutils-core-${GH_TAGNAME:C/^v//}
GH_PROJECT = core
-GH_TAGNAME = v1.4
+GH_TAGNAME = v1.5
post-patch:
- sed -i -e 's/wtf/wintf/g' -e 's/lsw/lswin/g' ${WRKSRC}/man/*
+ sed -i -e 's/wtf/wintf/g' -e 's/lsw/lswin/g' ${WRKSRC}/man/*.1
-do-install:
- ${INSTALL_PROGRAM} \
-
${WRKBUILD}/{chwb,chwso,ignw,killw,mapw,pfw,wattr,wmp,wmv,wrs,wtp} \
- ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKBUILD}/lsw ${PREFIX}/bin/lswin
- ${INSTALL_PROGRAM} ${WRKBUILD}/wtf ${PREFIX}/bin/wintf
- ${INSTALL_MAN} \
-
${WRKSRC}/man/{chwb,chwso,ignw,killw,mapw,pfw,wattr,wmp,wmv,wrs,wmutils}.1 \
- ${PREFIX}/man/man1
- ${INSTALL_MAN} ${WRKSRC}/man/lsw.1 ${PREFIX}/man/man1/lswin.1
- ${INSTALL_MAN} ${WRKSRC}/man/wtf.1 ${PREFIX}/man/man1/wintf.1
+post-install:
+.for a b in lsw lswin wtf wintf
+ mv ${PREFIX}/man/man1/{$a,$b}.1
+ mv ${PREFIX}/bin/{$a,$b}
+.endfor
.include <bsd.port.mk>
Index: core/distinfo
===================================================================
RCS file: /cvs/ports/x11/wmutils/core/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- core/distinfo 8 Jan 2018 19:24:31 -0000 1.1.1.1
+++ core/distinfo 31 Jul 2021 15:17:44 -0000
@@ -1,2 +1,2 @@
-SHA256 (wmutils-core-1.4.tar.gz) = ROFldrf24fEmwssklEmrfhD9ZSia/3dP+vJ9LBWnsro=
-SIZE (wmutils-core-1.4.tar.gz) = 10333
+SHA256 (wmutils-core-1.5.tar.gz) = cq8i6lK8NDv5CmYDrj4WntPBX2RjX6QlB8xmKrBKY3I=
+SIZE (wmutils-core-1.5.tar.gz) = 10893
Index: core/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/wmutils/core/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- core/pkg/PLIST 8 Jan 2018 19:24:31 -0000 1.1.1.1
+++ core/pkg/PLIST 31 Jul 2021 15:17:44 -0000
@@ -6,6 +6,7 @@
@bin bin/lswin
@bin bin/mapw
@bin bin/pfw
+@bin bin/slw
@bin bin/wattr
@bin bin/wintf
@bin bin/wmp
@@ -19,9 +20,11 @@
@man man/man1/lswin.1
@man man/man1/mapw.1
@man man/man1/pfw.1
+@man man/man1/slw.1
@man man/man1/wattr.1
@man man/man1/wintf.1
@man man/man1/wmp.1
@man man/man1/wmutils.1
@man man/man1/wmv.1
@man man/man1/wrs.1
+@man man/man1/wtp.1
Index: opt/Makefile
===================================================================
RCS file: /cvs/ports/x11/wmutils/opt/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- opt/Makefile 8 Jan 2018 19:24:31 -0000 1.1.1.1
+++ opt/Makefile 31 Jul 2021 15:17:44 -0000
@@ -6,7 +6,6 @@ DISTNAME = wmutils-opt-${GH_TAGNAME:C/^v
GH_PROJECT = opt
GH_TAGNAME = v1.0
-FAKE_FLAGS = PREFIX="${TRUEPREFIX}" \
- MANPREFIX="${TRUEPREFIX}/man" \
+REVISION = 0
.include <bsd.port.mk>
