Attachment 169410 Details for Bug 208872 – x11-wm_bspwm.diff

[patch] x11-wm_bspwm.diff

x11-wm_bspwm.diff (text/plain), 8.09 KB, created by tkato432 on 2016-04-17 18:34:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2016-04-17 18:34:36 UTC

Size: 8.09 KB

patch

obsolete

>diff -urN /usr/ports/x11-wm/bspwm/Makefile x11-wm/bspwm/Makefile
>--- /usr/ports/x11-wm/bspwm/Makefile	2016-04-02 02:04:20.593018000 +0900
>+++ x11-wm/bspwm/Makefile	2016-04-18 00:00:00.000000000 +0900
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/x11-wm/bspwm/Makefile 412351 2016-04-01 14:33:55Z mat $
> 
> PORTNAME=	bspwm
>-PORTVERSION=	0.9
>-PORTREVISION=	2
>+PORTVERSION=	0.9.1
> CATEGORIES=	x11-wm
> 
> MAINTAINER=	ports@FreeBSD.org
>@@ -18,10 +17,17 @@
> 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=	*
>+PLIST_FILES=	bin/bspc bin/bspwm \
>+		man/man1/bspc.1.gz man/man1/bspwm.1.gz \
>+		share/bash-completion/completions/bspc \
>+		share/xsessions/bspwm.desktop \
>+		share/zsh/site-functions/_bspc
> 
> OPTIONS_DEFINE=	DOCS EXAMPLES
> 
>diff -urN /usr/ports/x11-wm/bspwm/distinfo x11-wm/bspwm/distinfo
>--- /usr/ports/x11-wm/bspwm/distinfo	2015-08-24 03:51:12.193675000 +0900
>+++ x11-wm/bspwm/distinfo	2016-04-18 00:00:00.000000000 +0900
>@@ -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
>diff -urN /usr/ports/x11-wm/bspwm/files/patch-Makefile x11-wm/bspwm/files/patch-Makefile
>--- /usr/ports/x11-wm/bspwm/files/patch-Makefile	2015-08-24 03:51:12.180720000 +0900
>+++ x11-wm/bspwm/files/patch-Makefile	2016-04-18 00:00:00.000000000 +0900
>@@ -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
>diff -urN /usr/ports/x11-wm/bspwm/files/pkg-message.in x11-wm/bspwm/files/pkg-message.in
>--- /usr/ports/x11-wm/bspwm/files/pkg-message.in	1970-01-01 09:00:00.000000000 +0900
>+++ x11-wm/bspwm/files/pkg-message.in	2016-04-18 00:00:00.000000000 +0900
>@@ -0,0 +1,10 @@
>+#######################################################################
>+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:
>+sxhkd &
>+exec bspwm
>+
>+Then type startx from tty to run bspwm.
>+#######################################################################
>diff -urN /usr/ports/x11-wm/bspwm/pkg-message x11-wm/bspwm/pkg-message
>--- /usr/ports/x11-wm/bspwm/pkg-message	2015-08-24 03:51:12.181120000 +0900
>+++ x11-wm/bspwm/pkg-message	1970-01-01 09:00:00.000000000 +0900
>@@ -1,10 +0,0 @@
>-#######################################################################
>-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:
>-sxhkd &
>-exec bspwm
>-
>-Then type startx from tty to run bspwm.
>-#######################################################################
>diff -urN /usr/ports/x11-wm/bspwm/pkg-plist x11-wm/bspwm/pkg-plist
>--- /usr/ports/x11-wm/bspwm/pkg-plist	2015-08-24 03:51:12.181513000 +0900
>+++ x11-wm/bspwm/pkg-plist	1970-01-01 09:00:00.000000000 +0900
>@@ -1,28 +0,0 @@
>-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

Actions: View | Diff

Attachments on bug 208872: 169410