Attachment #169410 for bug #208872

View | Details | Raw Unified | Return to bug 208872
Collapse All | Expand All




# $FreeBSD: head/x11-wm/bspwm/Makefile 412351 2016-04-01 14:33:55Z mat $

PORTNAME=	bspwm
PORTVERSION=	0.9.1
PORTREVISION=	2
CATEGORIES=	x11-wm

MAINTAINER=	ports@FreeBSD.org

USE_GITHUB=	yes
GH_ACCOUNT=	baskerville

USES=		gmake pkgconfig
SHEBANG_FILES=	contrib/freedesktop/bspwm-session

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


Lines 1-2 Link Here

(-)x11-wm/bspwm/distinfo (-2 / +2 lines)
1	SHA256 (baskerville-bspwm-0.9_GH0.tar.gz) = 1efb2db7b8a251bcc006d66a050cf66e9d311761c94890bebf91a32905042fde	1	SHA256 (baskerville-bspwm-0.9.1_GH0.tar.gz) = 02bb58a307acdec242eb4b8a62764ed53d01c30474dfb1bc09812d943773bb85
2	SIZE (baskerville-bspwm-0.9_GH0.tar.gz) = 62798	2	SIZE (baskerville-bspwm-0.9.1_GH0.tar.gz) = 82335




