On Wed 26/02/2020 02:09, Paco Esteban wrote:
> CVSROOT:      /cvs
> Module name:  ports
> Changes by:   [email protected]    2020/02/26 02:09:00
> 
> Modified files:
>       sysutils/py-prometheus_client: Makefile 
>       sysutils/py-prometheus_client/pkg: PLIST 
> 
> Log message:
> Migrate to python3 only
> 
> ok bket@, kmos@
> 

$ cvs diff -r1.1.1.1 -r 1.2 PLIST
Index: PLIST
===================================================================
RCS file: /cvs/ports/sysutils/py-prometheus_client/pkg/PLIST,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -p -r1.1.1.1 -r1.2
--- PLIST       29 Apr 2019 13:05:01 -0000      1.1.1.1
+++ PLIST       26 Feb 2020 09:09:00 -0000      1.2
@@ -1,4 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2019/04/29 13:05:01 bket Exp $
+@comment $OpenBSD: PLIST,v 1.2 2020/02/26 09:09:00 paco Exp $
+@conflict sysutils/py-prometheus_client-*

Conflict marker is wrong. It should be '@conflict py-prometheus_client-*'.
Sorry, I should have noticed this earlier...

Reply via email to