diff options
| author | Boris Samorodov <bsam@FreeBSD.org> | 2006-10-05 18:53:43 +0000 |
|---|---|---|
| committer | Boris Samorodov <bsam@FreeBSD.org> | 2006-10-05 18:53:43 +0000 |
| commit | 9aa07987fc423bd8d0cecf6943e9019092e5120e (patch) | |
| tree | 600eb89909353df26288feffdf777df7babbd4f8 /x11 | |
| parent | - The whitespace police is back in town. (diff) | |
Revert back previous commit of removing deleted ports from
CONFLICTS variable. Give happy users just another chance to
update their systems.
Pointed out by: infofarmer, kris
Notes
Notes:
svn path=/head/; revision=174569
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/linux-XFree86-libs/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/x11/linux-XFree86-libs/Makefile b/x11/linux-XFree86-libs/Makefile index d2fa333b8bc7..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-xorg-libs* +CONFLICTS= linux_base-7* linux_base-deb* linux-xorg-libs* USE_LINUX_PREFIX=yes USE_LINUX= yes MD5_FILE= ${MASTERDIR}/distinfo.i386 |