--- Makefile.orig	2016-03-15 16:06:25 UTC
+++ Makefile
@@ -1,15 +1,16 @@
 VERSION := $(shell git describe 2> /dev/null || 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
 
 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 -pr examples "$(DESTDIR)$(DOCPREFIX)"/examples
+	${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)"
+	${BSD_INSTALL_DATA} contrib/freedesktop/bspwm.desktop "$(DESTDIR)$(XSESSIONS)"
 
 uninstall:
 	rm -f "$(DESTDIR)$(BINPREFIX)"/bspwm

Line 0 Link Here

(-)x11-wm/bspwm/files/pkg-message.in (+10 lines)
	1	#######################################################################
	2	Copy the files bspwmrc and sxhkdrc from %%EXAMPLESDIR%%
	3	to ~/.config/bspwm/ and ~/.config/sxhkd/ and configure them as you wish.
	4
	5	And add these lines to you .xinitrc:
	6	sxhkd &
	7	exec bspwm
	8
	9	Then type startx from tty to run bspwm.
	10	#######################################################################

Lines 1-10 Link Here

(-)x11-wm/bspwm/pkg-message (-10 lines)
1	#######################################################################
2	Copy the files bspwmrc and sxhkdrc from ${EXAMPLESDIR} to
3	~/.config/bspwm/ and ~/.config/sxhkd/ and configure them as you wish.
4
5	And add these lines to you .xinitrc:
6	sxhkd &
7	exec bspwm
8
9	Then type startx from tty to run bspwm.
10	#######################################################################




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

Return to bug 208872

Lines 2-9 Link Here

(-)x11-wm/bspwm/Makefile (-5 / +11 lines)
2	# $FreeBSD: head/x11-wm/bspwm/Makefile 412351 2016-04-01 14:33:55Z mat $	2	# $FreeBSD: head/x11-wm/bspwm/Makefile 412351 2016-04-01 14:33:55Z mat $
3		3
4	PORTNAME= bspwm	4	PORTNAME= bspwm
5	PORTVERSION= 0.9	5	PORTVERSION= 0.9.1
6	PORTREVISION= 2
7	CATEGORIES= x11-wm	6	CATEGORIES= x11-wm
8		7
9	MAINTAINER= ports@FreeBSD.org	8	MAINTAINER= ports@FreeBSD.org
Lines 18-27 Link Here
18	USE_GITHUB= yes	17	USE_GITHUB= yes
19	GH_ACCOUNT= baskerville	18	GH_ACCOUNT= baskerville
20		19
21	USES= gmake shebangfix	20	USES= gmake pkgconfig
22	SHEBANG_FILES= contrib/freedesktop/bspwm-session
23		21
24	MAKE_ENV+= EXAMPLESDIR=${EXAMPLESDIR}	22	SUB_FILES= pkg-message
		23
		24	PORTDOCS= *
		25	PORTEXAMPLES= *
		26	PLIST_FILES= bin/bspc bin/bspwm \
		27	man/man1/bspc.1.gz man/man1/bspwm.1.gz \
		28	share/bash-completion/completions/bspc \
		29	share/xsessions/bspwm.desktop \
		30	share/zsh/site-functions/_bspc
25		31
26	OPTIONS_DEFINE= DOCS EXAMPLES	32	OPTIONS_DEFINE= DOCS EXAMPLES
27		33

Lines 1-20 Link Here

(-)x11-wm/bspwm/files/patch-Makefile (-14 / +66 lines)
1	--- Makefile.orig 2015-03-20 21:29:14 UTC	1	--- Makefile.orig 2016-03-15 16:06:25 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -8,7 +8,7 @@ LDFLAGS += -L$(PREFIX)/lib	3	@@ -1,15 +1,16 @@
		4	VERSION := $(shell git describe 2> /dev/null \|\| cat VERSION)
4		5
5	PREFIX ?= /usr/local	6	-CPPFLAGS += -D_POSIX_C_SOURCE=200112L -DVERSION=\"$(VERSION)\"
6	BINPREFIX = $(PREFIX)/bin	7	+CPPFLAGS += $(shell pkg-config --cflags xcb-ewmh xcb-event xcb-icccm xcb-randr xcb-util xcb-xinerama) -DVERSION=\"$(VERSION)\"
7	-MANPREFIX = $(PREFIX)/share/man	8	CFLAGS += -std=c99 -pedantic -Wall -Wextra
8	+MANPREFIX = $(PREFIX)/man	9	-LDLIBS = -lm -lxcb -lxcb-util -lxcb-icccm -lxcb-ewmh -lxcb-randr -lxcb-xinerama
9	BASHCPL = $(PREFIX)/share/bash-completion/completions	10	+LDLIBS = $(shell pkg-config --libs xcb-ewmh xcb-event xcb-icccm xcb-randr xcb-util xcb-xinerama) -lm
10	ZSHCPL = $(PREFIX)/share/zsh/site-functions	11
11	DOCPREFIX = $(PREFIX)/share/doc/bspwm	12	PREFIX ?= /usr/local
12	@@ -56,7 +56,7 @@ install:	13	-BINPREFIX ?= $(PREFIX)/bin
13	cp -p contrib/zsh_completion "$(DESTDIR)$(ZSHCPL)"/_bspc	14	-MANPREFIX ?= $(PREFIX)/share/man
		15	-DOCPREFIX ?= $(PREFIX)/share/doc/bspwm
		16	-BASHCPL ?= $(PREFIX)/share/bash-completion/completions
		17	-ZSHCPL ?= $(PREFIX)/share/zsh/site-functions
		18	+BINPREFIX = $(PREFIX)/bin
		19	+MANPREFIX = $(PREFIX)/man
		20	+DOCPREFIX = $(PREFIX)/share/doc/bspwm
		21	+EXPREFIX = $(PREFIX)/share/examples/bspwm
		22	+BASHCPL = $(PREFIX)/share/bash-completion/completions
		23	+ZSHCPL = $(PREFIX)/share/zsh/site-functions
		24
		25	MD_DOCS = README.md doc/CHANGELOG.md doc/CONTRIBUTING.md doc/INSTALL.md doc/MISC.md doc/TODO.md
		26	XSESSIONS ?= $(PREFIX)/share/xsessions
		27	@@ -35,20 +36,36 @@ bspc: $(CLI_OBJ)
		28
		29	install:
		30	mkdir -p "$(DESTDIR)$(BINPREFIX)"
		31	- cp -pf bspwm "$(DESTDIR)$(BINPREFIX)"
		32	- cp -pf bspc "$(DESTDIR)$(BINPREFIX)"
		33	+ ${BSD_INSTALL_PROGRAM} bspwm "$(DESTDIR)$(BINPREFIX)"
		34	+ ${BSD_INSTALL_PROGRAM} bspc "$(DESTDIR)$(BINPREFIX)"
		35	mkdir -p "$(DESTDIR)$(MANPREFIX)"/man1
		36	- cp -p doc/bspwm.1 "$(DESTDIR)$(MANPREFIX)"/man1
		37	- cp -Pp doc/bspc.1 "$(DESTDIR)$(MANPREFIX)"/man1
		38	+ ${BSD_INSTALL_MAN} doc/bspwm.1 "$(DESTDIR)$(MANPREFIX)"/man1
		39	+ ${BSD_INSTALL_MAN} doc/bspc.1 "$(DESTDIR)$(MANPREFIX)"/man1
		40	mkdir -p "$(DESTDIR)$(BASHCPL)"
		41	- cp -p contrib/bash_completion "$(DESTDIR)$(BASHCPL)"/bspc
		42	+ ${BSD_INSTALL_DATA} contrib/bash_completion "$(DESTDIR)$(BASHCPL)"/bspc
		43	mkdir -p "$(DESTDIR)$(ZSHCPL)"
		44	- cp -p contrib/zsh_completion "$(DESTDIR)$(ZSHCPL)"/_bspc
		45	+ ${BSD_INSTALL_DATA} contrib/zsh_completion "$(DESTDIR)$(ZSHCPL)"/_bspc
14	mkdir -p "$(DESTDIR)$(DOCPREFIX)"	46	mkdir -p "$(DESTDIR)$(DOCPREFIX)"
15	cp -p $(MD_DOCS) "$(DESTDIR)$(DOCPREFIX)"	47	- cp -p $(MD_DOCS) "$(DESTDIR)$(DOCPREFIX)"
16	- cp -pr examples "$(DESTDIR)$(DOCPREFIX)"/examples	48	- cp -pr examples "$(DESTDIR)$(DOCPREFIX)"/examples
17	+ cp -pr examples "$(DESTDIR)$(EXAMPLESDIR)"	49	+ ${BSD_INSTALL_DATA} $(MD_DOCS) "$(DESTDIR)$(DOCPREFIX)"
		50	+ mkdir -p "$(DESTDIR)$(EXPREFIX)/external_rules"
		51	+ ${BSD_INSTALL_DATA} examples/external_rules/bspwmrc \
		52	+ "$(DESTDIR)$(EXPREFIX)/external_rules"
		53	+ ${BSD_INSTALL_DATA} examples/external_rules/external_rules \
		54	+ "$(DESTDIR)$(EXPREFIX)/external_rules"
		55	+ mkdir -p "$(DESTDIR)$(EXPREFIX)/external_rules/pseudo_automatic_mode"
		56	+ ${BSD_INSTALL_DATA} examples/external_rules/pseudo_automatic_mode/* \
		57	+ "$(DESTDIR)$(EXPREFIX)/external_rules/pseudo_automatic_mode"
		58	+ mkdir -p "$(DESTDIR)$(EXPREFIX)/loop"
		59	+ ${BSD_INSTALL_DATA} examples/loop/* \
		60	+ "$(DESTDIR)$(EXPREFIX)/loop"
		61	+ mkdir -p "$(DESTDIR)$(EXPREFIX)/overlapping_borders"
		62	+ ${BSD_INSTALL_DATA} examples/overlapping_borders/* \
		63	+ "$(DESTDIR)$(EXPREFIX)/overlapping_borders"
		64	+ mkdir -p "$(DESTDIR)$(EXPREFIX)/panel"
		65	+ ${BSD_INSTALL_DATA} examples/panel/* \
		66	+ "$(DESTDIR)$(EXPREFIX)/panel"
18	mkdir -p "$(DESTDIR)$(XSESSIONS)"	67	mkdir -p "$(DESTDIR)$(XSESSIONS)"
19	cp -p contrib/freedesktop/bspwm.desktop "$(DESTDIR)$(XSESSIONS)"	68	- cp -p contrib/freedesktop/bspwm.desktop "$(DESTDIR)$(XSESSIONS)"
		69	+ ${BSD_INSTALL_DATA} contrib/freedesktop/bspwm.desktop "$(DESTDIR)$(XSESSIONS)"
20		70
		71	uninstall:
		72	rm -f "$(DESTDIR)$(BINPREFIX)"/bspwm

Lines 1-28 Link Here

(-)x11-wm/bspwm/pkg-plist (-28 lines)
1	bin/bspc
2	bin/bspwm
3	bin/bspwm-session
4	man/man1/bspc.1.gz
5	man/man1/bspwm.1.gz
6	share/bash-completion/completions/bspc
7	%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTING.md
8	%%PORTDOCS%%%%DOCSDIR%%/INSTALL.md
9	%%PORTDOCS%%%%DOCSDIR%%/MISC.md
10	%%PORTDOCS%%%%DOCSDIR%%/TODO.md
11	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bspwmrc
12	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/external_rules/bspwmrc
13	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/external_rules/external_rules
14	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/loop/bspwmrc
15	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/loop/profile
16	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/loop/sxhkdrc
17	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/loop/wm
18	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/loop/xinitrc
19	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/overlapping_borders/bspwmrc
20	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/panel/bspwmrc
21	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/panel/panel
22	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/panel/panel_bar
23	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/panel/panel_colors
24	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/panel/profile
25	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/panel/sxhkdrc
26	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sxhkdrc
27	share/xsessions/bspwm.desktop
28	share/zsh/site-functions/_bspc