aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--emulators/linux_base-c6/Makefile4
-rw-r--r--emulators/linux_base-f10/Makefile4
-rw-r--r--emulators/linux_base-f7/Makefile4
-rw-r--r--emulators/linux_base-f8/Makefile4
-rw-r--r--emulators/linux_base-f9/Makefile4
-rw-r--r--emulators/linux_base-f9/linux_base-f8/Makefile4
-rw-r--r--emulators/linux_base-fc4/Makefile4
-rw-r--r--emulators/linux_base-fc6/Makefile4
-rw-r--r--emulators/linux_base-fc7/Makefile4
-rw-r--r--emulators/linux_base-suse-9.1/Makefile3
-rw-r--r--emulators/linux_base-suse-9.2/Makefile3
-rw-r--r--emulators/linux_base-suse-9.3/Makefile3
-rw-r--r--emulators/linux_dist-gentoo-stage1/Makefile4
-rw-r--r--emulators/linux_dist-gentoo-stage2/Makefile4
-rw-r--r--emulators/linux_dist-gentoo-stage3/Makefile4
-rw-r--r--x11/linux-XFree86-libs/Makefile2
16 files changed, 16 insertions, 43 deletions
diff --git a/emulators/linux_base-c6/Makefile b/emulators/linux_base-c6/Makefile
index 34103dca9b6f..bf973338ec4d 100644
--- a/emulators/linux_base-c6/Makefile
+++ b/emulators/linux_base-c6/Makefile
@@ -97,9 +97,7 @@ SRC_DISTFILES+= acl-2.2.32-1.FC4.2.src.rpm \
ALWAYS_KEEP_DISTFILES= yes
.endif
-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*
+CONFLICTS= linux_base-gentoo* linux_base-suse-9*
ONLY_FOR_ARCHS= i386 amd64
LINUX_RPM_ARCH= i386
USE_LINUX_PREFIX= yes
diff --git a/emulators/linux_base-f10/Makefile b/emulators/linux_base-f10/Makefile
index 34103dca9b6f..bf973338ec4d 100644
--- a/emulators/linux_base-f10/Makefile
+++ b/emulators/linux_base-f10/Makefile
@@ -97,9 +97,7 @@ SRC_DISTFILES+= acl-2.2.32-1.FC4.2.src.rpm \
ALWAYS_KEEP_DISTFILES= yes
.endif
-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*
+CONFLICTS= linux_base-gentoo* linux_base-suse-9*
ONLY_FOR_ARCHS= i386 amd64
LINUX_RPM_ARCH= i386
USE_LINUX_PREFIX= yes
diff --git a/emulators/linux_base-f7/Makefile b/emulators/linux_base-f7/Makefile
index 34103dca9b6f..bf973338ec4d 100644
--- a/emulators/linux_base-f7/Makefile
+++ b/emulators/linux_base-f7/Makefile
@@ -97,9 +97,7 @@ SRC_DISTFILES+= acl-2.2.32-1.FC4.2.src.rpm \
ALWAYS_KEEP_DISTFILES= yes
.endif
-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*
+CONFLICTS= linux_base-gentoo* linux_base-suse-9*
ONLY_FOR_ARCHS= i386 amd64
LINUX_RPM_ARCH= i386
USE_LINUX_PREFIX= yes
diff --git a/emulators/linux_base-f8/Makefile b/emulators/linux_base-f8/Makefile
index 34103dca9b6f..bf973338ec4d 100644
--- a/emulators/linux_base-f8/Makefile
+++ b/emulators/linux_base-f8/Makefile
@@ -97,9 +97,7 @@ SRC_DISTFILES+= acl-2.2.32-1.FC4.2.src.rpm \
ALWAYS_KEEP_DISTFILES= yes
.endif
-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*
+CONFLICTS= linux_base-gentoo* linux_base-suse-9*
ONLY_FOR_ARCHS= i386 amd64
LINUX_RPM_ARCH= i386
USE_LINUX_PREFIX= yes
diff --git a/emulators/linux_base-f9/Makefile b/emulators/linux_base-f9/Makefile
index 34103dca9b6f..bf973338ec4d 100644
--- a/emulators/linux_base-f9/Makefile
+++ b/emulators/linux_base-f9/Makefile
@@ -97,9 +97,7 @@ SRC_DISTFILES+= acl-2.2.32-1.FC4.2.src.rpm \
ALWAYS_KEEP_DISTFILES= yes
.endif
-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*
+CONFLICTS= linux_base-gentoo* linux_base-suse-9*
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 34103dca9b6f..bf973338ec4d 100644
--- a/emulators/linux_base-f9/linux_base-f8/Makefile
+++ b/emulators/linux_base-f9/linux_base-f8/Makefile
@@ -97,9 +97,7 @@ SRC_DISTFILES+= acl-2.2.32-1.FC4.2.src.rpm \
ALWAYS_KEEP_DISTFILES= yes
.endif
-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*
+CONFLICTS= linux_base-gentoo* linux_base-suse-9*
ONLY_FOR_ARCHS= i386 amd64
LINUX_RPM_ARCH= i386
USE_LINUX_PREFIX= yes
diff --git a/emulators/linux_base-fc4/Makefile b/emulators/linux_base-fc4/Makefile
index 34103dca9b6f..bf973338ec4d 100644
--- a/emulators/linux_base-fc4/Makefile
+++ b/emulators/linux_base-fc4/Makefile
@@ -97,9 +97,7 @@ SRC_DISTFILES+= acl-2.2.32-1.FC4.2.src.rpm \
ALWAYS_KEEP_DISTFILES= yes
.endif
-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*
+CONFLICTS= linux_base-gentoo* linux_base-suse-9*
ONLY_FOR_ARCHS= i386 amd64
LINUX_RPM_ARCH= i386
USE_LINUX_PREFIX= yes
diff --git a/emulators/linux_base-fc6/Makefile b/emulators/linux_base-fc6/Makefile
index 34103dca9b6f..bf973338ec4d 100644
--- a/emulators/linux_base-fc6/Makefile
+++ b/emulators/linux_base-fc6/Makefile
@@ -97,9 +97,7 @@ SRC_DISTFILES+= acl-2.2.32-1.FC4.2.src.rpm \
ALWAYS_KEEP_DISTFILES= yes
.endif
-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*
+CONFLICTS= linux_base-gentoo* linux_base-suse-9*
ONLY_FOR_ARCHS= i386 amd64
LINUX_RPM_ARCH= i386
USE_LINUX_PREFIX= yes
diff --git a/emulators/linux_base-fc7/Makefile b/emulators/linux_base-fc7/Makefile
index 34103dca9b6f..bf973338ec4d 100644
--- a/emulators/linux_base-fc7/Makefile
+++ b/emulators/linux_base-fc7/Makefile
@@ -97,9 +97,7 @@ SRC_DISTFILES+= acl-2.2.32-1.FC4.2.src.rpm \
ALWAYS_KEEP_DISTFILES= yes
.endif
-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*
+CONFLICTS= linux_base-gentoo* linux_base-suse-9*
ONLY_FOR_ARCHS= i386 amd64
LINUX_RPM_ARCH= i386
USE_LINUX_PREFIX= yes
diff --git a/emulators/linux_base-suse-9.1/Makefile b/emulators/linux_base-suse-9.1/Makefile
index 873b29362ea8..ba38d60ee659 100644
--- a/emulators/linux_base-suse-9.1/Makefile
+++ b/emulators/linux_base-suse-9.1/Makefile
@@ -46,8 +46,7 @@ COMMENT= Basic packages for Linux mode from SUSE 9.1/i386
EXTRACT_DEPENDS= rpm:${PORTSDIR}/archivers/rpm
-CONFLICTS= linux_base-7* linux_base-8* linux_base-debian* \
- linux_base-fc* linux_base-gentoo* linux_base-rh-9* \
+CONFLICTS= linux_base-fc* linux_base-gentoo* \
linux_base-suse-9.2* linux_base-suse-9.3*
NO_LATEST_LINK= yes
diff --git a/emulators/linux_base-suse-9.2/Makefile b/emulators/linux_base-suse-9.2/Makefile
index de18b4112e04..146e9d30661d 100644
--- a/emulators/linux_base-suse-9.2/Makefile
+++ b/emulators/linux_base-suse-9.2/Makefile
@@ -50,8 +50,7 @@ EXTRACT_DEPENDS= rpm:${PORTSDIR}/archivers/rpm
BROKEN= Does not build
-CONFLICTS= linux_base-7* linux_base-8* linux_base-debian* \
- linux_base-fc* linux_base-gentoo* linux_base-rh* \
+CONFLICTS= linux_base-fc* linux_base-gentoo* \
linux_base-suse-9.1* linux_base-suse-9.3*
RESTRICTED= binaries under GNU GPL: http://www.gnu.org/licenses/gpl.txt
diff --git a/emulators/linux_base-suse-9.3/Makefile b/emulators/linux_base-suse-9.3/Makefile
index dbad12900d86..4725d28eebac 100644
--- a/emulators/linux_base-suse-9.3/Makefile
+++ b/emulators/linux_base-suse-9.3/Makefile
@@ -19,8 +19,7 @@ COMMENT= Basic packages for Linux mode from SUSE 9.3/i386
EXTRACT_DEPENDS= rpm:${PORTSDIR}/archivers/rpm
-CONFLICTS= linux_base-7* linux_base-8* linux_base-debian* \
- linux_base-fc* linux_base-gentoo* linux_base-rh* \
+CONFLICTS= linux_base-fc* linux_base-gentoo* \
linux_base-suse-9.1* linux_base-suse-9.2*
RPMLIST= ${.CURDIR}/files/rpmlist.conf
diff --git a/emulators/linux_dist-gentoo-stage1/Makefile b/emulators/linux_dist-gentoo-stage1/Makefile
index 2222deee1126..8a90c424e29a 100644
--- a/emulators/linux_dist-gentoo-stage1/Makefile
+++ b/emulators/linux_dist-gentoo-stage1/Makefile
@@ -35,9 +35,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-gentoo-stage[23]-*
+CONFLICTS= linux_base-suse* linux_base-fc* linux_base-gentoo-stage[23]-*
USE_LINUX_PREFIX= YES
PREFIX_SUBDIR=
.else
diff --git a/emulators/linux_dist-gentoo-stage2/Makefile b/emulators/linux_dist-gentoo-stage2/Makefile
index 2615fe692aa4..cf6506ce419b 100644
--- a/emulators/linux_dist-gentoo-stage2/Makefile
+++ b/emulators/linux_dist-gentoo-stage2/Makefile
@@ -35,9 +35,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-gentoo-stage[13]-*
+CONFLICTS= linux_base-suse* linux_base-fc* linux_base-gentoo-stage[13]-*
USE_LINUX_PREFIX= YES
PREFIX_SUBDIR=
.else
diff --git a/emulators/linux_dist-gentoo-stage3/Makefile b/emulators/linux_dist-gentoo-stage3/Makefile
index fab097501440..2cf81fe1d0c8 100644
--- a/emulators/linux_dist-gentoo-stage3/Makefile
+++ b/emulators/linux_dist-gentoo-stage3/Makefile
@@ -35,9 +35,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-gentoo-stage[12]-*
+CONFLICTS= linux_base-suse* linux_base-fc* linux_base-gentoo-stage[12]-*
USE_LINUX_PREFIX= YES
PREFIX_SUBDIR=
.else
diff --git a/x11/linux-XFree86-libs/Makefile b/x11/linux-XFree86-libs/Makefile
index cc477b05b03b..d2fa333b8bc7 100644
--- a/x11/linux-XFree86-libs/Makefile
+++ b/x11/linux-XFree86-libs/Makefile
@@ -25,7 +25,7 @@ COMMENT= XFree86 libraries, Linux binary
BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm
RUN_DEPENDS= ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig
-CONFLICTS= linux_base-7* linux_base-deb* linux-xorg-libs*
+CONFLICTS= linux-xorg-libs*
USE_LINUX_PREFIX=yes
USE_LINUX= yes
MD5_FILE= ${MASTERDIR}/distinfo.i386
generated by cgit (git 2.34.1) at 2024-12-30 09:59:12 +0800