summaryrefslogtreecommitdiff
path: root/x11-wm/bspwm
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2016-11-02 10:03:34 +0000
committerJan Beich <jbeich@FreeBSD.org>2016-11-02 10:03:34 +0000
commit05470a947eb89df027afa41219ede41e24063752 (patch)
tree820ad984756fdfe7b87b0b6b8433a2a3500f67f7 /x11-wm/bspwm
parentAdd missing header files (com_err.h and com_right.h). (diff)
x11-wm/bspwm: update to 0.9.2
- Pass maintainership to the submitter Changes: https://github.com/baskerville/bspwm/compare/0.9.1...0.9.2 PR: 213949 Submitted by: Oleg Gushchenkov <gor@clogic.com.ua>
Notes
Notes: svn path=/head/; revision=425130
Diffstat (limited to 'x11-wm/bspwm')
-rw-r--r--x11-wm/bspwm/Makefile7
-rw-r--r--x11-wm/bspwm/distinfo5
-rw-r--r--x11-wm/bspwm/files/patch-Makefile20
-rw-r--r--x11-wm/bspwm/pkg-plist1
4 files changed, 21 insertions, 12 deletions
diff --git a/x11-wm/bspwm/Makefile b/x11-wm/bspwm/Makefile
index 35447c7e34c1..3d8174d51a97 100644
--- a/x11-wm/bspwm/Makefile
+++ b/x11-wm/bspwm/Makefile
@@ -2,16 +2,17 @@
# $FreeBSD$
PORTNAME= bspwm
-PORTVERSION= 0.9.1
+PORTVERSION= 0.9.2
CATEGORIES= x11-wm
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= gor@clogic.com.ua
COMMENT= Tiling window manager based on binary space partitioning
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-LIB_DEPENDS= libxcb-icccm.so:x11/xcb-util-wm
+LIB_DEPENDS= libxcb-icccm.so:x11/xcb-util-wm \
+ libxcb-keysyms.so:x11/xcb-util-keysyms
RUN_DEPENDS= sxhkd:x11/sxhkd
USE_GITHUB= yes
diff --git a/x11-wm/bspwm/distinfo b/x11-wm/bspwm/distinfo
index e810c9fdc57f..d1d1ed659f5e 100644
--- a/x11-wm/bspwm/distinfo
+++ b/x11-wm/bspwm/distinfo
@@ -1,2 +1,3 @@
-SHA256 (baskerville-bspwm-0.9.1_GH0.tar.gz) = 02bb58a307acdec242eb4b8a62764ed53d01c30474dfb1bc09812d943773bb85
-SIZE (baskerville-bspwm-0.9.1_GH0.tar.gz) = 82335
+TIMESTAMP = 1477914289
+SHA256 (baskerville-bspwm-0.9.2_GH0.tar.gz) = 33689d138d50f42444820b3a76b84fee7fa3af58e33ad589319c84e51fefdcf0
+SIZE (baskerville-bspwm-0.9.2_GH0.tar.gz) = 92558
diff --git a/x11-wm/bspwm/files/patch-Makefile b/x11-wm/bspwm/files/patch-Makefile
index a5777aa06d1a..20f21c46f386 100644
--- a/x11-wm/bspwm/files/patch-Makefile
+++ b/x11-wm/bspwm/files/patch-Makefile
@@ -1,30 +1,33 @@
---- Makefile.orig 2016-03-15 16:06:25 UTC
+--- Makefile.orig 2016-10-30 12:25:26 UTC
+++ Makefile
-@@ -1,15 +1,16 @@
- VERSION := $(shell git describe 2> /dev/null || cat VERSION)
+@@ -1,17 +1,18 @@
+ VERCMD ?= git describe 2> /dev/null
+ VERSION := $(shell $(VERCMD) || cat VERSION)
-CPPFLAGS += -D_POSIX_C_SOURCE=200112L -DVERSION=\"$(VERSION)\"
+CPPFLAGS += $(shell pkg-config --cflags xcb-ewmh xcb-event xcb-icccm xcb-randr xcb-util xcb-xinerama) -DVERSION=\"$(VERSION)\"
CFLAGS += -std=c99 -pedantic -Wall -Wextra
--LDLIBS = -lm -lxcb -lxcb-util -lxcb-icccm -lxcb-ewmh -lxcb-randr -lxcb-xinerama
-+LDLIBS = $(shell pkg-config --libs xcb-ewmh xcb-event xcb-icccm xcb-randr xcb-util xcb-xinerama) -lm
+-LDLIBS = -lm -lxcb -lxcb-util -lxcb-keysyms -lxcb-icccm -lxcb-ewmh -lxcb-randr -lxcb-xinerama
++LDLIBS = $(shell pkg-config --libs xcb-keysyms xcb-ewmh xcb-event xcb-icccm xcb-randr xcb-util xcb-xinerama) -lm
PREFIX ?= /usr/local
-BINPREFIX ?= $(PREFIX)/bin
-MANPREFIX ?= $(PREFIX)/share/man
-DOCPREFIX ?= $(PREFIX)/share/doc/bspwm
-BASHCPL ?= $(PREFIX)/share/bash-completion/completions
+-FISHCPL ?= $(PREFIX)/share/fish/vendor_completions.d
-ZSHCPL ?= $(PREFIX)/share/zsh/site-functions
+BINPREFIX = $(PREFIX)/bin
+MANPREFIX = $(PREFIX)/man
+DOCPREFIX = $(PREFIX)/share/doc/bspwm
+EXPREFIX = $(PREFIX)/share/examples/bspwm
+BASHCPL = $(PREFIX)/share/bash-completion/completions
++FISHCPL = $(PREFIX)/share/fish/vendor_completions.d
+ZSHCPL = $(PREFIX)/share/zsh/site-functions
- MD_DOCS = README.md doc/CHANGELOG.md doc/CONTRIBUTING.md doc/INSTALL.md doc/MISC.md doc/TODO.md
+ MD_DOCS = README.md doc/CHANGELOG.md doc/CONTRIBUTING.md doc/INSTALL.md doc/MISC.md doc/TODO.md
XSESSIONS ?= $(PREFIX)/share/xsessions
-@@ -35,20 +36,36 @@ bspc: $(CLI_OBJ)
+@@ -37,22 +38,38 @@ bspc: $(CLI_OBJ)
install:
mkdir -p "$(DESTDIR)$(BINPREFIX)"
@@ -40,6 +43,9 @@
mkdir -p "$(DESTDIR)$(BASHCPL)"
- cp -p contrib/bash_completion "$(DESTDIR)$(BASHCPL)"/bspc
+ ${BSD_INSTALL_DATA} contrib/bash_completion "$(DESTDIR)$(BASHCPL)"/bspc
+ mkdir -p "$(DESTDIR)$(FISHCPL)"
+- cp -p contrib/fish_completion "$(DESTDIR)$(FISHCPL)"/bspc.fish
++ ${BSD_INSTALL_DATA} contrib/fish_completion "$(DESTDIR)$(FISHCPL)"/bspc.fish
mkdir -p "$(DESTDIR)$(ZSHCPL)"
- cp -p contrib/zsh_completion "$(DESTDIR)$(ZSHCPL)"/_bspc
+ ${BSD_INSTALL_DATA} contrib/zsh_completion "$(DESTDIR)$(ZSHCPL)"/_bspc
diff --git a/x11-wm/bspwm/pkg-plist b/x11-wm/bspwm/pkg-plist
index bb274223f487..04a9f35e58ab 100644
--- a/x11-wm/bspwm/pkg-plist
+++ b/x11-wm/bspwm/pkg-plist
@@ -3,5 +3,6 @@ bin/bspwm
man/man1/bspc.1.gz
man/man1/bspwm.1.gz
share/bash-completion/completions/bspc
+share/fish/vendor_completions.d/bspc.fish
share/xsessions/bspwm.desktop
share/zsh/site-functions/_bspc