summaryrefslogtreecommitdiffstats
path: root/x11/linux-XFree86-libs
diff options
context:
space:
mode:
authorbsam <bsam@FreeBSD.org>2006-10-05 15:32:10 +0000
committerbsam <bsam@FreeBSD.org>2006-10-05 15:32:10 +0000
commit5363b88cd310c43990f3a806bcbe49f0274edd06 (patch)
tree91385f08a99d2150dc7b9e85c732859d56afdade /x11/linux-XFree86-libs
parent80f093f4c0fc5014088744a49c0374d01d051190 (diff)
downloadFreeBSD-ports-5363b88cd310c43990f3a806bcbe49f0274edd06.zip
FreeBSD-ports-5363b88cd310c43990f3a806bcbe49f0274edd06.tar.gz
Remove deleted linux_base-* and linux_locale* ports from CONFLICTS variable
of the remaining linux ports. Reviewed by: netchild (agreed in principle)
Diffstat (limited to 'x11/linux-XFree86-libs')
-rw-r--r--x11/linux-XFree86-libs/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/x11/linux-XFree86-libs/Makefile b/x11/linux-XFree86-libs/Makefile
index cc477b0..d2fa333 100644
--- a/x11/linux-XFree86-libs/Makefile
+++ b/x11/linux-XFree86-libs/Makefile
@@ -25,7 +25,7 @@ COMMENT= XFree86 libraries, Linux binary
BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm
RUN_DEPENDS= ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig
-CONFLICTS= linux_base-7* linux_base-deb* linux-xorg-libs*
+CONFLICTS= linux-xorg-libs*
USE_LINUX_PREFIX=yes
USE_LINUX= yes
MD5_FILE= ${MASTERDIR}/distinfo.i386
OpenPOWER on IntegriCloud