On Tue Apr 22, 2025 at 12:18:44PM +0100, Stuart Henderson wrote:
> On 2025/04/22 07:29, Rafael Sadowski wrote:
> > On Mon Apr 21, 2025 at 04:14:10PM +0200, Rafael Sadowski wrote:
> > > On Mon Apr 21, 2025 at 01:24:44PM +0100, Stuart Henderson wrote:
> > > > Firstly, no need for python.port.mk bits if you just want a BDEP on
> > > > pypandoc, just add the dep.
> > > >
> > > > But, adding a pandoc dep makes it arm64/amd64 only. Can you disable the
> > > > cmake doc building and use the steps from
> > > > https://github.com/brndnmtthws/conky/tree/main/doc with a different
> > > > markdown->text converter (e.g. lowdown) instead?
> > > >
> > >
> > > New diff:
> > >
> > > - Added new build dependency on gperf
> > > - Remove APP_SED (unused)
> > > - Fix man1 directory
> > > - Add a logic to use pypandoc or lowdown to generate the man page. (You
> > > could push this upstream if you adjust the docs.)
> > >
> >
> > Readded python, we need it for the first docs tasks:
> >
> > add_custom_target(man.md
> > ALL
> > COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/render.py
> > man.md.j2 > ${CMAKE_CURRENT_BINARY_DIR}/man.md
> > WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
> > SOURCES config_settings.yaml variables.yaml lua.yaml man.md.j2
> > )
> ...
> > +MODULES = devel/cmake \
> > + lang/lua \
> > + lang/python
> > +
> > +# dependency to build docs
> > +MODPY_RUNDEP = No
>
> Since we have simplified from lang/python/3.xx to lang/python/3
> I would probably go with a simple BUILD_DEPENDS on lang/python/3
> in this case. It's not using any of the Python module build
> infrastructure and the python module adds a lot of baggage.
> (Wouldn't object either way, but I think it's more straightforward
> like that).
>
cmake.mk sets the necessary vars:
# Python
.if ${MODULES:Mlang/python}
#
https://cmake.org/cmake/help/latest/module/FindPython3.html#artifacts-specification
CONFIGURE_ARGS += -DPYTHON_EXECUTABLE=${MODPY_BIN}
CONFIGURE_ARGS += -DPYTHON_LIBRARY_DIRS=${MODPY_LIBDIR}
CONFIGURE_ARGS += -DPYTHON_INCLUDE_DIR=${MODPY_INCDIR}
CONFIGURE_ARGS += -DPython_EXECUTABLE=${MODPY_BIN}
CONFIGURE_ARGS += -DPython_LIBRARY_DIRS=${MODPY_LIBDIR}
CONFIGURE_ARGS += -DPython_INCLUDE_DIR=${MODPY_INCDIR}
CONFIGURE_ARGS += -DPython${MODPY_MAJOR_VERSION}_EXECUTABLE=${MODPY_BIN}
CONFIGURE_ARGS +=
-DPython${MODPY_MAJOR_VERSION}_LIBRARY_DIRS=${MODPY_LIBDIR}
CONFIGURE_ARGS +=
-DPython${MODPY_MAJOR_VERSION}_INCLUDE_DIR=${MODPY_INCDIR}
.endif
> > + if(NOT DEFINED DOC_PATH)
> > +- set(DOC_PATH "share/doc/${CPACK_PACKAGE_NAME}-${RELEASE_VERSION}")
> > ++ set(DOC_PATH "share/doc/${CPACK_PACKAGE_NAME}")
> > + endif(NOT DEFINED DOC_PATH)
>
> You're setting this up, but docs are not installed any more.
The patch was stolen from FreeBSD. I didn't want to edit it anymore.
>
> diff --git a/sysutils/conky/pkg/PLIST b/sysutils/conky/pkg/PLIST
> > index 186bca4018d..ad40a29e93b 100644
> > --- a/sysutils/conky/pkg/PLIST
> > +++ b/sysutils/conky/pkg/PLIST
> > @@ -1,15 +1,11 @@
> > +@pkgpath ${BASE_PKGPATH},xmms2
> > @pkgpath ${BASE_PKGPATH},imlib2
> > @pkgpath ${BASE_PKGPATH},audacious
> > @bin bin/conky
> > @man man/man1/conky.1
> > -share/doc/conky/
> > -share/doc/conky/README
> > -share/doc/conky/config_settings.html
> > -share/doc/conky/docs.html
> > -share/doc/conky/lua.html
> > -share/doc/conky/variables.html
> > share/examples/conky/
> > @sample ${SYSCONFDIR}/conky/
> > share/examples/conky/conky.conf
> > @sample ${SYSCONFDIR}/conky/conky.conf
> > share/examples/conky/conky_no_x11.conf
> > +share/examples/conky/convert.lua
>
> I didn't check, but does convert.lua want an @sample too?
>
I don't think so. It's a tool to convert conky1 configs:
Usage: convert.lua old_conkyrc [new_conkyrc]
