View | Details | Raw Unified | Return to bug 220788 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-5 / +8 lines)
Lines 1-8 Link Here
1
# Created by: Anton Törnqvist <antont@inbox.lv>
1
# Created by: Anton Tornqvist <antont@inbox.lv>
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	bspwm
4
PORTNAME=	bspwm
5
PORTVERSION=	0.9.2
5
PORTVERSION=	0.9.3
6
CATEGORIES=	x11-wm
6
CATEGORIES=	x11-wm
7
7
8
MAINTAINER=	gor@clogic.com.ua
8
MAINTAINER=	gor@clogic.com.ua
Lines 11-25 Link Here
11
LICENSE=	BSD2CLAUSE
11
LICENSE=	BSD2CLAUSE
12
LICENSE_FILE=	${WRKSRC}/LICENSE
12
LICENSE_FILE=	${WRKSRC}/LICENSE
13
13
14
LIB_DEPENDS=	libxcb-icccm.so:x11/xcb-util-wm \
14
LIB_DEPENDS=	libxcb-util.so:x11/xcb-util \
15
		libxcb-icccm.so:x11/xcb-util-wm \
15
		libxcb-keysyms.so:x11/xcb-util-keysyms
16
		libxcb-keysyms.so:x11/xcb-util-keysyms
16
RUN_DEPENDS=	sxhkd:x11/sxhkd
17
RUN_DEPENDS=	sxhkd:x11/sxhkd
17
18
19
USES=		gmake pkgconfig
20
21
USE_XORG+=	xcb
22
18
USE_GITHUB=	yes
23
USE_GITHUB=	yes
19
GH_ACCOUNT=	baskerville
24
GH_ACCOUNT=	baskerville
20
25
21
USES=		gmake pkgconfig
22
23
SUB_FILES=	pkg-message
26
SUB_FILES=	pkg-message
24
27
25
PORTDOCS=	*
28
PORTDOCS=	*
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1477914289
1
TIMESTAMP = 1500268835
2
SHA256 (baskerville-bspwm-0.9.2_GH0.tar.gz) = 33689d138d50f42444820b3a76b84fee7fa3af58e33ad589319c84e51fefdcf0
2
SHA256 (baskerville-bspwm-0.9.3_GH0.tar.gz) = b356e3ff5754c63c94b36d904274c0ba16f9a8494e78a1c93bb23113f891bc9d
3
SIZE (baskerville-bspwm-0.9.2_GH0.tar.gz) = 92558
3
SIZE (baskerville-bspwm-0.9.3_GH0.tar.gz) = 95779
(-)files/patch-Makefile (-14 / +21 lines)
Lines 1-4 Link Here
1
--- Makefile.orig	2016-10-30 12:25:26 UTC
1
--- Makefile.orig	2017-07-14 19:01:20 UTC
2
+++ Makefile
2
+++ Makefile
3
@@ -1,17 +1,18 @@
3
@@ -1,17 +1,18 @@
4
 VERCMD  ?= git describe 2> /dev/null
4
 VERCMD  ?= git describe 2> /dev/null
Lines 27-33 Link Here
27
 
27
 
28
 MD_DOCS    = README.md doc/CHANGELOG.md doc/CONTRIBUTING.md doc/INSTALL.md doc/MISC.md doc/TODO.md
28
 MD_DOCS    = README.md doc/CHANGELOG.md doc/CONTRIBUTING.md doc/INSTALL.md doc/MISC.md doc/TODO.md
29
 XSESSIONS ?= $(PREFIX)/share/xsessions
29
 XSESSIONS ?= $(PREFIX)/share/xsessions
30
@@ -37,22 +38,38 @@ bspc: $(CLI_OBJ)
30
@@ -39,23 +40,44 @@ bspc: $(CLI_OBJ)
31
 
31
 
32
 install:
32
 install:
33
 	mkdir -p "$(DESTDIR)$(BINPREFIX)"
33
 	mkdir -p "$(DESTDIR)$(BINPREFIX)"
Lines 51-75 Link Here
51
+	${BSD_INSTALL_DATA} contrib/zsh_completion "$(DESTDIR)$(ZSHCPL)"/_bspc
51
+	${BSD_INSTALL_DATA} contrib/zsh_completion "$(DESTDIR)$(ZSHCPL)"/_bspc
52
 	mkdir -p "$(DESTDIR)$(DOCPREFIX)"
52
 	mkdir -p "$(DESTDIR)$(DOCPREFIX)"
