diff options
| author | nia <nia@pkgsrc.org> | 2020-01-18 21:40:24 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2020-01-18 21:40:24 +0000 |
| commit | 2b5198f1f17f83c32847b02abb8a06e833271ff8 (patch) | |
| tree | b52bb8e755d80354b6689dabc7c24227be183a21 /wm | |
| parent | dc2c16301ff78ab56c565d1690e821d56c74748b (diff) | |
| download | pkgsrc-2b5198f1f17f83c32847b02abb8a06e833271ff8.tar.gz | |
9wm: Update to 1.4.1
Changes:
- We got a patch upstreamed, but have to add another.
Diffstat (limited to 'wm')
| -rw-r--r-- | wm/9wm/Makefile | 9 | ||||
| -rw-r--r-- | wm/9wm/distinfo | 12 | ||||
| -rw-r--r-- | wm/9wm/patches/patch-9wm.c | 14 | ||||
| -rw-r--r-- | wm/9wm/patches/patch-Makefile | 19 |
4 files changed, 24 insertions, 30 deletions
diff --git a/wm/9wm/Makefile b/wm/9wm/Makefile index 92483f738ad..dad444e13ee 100644 --- a/wm/9wm/Makefile +++ b/wm/9wm/Makefile @@ -1,11 +1,8 @@ -# $NetBSD: Makefile,v 1.20 2019/11/04 21:50:15 rillig Exp $ +# $NetBSD: Makefile,v 1.21 2020/01/18 21:40:24 nia Exp $ -DISTNAME= 9wm-1.4.0 -PKGREVISION= 1 +DISTNAME= 9wm-1.4.1 CATEGORIES= plan9 wm MASTER_SITES= ${MASTER_SITE_GITHUB:=9wm/} -GITHUB_PROJECT= 9wm -GITHUB_TAG= 1.4.0 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://github.com/9wm/9wm @@ -16,6 +13,8 @@ USE_TOOLS= gmake INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 +BUILDLINK_TRANSFORM+= rm:-pedantic + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/9wm ${DESTDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/9wm.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/9wm.1 diff --git a/wm/9wm/distinfo b/wm/9wm/distinfo index e8319b74a89..656319b6f69 100644 --- a/wm/9wm/distinfo +++ b/wm/9wm/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.5 2017/05/16 21:10:02 bsiegert Exp $ +$NetBSD: distinfo,v 1.6 2020/01/18 21:40:24 nia Exp $ -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 +SHA1 (9wm-1.4.1.tar.gz) = df5ffae8bd2fe97ed478c7d056b2c5f45bf9a566 +RMD160 (9wm-1.4.1.tar.gz) = 98ca519466cf8d8bc442bc60e4e353348708e846 +SHA512 (9wm-1.4.1.tar.gz) = 6d07ac44ba1b5171e24bfc2acfebf33207e030bdfd2ed5c18e2a5c9e59f4bf215d6e6148874bcfa95f50fbb218af48cfaeb7604dbb651d35cefe83860ae3fcb9 +Size (9wm-1.4.1.tar.gz) = 22021 bytes +SHA1 (patch-9wm.c) = 0e3c31b6cd872426a9be8b9e27294eee83da9712 diff --git a/wm/9wm/patches/patch-9wm.c b/wm/9wm/patches/patch-9wm.c new file mode 100644 index 00000000000..a1dac251ef7 --- /dev/null +++ b/wm/9wm/patches/patch-9wm.c @@ -0,0 +1,14 @@ +$NetBSD: patch-9wm.c,v 1.1 2020/01/18 21:40:24 nia Exp $ + +Include sys/select.h for select(2) + +--- 9wm.c.orig 2018-04-09 21:35:43.000000000 +0000 ++++ 9wm.c +@@ -5,6 +5,7 @@ + #include <signal.h> + #include <errno.h> + #include <stdlib.h> ++#include <sys/select.h> + #include <sys/wait.h> + #include <X11/X.h> + #include <X11/Xos.h> diff --git a/wm/9wm/patches/patch-Makefile b/wm/9wm/patches/patch-Makefile deleted file mode 100644 index 9ed2b20f135..00000000000 --- a/wm/9wm/patches/patch-Makefile +++ /dev/null @@ -1,19 +0,0 @@ -$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 |