Reads alright to me but I don't use pekwm anymore and I have no OpenBSD boxes with X at the moment so I can't test this diff. Do you want to take over as maintainer?
On Sun, Jan 25, 2015 at 10:16:21PM +0200, Timo Myyr?? wrote: > Hi, > > Here's an update for the pekwm window manager to latest version. > > I removed --enable-xinerama flag as it seems to be an default option. > The man page seems loses some bold and underline lines without groff but > otherwise renders just fine with mandoc. > > Big difference is the USE_GMAKE. The port builds without it but I couldn't > get > it to generate the script files under data/scripts directory without it. I > could > have used build targets and patching to process the scripts without using > Gmake > but this seemed easier for now. The only thing GMake seems to do is patch the > shell used to run the scripts and path to sed binary. > > Also added patch to remove unnecessary bash dependency from > pekwm_screenshot.sh > as was done on FreeBSD port. > > Been using this daily on amd64 but more testing wouldn't hurt. > > Timo > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/x11/pekwm/Makefile,v > retrieving revision 1.25 > diff -u -u -p -r1.25 Makefile > --- Makefile 23 Oct 2014 07:21:06 -0000 1.25 > +++ Makefile 25 Jan 2015 20:11:57 -0000 > @@ -2,19 +2,18 @@ > > COMMENT= aewm++ based pretty themable window manager > > -DISTNAME= pekwm-0.1.15 > -REVISION= 0 > +DISTNAME= pekwm-0.1.17 > CATEGORIES= x11 > > -HOMEPAGE= http://pekwm.org/ > +HOMEPAGE= https://www.pekwm.org/projects/pekwm/ > > MAINTAINER= Nicholas Marriott <n...@openbsd.org> > > # GPLv2 > PERMIT_PACKAGE_CDROM= Yes > > -WANTLIB += ICE SM X11 Xext Xft Xinerama Xpm Xrandr c jpeg m png > -WANTLIB += stdc++ z > +WANTLIB += ICE SM X11 Xext Xft Xinerama Xpm Xrandr c iconv > +WANTLIB += jpeg m png stdc++ > > MODULES= converters/libiconv > > @@ -23,13 +22,13 @@ EXTRACT_SUFX= .tar.bz2 > LIB_DEPENDS= graphics/jpeg \ > graphics/png > > -USE_GROFF = Yes > +# Use GNU make so pekwm scripts will get processed > +USE_GMAKE = Yes > NO_TEST= Yes > > CONFIGURE_STYLE=gnu > CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ > LDFLAGS="-L${LOCALBASE}/lib" > -CONFIGURE_ARGS= --enable-xinerama > > post-install: > @mv ${WRKINST}/etc/pekwm ${PREFIX}/share/examples > Index: distinfo > =================================================================== > RCS file: /cvs/ports/x11/pekwm/distinfo,v > retrieving revision 1.10 > diff -u -u -p -r1.10 distinfo > --- distinfo 12 Nov 2012 10:03:21 -0000 1.10 > +++ distinfo 25 Jan 2015 20:11:57 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (pekwm-0.1.15.tar.bz2) = VtQFuH89hY68U6In5N4juScwZ3ByURRckK8I01vHWC8= > -SIZE (pekwm-0.1.15.tar.bz2) = 395557 > +SHA256 (pekwm-0.1.17.tar.bz2) = ih/Tv5846Me7KyhkwJD5hrYM7CKB7PG7pGLRIPsyfQA= > +SIZE (pekwm-0.1.17.tar.bz2) = 405742 > cvs server: Diffing patches > Index: patches/patch-data_scripts_pekwm_screenshot_sh > =================================================================== > RCS file: patches/patch-data_scripts_pekwm_screenshot_sh > diff -N patches/patch-data_scripts_pekwm_screenshot_sh > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-data_scripts_pekwm_screenshot_sh 25 Jan 2015 20:11:57 > -0000 > @@ -0,0 +1,68 @@ > +$OpenBSD$ > +No need for bash here, use /bin/sh > +--- data/scripts/pekwm_screenshot.sh.orig Sun Jan 25 21:32:06 2015 > ++++ data/scripts/pekwm_screenshot.sh Sun Jan 25 21:33:18 2015 > +@@ -1,30 +1,30 @@ > +-#!/usr/bin/env bash > ++#!/bin/sh > + # > + # Copyright ?? 2013 the pekwm development team > + # > + > +-function screenshot_scrot > ++screenshot_scrot() > + { > + scrot -z "$1" > + } > + > +-function screenshot_xwd_netpbm > ++screenshot_xwd_netpbm() > + { > + xwd -root | xwdtopnm 2>/dev/null | pnmtopng > "$1" > + } > + > +-function screenshot_imagemagick > ++screenshot_imagemagick() > + { > + import -window root "$1" > + } > + > +-function is_in_path > ++is_in_path() > + { > + which $1 >/dev/null 2>&1 > + return $? > + } > + > +-function detect_command > ++detect_command() > + { > + is_in_path "scrot" > + if test $? -eq 0; then > +@@ -45,7 +45,7 @@ function detect_command > + fi > + } > + > +-function usage > ++usage() > + { > + echo "usage: pekwm_screenshot.sh [-c scrot|netpbm|magick] [-d delay] > [-o output.png]" > + echo "" > +@@ -61,7 +61,7 @@ function usage > + exit 0 > + } > + > +-function usage_command > ++usage_command() > + { > + echo "Unable to find any supported commands for taking screenshots" > + echo "" > +@@ -74,7 +74,7 @@ function usage_command > + exit 1 > + } > + > +-function main > ++main() > + { > + # Initialize for strict mode > + command="" > cvs server: Diffing pkg > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/x11/pekwm/pkg/PLIST,v > retrieving revision 1.7 > diff -u -u -p -r1.7 PLIST > --- pkg/PLIST 12 Nov 2012 10:03:21 -0000 1.7 > +++ pkg/PLIST 25 Jan 2015 20:11:57 -0000 > @@ -1,4 +1,4 @@ > -@comment $OpenBSD: PLIST,v 1.7 2012/11/12 10:03:21 jasper Exp $ > +@comment $OpenBSD$ > @bin bin/pekwm > @man man/man1/pekwm.1 > share/examples/pekwm/ > @@ -29,6 +29,7 @@ share/examples/pekwm/vars > @sample ${SYSCONFDIR}/pekwm/vars > share/pekwm/ > share/pekwm/scripts/ > +share/pekwm/scripts/pekwm_screenshot.sh > share/pekwm/scripts/pekwm_themeset.sh > share/pekwm/scripts/pekwm_ws_menu.sh > share/pekwm/themes/
