* Depend on libc6, this should fix some lib-problems. Also automatically

  install linuxbase if it's not yet installed.
* Fix the cdrom installation

Submitted by:	Martin Blapp <mp@imp.ch> (MAINTAINER) on IRC

24 files changed, 96 insertions, 24 deletions

diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile
index 58ad83f539fa..6f0d006998c8 100644
--- a/editors/openoffice-1.0/Makefile
+++ b/editors/openoffice-1.0/Makefile
@@ -26,7 +26,8 @@ EXTRACT_ONLY=
 
 MAINTAINER=	mb@imp.ch
 
-RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
+DEPENDS=	${PORTSDIR}/emulators/linux_base
+RUN_DEPENDS=	/compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
 
 ONLY_FOR_ARCHS=	i386
 NO_CDROM=	'Must be downloaded direct from Sun via www interface'
@@ -53,12 +54,14 @@ pre-fetch:
 	@${FALSE}
 .endif
 .if defined(WITH_CDROM)
+.if !exists(${CD_MOUNTPT}/linux/office52/setup)
 	@${ECHO}
 	@${ECHO} Please mount the Sun StarOffice 5.2 CDROM
 	@${ECHO} onto /cdrom and run make again.
 	@${ECHO}
 	@${FALSE}
 .endif
+.endif
 
 .if defined(WITH_CDROM)
 do-extract:
diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile
index 58ad83f539fa..6f0d006998c8 100644
--- a/editors/openoffice-1.1-devel/Makefile
+++ b/editors/openoffice-1.1-devel/Makefile
@@ -26,7 +26,8 @@ EXTRACT_ONLY=
 
 MAINTAINER=	mb@imp.ch
 
-RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
+DEPENDS=	${PORTSDIR}/emulators/linux_base
+RUN_DEPENDS=	/compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
 
 ONLY_FOR_ARCHS=	i386
 NO_CDROM=	'Must be downloaded direct from Sun via www interface'
@@ -53,12 +54,14 @@ pre-fetch:
 	@${FALSE}
 .endif
 .if defined(WITH_CDROM)
+.if !exists(${CD_MOUNTPT}/linux/office52/setup)
 	@${ECHO}
 	@${ECHO} Please mount the Sun StarOffice 5.2 CDROM
 	@${ECHO} onto /cdrom and run make again.
 	@${ECHO}
 	@${FALSE}
 .endif
+.endif
 
 .if defined(WITH_CDROM)
 do-extract:
diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile
index 58ad83f539fa..6f0d006998c8 100644
--- a/editors/openoffice-1.1/Makefile
+++ b/editors/openoffice-1.1/Makefile
@@ -26,7 +26,8 @@ EXTRACT_ONLY=
 
 MAINTAINER=	mb@imp.ch
 
-RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
+DEPENDS=	${PORTSDIR}/emulators/linux_base
+RUN_DEPENDS=	/compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
 
 ONLY_FOR_ARCHS=	i386
 NO_CDROM=	'Must be downloaded direct from Sun via www interface'
@@ -53,12 +54,14 @@ pre-fetch:
 	@${FALSE}
 .endif
 .if defined(WITH_CDROM)
+.if !exists(${CD_MOUNTPT}/linux/office52/setup)
 	@${ECHO}
 	@${ECHO} Please mount the Sun StarOffice 5.2 CDROM
 	@${ECHO} onto /cdrom and run make again.
 	@${ECHO}
 	@${FALSE}
 .endif
+.endif
 
 .if defined(WITH_CDROM)
 do-extract:
diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile
index 58ad83f539fa..6f0d006998c8 100644
--- a/editors/openoffice-2.0-devel/Makefile
+++ b/editors/openoffice-2.0-devel/Makefile
@@ -26,7 +26,8 @@ EXTRACT_ONLY=
 
 MAINTAINER=	mb@imp.ch
 
-RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
+DEPENDS=	${PORTSDIR}/emulators/linux_base
+RUN_DEPENDS=	/compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
 
 ONLY_FOR_ARCHS=	i386
 NO_CDROM=	'Must be downloaded direct from Sun via www interface'
