diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2017-11-22 06:24:39 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2017-11-22 06:24:39 +0000 |
| commit | d9e8ad40c842932c2e304c53f6a7916c1ef78b0a (patch) | |
| tree | 9f531b16327e0d37f19d3634cc5119f2e32dad87 /www | |
| parent | graphics/linux-adobesvg: remove after r454665 (diff) | |
gecko: simplify conflicts
Notes
Notes:
svn path=/head/; revision=454667
Diffstat (limited to 'www')
| -rw-r--r-- | www/firefox-esr/Makefile | 2 | ||||
| -rw-r--r-- | www/firefox/Makefile | 2 | ||||
| -rw-r--r-- | www/libxul/Makefile | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index 0d669dd49302..04b41b286fbf 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -33,7 +33,7 @@ LIB_DEPENDS= libv4l2.so:multimedia/libv4l USE_GECKO= gecko CPE_PRODUCT= ${PORTNAME}_esr -CONFLICTS_INSTALL= firefox-[0-9]* +CONFLICTS_INSTALL= firefox MOZ_PKGCONFIG_FILES= # empty USE_MOZILLA= -soundtouch MOZILLA_NAME= Firefox diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 54dbd5b180b2..c1ff6c2e9b21 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -32,7 +32,7 @@ BUILD_DEPENDS= nspr>=4.17:devel/nspr \ LIB_DEPENDS= libv4l2.so:multimedia/libv4l USE_GECKO= gecko -CONFLICTS_INSTALL= firefox-esr-45.* firefox-esr-3[18].* firefox-esr-24.* +CONFLICTS_INSTALL= firefox-esr MOZ_PKGCONFIG_FILES= # empty USE_MOZILLA= -soundtouch MOZILLA_NAME= Firefox diff --git a/www/libxul/Makefile b/www/libxul/Makefile index 2e27153d7b3d..196fad696217 100644 --- a/www/libxul/Makefile +++ b/www/libxul/Makefile @@ -31,7 +31,6 @@ BUILD_DEPENDS= nspr>=4.12:devel/nspr \ LIB_DEPENDS= libv4l2.so:multimedia/libv4l WRKSRC:= ${WRKDIR}/firefox-${DISTVERSION}esr -CONFLICTS_INSTALL= libxul-1.9.* USE_GL= gl USES= pathfix shebangfix tar:xz |