git: 48f3eb71a699 - main - x11-wm/spectrwm: Update to 3.6.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 12 Jan 2025 17:15:03 UTC
The branch main has been updated by uzsolt:
URL: https://cgit.FreeBSD.org/ports/commit/?id=48f3eb71a699438e78ef3241423f9cb881943f34
commit 48f3eb71a699438e78ef3241423f9cb881943f34
Author: Yusuf Yaman <nxjoseph@protonmail.com>
AuthorDate: 2025-01-12 17:12:11 +0000
Commit: Zsolt Udvari <uzsolt@FreeBSD.org>
CommitDate: 2025-01-12 17:14:52 +0000
x11-wm/spectrwm: Update to 3.6.0
Remove do-build target, the freebsd/Makefile works well.
Remove EXAMPLES option, installs only some kilobytes.
Add xterm to RUN_DEPENDS.
Add LICENSE_FILE.
Submitter takes maintainership.
PR: 280940
---
x11-wm/spectrwm/Makefile | 78 ++++++++++++----------------
x11-wm/spectrwm/distinfo | 6 +--
x11-wm/spectrwm/files/patch-freebsd_Makefile | 35 +++++++++++++
x11-wm/spectrwm/files/patch-spectrwm.c | 11 ----
x11-wm/spectrwm/pkg-plist | 18 +++----
5 files changed, 81 insertions(+), 67 deletions(-)
diff --git a/x11-wm/spectrwm/Makefile b/x11-wm/spectrwm/Makefile
index d28b0955739d..a3d1cbf19f11 100644
--- a/x11-wm/spectrwm/Makefile
+++ b/x11-wm/spectrwm/Makefile
@@ -1,69 +1,59 @@
PORTNAME= spectrwm
DISTVERSIONPREFIX= SPECTRWM_
-DISTVERSION= 3_4_1
-PORTREVISION= 2
+DISTVERSION= 3_6_0
CATEGORIES= x11-wm
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= nxjoseph@protonmail.com
COMMENT= Small, dynamic tiling window manager for X11
WWW= https://github.com/conformal/spectrwm
LICENSE= ISCL
+LICENSE_FILE= ${WRKSRC}/LICENSE.md
-LIB_DEPENDS+= libxcb-util.so:x11/xcb-util \
+LIB_DEPENDS+= libfontconfig.so:x11-fonts/fontconfig \
libxcb-icccm.so:x11/xcb-util-wm \
- libxcb-keysyms.so:x11/xcb-util-keysyms
-RUN_DEPENDS+= dmenu:x11/dmenu
+ libxcb-keysyms.so:x11/xcb-util-keysyms \
+ libxcb-util.so:x11/xcb-util
+RUN_DEPENDS+= dmenu:x11/dmenu \
+ xlock:x11/xlockmore \
+ xterm:x11/xterm
+USES= compiler:c11 xorg
USE_GITHUB= yes
GH_ACCOUNT= conformal
-
-OPTIONS_DEFINE= EXAMPLES
-
-.include <bsd.port.options.mk>
-
-USES= compiler:c11 xorg
+USE_LDCONFIG= yes
USE_XORG= x11 xcb xcursor xft xrandr xt
-USE_LDCONFIG= yes
-CONFEXAMPLES= spectrwm_cz.conf \
- spectrwm_es.conf \
- spectrwm_fr.conf \
- spectrwm_fr_ch.conf \
- spectrwm_se.conf \
- spectrwm_us.conf
+MAKE_ARGS+= -C \
+ freebsd
-SCRIPTEXAMPLES= baraction.sh \
- screenshot.sh
+CONFEXAMPLES= spectrwm_cz.conf spectrwm_es.conf spectrwm_fr.conf \
+ spectrwm_fr_ch.conf spectrwm_se.conf spectrwm_us.conf
-post-patch:
- @${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' ${WRKSRC}/spectrwm.*
+SCRIPTEXAMPLES= baraction.sh screenshot.sh
-do-build:
- ln -sf ${WRKSRC}/linux/pledge.h ${WRKSRC}/pledge.h
- ${CC} ${CFLAGS} -Wall -Wextra -Wshadow -Werror -I${LOCALBASE}/include \
- -I${LOCALBASE}/include/freetype2 -I${WRKSRC}/freebsd \
- -lutil -L${LOCALBASE}/lib -lX11 -lX11-xcb -lxcb -lxcb-icccm \
- -lxcb-keysyms -lxcb-randr -lxcb-util -lxcb-xinput -lxcb-xtest \
- -lXcursor -lXft -DSWM_LIB=\"${PREFIX}/lib/libswmhack.so\" \
- -o ${WRKSRC}/${PORTNAME} ${WRKSRC}/${PORTNAME}.c
- ${CC} ${CFLAGS} -Wall -Wextra -Wshadow -Werror -I${LOCALBASE}/include \
- -shared -fpic -DPIC -L${LOCALBASE}/lib -lX11 \
- -o ${WRKSRC}/libswmhack.so ${WRKSRC}/lib/swm_hack.c
+post-patch:
+ @${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \
+ ${WRKSRC}/spectrwm.c \
+ ${WRKSRC}/spectrwm.1
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_LIB} ${WRKSRC}/libswmhack.so ${STAGEDIR}${PREFIX}/lib
- ${INSTALL_MAN} ${WRKSRC}/spectrwm.1 ${STAGEDIR}${PREFIX}/share/man/man1
- ${INSTALL_DATA} ${WRKSRC}/spectrwm.conf ${STAGEDIR}${PREFIX}/etc/spectrwm.conf.sample
-
-do-install-EXAMPLES-on:
${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-.for file in ${CONFEXAMPLES}
- ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${EXAMPLESDIR}
+ ${INSTALL_PROGRAM} ${WRKSRC}/freebsd/${PORTNAME} \
+ ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_LIB} ${WRKSRC}/freebsd/libswmhack.so \
+ ${STAGEDIR}${PREFIX}/lib
+ ${INSTALL_MAN} ${WRKSRC}/spectrwm.1 \
+ ${STAGEDIR}${PREFIX}/share/man/man1
+ ${INSTALL_DATA} ${WRKSRC}/spectrwm.conf \
+ ${STAGEDIR}${PREFIX}/etc/spectrwm.conf.sample
+.for f in ${CONFEXAMPLES}
+ ${INSTALL_DATA} ${WRKSRC}/${f} \
+ ${STAGEDIR}${EXAMPLESDIR}
.endfor
-.for file in ${SCRIPTEXAMPLES}
- ${INSTALL_SCRIPT} ${WRKSRC}/${file} ${STAGEDIR}${EXAMPLESDIR}
+.for f in ${SCRIPTEXAMPLES}
+ ${INSTALL_SCRIPT} ${WRKSRC}/${f} \
+ ${STAGEDIR}${EXAMPLESDIR}
.endfor
.include <bsd.port.mk>
diff --git a/x11-wm/spectrwm/distinfo b/x11-wm/spectrwm/distinfo
index c9b3d7e499e7..0587a63847e7 100644
--- a/x11-wm/spectrwm/distinfo
+++ b/x11-wm/spectrwm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1593084248
-SHA256 (conformal-spectrwm-SPECTRWM_3_4_1_GH0.tar.gz) = c030ef30bd11bbdfce3d4a1daf51f0c1358821ba95ebdc4cdb32d3944c8ce03c
-SIZE (conformal-spectrwm-SPECTRWM_3_4_1_GH0.tar.gz) = 164507
+TIMESTAMP = 1736187162
+SHA256 (conformal-spectrwm-SPECTRWM_3_6_0_GH0.tar.gz) = 49854c5215475d2450d2558da12a3afe9019861170ba9d556c8b403d4d66f0d1
+SIZE (conformal-spectrwm-SPECTRWM_3_6_0_GH0.tar.gz) = 205957
diff --git a/x11-wm/spectrwm/files/patch-freebsd_Makefile b/x11-wm/spectrwm/files/patch-freebsd_Makefile
new file mode 100644
index 000000000000..287cfa6bf386
--- /dev/null
+++ b/x11-wm/spectrwm/files/patch-freebsd_Makefile
@@ -0,0 +1,35 @@
+--- freebsd/Makefile.orig 2025-01-10 20:44:14 UTC
++++ freebsd/Makefile
+@@ -17,12 +17,12 @@ CFLAGS+= -I. -I${LOCALBASE}/include -I${LOCALBASE}/inc
+
+ CFLAGS+= -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized -g
+ CFLAGS+= -I. -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
+-CFLAGS+= -DSWM_LIB=\"$(SWM_LIBDIR)/libswmhack.so.$(LVERS)\"
++CFLAGS+= -DSWM_LIB=\"$(SWM_LIBDIR)/libswmhack.so\"
+ LDADD+= -lutil -L${LOCALBASE}/lib -lX11 -lX11-xcb -lxcb \
+ -lxcb-icccm -lxcb-keysyms -lxcb-randr -lxcb-util -lxcb-xinput -lxcb-xtest -lfontconfig -lXft -lXcursor
+
+
+-all: spectrwm libswmhack.so.$(LVERS)
++all: spectrwm libswmhack.so
+
+ spectrwm.c:
+ ln -sf ../spectrwm.c
+@@ -38,7 +38,7 @@ swm_hack.so: swm_hack.c
+ swm_hack.so: swm_hack.c
+ $(CC) $(CFLAGS) -c -shared -fpic -DPIC -o ${.TARGET} ${.ALLSRC}
+
+-libswmhack.so.$(LVERS): swm_hack.so
++libswmhack.so: swm_hack.so
+ $(CC) $(LDFLAGS) -shared -fpic -o ${.TARGET} ${.ALLSRC}
+
+ install: all
+@@ -46,7 +46,7 @@ install: all
+ install -m 755 -d $(SWM_LIBDIR)
+ install -m 755 -d $(SWM_MANDIR)/man1
+ install -m 755 spectrwm $(SWM_BINDIR)
+- install -m 755 libswmhack.so.$(LVERS) $(SWM_LIBDIR)
++ install -m 755 libswmhack.so $(SWM_LIBDIR)
+ install -m 644 ../spectrwm.1 $(SWM_MANDIR)/man1/spectrwm.1
+ ln -sf spectrwm $(SWM_BINDIR)/scrotwm
+
diff --git a/x11-wm/spectrwm/files/patch-spectrwm.c b/x11-wm/spectrwm/files/patch-spectrwm.c
deleted file mode 100644
index 226705daf013..000000000000
--- a/x11-wm/spectrwm/files/patch-spectrwm.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- spectrwm.c.orig 2020-06-17 19:26:40 UTC
-+++ spectrwm.c
-@@ -8913,7 +8913,7 @@ validate_spawns(void)
- void
- setup_spawn(void)
- {
-- setconfspawn("lock", "xlock", 0, NULL);
-+ setconfspawn("lock", "xlock", SWM_SPAWN_OPTIONAL, NULL);
-
- setconfspawn("term", "xterm", 0, NULL);
- setconfspawn("spawn_term", "xterm", 0, NULL);
diff --git a/x11-wm/spectrwm/pkg-plist b/x11-wm/spectrwm/pkg-plist
index 03b0dcc32607..e08eb273b59f 100644
--- a/x11-wm/spectrwm/pkg-plist
+++ b/x11-wm/spectrwm/pkg-plist
@@ -1,12 +1,12 @@
bin/spectrwm
+%%ETCDIR%%.conf.sample
lib/libswmhack.so
+%%EXAMPLESDIR%%/baraction.sh
+%%EXAMPLESDIR%%/screenshot.sh
+%%EXAMPLESDIR%%/spectrwm_cz.conf
+%%EXAMPLESDIR%%/spectrwm_es.conf
+%%EXAMPLESDIR%%/spectrwm_fr.conf
+%%EXAMPLESDIR%%/spectrwm_fr_ch.conf
+%%EXAMPLESDIR%%/spectrwm_se.conf
+%%EXAMPLESDIR%%/spectrwm_us.conf
share/man/man1/spectrwm.1.gz
-@sample etc/spectrwm.conf.sample
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/baraction.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/screenshot.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spectrwm_cz.conf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spectrwm_es.conf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spectrwm_fr.conf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spectrwm_fr_ch.conf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spectrwm_se.conf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spectrwm_us.conf