53
-	cp -p $(MD_DOCS) "$(DESTDIR)$(DOCPREFIX)"
53
-	cp -p $(MD_DOCS) "$(DESTDIR)$(DOCPREFIX)"
54
-	cp -pr examples "$(DESTDIR)$(DOCPREFIX)"/examples
54
-	mkdir -p "$(DESTDIR)$(DOCPREFIX)"/examples
55
-	cp -pr examples/* "$(DESTDIR)$(DOCPREFIX)"/examples
55
+	${BSD_INSTALL_DATA} $(MD_DOCS) "$(DESTDIR)$(DOCPREFIX)"
56
+	${BSD_INSTALL_DATA} $(MD_DOCS) "$(DESTDIR)$(DOCPREFIX)"
56
+	mkdir -p "$(DESTDIR)$(EXPREFIX)/external_rules"
57
+	mkdir -p "$(DESTDIR)$(EXPREFIX)"
58
+	${BSD_INSTALL_DATA} examples/bspwmrc "$(DESTDIR)$(EXPREFIX)"
59
+	${BSD_INSTALL_DATA} examples/sxhkdrc "$(DESTDIR)$(EXPREFIX)"
60
+	mkdir -p "$(DESTDIR)$(EXPREFIX)"/external_rules
57
+	${BSD_INSTALL_DATA} examples/external_rules/bspwmrc \
61
+	${BSD_INSTALL_DATA} examples/external_rules/bspwmrc \
58
+		"$(DESTDIR)$(EXPREFIX)/external_rules"
62
+		"$(DESTDIR)$(EXPREFIX)"/external_rules
59
+	${BSD_INSTALL_DATA} examples/external_rules/external_rules \
63
+	${BSD_INSTALL_DATA} examples/external_rules/external_rules \
60
+		"$(DESTDIR)$(EXPREFIX)/external_rules"
64
+		"$(DESTDIR)$(EXPREFIX)"/external_rules
61
+	mkdir -p "$(DESTDIR)$(EXPREFIX)/external_rules/pseudo_automatic_mode"
65
+	mkdir -p "$(DESTDIR)$(EXPREFIX)"/external_rules/pseudo_automatic_mode
62
+	${BSD_INSTALL_DATA} examples/external_rules/pseudo_automatic_mode/* \
66
+	${BSD_INSTALL_DATA} examples/external_rules/pseudo_automatic_mode/* \
63
+		"$(DESTDIR)$(EXPREFIX)/external_rules/pseudo_automatic_mode"
67
+		"$(DESTDIR)$(EXPREFIX)"/external_rules/pseudo_automatic_mode
64
+	mkdir -p "$(DESTDIR)$(EXPREFIX)/loop"
68
+	mkdir -p "$(DESTDIR)$(EXPREFIX)"/loop
65
+	${BSD_INSTALL_DATA} examples/loop/* \
69
+	${BSD_INSTALL_DATA} examples/loop/* \
66
+		"$(DESTDIR)$(EXPREFIX)/loop"
70
+		"$(DESTDIR)$(EXPREFIX)"/loop
67
+	mkdir -p "$(DESTDIR)$(EXPREFIX)/overlapping_borders"
71
+	mkdir -p "$(DESTDIR)$(EXPREFIX)"/overlapping_borders
68
+	${BSD_INSTALL_DATA} examples/overlapping_borders/* \
72
+	${BSD_INSTALL_DATA} examples/overlapping_borders/* \
69
+		"$(DESTDIR)$(EXPREFIX)/overlapping_borders"
73
+		"$(DESTDIR)$(EXPREFIX)"/overlapping_borders
70
+	mkdir -p "$(DESTDIR)$(EXPREFIX)/panel"
74
+	mkdir -p "$(DESTDIR)$(EXPREFIX)"/panel
71
+	${BSD_INSTALL_DATA} examples/panel/* \
75
+	${BSD_INSTALL_DATA} examples/panel/* \
72
+		"$(DESTDIR)$(EXPREFIX)/panel"
76
+		"$(DESTDIR)$(EXPREFIX)"/panel
77
+	mkdir -p "$(DESTDIR)$(EXPREFIX)"/receptacles
78
+	${BSD_INSTALL_DATA} examples/receptacles/* \
79
+		"$(DESTDIR)$(EXPREFIX)"/receptacles
73
 	mkdir -p "$(DESTDIR)$(XSESSIONS)"
80
 	mkdir -p "$(DESTDIR)$(XSESSIONS)"
74
-	cp -p contrib/freedesktop/bspwm.desktop "$(DESTDIR)$(XSESSIONS)"
81
-	cp -p contrib/freedesktop/bspwm.desktop "$(DESTDIR)$(XSESSIONS)"
75
+	${BSD_INSTALL_DATA} contrib/freedesktop/bspwm.desktop "$(DESTDIR)$(XSESSIONS)"
82
+	${BSD_INSTALL_DATA} contrib/freedesktop/bspwm.desktop "$(DESTDIR)$(XSESSIONS)"

Return to bug 220788