wmii: remove some debug things, re-introduce @@ things that got mangled via mkpatches, appease the pkglint godsdiff -r1.33 -r1.34 pkgsrc/wm/wmii/Makefile
(maya)
@@ -1,67 +1,66 @@ | @@ -1,67 +1,66 @@ | |||
1 | # $NetBSD: Makefile,v 1.33 2018/05/14 10:20:57 maya Exp $ | 1 | # $NetBSD: Makefile,v 1.34 2018/05/14 10:31:14 maya Exp $ | |
2 | 2 | |||
3 | PKGNAME= wmii-3.9.2 | |||
4 | DISTNAME= wmii+ixp-3.9.2 | 3 | DISTNAME= wmii+ixp-3.9.2 | |
4 | PKGNAME= wmii-3.9.2 | |||
5 | CATEGORIES= wm | 5 | CATEGORIES= wm | |
6 | MASTER_SITES= http://dl.suckless.org/wmii/ | 6 | MASTER_SITES= http://dl.suckless.org/wmii/ | |
7 | EXTRACT_SUFX= .tbz | |||
7 | 8 | |||
8 | MAINTAINER= pkgsrc-users@NetBSD.org | 9 | MAINTAINER= pkgsrc-users@NetBSD.org | |
9 | HOMEPAGE= https://github.com/0intro/wmii | 10 | HOMEPAGE= https://github.com/0intro/wmii | |
10 | COMMENT= Modular and keyboard-friendly window manager | 11 | COMMENT= Modular and keyboard-friendly window manager | |
11 | LICENSE= mit | 12 | LICENSE= mit | |
12 | EXTRACT_SUFX= .tbz | |||
13 | 13 | |||
14 | DEPENDS+= dmenu>=3.7:../../x11/dmenu | 14 | DEPENDS+= dmenu>=3.7:../../x11/dmenu | |
15 | 15 | |||
16 | USE_TOOLS+= tbl | 16 | USE_TOOLS+= tbl | |
17 | 17 | |||
18 | NO_CONFIGURE= yes | 18 | NO_CONFIGURE= yes | |
19 | 19 | |||
20 | BUILD_DEFS+= PKG_SYSCONFBASE | 20 | BUILD_DEFS+= PKG_SYSCONFBASE | |
21 | MAKE_ENV+= PKG_SYSCONFBASE=${PKG_SYSCONFBASE} | 21 | MAKE_ENV+= PKG_SYSCONFBASE=${PKG_SYSCONFBASE} | |
22 | # parallel compilations of at least cmd/util.o | 22 | # parallel compilations of at least cmd/util.o | |
23 | MAKE_JOBS_SAFE= no | 23 | MAKE_JOBS_SAFE= no | |
24 | 24 | |||
25 | # see ${WRKSRC}/mk/wmii.mk | 25 | # see ${WRKSRC}/mk/wmii.mk | |
26 | CONFVERSION= 3.9.2 | 26 | CONFVERSION= ${PKGNAME:S/wmii-//} | |
27 | 27 | |||
28 | EGDIR= ${PREFIX}/share/examples/wmii | 28 | EGDIR= ${PREFIX}/share/examples/wmii | |
29 | EGSUBDIR.top= | 29 | EGSUBDIR.top= # empty | |
30 | EGFILES.top+= wmiirc welcome | 30 | EGFILES.top+= wmiirc welcome | |
31 | EGSUBDIR.pygmi= python/pygmi | 31 | EGSUBDIR.pygmi= python/pygmi | |
32 | EGFILES.pygmi+= __init__.py event.py fs.py menu.py monitor.py | 32 | EGFILES.pygmi+= __init__.py event.py fs.py menu.py monitor.py | |
33 | EGFILES.pygmi+= util.py | 33 | EGFILES.pygmi+= util.py | |
34 | EGSUBDIR.pyxp= python/pyxp | 34 | EGSUBDIR.pyxp= python/pyxp | |
35 | EGFILES.pyxp+= __init__.py asyncclient.py client.py dial.py | 35 | EGFILES.pyxp+= __init__.py asyncclient.py client.py dial.py | |
36 | EGFILES.pyxp+= fcall.py fields.py messages.py mux.py types.py | 36 | EGFILES.pyxp+= fcall.py fields.py messages.py mux.py types.py | |
37 | EGSUBDIR.python= python | 37 | EGSUBDIR.python= python | |
38 | EGFILES.python+= wmiirc wmiirc.py | 38 | EGFILES.python+= wmiirc wmiirc.py | |
39 | EGSUBDIR.ruby= ruby | 39 | EGSUBDIR.ruby= ruby | |
40 | EGFILES.ruby+= wmiirc config.rb config.yaml | 40 | EGFILES.ruby+= wmiirc config.rb config.yaml | |
41 | CONF_FILES_MODE= 0755 | 41 | CONF_FILES_MODE= 0644 | |
42 | 42 | |||
43 | .for subdir in top pygmi pyxp python ruby | 43 | .for subdir in top pygmi pyxp python ruby | |
44 | THING+= ${subdir} | |||
45 | . for file in ${EGFILES.${subdir}} | 44 | . for file in ${EGFILES.${subdir}} | |
46 | CONF_FILES+= ${EGDIR}/${EGSUBDIR.${subdir}}/${file} \ | 45 | CONF_FILES+= ${EGDIR}/${EGSUBDIR.${subdir}}/${file} \ | |
47 | ${PKG_SYSCONFDIR}/wmii-${CONFVERSION}/${EGSUBDIR.${subdir}}${file} | 46 | ${PKG_SYSCONFDIR}/wmii-${CONFVERSION}/${EGSUBDIR.${subdir}}${file} | |
48 | . endfor | 47 | . endfor | |
49 | .endfor | 48 | .endfor | |
50 | 49 | |||
51 | LDFLAGS.SunOS+= -lsocket -lnsl -liconv | 50 | LDFLAGS.SunOS+= -lsocket -lnsl -liconv | |
52 | 51 | |||
53 | SUBST_CLASSES+= vars | 52 | SUBST_CLASSES+= vars | |
54 | SUBST_STAGE.vars= pre-build | 53 | SUBST_STAGE.vars= post-patch | |
55 | SUBST_FILES.vars= util/compile | 54 | SUBST_FILES.vars= util/compile | |
56 | SUBST_VARS.vars= EGREP SED SH AWK | 55 | SUBST_VARS.vars= EGREP SED SH AWK | |
57 | 56 | |||
58 | post-build: | 57 | post-build: | |
59 | mv ${WRKSRC}/man/wmii.1 ${WRKSRC}/man/wmii.tbl | 58 | mv ${WRKSRC}/man/wmii.1 ${WRKSRC}/man/wmii.tbl | |
60 | ${TBL} ${WRKSRC}/man/wmii.tbl > ${WRKSRC}/man/wmii.1 | 59 | ${TBL} ${WRKSRC}/man/wmii.tbl > ${WRKSRC}/man/wmii.1 | |
61 | 60 | |||
62 | .include "../../converters/libiconv/buildlink3.mk" | 61 | .include "../../converters/libiconv/buildlink3.mk" | |
63 | # bundles it's own libixp, which is needed until a new stable release is out. | 62 | # bundles it's own libixp, which is needed until a new stable release is out. | |
64 | #.include "../../devel/libixp/buildlink3.mk" | 63 | #.include "../../devel/libixp/buildlink3.mk" | |
65 | .include "../../x11/libXext/buildlink3.mk" | 64 | .include "../../x11/libXext/buildlink3.mk" | |
66 | .include "../../x11/libXt/buildlink3.mk" | 65 | .include "../../x11/libXt/buildlink3.mk" | |
67 | .include "../../x11/libXft/buildlink3.mk" | 66 | .include "../../x11/libXft/buildlink3.mk" |
@@ -1,10 +1,10 @@ | @@ -1,10 +1,10 @@ | |||
1 | $NetBSD: distinfo,v 1.15 2018/05/14 10:20:57 maya Exp $ | 1 | $NetBSD: distinfo,v 1.16 2018/05/14 10:31:14 maya Exp $ | |
2 | 2 | |||
3 | SHA1 (wmii+ixp-3.9.2.tbz) = e85a2979a0bd0a1db7ed486fc709afe72bafd8b0 | 3 | SHA1 (wmii+ixp-3.9.2.tbz) = e85a2979a0bd0a1db7ed486fc709afe72bafd8b0 | |
4 | RMD160 (wmii+ixp-3.9.2.tbz) = 8a401a5d0a033c0da254d15e7fe415ec40e7a332 | 4 | RMD160 (wmii+ixp-3.9.2.tbz) = 8a401a5d0a033c0da254d15e7fe415ec40e7a332 | |
5 | SHA512 (wmii+ixp-3.9.2.tbz) = c75d6d3f80e2b263c8d7b9eb6d0e700a1ad642209fc0984908e9399d22372c6c0572f47ab61881d5d56c4cc4eeb2914a545f6af1bbb936b65848764577d75761 | 5 | SHA512 (wmii+ixp-3.9.2.tbz) = c75d6d3f80e2b263c8d7b9eb6d0e700a1ad642209fc0984908e9399d22372c6c0572f47ab61881d5d56c4cc4eeb2914a545f6af1bbb936b65848764577d75761 | |
6 | Size (wmii+ixp-3.9.2.tbz) = 432032 bytes | 6 | Size (wmii+ixp-3.9.2.tbz) = 432032 bytes | |
7 | SHA1 (patch-aa) = ba9598bf6d9313a800ee8de8588a6192c294e697 | 7 | SHA1 (patch-aa) = e8f5445fce699ba438753cefd4ec250018ce6985 | |
8 | SHA1 (patch-ab) = cdb5ae1f02497852a5c965bdfb106e1b3a77853e | 8 | SHA1 (patch-ab) = cdb5ae1f02497852a5c965bdfb106e1b3a77853e | |
9 | SHA1 (patch-cmd_wmii_main.c) = 2e52a5861b197b9ffa8b7df83230e7bc74059256 | 9 | SHA1 (patch-cmd_wmii_main.c) = 2e52a5861b197b9ffa8b7df83230e7bc74059256 | |
10 | SHA1 (patch-util_compile) = 0474964a1e2491a28a17cc1f37c7a3cadd3b598a | 10 | SHA1 (patch-util_compile) = 5b4815086c36789ad53c795ab26057b1066f5113 |
@@ -1,14 +1,16 @@ | @@ -1,14 +1,16 @@ | |||
1 | $NetBSD: patch-aa,v 1.11 2018/05/14 10:20:57 maya Exp $ | 1 | $NetBSD: patch-aa,v 1.12 2018/05/14 10:31:14 maya Exp $ | |
2 | ||||
3 | pkgsrc-friendly paths, don't force /usr/local PREFIX. | |||
2 | 4 | |||
3 | --- config.mk.orig 2010-06-10 07:24:04.000000000 +0000 | 5 | --- config.mk.orig 2010-06-10 07:24:04.000000000 +0000 | |
4 | +++ config.mk | 6 | +++ config.mk | |
5 | @@ -1,11 +1,11 @@ | 7 | @@ -1,11 +1,11 @@ | |
6 | # Customize below to fit your system | 8 | # Customize below to fit your system | |
7 | 9 | |||
8 | # Paths | 10 | # Paths | |
9 | -PREFIX = /usr/local | 11 | -PREFIX = /usr/local | |
10 | +PREFIX ?= /usr/local | 12 | +PREFIX ?= /usr/local | |
11 | BIN = $(PREFIX)/bin | 13 | BIN = $(PREFIX)/bin | |
12 | - MAN = $(PREFIX)/share/man | 14 | - MAN = $(PREFIX)/share/man | |
13 | + MAN = $(PREFIX)/$(PKGMANDIR) | 15 | + MAN = $(PREFIX)/$(PKGMANDIR) | |
14 | DOC = $(PREFIX)/share/doc/wmii | 16 | DOC = $(PREFIX)/share/doc/wmii |
@@ -1,39 +1,45 @@ | @@ -1,39 +1,45 @@ | |||
1 | $NetBSD: patch-util_compile,v 1.2 2018/05/14 10:20:57 maya Exp $ | 1 | $NetBSD: patch-util_compile,v 1.3 2018/05/14 10:31:14 maya Exp $ | |
2 | ||||
3 | Allow substituing sh, bin, awk, egrep. | |||
2 | 4 | |||
3 | --- util/compile.orig 2010-06-10 07:24:04.000000000 +0000 | 5 | --- util/compile.orig 2010-06-10 07:24:04.000000000 +0000 | |
4 | +++ util/compile | 6 | +++ util/compile | |
5 | @@ -4,7 +4,7 @@ CC=$1 | 7 | @@ -1,10 +1,10 @@ | |
8 | -#!/bin/sh -f | |||
9 | +#!@SH@ -f | |||
10 | ||||
11 | CC=$1 | |||
6 | CFLAGS=$2; shift 2 | 12 | CFLAGS=$2; shift 2 | |
7 | 13 | |||
8 | outfile="$1"; shift | 14 | outfile="$1"; shift | |
9 | -bin="$(echo $0 | sed 's,/[^/]*$,,')" | 15 | -bin="$(echo $0 | sed 's,/[^/]*$,,')" | |
10 | +bin="$(echo $0 | /usr/bin/sed 's,/[^/]*$,,')" | 16 | +bin="$(echo $0 | @SED@ 's,/[^/]*$,,')" | |
11 | 17 | |||
12 | # Derived from Russ Cox's 9c in plan9port. | 18 | # Derived from Russ Cox's 9c in plan9port. | |
13 | 19 | |||
14 | @@ -16,7 +16,7 @@ eval '$CC -o $outfile '"$CFLAGS"' $@ >$x | 20 | @@ -16,7 +16,7 @@ eval '$CC -o $outfile '"$CFLAGS"' $@ >$x | |
15 | status=$? | 21 | status=$? | |
16 | [ $? -eq 0 ] || echo $CC -o $outfile $CFLAGS $@ >&2 | 22 | [ $? -eq 0 ] || echo $CC -o $outfile $CFLAGS $@ >&2 | |
17 | 23 | |||
18 | -base=$(echo $BASE | sed 's/,/\\,/g') | 24 | -base=$(echo $BASE | sed 's/,/\\,/g') | |
19 | +base=$(echo $BASE | /usr/bin/sed 's/,/\\,/g') | 25 | +base=$(echo $BASE | @SED@ 's/,/\\,/g') | |
20 | re='\([^[:space:]/]*\..:[0-9]\)' | 26 | re='\([^[:space:]/]*\..:[0-9]\)' | |
21 | 27 | |||
22 | undup() { # GCC is crap. | 28 | undup() { # GCC is crap. | |
23 | @@ -58,11 +58,11 @@ undup() { # GCC is crap. | 29 | @@ -58,11 +58,11 @@ undup() { # GCC is crap. | |
24 | }' | 30 | }' | |
25 | } | 31 | } | |
26 | 32 | |||
27 | -cat $xtmp | sed "s,^$re,$base&,g; s,\([[:space:]]\)$re,\1$base\2,g" | | 33 | -cat $xtmp | sed "s,^$re,$base&,g; s,\([[:space:]]\)$re,\1$base\2,g" | | |
28 | - egrep -v ': error: .Each undeclared identifier|: error: for each function it appears|is dangerous, better use|is almost always misused|: In function |: At top level:|support .long long.|use of C99 long long|ISO C forbids conversion|warning:.*warn_unused_result' | | 34 | - egrep -v ': error: .Each undeclared identifier|: error: for each function it appears|is dangerous, better use|is almost always misused|: In function |: At top level:|support .long long.|use of C99 long long|ISO C forbids conversion|warning:.*warn_unused_result' | | |
29 | - sed 's/ .first use in this function.$//; s/\"\([^\"][^\"]*\)\", line \([0-9][0-9]*\)/\1:\2/g' | | 35 | - sed 's/ .first use in this function.$//; s/\"\([^\"][^\"]*\)\", line \([0-9][0-9]*\)/\1:\2/g' | | |
30 | - awk '$1 == "warning:"{t=$2" "$1; sub(/^[^ ]+ [^ ]+ /, ""); $0 = t" "$0}; //' | | 36 | - awk '$1 == "warning:"{t=$2" "$1; sub(/^[^ ]+ [^ ]+ /, ""); $0 = t" "$0}; //' | | |
31 | - awk '{sub(/\[/, ": [", $1); print}' | | 37 | - awk '{sub(/\[/, ": [", $1); print}' | | |
32 | +cat $xtmp | /usr/bin/sed "s,^$re,$base&,g; s,\([[:space:]]\)$re,\1$base\2,g" | | 38 | +cat $xtmp | @SED@ "s,^$re,$base&,g; s,\([[:space:]]\)$re,\1$base\2,g" | | |
33 | + /usr/bin/egrep -v ': error: .Each undeclared identifier|: error: for each function it appears|is dangerous, better use|is almost always misused|: In function |: At top level:|support .long long.|use of C99 long long|ISO C forbids conversion|warning:.*warn_unused_result' | | 39 | + @EGREP@ -v ': error: .Each undeclared identifier|: error: for each function it appears|is dangerous, better use|is almost always misused|: In function |: At top level:|support .long long.|use of C99 long long|ISO C forbids conversion|warning:.*warn_unused_result' | | |
34 | + /usr/bin/sed 's/ .first use in this function.$//; s/\"\([^\"][^\"]*\)\", line \([0-9][0-9]*\)/\1:\2/g' | | 40 | + @SED@ 's/ .first use in this function.$//; s/\"\([^\"][^\"]*\)\", line \([0-9][0-9]*\)/\1:\2/g' | | |
35 | + /usr/bin/awk '$1 == "warning:"{t=$2" "$1; sub(/^[^ ]+ [^ ]+ /, ""); $0 = t" "$0}; //' | | 41 | + @AWK@ '$1 == "warning:"{t=$2" "$1; sub(/^[^ ]+ [^ ]+ /, ""); $0 = t" "$0}; //' | | |
36 | + /usr/bin/awk '{sub(/\[/, ": [", $1); print}' | | 42 | + @AWK@ '{sub(/\[/, ": [", $1); print}' | | |
37 | undup 1>&2 | 43 | undup 1>&2 | |
38 | 44 | |||
39 | rm -f $xtmp | 45 | rm -f $xtmp |