summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorAlexander Leidinger <netchild@FreeBSD.org>2006-05-01 14:16:24 +0000
committerAlexander Leidinger <netchild@FreeBSD.org>2006-05-01 14:16:24 +0000
commit730110191bc4b8444a6070a98b7fb46395ca3c0e (patch)
treee8ec6e21603eb488578f50be1758f9962ef5b892 /x11
parent- Update to 0.095 (diff)
This port now conflicts with the linux-xorg-libs port.
Notified by: Boris Samorodov <bsam@ipt.ru> Forgotten by: netchild
Notes
Notes: svn path=/head/; revision=161063
Diffstat (limited to 'x11')
-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 21ca8fe83cd9..cc477b05b03b 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*
+CONFLICTS= linux_base-7* linux_base-deb* linux-xorg-libs*
USE_LINUX_PREFIX=yes
USE_LINUX= yes
MD5_FILE= ${MASTERDIR}/distinfo.i386