On 2021/11/18 02:49, Erling Westenvik wrote:
> On Wed, Nov 17, 2021 at 05:35:08PM +0100, Paco Esteban wrote:
> > On Sun, 14 Nov 2021, Erling Westenvik wrote:
> > 
> > > Thanks for caring about taskwarrior. Any chance that you can update
> > > timewarrior too? Since the two are kind of siblings from the same
> > > developers I mean? Our 1.1.1p0 lags awfully behind the official 1.4.3.
> > 
> > I don't use timewarrior at all, so I cannot test it properly.  Could you
> > take a look at the diff at the end ?
> 
> Diff applied and port compiled without any problems. Thank you very much!
> 
> (Is there a way to build with the extensive man pages that comes with 
> timewarrior?)

There are some problems with the cmakefiles for building/installing
the docs. Firstly although pregenerated files are included with the releases
the installation target is not used unless asciidoctor was detected at
configure time. And secondly there's some confusion between
CMAKE_CURRENT_SOURCE_DIR not CMAKE_CURRENT_BINARY_DIR in the doc cmakefiles
that isn't compatible with SEPARATE_BUILD.

If you want to have a play around to try fixing this, I recommend installing
ccache and setting USE_CCACHE=Yes in mk.conf, it will save a lot of time
when rebuilding to try things.

> > By the way, this is a good opportunity for you to adopt a port ;-)
> 
> I guess. Especially if I'm the only user of timewarrior. Next year marks
> my OpenBSD twentieth year anniversary and I reckon it's time to take some
> least amount of responsibility. Sign me up.
> 
> Regards,
> 
> Erling
> 
> > 
> > Cheers,
> > Paco.
> > 
> > diff 27f3dd7c26bdb48f530ada84e53150ba0dad7546 /usr/ports
> > blob - adff63080591f23124de87a0bfe23cd43a69a5b5
> > file + productivity/timewarrior/Makefile
> > --- productivity/timewarrior/Makefile
> > +++ productivity/timewarrior/Makefile
> > @@ -2,35 +2,34 @@
> >  
> >  COMMENT =  command line tracking time tool
> >  
> > -VERSION =  1.1.1
> > +VERSION =  1.4.3
> >  DISTNAME = timew-${VERSION}
> >  PKGNAME =  timewarrior-${VERSION}
> >  CATEGORIES =       productivity
> > -REVISION = 0
> >  
> >  HOMEPAGE = https://timewarrior.net/
> >  
> >  # MIT
> >  PERMIT_PACKAGE =           Yes
> >  
> > +MASTER_SITES =  
> > https://github.com/GothenburgBitFactory/timewarrior/releases/download/v${VERSION}/
> > +
> >  WANTLIB += c m ${COMPILER_LIBCXX}
> >  
> > -MASTER_SITES =     https://taskwarrior.org/download/
> > -
> >  COMPILER =         base-clang ports-gcc
> >  
> >  MODULES =          devel/cmake \
> >                     lang/python
> > -MODPY_VERSION =    ${MODPY_DEFAULT_VERSION_2}
> > +
> >  MODPY_RUNDEP =             No
> >  MODPY_BUILDDEP =   No
> >  MODPY_ADJ_FILES =  ext/totals.py
> >  
> >  CONFIGURE_STYLE =  cmake
> >  
> > -CONFIGURE_ARGS +=  -DTIMEW_DOCDIR=share/doc/timewarrior
> > -CONFIGURE_ARGS +=  -DTIMEW_RCDIR=share/doc/timewarrior/rc
> > -CONFIGURE_ARGS +=  -DTIMEW_MAN1DIR=man/man1
> > +CONFIGURE_ARGS +=  -DTIMEW_DOCDIR=share/doc/timewarrior \
> > +                   -DTIMEW_RCDIR=share/doc/timewarrior/rc \
> > +                   -DTIMEW_MAN1DIR=man/man1
> >  
> >  NO_TEST =          Yes
> >  
> > blob - cfcb76568eb20a1031d00b22d79e7bbe048ab3d0
> > file + productivity/timewarrior/distinfo
> > --- productivity/timewarrior/distinfo
> > +++ productivity/timewarrior/distinfo
> > @@ -1,2 +1,2 @@
> > -SHA256 (timew-1.1.1.tar.gz) = H32aYuVfxaMSZDNlTMsf19LRNfBvBWl/hxiXydt3zMk=
> > -SIZE (timew-1.1.1.tar.gz) = 166484
> > +SHA256 (timew-1.4.3.tar.gz) = xN9+MGyaJnxDJSLDeVhTC4/W5aQQwFj1deJa9NjHylM=
> > +SIZE (timew-1.4.3.tar.gz) = 3188726
> > blob - 16b06872bece4fe8281aabcfd1dd43cd5e273c4c
> > file + productivity/timewarrior/pkg/PLIST
> > --- productivity/timewarrior/pkg/PLIST
> > +++ productivity/timewarrior/pkg/PLIST
> > @@ -1,13 +1,10 @@
> >  @comment $OpenBSD: PLIST,v 1.1.1.1 2018/05/17 23:22:21 sthen Exp $
> >  @bin bin/timew
> > -@man man/man1/timew.1
> >  share/doc/timewarrior/
> >  share/doc/timewarrior/AUTHORS
> > -share/doc/timewarrior/COPYING
> >  share/doc/timewarrior/ChangeLog
> >  share/doc/timewarrior/INSTALL
> >  share/doc/timewarrior/LICENSE
> > -share/doc/timewarrior/NEWS
> >  share/doc/timewarrior/README.md
> >  share/doc/timewarrior/doc/
> >  share/doc/timewarrior/doc/holidays/
> > 
> > -- 
> > Paco Esteban.
> > 0x5818130B8A6DBC03
> 

Reply via email to