diff options
| author | bsam <bsam@FreeBSD.org> | 2006-10-06 02:53:43 +0800 |
|---|---|---|
| committer | bsam <bsam@FreeBSD.org> | 2006-10-06 02:53:43 +0800 |
| commit | abd956df6353fb8871d5ccac12afda3e9f3684fa (patch) | |
| tree | 80c837cd412916fdb1c12a365c06aedf35f9627a /x11 | |
| parent | 261f625ed0ea67a6f25e73bfd3225b47bd4a4238 (diff) | |
| download | freebsd-ports-gnome-abd956df6353fb8871d5ccac12afda3e9f3684fa.tar.gz freebsd-ports-gnome-abd956df6353fb8871d5ccac12afda3e9f3684fa.tar.zst freebsd-ports-gnome-abd956df6353fb8871d5ccac12afda3e9f3684fa.zip | |
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
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 |