Provide patch for rtld.c both 4-series and 5-series

and update the instruction

Submitted by:	marck

14 files changed, 112 insertions, 42 deletions

diff --git a/editors/openoffice-1.1/files/Makefile.knobs b/editors/openoffice-1.1/files/Makefile.knobs
index efb76fa8fd2f..cfc3757a9a31 100644
--- a/editors/openoffice-1.1/files/Makefile.knobs
+++ b/editors/openoffice-1.1/files/Makefile.knobs
@@ -31,9 +31,14 @@ pre-fetch:
 	@${ECHO}
 	@${ECHO} "WARNING"
 	@${ECHO} "Your rtld seems to be old."
-	@${ECHO} "Please remake your rtld by:"
-	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c"
-	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c"
+	@${ECHO} "Please remake your rtld by:
+	@${ECHO} "[1] if you use 4-series:"
+	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng4"
+	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng4"
+	@${ECHO} "# make ; make depend ; make install"
+	@${ECHO} "[2] if you use 5-series:"
+	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng5"
+	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng5"
 	@${ECHO} "# make ; make depend ; make install"
 	@${ECHO} "AT YOUR OWN RISK!"
 .endif
diff --git a/editors/openoffice-2.0-devel/files/Makefile.knobs b/editors/openoffice-2.0-devel/files/Makefile.knobs
index 0fd696fa080e..9315fddb9d73 100644
--- a/editors/openoffice-2.0-devel/files/Makefile.knobs
+++ b/editors/openoffice-2.0-devel/files/Makefile.knobs
@@ -36,9 +36,14 @@ pre-fetch:
 	@${ECHO}
 	@${ECHO} "WARNING"
 	@${ECHO} "Your rtld seems to be old."
-	@${ECHO} "Please remake your rtld by:"
-	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c"
-	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c"
+	@${ECHO} "Please remake your rtld by:
+	@${ECHO} "[1] if you use 4-series:"
+	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng4"
+	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng4"
+	@${ECHO} "# make ; make depend ; make install"
+	@${ECHO} "[2] if you use 5-series:"
+	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng5"
+	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng5"
 	@${ECHO} "# make ; make depend ; make install"
 	@${ECHO} "AT YOUR OWN RISK!"
 .endif
diff --git a/editors/openoffice-3-devel/files/Makefile.knobs b/editors/openoffice-3-devel/files/Makefile.knobs
index 0fd696fa080e..9315fddb9d73 100644
--- a/editors/openoffice-3-devel/files/Makefile.knobs
+++ b/editors/openoffice-3-devel/files/Makefile.knobs
@@ -36,9 +36,14 @@ pre-fetch:
 	@${ECHO}
 	@${ECHO} "WARNING"
 	@${ECHO} "Your rtld seems to be old."
-	@${ECHO} "Please remake your rtld by:"
-	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c"
-	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c"
+	@${ECHO} "Please remake your rtld by:
+	@${ECHO} "[1] if you use 4-series:"
+	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng4"
+	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng4"
+	@${ECHO} "# make ; make depend ; make install"
+	@${ECHO} "[2] if you use 5-series:"
+	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng5"
+	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng5"
 	@${ECHO} "# make ; make depend ; make install"
 	@${ECHO} "AT YOUR OWN RISK!"
 .endif
diff --git a/editors/openoffice-3/files/Makefile.knobs b/editors/openoffice-3/files/Makefile.knobs
index 0fd696fa080e..9315fddb9d73 100644
--- a/editors/openoffice-3/files/Makefile.knobs
+++ b/editors/openoffice-3/files/Makefile.knobs
@@ -36,9 +36,14 @@ pre-fetch:
 	@${ECHO}
 	@${ECHO} "WARNING"
 	@${ECHO} "Your rtld seems to be old."
-	@${ECHO} "Please remake your rtld by:"
-	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c"
-	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c"
+	@${ECHO} "Please remake your rtld by:
+	@${ECHO} "[1] if you use 4-series:"
+	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng4"
+	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng4"
+	@${ECHO} "# make ; make depend ; make install"
+	@${ECHO} "[2] if you use 5-series:"
+	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng5"
+	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng5"
 	@${ECHO} "# make ; make depend ; make install"
 	@${ECHO} "AT YOUR OWN RISK!"
 .endif
diff --git a/editors/openoffice.org-1.1/files/Makefile.knobs b/editors/openoffice.org-1.1/files/Makefile.knobs
index efb76fa8fd2f..cfc3757a9a31 100644
--- a/editors/openoffice.org-1.1/files/Makefile.knobs
+++ b/editors/openoffice.org-1.1/files/Makefile.knobs
@@ -31,9 +31,14 @@ pre-fetch:
 	@${ECHO}
 	@${ECHO} "WARNING"
 	@${ECHO} "Your rtld seems to be old."
