diff options
| author | bsam <bsam@FreeBSD.org> | 2006-10-05 23:32:10 +0800 |
|---|---|---|
| committer | bsam <bsam@FreeBSD.org> | 2006-10-05 23:32:10 +0800 |
| commit | 5363b88cd310c43990f3a806bcbe49f0274edd06 (patch) | |
| tree | 91385f08a99d2150dc7b9e85c732859d56afdade /x11 | |
| parent | 80f093f4c0fc5014088744a49c0374d01d051190 (diff) | |
| download | freebsd-ports-gnome-5363b88cd310c43990f3a806bcbe49f0274edd06.tar.gz freebsd-ports-gnome-5363b88cd310c43990f3a806bcbe49f0274edd06.tar.zst freebsd-ports-gnome-5363b88cd310c43990f3a806bcbe49f0274edd06.zip | |
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')
| -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 cc477b05b03b..d2fa333b8bc7 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 |