From 3ddb79f32802cdb2c7138a1b062ca61ec999300d Mon Sep 17 00:00:00 2001 From: bket Date: Mon, 10 Aug 2020 14:42:02 +0000 Subject: [PATCH] category/ is wrong for @conflict, it must be package name Found by sthen@ --- converters/p5-Net-IDN-Encode/pkg/PLIST | 4 ++-- mail/p5-Email-MIME/pkg/PLIST | 6 +++--- net/py-aiodns/pkg/PLIST | 4 ++-- net/py-cares/pkg/PLIST | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/converters/p5-Net-IDN-Encode/pkg/PLIST b/converters/p5-Net-IDN-Encode/pkg/PLIST index 2c646cabfd9..2c49c7581a9 100644 --- a/converters/p5-Net-IDN-Encode/pkg/PLIST +++ b/converters/p5-Net-IDN-Encode/pkg/PLIST @@ -1,5 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.4 2015/05/01 13:16:54 ajacoutot Exp $ -@conflict converters/p5-IDNA-Punycode-* +@comment $OpenBSD: PLIST,v 1.5 2020/08/10 14:42:02 bket Exp $ +@conflict p5-IDNA-Punycode-* @pkgpath converters/p5-IDNA-Punycode ${P5ARCH}/ ${P5ARCH}/Net/ diff --git a/mail/p5-Email-MIME/pkg/PLIST b/mail/p5-Email-MIME/pkg/PLIST index 645e7ecf85e..88b64fb9c61 100644 --- a/mail/p5-Email-MIME/pkg/PLIST +++ b/mail/p5-Email-MIME/pkg/PLIST @@ -1,6 +1,6 @@ -@comment $OpenBSD: PLIST,v 1.7 2019/05/09 17:05:42 afresh1 Exp $ -@conflict mail/p5-Email-MIME-Creator-* -@conflict mail/p5-Email-MIME-Modifier-* +@comment $OpenBSD: PLIST,v 1.8 2020/08/10 14:42:02 bket Exp $ +@conflict p5-Email-MIME-Creator-* +@conflict p5-Email-MIME-Modifier-* @pkgpath mail/p5-Email-MIME-Creator @pkgpath mail/p5-Email-MIME-Modifier ${P5SITE}/Email/MIME.pm diff --git a/net/py-aiodns/pkg/PLIST b/net/py-aiodns/pkg/PLIST index cf34ed2e573..c996e18057a 100644 --- a/net/py-aiodns/pkg/PLIST +++ b/net/py-aiodns/pkg/PLIST @@ -1,5 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.3 2020/07/07 18:39:14 paco Exp $ -@conflict net/py-aiodns-* +@comment $OpenBSD: PLIST,v 1.4 2020/08/10 14:42:02 bket Exp $ +@conflict py-aiodns-* @pkgpath net/py-aiodns lib/python${MODPY_VERSION}/site-packages/aiodns/ lib/python${MODPY_VERSION}/site-packages/aiodns-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ diff --git a/net/py-cares/pkg/PLIST b/net/py-cares/pkg/PLIST index 4f268902985..dd7daff85fa 100644 --- a/net/py-cares/pkg/PLIST +++ b/net/py-cares/pkg/PLIST @@ -1,5 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.4 2020/07/10 03:23:55 kmos Exp $ -@conflict net/py-cares-* +@comment $OpenBSD: PLIST,v 1.5 2020/08/10 14:42:02 bket Exp $ +@conflict py-cares-* @pkgpath net/py-cares lib/python${MODPY_VERSION}/site-packages/pycares/ lib/python${MODPY_VERSION}/site-packages/pycares-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/