Am Thu, 26 Aug 2021 12:55:29 +0100
schrieb Stuart Henderson <[email protected]>:
> On 2021/08/26 12:39, Florian Viehweger wrote:
> > Hi,
> >
> > I'm in the process of revising my submitted update to profanity to
> > use libstrophe instead of libmesode.
> >
> > The reason is that libmesode is deprecated upstream and libstrophe
> > should be used.
> >
> > libstrophe: portcheck, 'make lib-depends-check' and 'make tests' are
> > happy.
> > I've removed the patch, because libstrophe got LibreSSL support in
> > 0.10.0.
>
> libstrophe is not linked to the build in net/Makefile, that needs
> doing too.
That makes everything clear. After I sent the mail, I've discovered
that working in /usr/ports/net/... works.
> libmesode is then an orphan and it should probably be removed too.
I've removed libmesode in net/Makefile. Is that sufficient, or should
all individual files of libmesode marked as deleted?
> > profanity: it builds fine and portcheck is happy. However I cannot
> > install profanity and 'make lib-depends-check' complains with
> > messages added at the end.
> >
> > CC current maintainer of (deprecated) libstrophe. I'm happy to take
> > mainainership.
> >
> > I've added both diffs as attachments to avoid cluttering.
> >
> > Any tips what I've done wrong?
>
> > Error: Libraries in packing-lists in the ports tree
> > and libraries from installed packages don't match
> > --- /tmp/dep_cache.6piHy1P81/portstree-profanity-0.11.0 Thu Aug 26
> > 12:33:18 2021 +++ /tmp/dep_cache.6piHy1P81/inst-profanity-0.11.0
> > Thu Aug 26 12:33:18 2021 @@ -16,7 +16,7 @@
> > -W iconv.7.0
> > -W intl.7.0
> > -W m.10.1
> > --W strophe.2.0
> > +-W strophe.3.0
> ...
>
> Maybe working on a copy of the port rather than the actual one in
> /usr/ports/net/libstrophe?
Yes, I've always work in /usr/ports/mystuff/... and I never had a
problem with it. It probably failed this time because libstrophe was
marked as orphaned.
I started working with copies in /usr/ports/mystuff after a workshop
from bcallah@ on youtube[1].
> > --- Makefile 23 Feb 2021 19:39:33 -0000 1.20
>
> btw, if you send patches for multiple ports in one mail, it's helpful
> to run "cvs diff" from a directory "above" (either /usr/ports or
> /usr/ports/net in this case) so that they can all be applied with
> one command
I will remember that for the future.
> > --enable-omemo=yes \
> > --enable-otr=yes
> >
> > +post-patch:
> > + ${SUBST_CMD} ${WRKSRC}/configure.ac
> > +
>
> it's usually better to keep the targets together at the end, like they
> were before.
That was an unintentional mishap on my part.
libstrophe: portcheck complains that patches is empty and should be
removed. Is 'cvs rm patches' after deleting the folder sufficient? I
was under the impression that 'cvs rm' only deals with files?
Thank you for your help. I will submit an updated diff later tonight.
So far everything works as expected.
[1] https://www.youtube.com/watch?v=z_TnemhzbXQ
--
greetings,
Florian Viehweger
