This is the version string that shows up as part of "OpenBSD 6.8" in the
bottom right window in a default installation.

But as this version stems from the build machine's kernel with which
fvwm was build, it can differ from the version you're running on your
machine which is what you'd expect as user.

I do not use fvwm but this is irritating enough that I'd like to remove
the version number completely;  users can still set the entire string
in their ~/.fvwmrc or so.

The diff could be better but not without changing more of the build
system, hence keep the `all' target and continue using cat(1) and
redirection instead of using cp(1) and or building fvwm in a smarter way
in the first place.

Feedback? Objections? OK?


Index: app/fvwm//sample.fvwmrc/Makefile
===================================================================
RCS file: /cvs/xenocara/app/fvwm/sample.fvwmrc/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- app/fvwm//sample.fvwmrc/Makefile    6 Jan 2008 18:13:58 -0000       1.7
+++ app/fvwm//sample.fvwmrc/Makefile    29 Sep 2020 18:23:16 -0000
@@ -2,14 +2,12 @@
 
 .include "../Makefile.inc"
 
-OSRELEASE=`/sbin/sysctl -n kern.osrelease 2>&1`
 RM?=rm
 
 depend:
 
 all:
-       @sed -e "s,__osrelease__,${OSRELEASE}," \
-               ${.CURDIR}/system.fvwmrc > .fvwmrc
+       @cat ${.CURDIR}/system.fvwmrc > .fvwmrc
 
 install:
        ${INSTALL_DATA} .fvwmrc \
Index: app/fvwm//sample.fvwmrc/system.fvwmrc
===================================================================
RCS file: /cvs/xenocara/app/fvwm/sample.fvwmrc/system.fvwmrc,v
retrieving revision 1.8
diff -u -p -r1.8 system.fvwmrc
--- app/fvwm//sample.fvwmrc/system.fvwmrc       10 Sep 2012 13:52:04 -0000      
1.8
+++ app/fvwm//sample.fvwmrc/system.fvwmrc       29 Sep 2020 18:21:42 -0000
@@ -352,7 +352,7 @@ Key F8              A       M       CirculateDown
 *FvwmPagerFore white
 *FvwmPagerHilight #2d2d2d
 *FvwmPagerGeometry 80x60-1-1
-*FvwmPagerLabel 0 "OpenBSD __osrelease__"
+*FvwmPagerLabel 0 "OpenBSD"
 *FvwmPagerLabel 1 Maker
 *FvwmPagerLabel 2 Mail
 *FvwmPagerLabel 3 Matlab

Reply via email to