diff options
| author | wiz <wiz> | 2016-12-01 14:48:02 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2016-12-01 14:48:02 +0000 |
| commit | 977abdadc6d0911ba118d42578a3a75aae7e05de (patch) | |
| tree | 3a206a15f9a339017e2d7b26b43c91f75c266d69 /www | |
| parent | 388eef4544309783d463846a0fe609e5f0efbb3a (diff) | |
| download | pkgsrc-977abdadc6d0911ba118d42578a3a75aae7e05de.tar.gz | |
Fix weird CONFLICTS line.
Diffstat (limited to 'www')
| -rw-r--r-- | www/horde/Makefile | 4 | ||||
| -rw-r--r-- | www/p5-URI/Makefile | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/www/horde/Makefile b/www/horde/Makefile index 456843c81df..66b84e90ec5 100644 --- a/www/horde/Makefile +++ b/www/horde/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.77 2016/05/17 10:32:09 fhajny Exp $ +# $NetBSD: Makefile,v 1.78 2016/12/01 14:48:02 wiz Exp $ DISTNAME= horde-3.3.13 PKGREVISION= 2 @@ -11,7 +11,7 @@ HOMEPAGE= http://www.horde.org/ COMMENT= PHP application framework LICENSE= gnu-lgpl-v2 -CONFLICTS+= horde-2.*{,nb*} +CONFLICTS+= horde-2.* .include "../../lang/php/phpversion.mk" diff --git a/www/p5-URI/Makefile b/www/p5-URI/Makefile index c59db2bcc4b..1446b1f8b02 100644 --- a/www/p5-URI/Makefile +++ b/www/p5-URI/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.63 2016/06/08 19:25:17 wiz Exp $ +# $NetBSD: Makefile,v 1.64 2016/12/01 14:48:02 wiz Exp $ DISTNAME= URI-1.71 PKGNAME= p5-${DISTNAME} @@ -15,7 +15,7 @@ LICENSE= ${PERL5_LICENSE} # recommended DEPENDS+= p5-Business-ISBN-[0-9]*:../../misc/p5-Business-ISBN -CONFLICTS+= p5-libwww-5.36{,nb*} # URI used to be part of that package +CONFLICTS+= p5-libwww>=5.36<5.37 # URI used to be part of that package USE_LANGUAGES= # empty PERL5_PACKLIST= auto/URI/.packlist |