Index: head/x11-wm/bspwm/Makefile =================================================================== --- head/x11-wm/bspwm/Makefile (revision 446844) +++ head/x11-wm/bspwm/Makefile (revision 446845) @@ -1,30 +1,33 @@ -# Created by: Anton Törnqvist +# Created by: Anton Tornqvist # $FreeBSD$ PORTNAME= bspwm -PORTVERSION= 0.9.2 +PORTVERSION= 0.9.3 CATEGORIES= x11-wm 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-util.so:x11/xcb-util \ + libxcb-icccm.so:x11/xcb-util-wm \ libxcb-keysyms.so:x11/xcb-util-keysyms RUN_DEPENDS= sxhkd:x11/sxhkd +USES= gmake pkgconfig + +USE_XORG= xcb + USE_GITHUB= yes GH_ACCOUNT= baskerville - -USES= gmake pkgconfig SUB_FILES= pkg-message PORTDOCS= * PORTEXAMPLES= * OPTIONS_DEFINE= DOCS EXAMPLES .include Index: head/x11-wm/bspwm/distinfo =================================================================== --- head/x11-wm/bspwm/distinfo (revision 446844) +++ head/x11-wm/bspwm/distinfo (revision 446845) @@ -1,3 +1,3 @@ -TIMESTAMP = 1477914289 -SHA256 (baskerville-bspwm-0.9.2_GH0.tar.gz) = 33689d138d50f42444820b3a76b84fee7fa3af58e33ad589319c84e51fefdcf0 -SIZE (baskerville-bspwm-0.9.2_GH0.tar.gz) = 92558 +TIMESTAMP = 1500268835 +SHA256 (baskerville-bspwm-0.9.3_GH0.tar.gz) = b356e3ff5754c63c94b36d904274c0ba16f9a8494e78a1c93bb23113f891bc9d +SIZE (baskerville-bspwm-0.9.3_GH0.tar.gz) = 95779 Index: head/x11-wm/bspwm/files/patch-Makefile =================================================================== --- head/x11-wm/bspwm/files/patch-Makefile (revision 446844) +++ head/x11-wm/bspwm/files/patch-Makefile (revision 446845) @@ -1,78 +1,85 @@ ---- Makefile.orig 2016-10-30 12:25:26 UTC +--- Makefile.orig 2017-07-14 19:01:20 UTC +++ Makefile @@ -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-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 XSESSIONS ?= $(PREFIX)/share/xsessions -@@ -37,22 +38,38 @@ bspc: $(CLI_OBJ) +@@ -39,23 +40,44 @@ bspc: $(CLI_OBJ) install: mkdir -p "$(DESTDIR)$(BINPREFIX)" - cp -pf bspwm "$(DESTDIR)$(BINPREFIX)" - cp -pf bspc "$(DESTDIR)$(BINPREFIX)" + ${BSD_INSTALL_PROGRAM} bspwm "$(DESTDIR)$(BINPREFIX)" + ${BSD_INSTALL_PROGRAM} bspc "$(DESTDIR)$(BINPREFIX)" mkdir -p "$(DESTDIR)$(MANPREFIX)"/man1 - cp -p doc/bspwm.1 "$(DESTDIR)$(MANPREFIX)"/man1 - cp -Pp doc/bspc.1 "$(DESTDIR)$(MANPREFIX)"/man1 + ${BSD_INSTALL_MAN} doc/bspwm.1 "$(DESTDIR)$(MANPREFIX)"/man1 + ${BSD_INSTALL_MAN} doc/bspc.1 "$(DESTDIR)$(MANPREFIX)"/man1 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 mkdir -p "$(DESTDIR)$(DOCPREFIX)" - cp -p $(MD_DOCS) "$(DESTDIR)$(DOCPREFIX)" -- cp -pr examples "$(DESTDIR)$(DOCPREFIX)"/examples +- mkdir -p "$(DESTDIR)$(DOCPREFIX)"/examples +- cp -pr examples/* "$(DESTDIR)$(DOCPREFIX)"/examples + ${BSD_INSTALL_DATA} $(MD_DOCS) "$(DESTDIR)$(DOCPREFIX)" -+ mkdir -p "$(DESTDIR)$(EXPREFIX)/external_rules" ++ mkdir -p "$(DESTDIR)$(EXPREFIX)" ++ ${BSD_INSTALL_DATA} examples/bspwmrc "$(DESTDIR)$(EXPREFIX)" ++ ${BSD_INSTALL_DATA} examples/sxhkdrc "$(DESTDIR)$(EXPREFIX)" ++ mkdir -p "$(DESTDIR)$(EXPREFIX)"/external_rules + ${BSD_INSTALL_DATA} examples/external_rules/bspwmrc \ -+ "$(DESTDIR)$(EXPREFIX)/external_rules" ++ "$(DESTDIR)$(EXPREFIX)"/external_rules + ${BSD_INSTALL_DATA} examples/external_rules/external_rules \ -+ "$(DESTDIR)$(EXPREFIX)/external_rules" -+ mkdir -p "$(DESTDIR)$(EXPREFIX)/external_rules/pseudo_automatic_mode" ++ "$(DESTDIR)$(EXPREFIX)"/external_rules ++ mkdir -p "$(DESTDIR)$(EXPREFIX)"/external_rules/pseudo_automatic_mode + ${BSD_INSTALL_DATA} examples/external_rules/pseudo_automatic_mode/* \ -+ "$(DESTDIR)$(EXPREFIX)/external_rules/pseudo_automatic_mode" -+ mkdir -p "$(DESTDIR)$(EXPREFIX)/loop" ++ "$(DESTDIR)$(EXPREFIX)"/external_rules/pseudo_automatic_mode ++ mkdir -p "$(DESTDIR)$(EXPREFIX)"/loop + ${BSD_INSTALL_DATA} examples/loop/* \ -+ "$(DESTDIR)$(EXPREFIX)/loop" -+ mkdir -p "$(DESTDIR)$(EXPREFIX)/overlapping_borders" ++ "$(DESTDIR)$(EXPREFIX)"/loop ++ mkdir -p "$(DESTDIR)$(EXPREFIX)"/overlapping_borders + ${BSD_INSTALL_DATA} examples/overlapping_borders/* \ -+ "$(DESTDIR)$(EXPREFIX)/overlapping_borders" -+ mkdir -p "$(DESTDIR)$(EXPREFIX)/panel" ++ "$(DESTDIR)$(EXPREFIX)"/overlapping_borders ++ mkdir -p "$(DESTDIR)$(EXPREFIX)"/panel + ${BSD_INSTALL_DATA} examples/panel/* \ -+ "$(DESTDIR)$(EXPREFIX)/panel" ++ "$(DESTDIR)$(EXPREFIX)"/panel ++ mkdir -p "$(DESTDIR)$(EXPREFIX)"/receptacles ++ ${BSD_INSTALL_DATA} examples/receptacles/* \ ++ "$(DESTDIR)$(EXPREFIX)"/receptacles mkdir -p "$(DESTDIR)$(XSESSIONS)" - cp -p contrib/freedesktop/bspwm.desktop "$(DESTDIR)$(XSESSIONS)" + ${BSD_INSTALL_DATA} contrib/freedesktop/bspwm.desktop "$(DESTDIR)$(XSESSIONS)" uninstall: rm -f "$(DESTDIR)$(BINPREFIX)"/bspwm