diff options
| author | Gabor Kovesdan <gabor@FreeBSD.org> | 2009-06-27 08:23:05 +0000 |
|---|---|---|
| committer | Gabor Kovesdan <gabor@FreeBSD.org> | 2009-06-27 08:23:05 +0000 |
| commit | 86e223df2d21dec0c03584d6c75a8b9aaffa0f87 (patch) | |
| tree | e0e58e8419521ebb1da540f39abe76a513fe3ac6 /emulators | |
| parent | - Pass maintainership to submitter. (diff) | |
- Update CONFLICTS
PR: ports/135570
Submitted by: Alexander Best <alexbestms@math.uni-muenster.de>
Notes
Notes:
svn path=/head/; revision=236680
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/linux_dist-gentoo-stage1/Makefile | 2 | ||||
| -rw-r--r-- | 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= |