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 /emulators/linux_base-f10 | |
| 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 'emulators/linux_base-f10')
| -rw-r--r-- | emulators/linux_base-f10/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/emulators/linux_base-f10/Makefile b/emulators/linux_base-f10/Makefile index bf973338ec4d..34103dca9b6f 100644 --- a/emulators/linux_base-f10/Makefile +++ b/emulators/linux_base-f10/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 |