pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net Remove unnecessary CONFLICTS.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e2251a8e322a
branches:  trunk
changeset: 364854:e2251a8e322a
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Jul 06 05:25:15 2017 +0000

description:
Remove unnecessary CONFLICTS.

Packages always conflict with packages that have the same PKGBASE.

diffstat:

 net/Radicale/Makefile  |  3 +--
 net/Radicale2/Makefile |  3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diffs (34 lines):

diff -r 0b8c37031a4d -r e2251a8e322a net/Radicale/Makefile
--- a/net/Radicale/Makefile     Thu Jul 06 04:50:01 2017 +0000
+++ b/net/Radicale/Makefile     Thu Jul 06 05:25:15 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2017/07/01 05:38:18 darcy Exp $
+# $NetBSD: Makefile,v 1.22 2017/07/06 05:25:15 wiz Exp $
 
 DISTNAME=      Radicale-1.1.4
 CATEGORIES=    net time www
@@ -15,7 +15,6 @@
 RADICALE_GROUP?=       www
 PKG_GROUPS=            ${RADICALE_GROUP}
 PKG_USERS=             ${RADICALE_USER}:${RADICALE_GROUP}
-CONFLICTS+= Radicale-[2-9]*
 
 INSTALLATION_DIRS=     ${EGDIR}
 OWN_DIRS=              ${PKG_SYSCONFDIR}/radicale
diff -r 0b8c37031a4d -r e2251a8e322a net/Radicale2/Makefile
--- a/net/Radicale2/Makefile    Thu Jul 06 04:50:01 2017 +0000
+++ b/net/Radicale2/Makefile    Thu Jul 06 05:25:15 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2017/07/06 03:12:48 darcy Exp $
+# $NetBSD: Makefile,v 1.3 2017/07/06 05:25:15 wiz Exp $
 
 DISTNAME=      Radicale-2.1.1
 PKGREVISION=   1
@@ -16,7 +16,6 @@
 RADICALE_GROUP?=       www
 PKG_GROUPS=            ${RADICALE_GROUP}
 PKG_USERS=             ${RADICALE_USER}:${RADICALE_GROUP}
-CONFLICTS+=            Radicale-1.*
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 INSTALLATION_DIRS=     ${EGDIR}



Home | Main Index | Thread Index | Old Index