diff options
| author | wiz <wiz@pkgsrc.org> | 2017-07-06 05:25:15 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2017-07-06 05:25:15 +0000 |
| commit | 6130d3c53bce2fe1e3d40b3110b0e14a5d5b50ff (patch) | |
| tree | ca4509d376b4d33a9a3306a8dd976942c2ec55a7 /net | |
| parent | 68ebbb501c6b17dc954019604eaf50f119165eb6 (diff) | |
| download | pkgsrc-6130d3c53bce2fe1e3d40b3110b0e14a5d5b50ff.tar.gz | |
Remove unnecessary CONFLICTS.
Packages always conflict with packages that have the same PKGBASE.
Diffstat (limited to 'net')
| -rw-r--r-- | net/Radicale/Makefile | 3 | ||||
| -rw-r--r-- | net/Radicale2/Makefile | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/net/Radicale/Makefile b/net/Radicale/Makefile index f8bb68392e2..e653c4ad595 100644 --- a/net/Radicale/Makefile +++ b/net/Radicale/Makefile @@ -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 diff --git a/net/Radicale2/Makefile b/net/Radicale2/Makefile index ba412693df0..b8f3c510fa3 100644 --- a/net/Radicale2/Makefile +++ b/net/Radicale2/Makefile @@ -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} |