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

Collapse All | Expand All

(-)b/x11-wm/spectrwm/Makefile (-32 / +37 lines)
Lines 1-69 Link Here
1
PORTNAME=	spectrwm
1
PORTNAME=	spectrwm
2
DISTVERSIONPREFIX=	SPECTRWM_
2
DISTVERSIONPREFIX=	SPECTRWM_
3
DISTVERSION=	3_4_1
3
DISTVERSION=	3_6_0
4
PORTREVISION=	2
5
CATEGORIES=	x11-wm
4
CATEGORIES=	x11-wm
6
5
7
MAINTAINER=	ports@FreeBSD.org
6
MAINTAINER=	nxjoseph@protonmail.com
8
COMMENT=	Small, dynamic tiling window manager for X11
7
COMMENT=	Small, dynamic tiling window manager for X11
9
WWW=		https://github.com/conformal/spectrwm
8
WWW=		https://github.com/conformal/spectrwm
10
9
11
LICENSE=	ISCL
10
LICENSE=	ISCL
11
LICENSE_FILE=	${WRKSRC}/LICENSE.md
12
12
13
LIB_DEPENDS+=	libxcb-util.so:x11/xcb-util \
13
LIB_DEPENDS+=	libfontconfig.so:x11-fonts/fontconfig \
14
		libxcb-icccm.so:x11/xcb-util-wm \
14
		libxcb-icccm.so:x11/xcb-util-wm \
15
		libxcb-keysyms.so:x11/xcb-util-keysyms
15
		libxcb-keysyms.so:x11/xcb-util-keysyms \
16
RUN_DEPENDS+=	dmenu:x11/dmenu
16
		libxcb-util.so:x11/xcb-util
17
RUN_DEPENDS+=	dmenu:x11/dmenu \
18
		xlock:x11/xlockmore
17
19
20
USES=		compiler:c11 xorg
18
USE_GITHUB=	yes
21
USE_GITHUB=	yes
19
GH_ACCOUNT=	conformal
22
GH_ACCOUNT=	conformal
23
USE_LDCONFIG=	yes
24
USE_XORG=	x11 xcb xcursor xft xrandr xt
20
25
21
OPTIONS_DEFINE=	EXAMPLES
26
OPTIONS_DEFINE=	EXAMPLES
22
27
23
.include	<bsd.port.options.mk>
28
.include <bsd.port.options.mk>
24
29
25
USES=		compiler:c11 xorg
30
CONFEXAMPLES=	spectrwm_cz.conf spectrwm_es.conf spectrwm_fr.conf \
26
USE_XORG=	x11 xcb xcursor xft xrandr xt
31
		spectrwm_fr_ch.conf spectrwm_se.conf spectrwm_us.conf
27
28
USE_LDCONFIG=	yes
29
CONFEXAMPLES=	spectrwm_cz.conf \
30
		spectrwm_es.conf \
31
		spectrwm_fr.conf \
32
		spectrwm_fr_ch.conf \
33
		spectrwm_se.conf \
34
		spectrwm_us.conf
35
32
36
SCRIPTEXAMPLES=	baraction.sh \
33
SCRIPTEXAMPLES=	baraction.sh screenshot.sh
37
		screenshot.sh
