Marc Espie wrote (2023-09-01 22:08 IST):
> On Thu, Aug 31, 2023 at 11:20:17PM +0200, Ingo Schwarze wrote:
> > Hi Stefan,
> >
> > Stefan Hagen wrote on Wed, Aug 30, 2023 at 09:41:20AM +0200:
> >
> > > There's no good way to handle a conflict that's introduced with an
> > > update. So what we would do is to move the manpages into the install
> > > directory. (thanks to espie@ for the suggestion)
> >
> > Actually, i regard that as bad advice, espie@ shouldn't say such things.
>
> I don't know. The ability of install versioned manpages for the same
> software doesn't seem to be a bad idea to me.
>
> And /etc/man.conf does feature new default paths, so why not ?
>
> If adding new directories isn't the right level, maybe new sections ?
> or explicit versionned stuff.
>
> Yeah, we've installed several versions of tcl for a long time.
>
> Oh, and man has a "-a" option to display ALL manual pages.
>
> We have currently ZERO mechanism to desambiguate anything outside of
> sections...
>
> if you say, man foo, it will give you the first foo, not even hinting
> there might be a second food behind it.
>
> Yeah, we can rename stuff so that man doesn't get confused, but why
> does man get confused in the first place ?
I think Espies suggestion is more discoverable because the user gets a
message on install he might see.
Ingos suggestion is technically "more correct". However, I asked 6 devs
and only one knew what -a/w does. So I don't think this is used.
From a user perspective, I think it would be nice if we cold make the
manpage display a tiny bit dynamic and show the output of man -w at the
bottom.
Example....
MANPAGE VERSIONS:
fvwm3-FvwmButtons(1), FvwmButtons(1)
This would bring discoverability to Ingos solution. And we could freely
rename manpages, because our man(1) is clever enough to find them
anyway. (compared to linux man, which can't do this)
Another idea would be to print something to stderr when more than one
manpage for the search term is available. Either before the pager is
started or after the pager is closed.
I don't like what some linuxes do: SuSE for example shows the user a
list and asks which one to display. This is annoying.
---
I'm sending another diff with Ingos suggestion. I'm happy with this as
well. Both is inconvenient in a way, but at least the man pages are
there.
OK?
- Stefan
Index: x11/fvwm3/Makefile
===================================================================
RCS file: /cvs/ports/x11/fvwm3/Makefile,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 Makefile
--- x11/fvwm3/Makefile 24 Jan 2023 18:05:35 -0000 1.8
+++ x11/fvwm3/Makefile 1 Sep 2023 15:51:43 -0000
@@ -1,6 +1,6 @@
COMMENT= multiple virtual desktop window manager
-VERSION= 1.0.6a
+VERSION= 1.0.7
DISTNAME= fvwm3-${VERSION}
CATEGORIES= x11
@@ -20,13 +20,14 @@ WANTLIB += readline rsvg-2 event_core ev
MASTER_SITES= https://github.com/fvwmorg/fvwm3/releases/download/${VERSION}/
+BUILD_DEPENDS+= textproc/asciidoctor
+
LIB_DEPENDS+= graphics/png \
x11/gnome/librsvg \
devel/libevent2
SUBST_VARS= VERSION
-SEPARATE_BUILD= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --enable-mandoc \
@@ -39,7 +40,14 @@ CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -
DEBUG_PACKAGES = ${BUILD_PACKAGES}
+USE_GMAKE = yes
+
post-install:
+ cd ${WRKINST}/${TRUEPREFIX}/man/man1 && for m in Fvwm*.1; \
+ do mv {,fvwm3-}$$m; done
+ cd ${WRKINST}/${TRUEPREFIX}/man/man1/ && \
+ mv fvwm3-FvwmCommand{,3}.1 && \
+ ln -s fvwm3-FvwmCommand3.1 FvwmCommand3.1
mv ${WRKINST}/${TRUEPREFIX}/bin/FvwmCommand{,3}
mv ${WRKINST}/${TRUEPREFIX}/share/FvwmScript-* \
${WRKINST}/${TRUEPREFIX}/share/fvwm3/
Index: x11/fvwm3/distinfo
===================================================================
RCS file: /cvs/ports/x11/fvwm3/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- x11/fvwm3/distinfo 22 Jan 2023 12:11:26 -0000 1.3
+++ x11/fvwm3/distinfo 1 Sep 2023 15:51:43 -0000
@@ -1,2 +1,2 @@
-SHA256 (fvwm3-1.0.6a.tar.gz) = RmWmYTPgcLeRkXsHlMxt9rdUZ56+kTBxhCfbZHm7W2g=
-SIZE (fvwm3-1.0.6a.tar.gz) = 4538100
+SHA256 (fvwm3-1.0.7.tar.gz) = OqzXz+/2DbG82cdzMtxXX+dxHS0wbwR5UlN43G2z0x4=
+SIZE (fvwm3-1.0.7.tar.gz) = 4512128
Index: x11/fvwm3/patches/patch-configure
===================================================================
RCS file: /cvs/ports/x11/fvwm3/patches/patch-configure,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-configure
--- x11/fvwm3/patches/patch-configure 13 Oct 2022 16:00:45 -0000 1.3
+++ x11/fvwm3/patches/patch-configure 1 Sep 2023 15:51:43 -0000
@@ -1,7 +1,7 @@
Index: configure
--- configure.orig
+++ configure
-@@ -11779,7 +11779,7 @@ then :
+@@ -11726,7 +11726,7 @@ then :
else $as_nop
with_intl=maybe
Index: x11/fvwm3/patches/patch-default-config_Makefile_in
===================================================================
RCS file: /cvs/ports/x11/fvwm3/patches/patch-default-config_Makefile_in,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-default-config_Makefile_in
--- x11/fvwm3/patches/patch-default-config_Makefile_in 13 Oct 2022 16:00:45
-0000 1.3
+++ x11/fvwm3/patches/patch-default-config_Makefile_in 1 Sep 2023 15:51:43
-0000
@@ -1,7 +1,7 @@
Index: default-config/Makefile.in
--- default-config/Makefile.in.orig
+++ default-config/Makefile.in
-@@ -593,9 +593,10 @@ uninstall-am: uninstall-configDATA
+@@ -574,9 +574,10 @@ uninstall-am: uninstall-configDATA
install-data-hook:
cp -r $(srcdir)/images $(inst_location)/default-config
Index: x11/fvwm3/patches/patch-fvwm_ewmh_c
===================================================================
RCS file: x11/fvwm3/patches/patch-fvwm_ewmh_c
diff -N x11/fvwm3/patches/patch-fvwm_ewmh_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/fvwm3/patches/patch-fvwm_ewmh_c 1 Sep 2023 15:51:43 -0000
@@ -0,0 +1,24 @@
+https://github.com/fvwmorg/fvwm3/commit/4d5a697fac3282af18cacebb6d061c92db410f1a
+Fixes https://github.com/fvwmorg/fvwm3/issues/873
+
+Index: fvwm/ewmh.c
+--- fvwm/ewmh.c.orig
++++ fvwm/ewmh.c
+@@ -458,7 +458,7 @@ void *atom_get(Window win, Atom to_get, Atom type, int
+ int asize;
+
+ asize = atom_size(format_ret);
+- data = fxmalloc(num_ret * asize);
++ data = fxmalloc(num_ret * asize + 1);
+ if (format_ret == 32 && asize * 8 != format_ret)
+ {
+ int i;
+@@ -472,7 +472,7 @@ void *atom_get(Window win, Atom to_get, Atom type, int
+ {
+ if (data)
+ {
+- memcpy(data, retval, num_ret * asize);
++ memcpy(data, retval, num_ret * asize + 1);
+ }
+ }
+ XFree(retval);
Index: x11/fvwm3/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/fvwm3/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- x11/fvwm3/pkg/PLIST 22 Jan 2023 12:11:26 -0000 1.3
+++ x11/fvwm3/pkg/PLIST 1 Sep 2023 15:51:43 -0000
@@ -25,9 +25,34 @@ libexec/fvwm3/${VERSION}/FvwmPerl
@bin libexec/fvwm3/${VERSION}/FvwmRearrange
@bin libexec/fvwm3/${VERSION}/FvwmScript
libexec/fvwm3/${VERSION}/FvwmTalk
+@man man/man1/FvwmCommand3.1
+@man man/man1/fvwm3-FvwmAnimate.1
+@man man/man1/fvwm3-FvwmAuto.1
+@man man/man1/fvwm3-FvwmBacker.1
+@man man/man1/fvwm3-FvwmButtons.1
+@man man/man1/fvwm3-FvwmCommand3.1
+@man man/man1/fvwm3-FvwmConsole.1
+@man man/man1/fvwm3-FvwmEvent.1
+@man man/man1/fvwm3-FvwmForm.1
+@man man/man1/fvwm3-FvwmIconMan.1
+@man man/man1/fvwm3-FvwmIdent.1
+@man man/man1/fvwm3-FvwmMFL.1
+@man man/man1/fvwm3-FvwmPager.1
+@man man/man1/fvwm3-FvwmPerl.1
+@man man/man1/fvwm3-FvwmPrompt.1
+@man man/man1/fvwm3-FvwmRearrange.1
+@man man/man1/fvwm3-FvwmScript.1
+@man man/man1/fvwm3-convert-2.6.1
+@man man/man1/fvwm3-menu-desktop.1
@man man/man1/fvwm3-menu-directory.1
@man man/man1/fvwm3-menu-xlock.1
@man man/man1/fvwm3-perllib.1
+@man man/man1/fvwm3-root.1
+@man man/man1/fvwm3.1
+@man man/man1/fvwm3all.1
+@man man/man1/fvwm3commands.1
+@man man/man1/fvwm3menus.1
+@man man/man1/fvwm3styles.1
share/fvwm3/
share/fvwm3/ConfigFvwmBacker
share/fvwm3/ConfigFvwmButtons