@@ -53,12 +54,14 @@ pre-fetch:
 	@${FALSE}
 .endif
 .if defined(WITH_CDROM)
+.if !exists(${CD_MOUNTPT}/linux/office52/setup)
 	@${ECHO}
 	@${ECHO} Please mount the Sun StarOffice 5.2 CDROM
 	@${ECHO} onto /cdrom and run make again.
 	@${ECHO}
 	@${FALSE}
 .endif
+.endif
 
 .if defined(WITH_CDROM)
 do-extract:
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 58ad83f539fa..6f0d006998c8 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -26,7 +26,8 @@ EXTRACT_ONLY=
 
 MAINTAINER=	mb@imp.ch
 
-RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
+DEPENDS=	${PORTSDIR}/emulators/linux_base
+RUN_DEPENDS=	/compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
 
 ONLY_FOR_ARCHS=	i386
 NO_CDROM=	'Must be downloaded direct from Sun via www interface'
@@ -53,12 +54,14 @@ pre-fetch:
 	@${FALSE}
 .endif
 .if defined(WITH_CDROM)
+.if !exists(${CD_MOUNTPT}/linux/office52/setup)
 	@${ECHO}
 	@${ECHO} Please mount the Sun StarOffice 5.2 CDROM
 	@${ECHO} onto /cdrom and run make again.
 	@${ECHO}
 	@${FALSE}
 .endif
+.endif
 
 .if defined(WITH_CDROM)
 do-extract:
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 58ad83f539fa..6f0d006998c8 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -26,7 +26,8 @@ EXTRACT_ONLY=
 
 MAINTAINER=	mb@imp.ch
 
-RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
+DEPENDS=	${PORTSDIR}/emulators/linux_base
+RUN_DEPENDS=	/compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
 
 ONLY_FOR_ARCHS=	i386
 NO_CDROM=	'Must be downloaded direct from Sun via www interface'
@@ -53,12 +54,14 @@ pre-fetch:
 	@${FALSE}
 .endif
 .if defined(WITH_CDROM)
+.if !exists(${CD_MOUNTPT}/linux/office52/setup)
 	@${ECHO}
 	@${ECHO} Please mount the Sun StarOffice 5.2 CDROM
 	@${ECHO} onto /cdrom and run make again.
 	@${ECHO}
 	@${FALSE}
 .endif
+.endif
 
 .if defined(WITH_CDROM)
 do-extract:
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index 58ad83f539fa..6f0d006998c8 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -26,7 +26,8 @@ EXTRACT_ONLY=
 
 MAINTAINER=	mb@imp.ch
 
-RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
+DEPENDS=	${PORTSDIR}/emulators/linux_base
+RUN_DEPENDS=	/compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
 
 ONLY_FOR_ARCHS=	i386
 NO_CDROM=	'Must be downloaded direct from Sun via www interface'
@@ -53,12 +54,14 @@ pre-fetch:
 	@${FALSE}
 .endif
 .if defined(WITH_CDROM)
+.if !exists(${CD_MOUNTPT}/linux/office52/setup)
 	@${ECHO}
 	@${ECHO} Please mount the Sun StarOffice 5.2 CDROM
 	@${ECHO} onto /cdrom and run make again.
 	@${ECHO}
 	@${FALSE}
 .endif
+.endif
 
 .if defined(WITH_CDROM)
 do-extract:
diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile
index 58ad83f539fa..6f0d006998c8 100644
--- a/editors/openoffice.org-1.0/Makefile
+++ b/editors/openoffice.org-1.0/Makefile
@@ -26,7 +26,8 @@ EXTRACT_ONLY=
 
 MAINTAINER=	mb@imp.ch
 
-RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
+DEPENDS=	${PORTSDIR}/emulators/linux_base
+RUN_DEPENDS=	/compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
 
 ONLY_FOR_ARCHS=	i386
 NO_CDROM=	'Must be downloaded direct from Sun via www interface'
@@ -53,12 +54,14 @@ pre-fetch:
 	@${FALSE}
 .endif
 .if defined(WITH_CDROM)
