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 /emulators/linux_base-f9 | |
| 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 'emulators/linux_base-f9')
| -rw-r--r-- | emulators/linux_base-f9/Makefile | 4 | ||||
| -rw-r--r-- | emulators/linux_base-f9/linux_base-f8/Makefile | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/emulators/linux_base-f9/Makefile b/emulators/linux_base-f9/Makefile index bf973338ec4d..34103dca9b6f 100644 --- a/emulators/linux_base-f9/Makefile +++ b/emulators/linux_base-f9/Makefile @@ -97,7 +97,9 @@ SRC_DISTFILES+= acl-2.2.32-1.FC4.2.src.rpm \ ALWAYS_KEEP_DISTFILES= yes .endif -CONFLICTS= linux_base-gentoo* linux_base-suse-9* +CONFLICTS= linux_base-7* linux_base-deb* linux_base-gentoo* \ + linux_base-rh-9* linux_base-suse-9* linux_base-8* \ + linux_base-fc3 linux_locale* ONLY_FOR_ARCHS= i386 amd64 LINUX_RPM_ARCH= i386 USE_LINUX_PREFIX= yes diff --git a/emulators/linux_base-f9/linux_base-f8/Makefile b/emulators/linux_base-f9/linux_base-f8/Makefile index bf973338ec4d..34103dca9b6f 100644 --- a/emulators/linux_base-f9/linux_base-f8/Makefile +++ b/emulators/linux_base-f9/linux_base-f8/Makefile @@ -97,7 +97,9 @@ SRC_DISTFILES+= acl-2.2.32-1.FC4.2.src.rpm \ ALWAYS_KEEP_DISTFILES= yes .endif -CONFLICTS= linux_base-gentoo* linux_base-suse-9* +CONFLICTS= linux_base-7* linux_base-deb* linux_base-gentoo* \ + linux_base-rh-9* linux_base-suse-9* linux_base-8* \ + linux_base-fc3 linux_locale* ONLY_FOR_ARCHS= i386 amd64 LINUX_RPM_ARCH= i386 USE_LINUX_PREFIX= yes |