CVS commit: pkgsrc/wm/9wm

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Tue May 16 21:10:03 UTC 2017

Modified Files:
        pkgsrc/wm/9wm: DESCR Makefile PLIST distinfo
Added Files:
        pkgsrc/wm/9wm/patches: patch-Makefile
Removed Files:
        pkgsrc/wm/9wm/patches: patch-aa

Log Message:
Update 9wm to 1.4.0, now developed on GitHub.

There are no release notes from upstream (short of commit
logs), here is a partial list of changes:

- no more manual window placement
- color support
- support for fullscreen and shaped windows
- format string and memory fixes
- compatibility fixes for some toolkits
- window titles are UTF-8


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/wm/9wm/DESCR
cvs rdiff -u -r1.17 -r1.18 pkgsrc/wm/9wm/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/wm/9wm/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/wm/9wm/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/wm/9wm/patches/patch-Makefile
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/wm/9wm/patches/patch-aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/wm/9wm/DESCR
diff -u pkgsrc/wm/9wm/DESCR:1.1 pkgsrc/wm/9wm/DESCR:1.2
--- pkgsrc/wm/9wm/DESCR:1.1     Wed Oct 31 20:59:00 2001
+++ pkgsrc/wm/9wm/DESCR Tue May 16 21:10:02 2017
@@ -1,9 +1,3 @@
-                        9wm Version 1.1
-                   Copyright 1994 David Hogan.
-
-What is 9wm?
-============
-
 9wm is an X window manager which attempts to emulate the Plan 9 window
 manager 8-1/2 as far as possible within the constraints imposed by X.
 It provides a simple yet comfortable user interface, without garish

Index: pkgsrc/wm/9wm/Makefile
diff -u pkgsrc/wm/9wm/Makefile:1.17 pkgsrc/wm/9wm/Makefile:1.18
--- pkgsrc/wm/9wm/Makefile:1.17 Tue Oct 23 10:24:13 2012
+++ pkgsrc/wm/9wm/Makefile      Tue May 16 21:10:02 2017
@@ -1,17 +1,23 @@
-# $NetBSD: Makefile,v 1.17 2012/10/23 10:24:13 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2017/05/16 21:10:02 bsiegert Exp $
 
-DISTNAME=              9wm-1.1
-PKGREVISION=           2
+DISTNAME=              9wm-1.4.0
 CATEGORIES=            plan9 wm
-MASTER_SITES=          ftp://ftp.freefriends.org/arnold/Source/
-EXTRACT_SUFX=          .shar.gz
+MASTER_SITES=          ${MASTER_SITE_GITHUB:=9wm/}
+GITHUB_PROJECT=                9wm
+GITHUB_TAG=            1.4.0
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              http://dhog.g7.org/dhog/9wm.html
-COMMENT=               8 1/2-like Window Manager for X
+HOMEPAGE=              https://github.com/9wm/9wm
+COMMENT=               Rio-like Window Manager for X
+LICENSE=               mit
 
-WRKSRC=                        ${WRKDIR}
-USE_IMAKE=             yes
+USE_TOOLS=             gmake
+
+INSTALLATION_DIRS=      bin ${PKGMANDIR}/man1
+
+do-install:
+       ${INSTALL_PROGRAM} ${WRKSRC}/9wm ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_MAN} ${WRKSRC}/9wm.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/9wm.1
 
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/wm/9wm/PLIST
diff -u pkgsrc/wm/9wm/PLIST:1.2 pkgsrc/wm/9wm/PLIST:1.3
--- pkgsrc/wm/9wm/PLIST:1.2     Mon Mar  3 03:32:32 2003
+++ pkgsrc/wm/9wm/PLIST Tue May 16 21:10:02 2017
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2003/03/03 03:32:32 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.3 2017/05/16 21:10:02 bsiegert Exp $
 bin/9wm
-${IMAKE_MAN_DIR}/9wm.${IMAKE_MANNEWSUFFIX}
+man/man1/9wm.man

Index: pkgsrc/wm/9wm/distinfo
diff -u pkgsrc/wm/9wm/distinfo:1.4 pkgsrc/wm/9wm/distinfo:1.5
--- pkgsrc/wm/9wm/distinfo:1.4  Mon Nov  2 23:42:50 2015
+++ pkgsrc/wm/9wm/distinfo      Tue May 16 21:10:02 2017
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2015/11/02 23:42:50 agc Exp $
+$NetBSD: distinfo,v 1.5 2017/05/16 21:10:02 bsiegert Exp $
 
-SHA1 (9wm-1.1.shar.gz) = 43a4e28a0665d54331d81d9691abae65927738ac
-RMD160 (9wm-1.1.shar.gz) = d2daa96d1b8dec45d349e49406156629e4b2c50a
-SHA512 (9wm-1.1.shar.gz) = 61114b96896bf16f66af7727d039e9d09d85971f6cffa10cfea1719697bc355d18f56d3813dfefe6cfb8b2bec16683fa541735debdca2dc25b2ddc11363a0714
-Size (9wm-1.1.shar.gz) = 19517 bytes
-SHA1 (patch-aa) = 3e0c11e450876ee882694fb653fa8222ee53340a
+SHA1 (9wm-1.4.0.tar.gz) = 9cc1530cd324a76a1553f82fa585bfd7e457fd1b
+RMD160 (9wm-1.4.0.tar.gz) = 21960a25cc0dfc55e0a61ff1a4de34b56c681120
+SHA512 (9wm-1.4.0.tar.gz) = dc78b28f146fbac0ca4e336c91cc8013b4af49889d8638b6b3f8c15d47c0801e22412eb9f840eb0b3d8888ef8455bf6fa68c0333b47fb212ee3d6ced1673d0a5
+Size (9wm-1.4.0.tar.gz) = 21579 bytes
+SHA1 (patch-Makefile) = 9290c1d1af46c17d7b0f1e83c78a7a915b40b3f8

Added files:

Index: pkgsrc/wm/9wm/patches/patch-Makefile
diff -u /dev/null pkgsrc/wm/9wm/patches/patch-Makefile:1.1
--- /dev/null   Tue May 16 21:10:03 2017
+++ pkgsrc/wm/9wm/patches/patch-Makefile        Tue May 16 21:10:02 2017
@@ -0,0 +1,19 @@
+$NetBSD: patch-Makefile,v 1.1 2017/05/16 21:10:02 bsiegert Exp $
+
+Correctly install into $PREFIX, remove -Werror (which breaks with clang).
+
+--- Makefile.orig      2017-05-12 22:39:16.000000000 +0000
++++ Makefile
+@@ -1,8 +1,9 @@
+-CFLAGS += -DSHAPE -DCOLOR -Wall -Werror -pedantic
++CFLAGS += -DSHAPE -DCOLOR -Wall -pedantic
+ LDLIBS = -lXext -lX11
+-BIN = $(DESTDIR)/usr/bin/
++PREFIX ?= /usr
++BIN = $(DESTDIR)$(PREFIX)/bin/
+ 
+-MANDIR = $(DESTDIR)/usr/share/man/man1
++MANDIR = $(DESTDIR)$(PREFIX)/share/man/man1
+ MANSUFFIX = 1
+ 
+ all: 9wm