+.if !exists(${CD_MOUNTPT}/linux/office52/setup)
 	@${ECHO}
 	@${ECHO} Please mount the Sun StarOffice 5.2 CDROM
 	@${ECHO} onto /cdrom and run make again.
 	@${ECHO}
 	@${FALSE}
 .endif
+.endif
 
 .if defined(WITH_CDROM)
 do-extract:
diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile
index 58ad83f539fa..6f0d006998c8 100644
--- a/editors/openoffice.org-1.1-devel/Makefile
+++ b/editors/openoffice.org-1.1-devel/Makefile
@@ -26,7 +26,8 @@ EXTRACT_ONLY=
 
 MAINTAINER=	mb@imp.ch
 
-RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
+DEPENDS=	${PORTSDIR}/emulators/linux_base
+RUN_DEPENDS=	/compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
 
 ONLY_FOR_ARCHS=	i386
 NO_CDROM=	'Must be downloaded direct from Sun via www interface'
@@ -53,12 +54,14 @@ pre-fetch:
 	@${FALSE}
 .endif
 .if defined(WITH_CDROM)
+.if !exists(${CD_MOUNTPT}/linux/office52/setup)
 	@${ECHO}
 	@${ECHO} Please mount the Sun StarOffice 5.2 CDROM
 	@${ECHO} onto /cdrom and run make again.
 	@${ECHO}
 	@${FALSE}
 .endif
+.endif
 
 .if defined(WITH_CDROM)
 do-extract:
diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile
index 58ad83f539fa..6f0d006998c8 100644
--- a/editors/openoffice.org-1.1/Makefile
+++ b/editors/openoffice.org-1.1/Makefile
@@ -26,7 +26,8 @@ EXTRACT_ONLY=
 
 MAINTAINER=	mb@imp.ch
 
-RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
+DEPENDS=	${PORTSDIR}/emulators/linux_base
+RUN_DEPENDS=	/compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
 
 ONLY_FOR_ARCHS=	i386
 NO_CDROM=	'Must be downloaded direct from Sun via www interface'
@@ -53,12 +54,14 @@ pre-fetch:
 	@${FALSE}
 .endif
 .if defined(WITH_CDROM)
+.if !exists(${CD_MOUNTPT}/linux/office52/setup)
 	@${ECHO}
 	@${ECHO} Please mount the Sun StarOffice 5.2 CDROM
 	@${ECHO} onto /cdrom and run make again.
 	@${ECHO}
 	@${FALSE}
 .endif
+.endif
 
 .if defined(WITH_CDROM)
 do-extract:
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index 58ad83f539fa..6f0d006998c8 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -26,7 +26,8 @@ EXTRACT_ONLY=
 
 MAINTAINER=	mb@imp.ch
 
-RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
+DEPENDS=	${PORTSDIR}/emulators/linux_base
+RUN_DEPENDS=	/compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
 
 ONLY_FOR_ARCHS=	i386
 NO_CDROM=	'Must be downloaded direct from Sun via www interface'
@@ -53,12 +54,14 @@ pre-fetch:
 	@${FALSE}
 .endif
 .if defined(WITH_CDROM)
+.if !exists(${CD_MOUNTPT}/linux/office52/setup)
 	@${ECHO}
 	@${ECHO} Please mount the Sun StarOffice 5.2 CDROM
 	@${ECHO} onto /cdrom and run make again.
 	@${ECHO}
 	@${FALSE}
 .endif
+.endif
 
 .if defined(WITH_CDROM)
 do-extract:
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index 58ad83f539fa..6f0d006998c8 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -26,7 +26,8 @@ EXTRACT_ONLY=
 
 MAINTAINER=	mb@imp.ch
 
-RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
+DEPENDS=	${PORTSDIR}/emulators/linux_base
+RUN_DEPENDS=	/compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
 
 ONLY_FOR_ARCHS=	i386
 NO_CDROM=	'Must be downloaded direct from Sun via www interface'
@@ -53,12 +54,14 @@ pre-fetch:
 	@${FALSE}
 .endif
 .if defined(WITH_CDROM)
+.if !exists(${CD_MOUNTPT}/linux/office52/setup)
 	@${ECHO}
 	@${ECHO} Please mount the Sun StarOffice 5.2 CDROM
 	@${ECHO} onto /cdrom and run make again.
 	@${ECHO}
 	@${FALSE}
 .endif