-	@${ECHO} "Please remake your rtld by:"
-	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c"
-	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c"
+	@${ECHO} "Please remake your rtld by:
+	@${ECHO} "[1] if you use 4-series:"
+	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng4"
+	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng4"
+	@${ECHO} "# make ; make depend ; make install"
+	@${ECHO} "[2] if you use 5-series:"
+	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng5"
+	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng5"
 	@${ECHO} "# make ; make depend ; make install"
 	@${ECHO} "AT YOUR OWN RISK!"
 .endif
diff --git a/editors/openoffice.org-2-RC/files/Makefile.knobs b/editors/openoffice.org-2-RC/files/Makefile.knobs
index 0fd696fa080e..9315fddb9d73 100644
--- a/editors/openoffice.org-2-RC/files/Makefile.knobs
+++ b/editors/openoffice.org-2-RC/files/Makefile.knobs
@@ -36,9 +36,14 @@ pre-fetch:
 	@${ECHO}
 	@${ECHO} "WARNING"
 	@${ECHO} "Your rtld seems to be old."
-	@${ECHO} "Please remake your rtld by:"
-	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c"
-	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c"
+	@${ECHO} "Please remake your rtld by:
+	@${ECHO} "[1] if you use 4-series:"
+	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng4"
+	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng4"
+	@${ECHO} "# make ; make depend ; make install"
+	@${ECHO} "[2] if you use 5-series:"
+	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng5"
+	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng5"
 	@${ECHO} "# make ; make depend ; make install"
 	@${ECHO} "AT YOUR OWN RISK!"
 .endif
diff --git a/editors/openoffice.org-2-devel/files/Makefile.knobs b/editors/openoffice.org-2-devel/files/Makefile.knobs
index 0fd696fa080e..9315fddb9d73 100644
--- a/editors/openoffice.org-2-devel/files/Makefile.knobs
+++ b/editors/openoffice.org-2-devel/files/Makefile.knobs
@@ -36,9 +36,14 @@ pre-fetch:
 	@${ECHO}
 	@${ECHO} "WARNING"
 	@${ECHO} "Your rtld seems to be old."
-	@${ECHO} "Please remake your rtld by:"
-	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c"
-	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c"
+	@${ECHO} "Please remake your rtld by:
+	@${ECHO} "[1] if you use 4-series:"
+	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng4"
+	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng4"
+	@${ECHO} "# make ; make depend ; make install"
+	@${ECHO} "[2] if you use 5-series:"
+	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng5"
+	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng5"
 	@${ECHO} "# make ; make depend ; make install"
 	@${ECHO} "AT YOUR OWN RISK!"
 .endif
diff --git a/editors/openoffice.org-2.0-devel/files/Makefile.knobs b/editors/openoffice.org-2.0-devel/files/Makefile.knobs
index 0fd696fa080e..9315fddb9d73 100644
--- a/editors/openoffice.org-2.0-devel/files/Makefile.knobs
+++ b/editors/openoffice.org-2.0-devel/files/Makefile.knobs
@@ -36,9 +36,14 @@ pre-fetch:
 	@${ECHO}
 	@${ECHO} "WARNING"
 	@${ECHO} "Your rtld seems to be old."
-	@${ECHO} "Please remake your rtld by:"
-	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c"
-	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c"
+	@${ECHO} "Please remake your rtld by:
+	@${ECHO} "[1] if you use 4-series:"
+	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng4"
+	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng4"
+	@${ECHO} "# make ; make depend ; make install"
+	@${ECHO} "[2] if you use 5-series:"
+	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng5"
+	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng5"
 	@${ECHO} "# make ; make depend ; make install"
 	@${ECHO} "AT YOUR OWN RISK!"
 .endif
diff --git a/editors/openoffice.org-2.0/files/Makefile.knobs b/editors/openoffice.org-2.0/files/Makefile.knobs
index 0fd696fa080e..9315fddb9d73 100644
--- a/editors/openoffice.org-2.0/files/Makefile.knobs
+++ b/editors/openoffice.org-2.0/files/Makefile.knobs
@@ -36,9 +36,14 @@ pre-fetch:
 	@${ECHO}
 	@${ECHO} "WARNING"
 	@${ECHO} "Your rtld seems to be old."
-	@${ECHO} "Please remake your rtld by:"
-	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c"
-	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c"
+	@${ECHO} "Please remake your rtld by:
+	@${ECHO} "[1] if you use 4-series:"
+	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng4"
+	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng4"
+	@${ECHO} "# make ; make depend ; make install"
+	@${ECHO} "[2] if you use 5-series:"
+	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng5"
+	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng5"
 	@${ECHO} "# make ; make depend ; make install"
 	@${ECHO} "AT YOUR OWN RISK!"
 .endif
diff --git a/editors/openoffice.org-2/files/Makefile.knobs b/editors/openoffice.org-2/files/Makefile.knobs
index 0fd696fa080e..9315fddb9d73 100644
--- a/editors/openoffice.org-2/files/Makefile.knobs
+++ b/editors/openoffice.org-2/files/Makefile.knobs
@@ -36,9 +36,14 @@ pre-fetch:
 	@${ECHO}
 	@${ECHO} "WARNING"
 	@${ECHO} "Your rtld seems to be old."
