CVS commit: pkgsrc/net

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jul  6 05:25:15 UTC 2017

Modified Files:
        pkgsrc/net/Radicale: Makefile
        pkgsrc/net/Radicale2: Makefile

Log Message:
Remove unnecessary CONFLICTS.

Packages always conflict with packages that have the same PKGBASE.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/net/Radicale/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/Radicale2/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/Radicale/Makefile
diff -u pkgsrc/net/Radicale/Makefile:1.21 pkgsrc/net/Radicale/Makefile:1.22
--- pkgsrc/net/Radicale/Makefile:1.21   Sat Jul  1 05:38:18 2017
+++ pkgsrc/net/Radicale/Makefile        Thu Jul  6 05:25:15 2017
@@ -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_USER?=               www
 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

Index: pkgsrc/net/Radicale2/Makefile
diff -u pkgsrc/net/Radicale2/Makefile:1.2 pkgsrc/net/Radicale2/Makefile:1.3
--- pkgsrc/net/Radicale2/Makefile:1.2   Thu Jul  6 03:12:48 2017
+++ pkgsrc/net/Radicale2/Makefile       Thu Jul  6 05:25:15 2017
@@ -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_USER?=               www
 RADICALE_GROUP?=       www
 PKG_GROUPS=            ${RADICALE_GROUP}
 PKG_USERS=             ${RADICALE_USER}:${RADICALE_GROUP}
-CONFLICTS+=            Radicale-1.*
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 INSTALLATION_DIRS=     ${EGDIR}