www/phalcon: proper protection against conflict

opnsense2 · Jul 15, 2019 · e1c88b1 · e1c88b1
1 parent 4ee2cfc
commit e1c88b1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/opnsense/phalcon4/Makefile b/opnsense/phalcon4/Makefile
@@ -18,7 +18,7 @@ USES=		php:ext
 USE_PHP=	hash:build json:build pdo:build
 IGNORE_WITH_PHP=71
 
-CONFLICTS_INSTALL=phalcon
+CONFLICTS_INSTALL=${PKGNAMEPREFIX}-phalcon
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	phalcon

diff --git a/www/phalcon/Makefile b/www/phalcon/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	phalcon
-DISTVERSIONPREFIX=	v
+DISTVERSIONPREFIX=v
 DISTVERSION=	3.4.4
 CATEGORIES=	www
 PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
@@ -16,7 +16,7 @@ ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386
 USES=		php:ext
 USE_PHP=	hash:build json:build pdo:build
 
-CONFLICTS_INSTALL=phalcon4
+CONFLICTS_INSTALL=${PKGNAMEPREFIX}-phalcon4
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	phalcon