Re: pkg/43459 (Out-of-date wm/wmii package in pkgsrc)

To: pkg-manager%netbsd.org@localhost,gnats-admin%netbsd.org@localhost,pkgsrc-bugs%netbsd.org@localhost,bughunting%xs4all.nl@localhost
Subject: Re: pkg/43459 (Out-of-date wm/wmii package in pkgsrc)
From: coypu%sdf.org@localhost
Date: Mon, 14 May 2018 09:55:01 +0000 (UTC)
The following reply was made to PR pkg/43459; it has been noted by GNATS.

From: coypu%sdf.org@localhost
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: pkg/43459 (Out-of-date wm/wmii package in pkgsrc)
Date: Mon, 14 May 2018 09:53:39 +0000

 --FL5UXtIhxfXey3p5
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 I took a stab at this, it runs but I don't know whether it works as
 expected.
 
 
 --FL5UXtIhxfXey3p5
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="wmii.diff"
 
 Index: Makefile
 ===================================================================
 RCS file: /cvsroot/pkgsrc/wm/wmii/Makefile,v
 retrieving revision 1.32
 diff -u -r1.32 Makefile
 --- Makefile	6 Sep 2017 11:30:41 -0000	1.32
 +++ Makefile	14 May 2018 09:49:03 -0000
 @@ -1,7 +1,7 @@
  # $NetBSD: Makefile,v 1.32 2017/09/06 11:30:41 wiz Exp $
  
 -DISTNAME=		wmii-3.6
 -PKGREVISION=		4
 +PKGNAME=		wmii-3.9.2
 +DISTNAME=		wmii+ixp-3.9.2
  CATEGORIES=		wm
  MASTER_SITES=		http://dl.suckless.org/wmii/
  
 @@ -9,6 +9,7 @@
  HOMEPAGE=		https://github.com/0intro/wmii
  COMMENT=		Modular and keyboard-friendly window manager
  LICENSE=		mit
 +EXTRACT_SUFX=		.tbz
  
  DEPENDS+=		dmenu>=3.7:../../x11/dmenu
  
 @@ -22,16 +23,29 @@
  MAKE_JOBS_SAFE=		no
  
  # see ${WRKSRC}/mk/wmii.mk
 -CONFVERSION=		3.5
 -PLIST_SUBST+=		CONFVERSION=${CONFVERSION}
 +CONFVERSION=		3.9.2
  
 -PKG_SYSCONFSUBDIR=	wmii-${CONFVERSION}
 -EGDIR=			${PREFIX}/share/examples/${PKG_SYSCONFSUBDIR}
 -EGFILES=		rc.wmii welcome wmiirc
 +EGDIR=			${PREFIX}/share/examples/wmii
 +EGSUBDIR.top=		
 +EGFILES.top+=		wmiirc welcome
 +EGSUBDIR.pygmi=		python/pygmi
 +EGFILES.pygmi+=		__init__.py event.py fs.py menu.py monitor.py
 +EGFILES.pygmi+=		util.py
 +EGSUBDIR.pyxp=		python/pyxp
 +EGFILES.pyxp+=		__init__.py asyncclient.py client.py dial.py
 +EGFILES.pyxp+=		fcall.py fields.py messages.py mux.py types.py
 +EGSUBDIR.python=	python
 +EGFILES.python+=	wmiirc wmiirc.py
 +EGSUBDIR.ruby=		ruby
 +EGFILES.ruby+=		wmiirc config.rb config.yaml
  CONF_FILES_MODE=	0755
  
 -.for f in ${EGFILES}
 -CONF_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 +.for subdir in top pygmi pyxp python ruby
 +THING+=	${subdir}
 +.  for file in ${EGFILES.${subdir}}
 +CONF_FILES+=		${EGDIR}/${EGSUBDIR.${subdir}}/${file} \
 +			${PKG_SYSCONFDIR}/wmii-${CONFVERSION}/${EGSUBDIR.${subdir}}${file}
 +.  endfor
  .endfor
  
  LDFLAGS.SunOS+=		-lsocket -lnsl -liconv
 @@ -39,15 +53,19 @@
  SUBST_CLASSES+=		vars
  SUBST_STAGE.vars=	pre-build
  SUBST_FILES.vars=	util/compile
 -SUBST_VARS.vars=	EGREP SED SH
 +SUBST_VARS.vars=	EGREP SED SH AWK
  
  post-build:
  	mv ${WRKSRC}/man/wmii.1 ${WRKSRC}/man/wmii.tbl
  	${TBL} ${WRKSRC}/man/wmii.tbl > ${WRKSRC}/man/wmii.1
  
  .include "../../converters/libiconv/buildlink3.mk"
 -.include "../../devel/libixp/buildlink3.mk"
 -.include "../../x11/libX11/buildlink3.mk"
 +# bundles it's own libixp, which is needed until a new stable release is out.
 +#.include "../../devel/libixp/buildlink3.mk"
  .include "../../x11/libXext/buildlink3.mk"
  .include "../../x11/libXt/buildlink3.mk"
 +.include "../../x11/libXft/buildlink3.mk"
 +.include "../../x11/libX11/buildlink3.mk"
 +.include "../../x11/libXinerama/buildlink3.mk"
 +.include "../../x11/libXrandr/buildlink3.mk"
  .include "../../mk/bsd.pkg.mk"
 Index: PLIST
 ===================================================================
 RCS file: /cvsroot/pkgsrc/wm/wmii/PLIST,v
 retrieving revision 1.7
 diff -u -r1.7 PLIST
 --- PLIST	14 Jun 2009 18:19:03 -0000	1.7
 +++ PLIST	14 May 2018 09:49:03 -0000
 @@ -1,13 +1,45 @@
 -@comment $NetBSD: PLIST,v 1.7 2009/06/14 18:19:03 joerg Exp $
 +@comment $NetBSD$
 +bin/wihack
 +bin/wimenu
  bin/wmii
 +bin/wmii.rc
 +bin/wmii.sh
  bin/wmii9menu
 -bin/wmii9rc
 -bin/wmiiloop
  bin/wmiir
 -bin/wmiistartrc
 +lib/libwmii_hack.so
 +man/man1/wimenu.1
  man/man1/wmii.1
 -man/man1/wmiiloop.1
 +man/man1/wmii9menu.1
  man/man1/wmiir.1
 -share/examples/wmii-${CONFVERSION}/rc.wmii
 -share/examples/wmii-${CONFVERSION}/welcome
 -share/examples/wmii-${CONFVERSION}/wmiirc
 +share/doc/wmii/LICENSE
 +share/doc/wmii/README
 +share/doc/wmii/alternative_wmiircs/README
 +share/doc/wmii/alternative_wmiircs/plan9port/README
 +share/doc/wmii/alternative_wmiircs/python/README
 +share/doc/wmii/alternative_wmiircs/ruby/HISTORY
 +share/doc/wmii/alternative_wmiircs/ruby/LICENSE
 +share/doc/wmii/alternative_wmiircs/ruby/README
 +share/doc/wmii/wmii.pdf
 +share/examples/wmii/plan9port/wmiirc
 +share/examples/wmii/python/pygmi/__init__.py
 +share/examples/wmii/python/pygmi/event.py
 +share/examples/wmii/python/pygmi/fs.py
 +share/examples/wmii/python/pygmi/menu.py
 +share/examples/wmii/python/pygmi/monitor.py
 +share/examples/wmii/python/pygmi/util.py
 +share/examples/wmii/python/pyxp/__init__.py
 +share/examples/wmii/python/pyxp/asyncclient.py
 +share/examples/wmii/python/pyxp/client.py
 +share/examples/wmii/python/pyxp/dial.py
 +share/examples/wmii/python/pyxp/fcall.py
 +share/examples/wmii/python/pyxp/fields.py
 +share/examples/wmii/python/pyxp/messages.py
 +share/examples/wmii/python/pyxp/mux.py
 +share/examples/wmii/python/pyxp/types.py
 +share/examples/wmii/python/wmiirc
 +share/examples/wmii/python/wmiirc.py
 +share/examples/wmii/ruby/config.rb
 +share/examples/wmii/ruby/config.yaml
 +share/examples/wmii/ruby/wmiirc
 +share/examples/wmii/welcome
 +share/examples/wmii/wmiirc
 Index: distinfo
 ===================================================================
 RCS file: /cvsroot/pkgsrc/wm/wmii/distinfo,v
 retrieving revision 1.14
 diff -u -r1.14 distinfo
 --- distinfo	2 Nov 2015 23:42:56 -0000	1.14
 +++ distinfo	14 May 2018 09:49:03 -0000
 @@ -1,10 +1,10 @@
  $NetBSD: distinfo,v 1.14 2015/11/02 23:42:56 agc Exp $
  
 -SHA1 (wmii-3.6.tar.gz) = 48e24f84f60b9c6ce37f715a46bc32e35d2086f3
 -RMD160 (wmii-3.6.tar.gz) = 29462b9ecc7d68e8e00e5f3eec82c2a46e268a52
 -SHA512 (wmii-3.6.tar.gz) = 153ba298bf4353579dfe57c568ce6799e00241b8e5fa6bf0bdfd62972d428b4761dd13a2991204633d58757536ba35a0316df5c390097beaa5b84250fd349762
 -Size (wmii-3.6.tar.gz) = 208249 bytes
 -SHA1 (patch-aa) = a02c6e62e2cd47424fb6591f7991ef1d90159dcf
 -SHA1 (patch-ab) = 5e208344ea8bde06ec4cc8084eef0e3ba2f165f7
 -SHA1 (patch-ac) = 8e4712bd308caeba9ca5dad023e32db8b27f3b31
 -SHA1 (patch-util_compile) = f6435bfa38bed3a8d897289ef2e0afeb793c5640
 +SHA1 (wmii+ixp-3.9.2.tbz) = e85a2979a0bd0a1db7ed486fc709afe72bafd8b0
 +RMD160 (wmii+ixp-3.9.2.tbz) = 8a401a5d0a033c0da254d15e7fe415ec40e7a332
 +SHA512 (wmii+ixp-3.9.2.tbz) = c75d6d3f80e2b263c8d7b9eb6d0e700a1ad642209fc0984908e9399d22372c6c0572f47ab61881d5d56c4cc4eeb2914a545f6af1bbb936b65848764577d75761
 +Size (wmii+ixp-3.9.2.tbz) = 432032 bytes
 +SHA1 (patch-aa) = ba9598bf6d9313a800ee8de8588a6192c294e697
 +SHA1 (patch-ab) = cdb5ae1f02497852a5c965bdfb106e1b3a77853e
 +SHA1 (patch-cmd_wmii_main.c) = 2e52a5861b197b9ffa8b7df83230e7bc74059256
 +SHA1 (patch-util_compile) = 0474964a1e2491a28a17cc1f37c7a3cadd3b598a
 Index: patches/patch-aa
 ===================================================================
 RCS file: /cvsroot/pkgsrc/wm/wmii/patches/patch-aa,v
 retrieving revision 1.10
 diff -u -r1.10 patch-aa
 --- patches/patch-aa	21 May 2013 14:59:25 -0000	1.10
 +++ patches/patch-aa	14 May 2018 09:49:03 -0000
 @@ -1,45 +1,19 @@
  $NetBSD: patch-aa,v 1.10 2013/05/21 14:59:25 jperkin Exp $
  
 ---- config.mk.orig	2007-11-16 13:59:15.000000000 +0000
 +--- config.mk.orig	2010-06-10 07:24:04.000000000 +0000
  +++ config.mk
 -@@ -1,12 +1,11 @@
 +@@ -1,11 +1,11 @@
   # Customize below to fit your system
   
 - # paths
 + # Paths
  -PREFIX = /usr/local
 --BIN = ${PREFIX}/bin
 --MAN = ${PREFIX}/share/man
 --ETC = ${PREFIX}/etc
 --LIBDIR = ${PREFIX}/lib
 --INCLUDE = ${PREFIX}/include
 -+BIN = ${DESTDIR}${PREFIX}/bin
 -+MAN = ${DESTDIR}${PREFIX}/${PKGMANDIR}
 -+ETC = ${DESTDIR}${PKG_SYSCONFBASE}
 -+LIBDIR = ${DESTDIR}${PREFIX}/lib
 -+INCLUDE = ${DESTDIR}${PREFIX}/include
 ++PREFIX ?= /usr/local
 +   BIN = $(PREFIX)/bin
 +-  MAN = $(PREFIX)/share/man
 ++  MAN = $(PREFIX)/$(PKGMANDIR)
 +   DOC = $(PREFIX)/share/doc/wmii
 +-  ETC = $(PREFIX)/etc
 ++  ETC = $(PREFIX)/share/examples
 +   LIBDIR = $(PREFIX)/lib
 +   INCLUDE = $(PREFIX)/include
   
 - # Includes and libs
 - INCPATH = .:${ROOT}/include:${INCLUDE}:/usr/include
 -@@ -14,9 +13,9 @@ LIBS = -L/usr/lib -lc -L${ROOT}/lib
 - 
 - # Flags
 - include ${ROOT}/mk/gcc.mk
 --CFLAGS += -g -O0 -DIXPlint
 --LDFLAGS += -g ${LIBS}
 --STATIC = -static
 -+CFLAGS += -DIXPlint
 -+LDFLAGS += ${LIBS}
 -+#STATIC = -static
 - MKDEP = cpp -M
 - 
 - # Compiler
 -@@ -32,8 +31,7 @@ P9PATHS = ${PLAN9}:"'$${HOME}/plan9'":/u
 - INCX11 = -I/usr/X11R6/include
 - LIBX11 = -L/usr/X11R6/lib -lX11
 - LIBICONV = # Leave blank if your libc includes iconv (glibc does)
 --LIBIXP = ${ROOT}/libixp/libixp.a
 --LIBIXP = ${LIBDIR}/libixp.a
 -+LIBIXP = ${PREFIX}/lib/libixp.a
 - 
 - # Solaris
 - #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
 Index: patches/patch-ab
 ===================================================================
 RCS file: /cvsroot/pkgsrc/wm/wmii/patches/patch-ab,v
 retrieving revision 1.6
 diff -u -r1.6 patch-ab
 --- patches/patch-ab	12 Feb 2010 20:42:33 -0000	1.6
 +++ patches/patch-ab	14 May 2018 09:49:03 -0000
 @@ -1,13 +1,13 @@
  $NetBSD: patch-ab,v 1.6 2010/02/12 20:42:33 joerg Exp $
  
 ---- rc/Makefile.orig	2007-11-16 14:59:15.000000000 +0100
 +--- rc/Makefile.orig	2010-06-10 07:24:04.000000000 +0000
  +++ rc/Makefile
  @@ -2,7 +2,7 @@ ROOT=..
 - include ${ROOT}/mk/hdr.mk
 - include ${ROOT}/mk/wmii.mk
 + include $(ROOT)/mk/hdr.mk
 + include $(ROOT)/mk/wmii.mk
   
 --BIN = ${ETC}/wmii-${CONFVERSION}
 -+BIN = ${DESTDIR}${PREFIX}/share/examples/wmii-${CONFVERSION}
 - TARG =	rc.wmii   \
 - 	wmiirc    \
 +-BIN = $(ETC)/wmii$(CONFVERSION)
 ++BIN = $(PREFIX)/share/examples/wmii$(CONFVERSION)
 + TARG =  wmiirc    \
   	welcome
 + 
 Index: patches/patch-cmd_wmii_main.c
 ===================================================================
 RCS file: patches/patch-cmd_wmii_main.c
 diff -N patches/patch-cmd_wmii_main.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ patches/patch-cmd_wmii_main.c	14 May 2018 09:49:03 -0000
 @@ -0,0 +1,15 @@
 +$NetBSD$
 +
 +signal.h for sigaction, otherwise it dumps core on netbsd/amd64
 +due to a reference to compat sigaction.
 +
 +--- cmd/wmii/main.c.orig	2010-06-10 07:24:02.000000000 +0000
 ++++ cmd/wmii/main.c
 +@@ -10,6 +10,7 @@
 + #include <fcntl.h>
 + #include <locale.h>
 + #include <pwd.h>
 ++#include <signal.h>
 + #include <sys/signal.h>
 + #include <sys/stat.h>
 + #include <unistd.h>
 Index: patches/patch-util_compile
 ===================================================================
 RCS file: /cvsroot/pkgsrc/wm/wmii/patches/patch-util_compile,v
 retrieving revision 1.1
 diff -u -r1.1 patch-util_compile
 --- patches/patch-util_compile	20 May 2013 09:04:44 -0000	1.1
 +++ patches/patch-util_compile	14 May 2018 09:49:03 -0000
 @@ -1,31 +1,39 @@
  $NetBSD: patch-util_compile,v 1.1 2013/05/20 09:04:44 jperkin Exp $
  
 ---- util/compile.orig	2007-11-16 13:59:15.000000000 +0000
 +--- util/compile.orig	2010-06-10 07:24:04.000000000 +0000
  +++ util/compile
 -@@ -1,7 +1,7 @@
 --#!/bin/sh -f
 -+#!@SH@ -f
 +@@ -4,7 +4,7 @@ CC=$1
 + CFLAGS=$2; shift 2
   
   outfile="$1"; shift
  -bin="$(echo $0 | sed 's,/[^/]*$,,')"
 -+bin="$(echo $0 | @SED@ 's,/[^/]*$,,')"
 ++bin="$(echo $0 | /usr/bin/sed 's,/[^/]*$,,')"
   
   # Derived from Russ Cox's 9c in plan9port.
   
 -@@ -12,12 +12,12 @@ echo CC $($bin/cleanname ${BASE}$outfile
 - $CC -o $outfile $CFLAGS $@ 2>$xtmp
 +@@ -16,7 +16,7 @@ eval '$CC -o $outfile '"$CFLAGS"' $@ >$x
   status=$?
 + [ $? -eq 0 ] || echo $CC -o $outfile $CFLAGS $@ >&2
   
  -base=$(echo $BASE | sed 's/,/\\,/g')
 -+base=$(echo $BASE | @SED@ 's/,/\\,/g')
 ++base=$(echo $BASE | /usr/bin/sed 's/,/\\,/g')
   re='\([^[:space:]/]*\..:[0-9]\)'
   
 + undup() { # GCC is crap.
 +@@ -58,11 +58,11 @@ undup() { # GCC is crap.
 + 	}'
 + }
 + 
  -cat $xtmp | sed "s,^$re,$base&,g; s,\([[:space:]]\)$re,\1$base\2,g" |
 --	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' |
 +-	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' |
  -	sed 's/ .first use in this function.$//; s/\"\([^\"][^\"]*\)\", line \([0-9][0-9]*\)/\1:\2/g' |
 -+cat $xtmp | @SED@ "s,^$re,$base&,g; s,\([[:space:]]\)$re,\1$base\2,g" |
 -+	@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' |
 -+	@SED@ 's/ .first use in this function.$//; s/\"\([^\"][^\"]*\)\", line \([0-9][0-9]*\)/\1:\2/g' |
 - 	uniq 1>&2
 +-	awk '$1 == "warning:"{t=$2" "$1; sub(/^[^ ]+ [^ ]+ /, ""); $0 = t" "$0}; //' |
 +-	awk '{sub(/\[/, ": [", $1); print}' |
 ++cat $xtmp | /usr/bin/sed "s,^$re,$base&,g; s,\([[:space:]]\)$re,\1$base\2,g" |
 ++	/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' |
 ++	/usr/bin/sed 's/ .first use in this function.$//; s/\"\([^\"][^\"]*\)\", line \([0-9][0-9]*\)/\1:\2/g' |
 ++	/usr/bin/awk '$1 == "warning:"{t=$2" "$1; sub(/^[^ ]+ [^ ]+ /, ""); $0 = t" "$0}; //' |
 ++	/usr/bin/awk '{sub(/\[/, ": [", $1); print}' |
 + 	undup 1>&2
   
   rm -f $xtmp
 
 --FL5UXtIhxfXey3p5--
Prev by Date: Re: pkg/52307 (sysutils/xfce4-diskperf-plugin build fails on -current (and netbsd-8))
Next by Date: PR/43459 CVS commit: pkgsrc/wm/wmii
Previous by Thread: Re: pkg/43459 (Out-of-date wm/wmii package in pkgsrc)
Next by Thread: Re: pkg/43463 (linking agains glib2 fails on Mac OS 10.4)
Indexes:
Home | Main Index | Thread Index | Old Index