Re: CVS commit: pkgsrc/net/libsoup

[Leonardo Taccari <leot%NetBSD.org@localhost>]

Hello Thomas,
(also cc:-ing <otis> that noticed that `gssapi' default option changed
and I think he also has related patches for SmartOS)

Thomas Klausner writes:
> Module Name:  pkgsrc
> Committed By: wiz
> Date:         Fri Aug 16 13:08:58 UTC 2019
>
> Modified Files:
>       pkgsrc/net/libsoup: Makefile PLIST distinfo options.mk
> Removed Files:
>       pkgsrc/net/libsoup/patches: patch-tests_Makefile.in
>
> Log Message:
> libsoup: update to 2.66.2.
>
> Switch to meson since autotools build system was removed.
> [...]

Thanks for updating it!

Unfortunately, I think there are some adjustments to do for the meson
migration.

> [...]
> Index: pkgsrc/net/libsoup/Makefile
> diff -u pkgsrc/net/libsoup/Makefile:1.51 pkgsrc/net/libsoup/Makefile:1.52
> --- pkgsrc/net/libsoup/Makefile:1.51  Wed Apr  3 00:32:59 2019
> +++ pkgsrc/net/libsoup/Makefile       Fri Aug 16 13:08:58 2019
> [...]
>  .include "../../devel/gobject-introspection/buildlink3.mk"
>  CONFIGURE_ARGS+=     --enable-introspection

I think that CONFIGURE_ARGS should be adjusted to `MESON_ARGS+=
-Dintrospection=true'.

> [...]
> Index: pkgsrc/net/libsoup/options.mk
> diff -u pkgsrc/net/libsoup/options.mk:1.4 pkgsrc/net/libsoup/options.mk:1.5
> --- pkgsrc/net/libsoup/options.mk:1.4 Tue May  3 11:37:39 2016
> +++ pkgsrc/net/libsoup/options.mk     Fri Aug 16 13:08:58 2019
> @@ -1,4 +1,4 @@
> -# $NetBSD: options.mk,v 1.4 2016/05/03 11:37:39 prlw1 Exp $
> +# $NetBSD: options.mk,v 1.5 2019/08/16 13:08:58 wiz Exp $
>  
>  PKG_OPTIONS_VAR=     PKG_OPTIONS.libsoup
>  PKG_SUPPORTED_OPTIONS=       gssapi
> @@ -8,8 +8,4 @@ PKG_SUGGESTED_OPTIONS=
>  
>  .if !empty(PKG_OPTIONS:Mgssapi)
>  .  include "../../mk/krb5.buildlink3.mk"
> -CONFIGURE_ARGS+=     --with-gssapi
> -CONFIGURE_ARGS+=     --with-krb5-config=${KRB5_CONFIG}
> -.else
> -CONFIGURE_ARGS+=     --without-gssapi
>  .endif
>

Should this be adjusted to, for `gssapi' enabled:

 MESON_ARGS+=   -Dgssapi=true
 MESON_ARGS+=   -Dkrb5_config=${KRB5_CONFIG}

...and whe the `.else' code path:

 MESON_ARGS+=   -Dgssapi=false

Also, it seems that now upstream enable `gssapi' by default and for ~24
hours or so on some platforms libsoup could be accidentally built with
it enabled despide the empty PKG_SUGGESTED_OPTIONS or user's `-gssapi'.

Should we also adjust PKG_SUGGESTED_OPTIONS or is it better to keep it
as is (in that case, to be on the safe side, I think that a PKGREVISION
bump is needed and probably also a revbmup for libsoup).


Thank you!