38
34
39
post-patch:
35
post-patch:
40
	@${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' ${WRKSRC}/spectrwm.*
36
	@${FIND} ${WRKSRC} -type f -maxdepth 0 \(-name "spectrwm.*" -o ! -name \
37
		"spectrwm.conf*" \ -o ! -name "spectrwm.desktop"\) | \
38
		${XARGS} ${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g'
41
39
42
do-build:
40
do-build:
43
	ln -sf ${WRKSRC}/linux/pledge.h ${WRKSRC}/pledge.h
41
	@${LN} -sf ${WRKSRC}/linux/pledge.h ${WRKSRC}/pledge.h
42
	@${LN} -sf ${WRKSRC}/linux/queue_compat.h ${WRKSRC}/queue_compat.h
44
	${CC} ${CFLAGS} -Wall -Wextra -Wshadow -Werror -I${LOCALBASE}/include \
43
	${CC} ${CFLAGS} -Wall -Wextra -Wshadow -Werror -I${LOCALBASE}/include \
45
		-I${LOCALBASE}/include/freetype2 -I${WRKSRC}/freebsd \
44
		-I${LOCALBASE}/include/freetype2 -I${WRKSRC}/freebsd \
46
		-lutil -L${LOCALBASE}/lib -lX11 -lX11-xcb -lxcb -lxcb-icccm \
45
		-lutil -L${LOCALBASE}/lib -lX11 -lX11-xcb -lxcb -lxcb-icccm \
47
		-lxcb-keysyms -lxcb-randr -lxcb-util -lxcb-xinput -lxcb-xtest \
46
		-lxcb-keysyms -lxcb-randr -lxcb-util -lxcb-xinput -lxcb-xtest \
48
		-lXcursor -lXft -DSWM_LIB=\"${PREFIX}/lib/libswmhack.so\" \
47
		-lXcursor -lXft -lfontconfig -DSWM_LIB=\"${PREFIX}/lib/libswmhack.so\" \
49
		-o ${WRKSRC}/${PORTNAME} ${WRKSRC}/${PORTNAME}.c
48
		-o ${WRKSRC}/${PORTNAME} ${WRKSRC}/${PORTNAME}.c
50
	${CC} ${CFLAGS} -Wall -Wextra -Wshadow -Werror -I${LOCALBASE}/include \
49
	${CC} ${CFLAGS} -Wall -Wextra -Wshadow -Werror -I${LOCALBASE}/include \
51
		-shared -fpic -DPIC -L${LOCALBASE}/lib -lX11 \
50
		-shared -fpic -DPIC -L${LOCALBASE}/lib -lX11 -o ${WRKSRC}/libswmhack.so \
52
		-o ${WRKSRC}/libswmhack.so ${WRKSRC}/lib/swm_hack.c
51
		${WRKSRC}/lib/swm_hack.c
53
52
54
do-install:
53
do-install:
55
	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
54
	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} \
56
	${INSTALL_LIB} ${WRKSRC}/libswmhack.so ${STAGEDIR}${PREFIX}/lib
55
		${STAGEDIR}${PREFIX}/bin
57
	${INSTALL_MAN} ${WRKSRC}/spectrwm.1 ${STAGEDIR}${PREFIX}/share/man/man1
56
	${INSTALL_LIB} ${WRKSRC}/libswmhack.so \
58
	${INSTALL_DATA} ${WRKSRC}/spectrwm.conf ${STAGEDIR}${PREFIX}/etc/spectrwm.conf.sample
57
		${STAGEDIR}${PREFIX}/lib
58
	${INSTALL_MAN} ${WRKSRC}/spectrwm.1 \
59
		${STAGEDIR}${PREFIX}/share/man/man1
60
	${INSTALL_DATA} ${WRKSRC}/spectrwm.conf \
61
		${STAGEDIR}${PREFIX}/etc/spectrwm.conf.sample
59
62
60
do-install-EXAMPLES-on:
63
do-install-EXAMPLES-on:
61
	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
64
	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
62
.for file in ${CONFEXAMPLES}
65
.for f in ${CONFEXAMPLES}
63
	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${EXAMPLESDIR}
66
	${INSTALL_DATA} ${WRKSRC}/${f} \
67
		${STAGEDIR}${EXAMPLESDIR}
64
.endfor
68
.endfor
65
.for file in ${SCRIPTEXAMPLES}
69
.for f in ${SCRIPTEXAMPLES}
66
	${INSTALL_SCRIPT} ${WRKSRC}/${file} ${STAGEDIR}${EXAMPLESDIR}
70
	${INSTALL_SCRIPT} ${WRKSRC}/${f} \
71
		${STAGEDIR}${EXAMPLESDIR}
67
.endfor
72
.endfor
68
73
69
.include <bsd.port.mk>
74
.include <bsd.port.mk>
(-)b/x11-wm/spectrwm/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1593084248
1
TIMESTAMP = 1736187162
2
SHA256 (conformal-spectrwm-SPECTRWM_3_4_1_GH0.tar.gz) = c030ef30bd11bbdfce3d4a1daf51f0c1358821ba95ebdc4cdb32d3944c8ce03c
2
SHA256 (conformal-spectrwm-SPECTRWM_3_6_0_GH0.tar.gz) = 49854c5215475d2450d2558da12a3afe9019861170ba9d556c8b403d4d66f0d1
3
SIZE (conformal-spectrwm-SPECTRWM_3_4_1_GH0.tar.gz) = 164507
3
SIZE (conformal-spectrwm-SPECTRWM_3_6_0_GH0.tar.gz) = 205957
(-)a/x11-wm/spectrwm/files/patch-spectrwm.c (-11 lines)
Removed Link Here
1
--- spectrwm.c.orig	2020-06-17 19:26:40 UTC
2
+++ spectrwm.c
3
@@ -8913,7 +8913,7 @@ validate_spawns(void)
4
 void
5
 setup_spawn(void)
6
 {
7
-	setconfspawn("lock", "xlock", 0, NULL);
8
+	setconfspawn("lock", "xlock", SWM_SPAWN_OPTIONAL, NULL);
9
 
10
 	setconfspawn("term", "xterm", 0, NULL);
11
 	setconfspawn("spawn_term", "xterm", 0, NULL);
(-)b/x11-wm/spectrwm/pkg-plist (-3 / +2 lines)
Lines 1-7 Link Here
1
bin/spectrwm
1
bin/spectrwm
2
%%ETCDIR%%.conf.sample
2
lib/libswmhack.so
3
lib/libswmhack.so
3
share/man/man1/spectrwm.1.gz
4
@sample etc/spectrwm.conf.sample
5
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/baraction.sh
4
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/baraction.sh
6
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/screenshot.sh
5
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/screenshot.sh
7
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spectrwm_cz.conf
6
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spectrwm_cz.conf
Lines 10-12 share/man/man1/spectrwm.1.gz Link Here
10
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spectrwm_fr_ch.conf
9
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spectrwm_fr_ch.conf
11
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spectrwm_se.conf
10
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spectrwm_se.conf
12
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spectrwm_us.conf
11
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spectrwm_us.conf
13
- 
12
share/man/man1/spectrwm.1.gz

Return to bug 280940