aboutsummaryrefslogtreecommitdiffstats
path: root/emulators
diff options
context:
space:
mode:
authorAlexander Leidinger <netchild@FreeBSD.org>2006-06-10 21:35:52 +0800
committerAlexander Leidinger <netchild@FreeBSD.org>2006-06-10 21:35:52 +0800
commit0b156f660d3cf3910954131d5d12c9c6a0cfb8d5 (patch)
tree18cbd191f70da13c6f8c79c0a5225f3dccea636f /emulators
parentea13613d69225bb86879573a9c67bf99c2a87135 (diff)
downloadfreebsd-ports-0b156f660d3cf3910954131d5d12c9c6a0cfb8d5.tar.gz
freebsd-ports-0b156f660d3cf3910954131d5d12c9c6a0cfb8d5.tar.zst
freebsd-ports-0b156f660d3cf3910954131d5d12c9c6a0cfb8d5.zip
Register conflicts with korean/linux_local.
Notes
Notes: svn path=/head/; revision=165026
Diffstat (limited to 'emulators')
-rw-r--r--emulators/linux_base-c6/Makefile3
-rw-r--r--emulators/linux_base-f10/Makefile3
-rw-r--r--emulators/linux_base-f7/Makefile3
-rw-r--r--emulators/linux_base-f8/Makefile3
-rw-r--r--emulators/linux_base-f9/Makefile3
-rw-r--r--emulators/linux_base-f9/linux_base-f8/Makefile3
-rw-r--r--emulators/linux_base-fc3/Makefile4
-rw-r--r--emulators/linux_base-fc4/Makefile3
-rw-r--r--emulators/linux_base-fc6/Makefile3
-rw-r--r--emulators/linux_base-fc7/Makefile3
10 files changed, 20 insertions, 11 deletions
diff --git a/emulators/linux_base-c6/Makefile b/emulators/linux_base-c6/Makefile
index 39b446ececf1..1132e1f2b9ac 100644
--- a/emulators/linux_base-c6/Makefile
+++ b/emulators/linux_base-c6/Makefile
@@ -8,6 +8,7 @@
PORTNAME= fc
PORTVERSION= 4
+PORTREVISION= 1
CATEGORIES= emulators linux
MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
MASTER_SITE_SUBDIR= ${PORTVERSION}/${LINUX_RPM_ARCH}/os/Fedora/RPMS \
@@ -93,7 +94,7 @@ ALWAYS_KEEP_DISTFILES= yes
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-libgcc*
+ linux_base-fc3 linux-libgcc* linux_locale*
ONLY_FOR_ARCHS= i386 amd64
LINUX_RPM_ARCH= i386
PREFIX?= ${LINUXBASE}
diff --git a/emulators/linux_base-f10/Makefile b/emulators/linux_base-f10/Makefile
index 39b446ececf1..1132e1f2b9ac 100644
--- a/emulators/linux_base-f10/Makefile
+++ b/emulators/linux_base-f10/Makefile
@@ -8,6 +8,7 @@
PORTNAME= fc
PORTVERSION= 4
+PORTREVISION= 1
CATEGORIES= emulators linux
MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
MASTER_SITE_SUBDIR= ${PORTVERSION}/${LINUX_RPM_ARCH}/os/Fedora/RPMS \
@@ -93,7 +94,7 @@ ALWAYS_KEEP_DISTFILES= yes
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-libgcc*
+ linux_base-fc3 linux-libgcc* linux_locale*
ONLY_FOR_ARCHS= i386 amd64
LINUX_RPM_ARCH= i386
PREFIX?= ${LINUXBASE}
diff --git a/emulators/linux_base-f7/Makefile b/emulators/linux_base-f7/Makefile
index 39b446ececf1..1132e1f2b9ac 100644
--- a/emulators/linux_base-f7/Makefile
+++ b/emulators/linux_base-f7/Makefile
@@ -8,6 +8,7 @@
PORTNAME= fc
PORTVERSION= 4
+PORTREVISION= 1
CATEGORIES= emulators linux
MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
MASTER_SITE_SUBDIR= ${PORTVERSION}/${LINUX_RPM_ARCH}/os/Fedora/RPMS \
@@ -93,7 +94,7 @@ ALWAYS_KEEP_DISTFILES= yes
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-libgcc*
+ linux_base-fc3 linux-libgcc* linux_locale*
ONLY_FOR_ARCHS= i386 amd64
LINUX_RPM_ARCH= i386
PREFIX?= ${LINUXBASE}
diff --git a/emulators/linux_base-f8/Makefile b/emulators/linux_base-f8/Makefile
index 39b446ececf1..1132e1f2b9ac 100644
--- a/emulators/linux_base-f8/Makefile
+++ b/emulators/linux_base-f8/Makefile
@@ -8,6 +8,7 @@
PORTNAME= fc
PORTVERSION= 4
+PORTREVISION= 1
CATEGORIES= emulators linux
MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
MASTER_SITE_SUBDIR= ${PORTVERSION}/${LINUX_RPM_ARCH}/os/Fedora/RPMS \
@@ -93,7 +94,7 @@ ALWAYS_KEEP_DISTFILES= yes
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-libgcc*
+ linux_base-fc3 linux-libgcc* linux_locale*
ONLY_FOR_ARCHS= i386 amd64
LINUX_RPM_ARCH= i386
PREFIX?= ${LINUXBASE}
diff --git a/emulators/linux_base-f9/Makefile b/emulators/linux_base-f9/Makefile
index 39b446ececf1..1132e1f2b9ac 100644
--- a/emulators/linux_base-f9/Makefile
+++ b/emulators/linux_base-f9/Makefile
@@ -8,6 +8,7 @@
PORTNAME= fc
PORTVERSION= 4
+PORTREVISION= 1
CATEGORIES= emulators linux
MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
MASTER_SITE_SUBDIR= ${PORTVERSION}/${LINUX_RPM_ARCH}/os/Fedora/RPMS \
@@ -93,7 +94,7 @@ ALWAYS_KEEP_DISTFILES= yes
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-libgcc*
+ linux_base-fc3 linux-libgcc* linux_locale*
ONLY_FOR_ARCHS= i386 amd64
LINUX_RPM_ARCH= i386
PREFIX?= ${LINUXBASE}
diff --git a/emulators/linux_base-f9/linux_base-f8/Makefile b/emulators/linux_base-f9/linux_base-f8/Makefile
index 39b446ececf1..1132e1f2b9ac 100644
--- a/emulators/linux_base-f9/linux_base-f8/Makefile
+++ b/emulators/linux_base-f9/linux_base-f8/Makefile
@@ -8,6 +8,7 @@
PORTNAME= fc
PORTVERSION= 4
+PORTREVISION= 1
CATEGORIES= emulators linux
MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
MASTER_SITE_SUBDIR= ${PORTVERSION}/${LINUX_RPM_ARCH}/os/Fedora/RPMS \
@@ -93,7 +94,7 @@ ALWAYS_KEEP_DISTFILES= yes
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-libgcc*
+ linux_base-fc3 linux-libgcc* linux_locale*
ONLY_FOR_ARCHS= i386 amd64
LINUX_RPM_ARCH= i386
PREFIX?= ${LINUXBASE}
diff --git a/emulators/linux_base-fc3/Makefile b/emulators/linux_base-fc3/Makefile
index ca6f82705234..53f80ea699fb 100644
--- a/emulators/linux_base-fc3/Makefile
+++ b/emulators/linux_base-fc3/Makefile
@@ -8,7 +8,7 @@
PORTNAME= fc
PORTVERSION= 3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= emulators linux
MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
MASTER_SITE_SUBDIR= ${PORTVERSION}/${LINUX_RPM_ARCH}/os/Fedora/RPMS \
@@ -91,7 +91,7 @@ ALWAYS_KEEP_DISTFILES= yes
CONFLICTS= linux_base-7* linux_base-deb* linux_base-gentoo* \
linux_base-rh-9* linux_base-suse-9* linux_base-8* \
- linux_base-fc-4* linux-libgcc*
+ linux_base-fc-4* linux-libgcc* linux_locale*
ONLY_FOR_ARCHS= i386 amd64
LINUX_RPM_ARCH= i386
PREFIX?= ${LINUXBASE}
diff --git a/emulators/linux_base-fc4/Makefile b/emulators/linux_base-fc4/Makefile
index 39b446ececf1..1132e1f2b9ac 100644
--- a/emulators/linux_base-fc4/Makefile
+++ b/emulators/linux_base-fc4/Makefile
@@ -8,6 +8,7 @@
PORTNAME= fc
PORTVERSION= 4
+PORTREVISION= 1
CATEGORIES= emulators linux
MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
MASTER_SITE_SUBDIR= ${PORTVERSION}/${LINUX_RPM_ARCH}/os/Fedora/RPMS \
@@ -93,7 +94,7 @@ ALWAYS_KEEP_DISTFILES= yes
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-libgcc*
+ linux_base-fc3 linux-libgcc* linux_locale*
ONLY_FOR_ARCHS= i386 amd64
LINUX_RPM_ARCH= i386
PREFIX?= ${LINUXBASE}
diff --git a/emulators/linux_base-fc6/Makefile b/emulators/linux_base-fc6/Makefile
index 39b446ececf1..1132e1f2b9ac 100644
--- a/emulators/linux_base-fc6/Makefile
+++ b/emulators/linux_base-fc6/Makefile
@@ -8,6 +8,7 @@
PORTNAME= fc
PORTVERSION= 4
+PORTREVISION= 1
CATEGORIES= emulators linux
MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
MASTER_SITE_SUBDIR= ${PORTVERSION}/${LINUX_RPM_ARCH}/os/Fedora/RPMS \
@@ -93,7 +94,7 @@ ALWAYS_KEEP_DISTFILES= yes
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-libgcc*
+ linux_base-fc3 linux-libgcc* linux_locale*
ONLY_FOR_ARCHS= i386 amd64
LINUX_RPM_ARCH= i386
PREFIX?= ${LINUXBASE}
diff --git a/emulators/linux_base-fc7/Makefile b/emulators/linux_base-fc7/Makefile
index 39b446ececf1..1132e1f2b9ac 100644
--- a/emulators/linux_base-fc7/Makefile
+++ b/emulators/linux_base-fc7/Makefile
@@ -8,6 +8,7 @@
PORTNAME= fc
PORTVERSION= 4
+PORTREVISION= 1
CATEGORIES= emulators linux
MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
MASTER_SITE_SUBDIR= ${PORTVERSION}/${LINUX_RPM_ARCH}/os/Fedora/RPMS \
@@ -93,7 +94,7 @@ ALWAYS_KEEP_DISTFILES= yes
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-libgcc*
+ linux_base-fc3 linux-libgcc* linux_locale*
ONLY_FOR_ARCHS= i386 amd64
LINUX_RPM_ARCH= i386
PREFIX?= ${LINUXBASE}
generated by cgit (git 2.34.1) at 2024-09-23 11:12:47 +0800