From 86e223df2d21dec0c03584d6c75a8b9aaffa0f87 Mon Sep 17 00:00:00 2001 From: Gabor Kovesdan Date: Sat, 27 Jun 2009 08:23:05 +0000 Subject: - Update CONFLICTS PR: ports/135570 Submitted by: Alexander Best --- emulators/linux_dist-gentoo-stage1/Makefile | 2 +- emulators/linux_dist-gentoo-stage3/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/emulators/linux_dist-gentoo-stage1/Makefile b/emulators/linux_dist-gentoo-stage1/Makefile index 72bab042679f..2d6a7310c5eb 100644 --- a/emulators/linux_dist-gentoo-stage1/Makefile +++ b/emulators/linux_dist-gentoo-stage1/Makefile @@ -31,7 +31,7 @@ PKGDEINSTALL= ${WRKDIR}/pkg-deinstall .if defined(WITH_LINUXBASE) PKGNAMEPREFIX= linux_base- CONFLICTS= linux_base-7* linux_base-8* linux_base-debian* \ - linux_base-rh* linux_base-suse* linux_base-fc* \ + linux_base-rh* linux_base-suse* linux_base-f* \ linux_base-gentoo-stage[23]-* USE_LINUX_PREFIX= YES PREFIX_SUBDIR= diff --git a/emulators/linux_dist-gentoo-stage3/Makefile b/emulators/linux_dist-gentoo-stage3/Makefile index dd30cf4be201..c5bf3ce26622 100644 --- a/emulators/linux_dist-gentoo-stage3/Makefile +++ b/emulators/linux_dist-gentoo-stage3/Makefile @@ -31,7 +31,7 @@ PKGDEINSTALL= ${WRKDIR}/pkg-deinstall .if defined(WITH_LINUXBASE) PKGNAMEPREFIX= linux_base- CONFLICTS= linux_base-7* linux_base-8* linux_base-debian* \ - linux_base-rh* linux_base-suse* linux_base-fc* \ + linux_base-rh* linux_base-suse* linux_base-f* \ linux_base-gentoo-stage[12]-* USE_LINUX_PREFIX= YES PREFIX_SUBDIR= -- cgit v1.2.3