From owner-svn-ports-head@freebsd.org Mon Apr 18 14:07:44 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 93619B127CB; Mon, 18 Apr 2016 14:07:44 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 56CF219B3; Mon, 18 Apr 2016 14:07:44 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3IE7hgp081928; Mon, 18 Apr 2016 14:07:43 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3IE7hr0081923; Mon, 18 Apr 2016 14:07:43 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201604181407.u3IE7hr0081923@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Mon, 18 Apr 2016 14:07:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413582 - in head/x11-wm/bspwm: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2016 14:07:44 -0000 Author: mat Date: Mon Apr 18 14:07:42 2016 New Revision: 413582 URL: https://svnweb.freebsd.org/changeset/ports/413582 Log: Update to 0.9.1. PR: 208872 Submitted by: tkato432 yahoo com Sponsored by: Absolight Added: head/x11-wm/bspwm/files/pkg-message.in (contents, props changed) - copied, changed from r413581, head/x11-wm/bspwm/pkg-message Deleted: head/x11-wm/bspwm/pkg-message Modified: head/x11-wm/bspwm/Makefile (contents, props changed) head/x11-wm/bspwm/distinfo (contents, props changed) head/x11-wm/bspwm/files/patch-Makefile (contents, props changed) head/x11-wm/bspwm/pkg-plist (contents, props changed) Modified: head/x11-wm/bspwm/Makefile ============================================================================== --- head/x11-wm/bspwm/Makefile Mon Apr 18 14:07:36 2016 (r413581) +++ head/x11-wm/bspwm/Makefile Mon Apr 18 14:07:42 2016 (r413582) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= bspwm -PORTVERSION= 0.9 -PORTREVISION= 2 +PORTVERSION= 0.9.1 CATEGORIES= x11-wm MAINTAINER= ports@FreeBSD.org @@ -18,10 +17,12 @@ RUN_DEPENDS= sxhkd:x11/sxhkd USE_GITHUB= yes GH_ACCOUNT= baskerville -USES= gmake shebangfix -SHEBANG_FILES= contrib/freedesktop/bspwm-session +USES= gmake pkgconfig -MAKE_ENV+= EXAMPLESDIR=${EXAMPLESDIR} +SUB_FILES= pkg-message + +PORTDOCS= * +PORTEXAMPLES= * OPTIONS_DEFINE= DOCS EXAMPLES Modified: head/x11-wm/bspwm/distinfo ============================================================================== --- head/x11-wm/bspwm/distinfo Mon Apr 18 14:07:36 2016 (r413581) +++ head/x11-wm/bspwm/distinfo Mon Apr 18 14:07:42 2016 (r413582) @@ -1,2 +1,2 @@ -SHA256 (baskerville-bspwm-0.9_GH0.tar.gz) = 1efb2db7b8a251bcc006d66a050cf66e9d311761c94890bebf91a32905042fde -SIZE (baskerville-bspwm-0.9_GH0.tar.gz) = 62798 +SHA256 (baskerville-bspwm-0.9.1_GH0.tar.gz) = 02bb58a307acdec242eb4b8a62764ed53d01c30474dfb1bc09812d943773bb85 +SIZE (baskerville-bspwm-0.9.1_GH0.tar.gz) = 82335 Modified: head/x11-wm/bspwm/files/patch-Makefile ============================================================================== --- head/x11-wm/bspwm/files/patch-Makefile Mon Apr 18 14:07:36 2016 (r413581) +++ head/x11-wm/bspwm/files/patch-Makefile Mon Apr 18 14:07:42 2016 (r413582) @@ -1,20 +1,72 @@ ---- Makefile.orig 2015-03-20 21:29:14 UTC +--- Makefile.orig 2016-03-15 16:06:25 UTC +++ Makefile -@@ -8,7 +8,7 @@ LDFLAGS += -L$(PREFIX)/lib +@@ -1,15 +1,16 @@ + VERSION := $(shell git describe 2> /dev/null || cat VERSION) - PREFIX ?= /usr/local - BINPREFIX = $(PREFIX)/bin --MANPREFIX = $(PREFIX)/share/man -+MANPREFIX = $(PREFIX)/man - BASHCPL = $(PREFIX)/share/bash-completion/completions - ZSHCPL = $(PREFIX)/share/zsh/site-functions - DOCPREFIX = $(PREFIX)/share/doc/bspwm -@@ -56,7 +56,7 @@ install: - cp -p contrib/zsh_completion "$(DESTDIR)$(ZSHCPL)"/_bspc +-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 + + PREFIX ?= /usr/local +-BINPREFIX ?= $(PREFIX)/bin +-MANPREFIX ?= $(PREFIX)/share/man +-DOCPREFIX ?= $(PREFIX)/share/doc/bspwm +-BASHCPL ?= $(PREFIX)/share/bash-completion/completions +-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 ++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 +@@ -35,20 +36,36 @@ 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)$(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 -p $(MD_DOCS) "$(DESTDIR)$(DOCPREFIX)" - cp -pr examples "$(DESTDIR)$(DOCPREFIX)"/examples -+ cp -pr examples "$(DESTDIR)$(EXAMPLESDIR)" ++ ${BSD_INSTALL_DATA} $(MD_DOCS) "$(DESTDIR)$(DOCPREFIX)" ++ mkdir -p "$(DESTDIR)$(EXPREFIX)/external_rules" ++ ${BSD_INSTALL_DATA} examples/external_rules/bspwmrc \ ++ "$(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" ++ ${BSD_INSTALL_DATA} examples/external_rules/pseudo_automatic_mode/* \ ++ "$(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" ++ ${BSD_INSTALL_DATA} examples/overlapping_borders/* \ ++ "$(DESTDIR)$(EXPREFIX)/overlapping_borders" ++ mkdir -p "$(DESTDIR)$(EXPREFIX)/panel" ++ ${BSD_INSTALL_DATA} examples/panel/* \ ++ "$(DESTDIR)$(EXPREFIX)/panel" mkdir -p "$(DESTDIR)$(XSESSIONS)" - cp -p contrib/freedesktop/bspwm.desktop "$(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 Copied and modified: head/x11-wm/bspwm/files/pkg-message.in (from r413581, head/x11-wm/bspwm/pkg-message) ============================================================================== --- head/x11-wm/bspwm/pkg-message Mon Apr 18 14:07:36 2016 (r413581, copy source) +++ head/x11-wm/bspwm/files/pkg-message.in Mon Apr 18 14:07:42 2016 (r413582) @@ -1,5 +1,5 @@ ####################################################################### -Copy the files bspwmrc and sxhkdrc from ${EXAMPLESDIR} to +Copy the files bspwmrc and sxhkdrc from %%EXAMPLESDIR%% to ~/.config/bspwm/ and ~/.config/sxhkd/ and configure them as you wish. And add these lines to you .xinitrc: Modified: head/x11-wm/bspwm/pkg-plist ============================================================================== --- head/x11-wm/bspwm/pkg-plist Mon Apr 18 14:07:36 2016 (r413581) +++ head/x11-wm/bspwm/pkg-plist Mon Apr 18 14:07:42 2016 (r413582) @@ -1,28 +1,7 @@ bin/bspc bin/bspwm -bin/bspwm-session man/man1/bspc.1.gz man/man1/bspwm.1.gz share/bash-completion/completions/bspc -%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTING.md -%%PORTDOCS%%%%DOCSDIR%%/INSTALL.md -%%PORTDOCS%%%%DOCSDIR%%/MISC.md -%%PORTDOCS%%%%DOCSDIR%%/TODO.md -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bspwmrc -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/external_rules/bspwmrc -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/external_rules/external_rules -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/loop/bspwmrc -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/loop/profile -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/loop/sxhkdrc -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/loop/wm -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/loop/xinitrc -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/overlapping_borders/bspwmrc -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/panel/bspwmrc -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/panel/panel -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/panel/panel_bar -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/panel/panel_colors -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/panel/profile -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/panel/sxhkdrc -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sxhkdrc share/xsessions/bspwm.desktop share/zsh/site-functions/_bspc