-	@${ECHO} "Please remake your rtld by:"
-	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c"
-	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c"
+	@${ECHO} "Please remake your rtld by:
+	@${ECHO} "[1] if you use 4-series:"
+	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng4"
+	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng4"
+	@${ECHO} "# make ; make depend ; make install"
+	@${ECHO} "[2] if you use 5-series:"
+	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng5"
+	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng5"
 	@${ECHO} "# make ; make depend ; make install"
 	@${ECHO} "AT YOUR OWN RISK!"
 .endif
diff --git a/editors/openoffice.org-3-RC/files/Makefile.knobs b/editors/openoffice.org-3-RC/files/Makefile.knobs
index 0fd696fa080e..9315fddb9d73 100644
--- a/editors/openoffice.org-3-RC/files/Makefile.knobs
+++ b/editors/openoffice.org-3-RC/files/Makefile.knobs
@@ -36,9 +36,14 @@ pre-fetch:
 	@${ECHO}
 	@${ECHO} "WARNING"
 	@${ECHO} "Your rtld seems to be old."
-	@${ECHO} "Please remake your rtld by:"
-	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c"
-	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c"
+	@${ECHO} "Please remake your rtld by:
+	@${ECHO} "[1] if you use 4-series:"
+	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng4"
+	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng4"
+	@${ECHO} "# make ; make depend ; make install"
+	@${ECHO} "[2] if you use 5-series:"
+	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng5"
+	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng5"
 	@${ECHO} "# make ; make depend ; make install"
 	@${ECHO} "AT YOUR OWN RISK!"
 .endif
diff --git a/editors/openoffice.org-3-devel/files/Makefile.knobs b/editors/openoffice.org-3-devel/files/Makefile.knobs
index 0fd696fa080e..9315fddb9d73 100644
--- a/editors/openoffice.org-3-devel/files/Makefile.knobs
+++ b/editors/openoffice.org-3-devel/files/Makefile.knobs
@@ -36,9 +36,14 @@ pre-fetch:
 	@${ECHO}
 	@${ECHO} "WARNING"
 	@${ECHO} "Your rtld seems to be old."
-	@${ECHO} "Please remake your rtld by:"
-	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c"
-	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c"
+	@${ECHO} "Please remake your rtld by:
+	@${ECHO} "[1] if you use 4-series:"
+	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng4"
+	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng4"
+	@${ECHO} "# make ; make depend ; make install"
+	@${ECHO} "[2] if you use 5-series:"
+	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng5"
+	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng5"
 	@${ECHO} "# make ; make depend ; make install"
 	@${ECHO} "AT YOUR OWN RISK!"
 .endif
diff --git a/editors/openoffice.org-3/files/Makefile.knobs b/editors/openoffice.org-3/files/Makefile.knobs
index 0fd696fa080e..9315fddb9d73 100644
--- a/editors/openoffice.org-3/files/Makefile.knobs
+++ b/editors/openoffice.org-3/files/Makefile.knobs
@@ -36,9 +36,14 @@ pre-fetch:
 	@${ECHO}
 	@${ECHO} "WARNING"
 	@${ECHO} "Your rtld seems to be old."
-	@${ECHO} "Please remake your rtld by:"
-	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c"
-	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c"
+	@${ECHO} "Please remake your rtld by:
+	@${ECHO} "[1] if you use 4-series:"
+	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng4"
+	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng4"
+	@${ECHO} "# make ; make depend ; make install"
+	@${ECHO} "[2] if you use 5-series:"
+	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng5"
+	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng5"
 	@${ECHO} "# make ; make depend ; make install"
 	@${ECHO} "AT YOUR OWN RISK!"
 .endif
diff --git a/editors/openoffice.org-vcltesttool/files/Makefile.knobs b/editors/openoffice.org-vcltesttool/files/Makefile.knobs
index 0fd696fa080e..9315fddb9d73 100644
--- a/editors/openoffice.org-vcltesttool/files/Makefile.knobs
+++ b/editors/openoffice.org-vcltesttool/files/Makefile.knobs
@@ -36,9 +36,14 @@ pre-fetch:
 	@${ECHO}
 	@${ECHO} "WARNING"
 	@${ECHO} "Your rtld seems to be old."
-	@${ECHO} "Please remake your rtld by:"
-	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c"
-	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c"
+	@${ECHO} "Please remake your rtld by:
+	@${ECHO} "[1] if you use 4-series:"
+	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng4"
+	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng4"
+	@${ECHO} "# make ; make depend ; make install"
+	@${ECHO} "[2] if you use 5-series:"
+	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng5"
+	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng5"
 	@${ECHO} "# make ; make depend ; make install"
 	@${ECHO} "AT YOUR OWN RISK!"
 .endif