diff options
| author | Trevor Johnson <trevor@FreeBSD.org> | 2004-12-21 19:49:43 +0000 |
|---|---|---|
| committer | Trevor Johnson <trevor@FreeBSD.org> | 2004-12-21 19:49:43 +0000 |
| commit | ce8d2856e5b64b575d19c842f5fce6cb6d7e9b0f (patch) | |
| tree | ea632b0e3bffddd94bc86a53b9cf977f52552988 | |
| parent | Update to 3.1.5. (diff) | |
Update CONFLICTS.
PR: 75283
Submitted by: linimon
Notes
Notes:
svn path=/head/; revision=124723
| -rw-r--r-- | emulators/linux_base-6/Makefile | 3 | ||||
| -rw-r--r-- | emulators/linux_base-8/Makefile | 3 | ||||
| -rw-r--r-- | emulators/linux_base-debian/Makefile | 3 | ||||
| -rw-r--r-- | emulators/linux_base/Makefile | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/emulators/linux_base-6/Makefile b/emulators/linux_base-6/Makefile index 1c3faea55d88..acf986bc7a0e 100644 --- a/emulators/linux_base-6/Makefile +++ b/emulators/linux_base-6/Makefile @@ -29,7 +29,8 @@ FORBIDDEN= "see <URL:http://rhn.redhat.com/errata/RHSA-2003-089.html> or\ BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm -CONFLICTS=cle_base-* linux_base-7* linux_base-8* linux_base-deb* linux_base-gen* +CONFLICTS= linux_base-7* linux_base-8* linux_base-deb* linux_base-gen* \ + linux_base-rh* linux_base-suse* ONLY_FOR_ARCHS= alpha i386 DIST_SUBDIR= rpm PREFIX= ${LINUXBASE} diff --git a/emulators/linux_base-8/Makefile b/emulators/linux_base-8/Makefile index 7e7af1670582..de30fb4375d2 100644 --- a/emulators/linux_base-8/Makefile +++ b/emulators/linux_base-8/Makefile @@ -54,7 +54,8 @@ COMMENT= Base set of packages needed in Linux mode (only for i386) EXTRACT_DEPENDS= rpm:${PORTSDIR}/archivers/rpm -CONFLICTS=cle_base-* linux_base-6* linux_base-7* linux_base-deb* linux_base-gen* +CONFLICTS= linux_base-6* linux_base-7* linux_base-deb* linux_base-gen* \ + linux_base-rh* linux_base-suse* RESTRICTED= "binaries under GNU GPL without accompanying source" ONLY_FOR_ARCHS= i386 amd64 DIST_SUBDIR= rpm/${MACHINE_ARCH}/${PORTVERSION} diff --git a/emulators/linux_base-debian/Makefile b/emulators/linux_base-debian/Makefile index 9d768fe50f2a..6cf1b4193c48 100644 --- a/emulators/linux_base-debian/Makefile +++ b/emulators/linux_base-debian/Makefile @@ -18,7 +18,8 @@ EXTRACT_ONLY= basedebs.tar MAINTAINER= ports@FreeBSD.org COMMENT= Debian base set for the Linux mode -CONFLICTS= linux_base-6* linux_base-7* linux_base-8* linux_base-gentoo* +CONFLICTS= linux_base-6* linux_base-7* linux_base-8* linux_base-gentoo* \ + linux_base-rh* linux_base-suse* ONLY_FOR_ARCHS= i386 amd64 BUILD_DEPENDS= ${DPKG_CMD}:${PORTSDIR}/archivers/dpkg diff --git a/emulators/linux_base/Makefile b/emulators/linux_base/Makefile index 0b0f8e27e5c1..9ea16e649958 100644 --- a/emulators/linux_base/Makefile +++ b/emulators/linux_base/Makefile @@ -48,7 +48,8 @@ COMMENT= The base set of packages needed in Linux mode BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm -CONFLICTS=cle_base-* linux_base-6* linux_base-8* linux_base-deb* linux_base-gen* +CONFLICTS= linux_base-6* linux_base-8* linux_base-deb* linux_base-gen* \ + linux_base-rh* linux_base-suse* ONLY_FOR_ARCHS= alpha i386 DIST_SUBDIR= rpm PREFIX= ${LINUXBASE} |