Re: libotf/openmpi conflicts

[Eric Brown]

> On Jun 11, 2019, at 5:40 AM, Stuart Henderson  wrote:
> 
> On 2019/06/11 01:52, Anthony J. Bentley wrote:
>> Hi,
>> 
>> Collision in openmpi-1.4.1p8: the following files already exist
>>/usr/local/bin/otfdump (libotf-0.9.16 and openmpi-1.4.1p8)
>>/usr/local/lib/libotf.a (libotf-0.9.16 and openmpi-1.4.1p8)
>>/usr/local/lib/libotf.la (libotf-0.9.16 and openmpi-1.4.1p8)
>> 
>> ok?
> 
> Even with the @conflict marker I don't like the same named library..
> 
> I think it's better to take martin@'s openmpi update diff instead which
> also avoids the conflict.
> 

(agreed)

Re: libotf/openmpi conflicts

[Stuart Henderson]

On 2019/06/11 01:52, Anthony J. Bentley wrote:
> Hi,
> 
> Collision in openmpi-1.4.1p8: the following files already exist
> /usr/local/bin/otfdump (libotf-0.9.16 and openmpi-1.4.1p8)
> /usr/local/lib/libotf.a (libotf-0.9.16 and openmpi-1.4.1p8)
> /usr/local/lib/libotf.la (libotf-0.9.16 and openmpi-1.4.1p8)
> 
> ok?

Even with the @conflict marker I don't like the same named library..

I think it's better to take martin@'s openmpi update diff instead which
also avoids the conflict.

libotf/openmpi conflicts

[Anthony J. Bentley]

Hi,

Collision in openmpi-1.4.1p8: the following files already exist
/usr/local/bin/otfdump (libotf-0.9.16 and openmpi-1.4.1p8)
/usr/local/lib/libotf.a (libotf-0.9.16 and openmpi-1.4.1p8)
/usr/local/lib/libotf.la (libotf-0.9.16 and openmpi-1.4.1p8)

ok?


Index: libotf/Makefile
===
RCS file: /cvs/ports/devel/libotf/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- libotf/Makefile 26 Mar 2019 16:44:12 -  1.1.1.1
+++ libotf/Makefile 11 Jun 2019 07:51:14 -
@@ -2,6 +2,7 @@
 
 COMMENT =  library for handling OpenType Fonts
 DISTNAME = libotf-0.9.16
+REVISION = 0
 
 CATEGORIES =   devel
 
Index: libotf/pkg/PLIST
===
RCS file: /cvs/ports/devel/libotf/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- libotf/pkg/PLIST26 Mar 2019 16:44:12 -  1.1.1.1
+++ libotf/pkg/PLIST11 Jun 2019 07:51:14 -
@@ -1,4 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2019/03/26 16:44:12 sthen Exp $
+@conflict openmpi-*
 bin/libotf-config
 @bin bin/otfdump
 @bin bin/otflist
Index: openmpi/Makefile
===
RCS file: /cvs/ports/devel/openmpi/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- openmpi/Makefile21 Jan 2019 14:24:30 -  1.26
+++ openmpi/Makefile11 Jun 2019 07:51:14 -
@@ -7,7 +7,7 @@ COMMENT =   open source MPI-2 implementat
 
 V= 1.4.1
 DISTNAME = openmpi-$V
-REVISION = 8
+REVISION = 9
 
 SHARED_LIBS =  mca_common_sm 1.0 \
mpi 0.1 \
Index: openmpi/pkg/PLIST
===
RCS file: /cvs/ports/devel/openmpi/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- openmpi/pkg/PLIST   27 Mar 2016 15:31:24 -  1.4
+++ openmpi/pkg/PLIST   11 Jun 2019 07:51:14 -
@@ -1,5 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.4 2016/03/27 15:31:24 naddy Exp $
 @conflict lam-*
+@conflict libotf-*
 bin/mpiCC
 bin/mpiCC-vt
 bin/mpic++