Re: gsl and microsoft-gsl conflict

On Mon, Aug 01, 2022 at 08:06:14AM +0000, Klemens Nanni wrote:
> Both ship identically named files under include/gsl/ as I just found out
> by having gsl installed and needing microsoft-gsl.
>
> I don't see an easy way to fix this, so register the conflicts.
>
> Feedback? OK?

I don't see any conflict.
I have both installed.


>
> Index: devel/gsl/Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/gsl/Makefile,v
> retrieving revision 1.39
> diff -u -p -r1.39 Makefile
> --- devel/gsl/Makefile 11 Mar 2022 18:50:10 -0000 1.39
> +++ devel/gsl/Makefile 1 Aug 2022 08:02:17 -0000
> @@ -1,7 +1,7 @@
> COMMENT= GNU Scientific Library
>
> DISTNAME= gsl-1.15
> -REVISION= 3
> +REVISION= 4
> SHARED_LIBS += gslcblas 1.0 # .0.0
> SHARED_LIBS += gsl 12.0 # .16.0
>
> Index: devel/gsl/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/devel/gsl/pkg/PLIST,v
> retrieving revision 1.11
> diff -u -p -r1.11 PLIST
> --- devel/gsl/pkg/PLIST 11 Mar 2022 18:50:10 -0000 1.11
> +++ devel/gsl/pkg/PLIST 1 Aug 2022 08:02:04 -0000
> @@ -1,3 +1,4 @@
> +@conflict microsoft-gsl-*
> bin/gsl-config
> @bin bin/gsl-histogram
> @bin bin/gsl-randist
> Index: devel/microsoft-gsl/Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/microsoft-gsl/Makefile,v
> retrieving revision 1.4
> diff -u -p -r1.4 Makefile
> --- devel/microsoft-gsl/Makefile 11 Mar 2022 18:50:48 -0000 1.4
> +++ devel/microsoft-gsl/Makefile 1 Aug 2022 08:02:27 -0000
> @@ -5,7 +5,7 @@ V = 4.0.0
> GH_TAGNAME = v${V}
> DISTNAME = microsoft-gsl-${V}
> CATEGORIES = devel
> -REVISION = 0
> +REVISION = 1
>
> # MIT
> PERMIT_PACKAGE = Yes
> Index: devel/microsoft-gsl/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/devel/microsoft-gsl/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST
> --- devel/microsoft-gsl/pkg/PLIST 10 Mar 2022 12:03:30 -0000 1.3
> +++ devel/microsoft-gsl/pkg/PLIST 1 Aug 2022 08:02:02 -0000
> @@ -1,3 +1,4 @@
> +@conflict gsl-*
> include/gsl/
> include/gsl/algorithm
> include/gsl/assert
>

--
Antoine