+.endif
 
 .if defined(WITH_CDROM)
 do-extract:
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index 58ad83f539fa..6f0d006998c8 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -26,7 +26,8 @@ EXTRACT_ONLY=
 
 MAINTAINER=	mb@imp.ch
 
-RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
+DEPENDS=	${PORTSDIR}/emulators/linux_base
+RUN_DEPENDS=	/compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
 
 ONLY_FOR_ARCHS=	i386
 NO_CDROM=	'Must be downloaded direct from Sun via www interface'
@@ -53,12 +54,14 @@ pre-fetch:
 	@${FALSE}
 .endif
 .if defined(WITH_CDROM)
+.if !exists(${CD_MOUNTPT}/linux/office52/setup)
 	@${ECHO}
 	@${ECHO} Please mount the Sun StarOffice 5.2 CDROM
 	@${ECHO} onto /cdrom and run make again.
 	@${ECHO}
 	@${FALSE}
 .endif
+.endif
 
 .if defined(WITH_CDROM)
 do-extract:
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index 58ad83f539fa..6f0d006998c8 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -26,7 +26,8 @@ EXTRACT_ONLY=
 
 MAINTAINER=	mb@imp.ch
 
-RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
+DEPENDS=	${PORTSDIR}/emulators/linux_base
+RUN_DEPENDS=	/compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
 
 ONLY_FOR_ARCHS=	i386
 NO_CDROM=	'Must be downloaded direct from Sun via www interface'
@@ -53,12 +54,14 @@ pre-fetch:
 	@${FALSE}
 .endif
 .if defined(WITH_CDROM)
+.if !exists(${CD_MOUNTPT}/linux/office52/setup)
 	@${ECHO}
 	@${ECHO} Please mount the Sun StarOffice 5.2 CDROM
 	@${ECHO} onto /cdrom and run make again.
 	@${ECHO}
 	@${FALSE}
 .endif
+.endif
 
 .if defined(WITH_CDROM)
 do-extract:
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index 58ad83f539fa..6f0d006998c8 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -26,7 +26,8 @@ EXTRACT_ONLY=
 
 MAINTAINER=	mb@imp.ch
 
-RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
+DEPENDS=	${PORTSDIR}/emulators/linux_base
+RUN_DEPENDS=	/compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
 
 ONLY_FOR_ARCHS=	i386
 NO_CDROM=	'Must be downloaded direct from Sun via www interface'
@@ -53,12 +54,14 @@ pre-fetch:
 	@${FALSE}
 .endif
 .if defined(WITH_CDROM)
+.if !exists(${CD_MOUNTPT}/linux/office52/setup)
 	@${ECHO}
 	@${ECHO} Please mount the Sun StarOffice 5.2 CDROM
 	@${ECHO} onto /cdrom and run make again.
 	@${ECHO}
 	@${FALSE}
 .endif
+.endif
 
 .if defined(WITH_CDROM)
 do-extract:
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 58ad83f539fa..6f0d006998c8 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -26,7 +26,8 @@ EXTRACT_ONLY=
 
 MAINTAINER=	mb@imp.ch
 
-RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
+DEPENDS=	${PORTSDIR}/emulators/linux_base
+RUN_DEPENDS=	/compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
 
 ONLY_FOR_ARCHS=	i386
 NO_CDROM=	'Must be downloaded direct from Sun via www interface'
@@ -53,12 +54,14 @@ pre-fetch:
 	@${FALSE}
 .endif
 .if defined(WITH_CDROM)
+.if !exists(${CD_MOUNTPT}/linux/office52/setup)
 	@${ECHO}
 	@${ECHO} Please mount the Sun StarOffice 5.2 CDROM
 	@${ECHO} onto /cdrom and run make again.
 	@${ECHO}
 	@${FALSE}
 .endif
+.endif
 
 .if defined(WITH_CDROM)
 do-extract:
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 58ad83f539fa..6f0d006998c8 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -26,7 +26,8 @@ EXTRACT_ONLY=
 
 MAINTAINER=	mb@imp.ch
 
-RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
+DEPENDS=	${PORTSDIR}/emulators/linux_base
+RUN_DEPENDS=	/compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
 
 ONLY_FOR_ARCHS=	i386
 NO_CDROM=	'Must be downloaded direct from Sun via www interface'
@@ -53,12 +54,14 @@ pre-fetch:
 	@${FALSE}
 .endif
 .if defined(WITH_CDROM)
+.if !exists(${CD_MOUNTPT}/linux/office52/setup)
 	@${ECHO}
 	@${ECHO} Please mount the Sun StarOffice 5.2 CDROM
 	@${ECHO} onto /cdrom and run make again.
 	@${ECHO}
 	@${FALSE}
 .endif
+.endif
 
 .if defined(WITH_CDROM)
 do-extract:
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 58ad83f539fa..6f0d006998c8 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -26,7 +26,8 @@ EXTRACT_ONLY=
 
 MAINTAINER=	mb@imp.ch
 
-RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
+DEPENDS=	${PORTSDIR}/emulators/linux_base
+RUN_DEPENDS=	/compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
 
 ONLY_FOR_ARCHS=	i386
 NO_CDROM=	'Must be downloaded direct from Sun via www interface'
@@ -53,12 +54,14 @@ pre-fetch:
 	@${FALSE}
 .endif
 .if defined(WITH_CDROM)
+.if !exists(${CD_MOUNTPT}/linux/office52/setup)
 	@${ECHO}
 	@${ECHO} Please mount the Sun StarOffice 5.2 CDROM
 	@${ECHO} onto /cdrom and run make again.
 	@${ECHO}
 	@${FALSE}
 .endif
+.endif
 
 .if defined(WITH_CDROM)
 do-extract:
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 58ad83f539fa..6f0d006998c8 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -26,7 +26,8 @@ EXTRACT_ONLY=
 
 MAINTAINER=	mb@imp.ch
 
-RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
+DEPENDS=	${PORTSDIR}/emulators/linux_base
+RUN_DEPENDS=	/compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
 
 ONLY_FOR_ARCHS=	i386
 NO_CDROM=	'Must be downloaded direct from Sun via www interface'
@@ -53,12 +54,14 @@ pre-fetch:
 	@${FALSE}
 .endif
 .if defined(WITH_CDROM)
+.if !exists(${CD_MOUNTPT}/linux/office52/setup)
 	@${ECHO}
 	@${ECHO} Please mount the Sun StarOffice 5.2 CDROM
 	@${ECHO} onto /cdrom and run make again.
 	@${ECHO}
 	@${FALSE}
 .endif
+.endif
 
 .if defined(WITH_CDROM)
 do-extract:
diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile
index 58ad83f539fa..6f0d006998c8 100644
--- a/editors/openoffice/Makefile
+++ b/editors/openoffice/Makefile
@@ -26,7 +26,8 @@ EXTRACT_ONLY=
 
 MAINTAINER=	mb@imp.ch
 
-RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
+DEPENDS=	${PORTSDIR}/emulators/linux_base
+RUN_DEPENDS=	/compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
 
 ONLY_FOR_ARCHS=	i386
 NO_CDROM=	'Must be downloaded direct from Sun via www interface'
@@ -53,12 +54,14 @@ pre-fetch:
 	@${FALSE}
 .endif
 .if defined(WITH_CDROM)
+.if !exists(${CD_MOUNTPT}/linux/office52/setup)
 	@${ECHO}
 	@${ECHO} Please mount the Sun StarOffice 5.2 CDROM
 	@${ECHO} onto /cdrom and run make again.
 	@${ECHO}
 	@${FALSE}
 .endif
+.endif
 
 .if defined(WITH_CDROM)
 do-extract:
diff --git a/editors/staroffice52/Makefile b/editors/staroffice52/Makefile
index 58ad83f539fa..6f0d006998c8 100644
--- a/editors/staroffice52/Makefile
+++ b/editors/staroffice52/Makefile
@@ -26,7 +26,8 @@ EXTRACT_ONLY=
 
 MAINTAINER=	mb@imp.ch
 
-RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
+DEPENDS=	${PORTSDIR}/emulators/linux_base
+RUN_DEPENDS=	/compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
 
 ONLY_FOR_ARCHS=	i386
 NO_CDROM=	'Must be downloaded direct from Sun via www interface'
@@ -53,12 +54,14 @@ pre-fetch:
 	@${FALSE}
 .endif
 .if defined(WITH_CDROM)
+.if !exists(${CD_MOUNTPT}/linux/office52/setup)
 	@${ECHO}
 	@${ECHO} Please mount the Sun StarOffice 5.2 CDROM
 	@${ECHO} onto /cdrom and run make again.
 	@${ECHO}
 	@${FALSE}
 .endif
+.endif
 
 .if defined(WITH_CDROM)
 do-extract:
diff --git a/editors/staroffice60/Makefile b/editors/staroffice60/Makefile
index 58ad83f539fa..6f0d006998c8 100644
--- a/editors/staroffice60/Makefile
+++ b/editors/staroffice60/Makefile
@@ -26,7 +26,8 @@ EXTRACT_ONLY=
 
 MAINTAINER=	mb@imp.ch
 
-RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
+DEPENDS=	${PORTSDIR}/emulators/linux_base
+RUN_DEPENDS=	/compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
 
 ONLY_FOR_ARCHS=	i386
 NO_CDROM=	'Must be downloaded direct from Sun via www interface'
@@ -53,12 +54,14 @@ pre-fetch:
 	@${FALSE}
 .endif
 .if defined(WITH_CDROM)
+.if !exists(${CD_MOUNTPT}/linux/office52/setup)
 	@${ECHO}
 	@${ECHO} Please mount the Sun StarOffice 5.2 CDROM
 	@${ECHO} onto /cdrom and run make again.
 	@${ECHO}
 	@${FALSE}
 .endif
+.endif
 
 .if defined(WITH_CDROM)
 do-extract:
diff --git a/editors/staroffice70/Makefile b/editors/staroffice70/Makefile
index 58ad83f539fa..6f0d006998c8 100644
--- a/editors/staroffice70/Makefile
+++ b/editors/staroffice70/Makefile
@@ -26,7 +26,8 @@ EXTRACT_ONLY=
 
 MAINTAINER=	mb@imp.ch
 
-RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
+DEPENDS=	${PORTSDIR}/emulators/linux_base
+RUN_DEPENDS=	/compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
 
 ONLY_FOR_ARCHS=	i386
 NO_CDROM=	'Must be downloaded direct from Sun via www interface'
@@ -53,12 +54,14 @@ pre-fetch:
 	@${FALSE}
 .endif
 .if defined(WITH_CDROM)
+.if !exists(${CD_MOUNTPT}/linux/office52/setup)
 	@${ECHO}
 	@${ECHO} Please mount the Sun StarOffice 5.2 CDROM
 	@${ECHO} onto /cdrom and run make again.
 	@${ECHO}
 	@${FALSE}
 .endif
+.endif
 
 .if defined(WITH_CDROM)
 do-extract:
diff --git a/german/staroffice70/Makefile b/german/staroffice70/Makefile
index 58ad83f539fa..6f0d006998c8 100644
--- a/german/staroffice70/Makefile
+++ b/german/staroffice70/Makefile
@@ -26,7 +26,8 @@ EXTRACT_ONLY=
 
 MAINTAINER=	mb@imp.ch
 
-RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
+DEPENDS=	${PORTSDIR}/emulators/linux_base
+RUN_DEPENDS=	/compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
 
 ONLY_FOR_ARCHS=	i386
 NO_CDROM=	'Must be downloaded direct from Sun via www interface'
@@ -53,12 +54,14 @@ pre-fetch:
 	@${FALSE}
 .endif
 .if defined(WITH_CDROM)
+.if !exists(${CD_MOUNTPT}/linux/office52/setup)
 	@${ECHO}
 	@${ECHO} Please mount the Sun StarOffice 5.2 CDROM
 	@${ECHO} onto /cdrom and run make again.
 	@${ECHO}
 	@${FALSE}
 .endif
+.endif
 
 .if defined(WITH_CDROM)
 do-extract: