RTLD hack is gone for FreeBSD_version >= 602103 (MFC'ed from current)

http://docs.freebsd.org/cgi/mid.cgi?200701160751.l0G7p4gH046864
http://docs.freebsd.org/cgi/mid.cgi?200701160940.l0G9eOQv074301

Submitted by:	jkim

20 files changed, 49 insertions, 49 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index bbfa7859ec18..cfd11844f655 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -182,7 +182,7 @@ WITHOUT_MOZILLA=	yes
 LIB_DEPENDS+=		boost_regex:${PORTSDIR}/devel/boost
 CONFIGURE_ARGS+=	--with-system-boost=yes #i58343#
 .endif
-.if (${OSVERSION} <= 700021)
+.if (${OSVERSION} <= 602102)
 EXTRA_PATCHES+=	${FILESDIR}/rtld-workaround-i66667
 .endif
 .if (${OSVERSION} <= 492000)
diff --git a/editors/openoffice-3-devel/files/patch-i66667 b/editors/openoffice-3-devel/files/patch-i66667
index a93aaea26176..c1d8cd362e9b 100644
--- a/editors/openoffice-3-devel/files/patch-i66667
+++ b/editors/openoffice-3-devel/files/patch-i66667
@@ -33,7 +33,7 @@
  };
  //__________________________________________________________________________________________________
  RTTI::RTTI() SAL_THROW( () )
-+#if __FreeBSD_version < 700022
++#if __FreeBSD_version < 602103
      : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
 +#else
 +    : m_hApp( dlopen( 0, RTLD_LAZY ) )
@@ -57,7 +57,7 @@
  
          OString symName( buf.makeStringAndClear() );
 -//#iZ 22253 
-+#if __FreeBSD_version < 700022 /* #i22253# */
++#if __FreeBSD_version < 602103 /* #i22253# */
          rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
 +#else
 +        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
@@ -117,7 +117,7 @@
  };
  //__________________________________________________________________________________________________
  RTTI::RTTI() SAL_THROW( () )
-+#if __FreeBSD_version < 700022
++#if __FreeBSD_version < 602103
      : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
 +#else
 +    : m_hApp( dlopen( 0, RTLD_LAZY ) )
@@ -129,7 +129,7 @@
          buf.append( 'E' );
          
          OString symName( buf.makeStringAndClear() );
-+#if __FreeBSD_version < 700022  /* #i22253# */
++#if __FreeBSD_version < 602103  /* #i22253# */
          rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
 +#else
 +        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index a2f006a1eef8..dba23424bff1 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -182,7 +182,7 @@ WITHOUT_MOZILLA=	yes
 LIB_DEPENDS+=		boost_regex:${PORTSDIR}/devel/boost
 CONFIGURE_ARGS+=	--with-system-boost=yes #i58343#
 .endif
-.if (${OSVERSION} <= 700021)
+.if (${OSVERSION} <= 602102)
 EXTRA_PATCHES+=	${FILESDIR}/rtld-workaround-i66667
 .endif
 .if (${OSVERSION} <= 492000)
diff --git a/editors/openoffice-3/files/patch-i66667 b/editors/openoffice-3/files/patch-i66667
index a93aaea26176..c1d8cd362e9b 100644
--- a/editors/openoffice-3/files/patch-i66667
+++ b/editors/openoffice-3/files/patch-i66667
@@ -33,7 +33,7 @@
  };
  //__________________________________________________________________________________________________
  RTTI::RTTI() SAL_THROW( () )
-+#if __FreeBSD_version < 700022
++#if __FreeBSD_version < 602103
      : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
 +#else
 +    : m_hApp( dlopen( 0, RTLD_LAZY ) )
@@ -57,7 +57,7 @@
  
          OString symName( buf.makeStringAndClear() );
 -//#iZ 22253 
-+#if __FreeBSD_version < 700022 /* #i22253# */
++#if __FreeBSD_version < 602103 /* #i22253# */
          rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
 +#else
 +        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
@@ -117,7 +117,7 @@
  };
  //__________________________________________________________________________________________________
  RTTI::RTTI() SAL_THROW( () )
-+#if __FreeBSD_version < 700022
++#if __FreeBSD_version < 602103
      : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
 +#else
 +    : m_hApp( dlopen( 0, RTLD_LAZY ) )
@@ -129,7 +129,7 @@
          buf.append( 'E' );
          
          OString symName( buf.makeStringAndClear() );
-+#if __FreeBSD_version < 700022  /* #i22253# */
++#if __FreeBSD_version < 602103  /* #i22253# */
          rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
 +#else
 +        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
diff --git a/editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
index ae3ff61e295b..5726cb84a6d7 100644
--- a/editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
+++ b/editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
@@ -35,7 +35,7 @@ diff -u -r1.4 except.cxx
  };
  //__________________________________________________________________________________________________
  RTTI::RTTI() SAL_THROW( () )
-+#if __FreeBSD_version < 700022  /* #i22253# */
++#if __FreeBSD_version < 602103 /* #i22253# */
 +    : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
 +#else
      : m_hApp( dlopen( 0, RTLD_LAZY ) )
@@ -47,7 +47,7 @@ diff -u -r1.4 except.cxx
          buf.append( 'E' );
  
          OString symName( buf.makeStringAndClear() );
-+#if __FreeBSD_version < 700022
++#if __FreeBSD_version < 602103 /* #i22253# */
 +        rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
 +#else
          rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
diff --git a/editors/openoffice.org-1.1/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice.org-1.1/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
index ae3ff61e295b..5726cb84a6d7 100644
--- a/editors/openoffice.org-1.1/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
+++ b/editors/openoffice.org-1.1/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel
@@ -35,7 +35,7 @@ diff -u -r1.4 except.cxx
  };
  //__________________________________________________________________________________________________
  RTTI::RTTI() SAL_THROW( () )
-+#if __FreeBSD_version < 700022  /* #i22253# */
++#if __FreeBSD_version < 602103 /* #i22253# */
 +    : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
 +#else
      : m_hApp( dlopen( 0, RTLD_LAZY ) )
@@ -47,7 +47,7 @@ diff -u -r1.4 except.cxx
          buf.append( 'E' );
  
          OString symName( buf.makeStringAndClear() );
-+#if __FreeBSD_version < 700022
++#if __FreeBSD_version < 602103 /* #i22253# */
 +        rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
 +#else
          rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index 1411e94d2902..a86ae59765cf 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -184,7 +184,7 @@ WITHOUT_MOZILLA=	yes
 LIB_DEPENDS+=		boost_regex:${PORTSDIR}/devel/boost
 CONFIGURE_ARGS+=	--with-system-boost=yes #i58343#
 .endif
-.if (${OSVERSION} <= 700021)
+.if (${OSVERSION} <= 602102)
 EXTRA_PATCHES+=	${FILESDIR}/rtld-workaround-i66667
 .endif
 .if (${OSVERSION} <= 492000)
diff --git a/editors/openoffice.org-2-RC/files/patch-i66667 b/editors/openoffice.org-2-RC/files/patch-i66667
index a93aaea26176..c1d8cd362e9b 100644
--- a/editors/openoffice.org-2-RC/files/patch-i66667
+++ b/editors/openoffice.org-2-RC/files/patch-i66667
@@ -33,7 +33,7 @@
  };
  //__________________________________________________________________________________________________
  RTTI::RTTI() SAL_THROW( () )
-+#if __FreeBSD_version < 700022
++#if __FreeBSD_version < 602103
      : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
 +#else
 +    : m_hApp( dlopen( 0, RTLD_LAZY ) )
@@ -57,7 +57,7 @@
  
          OString symName( buf.makeStringAndClear() );
 -//#iZ 22253 
-+#if __FreeBSD_version < 700022 /* #i22253# */
++#if __FreeBSD_version < 602103 /* #i22253# */
          rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
 +#else
 +        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
@@ -117,7 +117,7 @@
  };
  //__________________________________________________________________________________________________
  RTTI::RTTI() SAL_THROW( () )
-+#if __FreeBSD_version < 700022
++#if __FreeBSD_version < 602103
      : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
 +#else
 +    : m_hApp( dlopen( 0, RTLD_LAZY ) )
@@ -129,7 +129,7 @@
          buf.append( 'E' );
          
          OString symName( buf.makeStringAndClear() );
-+#if __FreeBSD_version < 700022  /* #i22253# */
++#if __FreeBSD_version < 602103  /* #i22253# */
          rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
 +#else
 +        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index bbfa7859ec18..cfd11844f655 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -182,7 +182,7 @@ WITHOUT_MOZILLA=	yes
 LIB_DEPENDS+=		boost_regex:${PORTSDIR}/devel/boost
 CONFIGURE_ARGS+=	--with-system-boost=yes #i58343#
 .endif
-.if (${OSVERSION} <= 700021)
+.if (${OSVERSION} <= 602102)
 EXTRA_PATCHES+=	${FILESDIR}/rtld-workaround-i66667
 .endif
 .if (${OSVERSION} <= 492000)
diff --git a/editors/openoffice.org-2-devel/files/patch-i66667 b/editors/openoffice.org-2-devel/files/patch-i66667
index a93aaea26176..c1d8cd362e9b 100644
--- a/editors/openoffice.org-2-devel/files/patch-i66667
+++ b/editors/openoffice.org-2-devel/files/patch-i66667
@@ -33,7 +33,7 @@
  };
  //__________________________________________________________________________________________________
  RTTI::RTTI() SAL_THROW( () )
-+#if __FreeBSD_version < 700022
++#if __FreeBSD_version < 602103
      : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
 +#else
 +    : m_hApp( dlopen( 0, RTLD_LAZY ) )
@@ -57,7 +57,7 @@
  
          OString symName( buf.makeStringAndClear() );
 -//#iZ 22253 
-+#if __FreeBSD_version < 700022 /* #i22253# */
++#if __FreeBSD_version < 602103 /* #i22253# */
          rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
 +#else
 +        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
@@ -117,7 +117,7 @@
  };
  //__________________________________________________________________________________________________
  RTTI::RTTI() SAL_THROW( () )
-+#if __FreeBSD_version < 700022
++#if __FreeBSD_version < 602103
      : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
 +#else
 +    : m_hApp( dlopen( 0, RTLD_LAZY ) )
@@ -129,7 +129,7 @@
          buf.append( 'E' );
          
          OString symName( buf.makeStringAndClear() );
-+#if __FreeBSD_version < 700022  /* #i22253# */
++#if __FreeBSD_version < 602103  /* #i22253# */
          rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
 +#else
 +        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index a2f006a1eef8..dba23424bff1 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -182,7 +182,7 @@ WITHOUT_MOZILLA=	yes
 LIB_DEPENDS+=		boost_regex:${PORTSDIR}/devel/boost
 CONFIGURE_ARGS+=	--with-system-boost=yes #i58343#
 .endif
-.if (${OSVERSION} <= 700021)
+.if (${OSVERSION} <= 602102)
 EXTRA_PATCHES+=	${FILESDIR}/rtld-workaround-i66667
 .endif
 .if (${OSVERSION} <= 492000)
diff --git a/editors/openoffice.org-2/files/patch-i66667 b/editors/openoffice.org-2/files/patch-i66667
index a93aaea26176..c1d8cd362e9b 100644
--- a/editors/openoffice.org-2/files/patch-i66667
+++ b/editors/openoffice.org-2/files/patch-i66667
@@ -33,7 +33,7 @@
  };
  //__________________________________________________________________________________________________
  RTTI::RTTI() SAL_THROW( () )
-+#if __FreeBSD_version < 700022
++#if __FreeBSD_version < 602103
      : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
 +#else
 +    : m_hApp( dlopen( 0, RTLD_LAZY ) )
@@ -57,7 +57,7 @@
  
          OString symName( buf.makeStringAndClear() );
 -//#iZ 22253 
-+#if __FreeBSD_version < 700022 /* #i22253# */
++#if __FreeBSD_version < 602103 /* #i22253# */
          rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
 +#else
 +        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
@@ -117,7 +117,7 @@
  };
  //__________________________________________________________________________________________________
  RTTI::RTTI() SAL_THROW( () )
-+#if __FreeBSD_version < 700022
++#if __FreeBSD_version < 602103
      : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
 +#else
 +    : m_hApp( dlopen( 0, RTLD_LAZY ) )
@@ -129,7 +129,7 @@
          buf.append( 'E' );
          
          OString symName( buf.makeStringAndClear() );
-+#if __FreeBSD_version < 700022  /* #i22253# */
++#if __FreeBSD_version < 602103  /* #i22253# */
          rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
 +#else
 +        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 1411e94d2902..a86ae59765cf 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -184,7 +184,7 @@ WITHOUT_MOZILLA=	yes
 LIB_DEPENDS+=		boost_regex:${PORTSDIR}/devel/boost
 CONFIGURE_ARGS+=	--with-system-boost=yes #i58343#
 .endif
-.if (${OSVERSION} <= 700021)
+.if (${OSVERSION} <= 602102)
 EXTRA_PATCHES+=	${FILESDIR}/rtld-workaround-i66667
 .endif
 .if (${OSVERSION} <= 492000)
diff --git a/editors/openoffice.org-3-RC/files/patch-i66667 b/editors/openoffice.org-3-RC/files/patch-i66667
index a93aaea26176..c1d8cd362e9b 100644
--- a/editors/openoffice.org-3-RC/files/patch-i66667
+++ b/editors/openoffice.org-3-RC/files/patch-i66667
@@ -33,7 +33,7 @@
  };
  //__________________________________________________________________________________________________
  RTTI::RTTI() SAL_THROW( () )
-+#if __FreeBSD_version < 700022
++#if __FreeBSD_version < 602103
      : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
 +#else
 +    : m_hApp( dlopen( 0, RTLD_LAZY ) )
@@ -57,7 +57,7 @@
  
          OString symName( buf.makeStringAndClear() );
 -//#iZ 22253 
-+#if __FreeBSD_version < 700022 /* #i22253# */
++#if __FreeBSD_version < 602103 /* #i22253# */
          rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
 +#else
 +        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
@@ -117,7 +117,7 @@
  };
  //__________________________________________________________________________________________________
  RTTI::RTTI() SAL_THROW( () )
-+#if __FreeBSD_version < 700022
++#if __FreeBSD_version < 602103
      : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
 +#else
 +    : m_hApp( dlopen( 0, RTLD_LAZY ) )
@@ -129,7 +129,7 @@
          buf.append( 'E' );
          
          OString symName( buf.makeStringAndClear() );
-+#if __FreeBSD_version < 700022  /* #i22253# */
++#if __FreeBSD_version < 602103  /* #i22253# */
          rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
 +#else
 +        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index bbfa7859ec18..cfd11844f655 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -182,7 +182,7 @@ WITHOUT_MOZILLA=	yes
 LIB_DEPENDS+=		boost_regex:${PORTSDIR}/devel/boost
 CONFIGURE_ARGS+=	--with-system-boost=yes #i58343#
 .endif
-.if (${OSVERSION} <= 700021)
+.if (${OSVERSION} <= 602102)
 EXTRA_PATCHES+=	${FILESDIR}/rtld-workaround-i66667
 .endif
 .if (${OSVERSION} <= 492000)
diff --git a/editors/openoffice.org-3-devel/files/patch-i66667 b/editors/openoffice.org-3-devel/files/patch-i66667
index a93aaea26176..c1d8cd362e9b 100644
--- a/editors/openoffice.org-3-devel/files/patch-i66667
+++ b/editors/openoffice.org-3-devel/files/patch-i66667
@@ -33,7 +33,7 @@
  };
  //__________________________________________________________________________________________________
  RTTI::RTTI() SAL_THROW( () )
-+#if __FreeBSD_version < 700022
++#if __FreeBSD_version < 602103
      : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
 +#else
 +    : m_hApp( dlopen( 0, RTLD_LAZY ) )
@@ -57,7 +57,7 @@
  
          OString symName( buf.makeStringAndClear() );
 -//#iZ 22253 
-+#if __FreeBSD_version < 700022 /* #i22253# */
++#if __FreeBSD_version < 602103 /* #i22253# */
          rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
 +#else
 +        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
@@ -117,7 +117,7 @@
  };
  //__________________________________________________________________________________________________
  RTTI::RTTI() SAL_THROW( () )
-+#if __FreeBSD_version < 700022
++#if __FreeBSD_version < 602103
      : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
 +#else
 +    : m_hApp( dlopen( 0, RTLD_LAZY ) )
@@ -129,7 +129,7 @@
          buf.append( 'E' );
          
          OString symName( buf.makeStringAndClear() );
-+#if __FreeBSD_version < 700022  /* #i22253# */
++#if __FreeBSD_version < 602103  /* #i22253# */
          rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
 +#else
 +        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index a2f006a1eef8..dba23424bff1 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -182,7 +182,7 @@ WITHOUT_MOZILLA=	yes
 LIB_DEPENDS+=		boost_regex:${PORTSDIR}/devel/boost
 CONFIGURE_ARGS+=	--with-system-boost=yes #i58343#
 .endif
-.if (${OSVERSION} <= 700021)
+.if (${OSVERSION} <= 602102)
 EXTRA_PATCHES+=	${FILESDIR}/rtld-workaround-i66667
 .endif
 .if (${OSVERSION} <= 492000)
diff --git a/editors/openoffice.org-3/files/patch-i66667 b/editors/openoffice.org-3/files/patch-i66667
index a93aaea26176..c1d8cd362e9b 100644
--- a/editors/openoffice.org-3/files/patch-i66667
+++ b/editors/openoffice.org-3/files/patch-i66667
@@ -33,7 +33,7 @@
  };
  //__________________________________________________________________________________________________
  RTTI::RTTI() SAL_THROW( () )
-+#if __FreeBSD_version < 700022
++#if __FreeBSD_version < 602103
      : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
 +#else
 +    : m_hApp( dlopen( 0, RTLD_LAZY ) )
@@ -57,7 +57,7 @@
  
          OString symName( buf.makeStringAndClear() );
 -//#iZ 22253 
-+#if __FreeBSD_version < 700022 /* #i22253# */
++#if __FreeBSD_version < 602103 /* #i22253# */
          rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
 +#else
 +        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
@@ -117,7 +117,7 @@
  };
  //__________________________________________________________________________________________________
  RTTI::RTTI() SAL_THROW( () )
-+#if __FreeBSD_version < 700022
++#if __FreeBSD_version < 602103
      : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
 +#else
 +    : m_hApp( dlopen( 0, RTLD_LAZY ) )
@@ -129,7 +129,7 @@
          buf.append( 'E' );
          
          OString symName( buf.makeStringAndClear() );
-+#if __FreeBSD_version < 700022  /* #i22253# */
++#if __FreeBSD_version < 602103  /* #i22253# */
          rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
 +#else
 +        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index bbfa7859ec18..cfd11844f655 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -182,7 +182,7 @@ WITHOUT_MOZILLA=	yes
 LIB_DEPENDS+=		boost_regex:${PORTSDIR}/devel/boost
 CONFIGURE_ARGS+=	--with-system-boost=yes #i58343#
 .endif
-.if (${OSVERSION} <= 700021)
+.if (${OSVERSION} <= 602102)
 EXTRA_PATCHES+=	${FILESDIR}/rtld-workaround-i66667
 .endif
 .if (${OSVERSION} <= 492000)
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i66667 b/editors/openoffice.org-vcltesttool/files/patch-i66667
index a93aaea26176..c1d8cd362e9b 100644
--- a/editors/openoffice.org-vcltesttool/files/patch-i66667
+++ b/editors/openoffice.org-vcltesttool/files/patch-i66667
@@ -33,7 +33,7 @@
  };
  //__________________________________________________________________________________________________
  RTTI::RTTI() SAL_THROW( () )
-+#if __FreeBSD_version < 700022
++#if __FreeBSD_version < 602103
      : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
 +#else
 +    : m_hApp( dlopen( 0, RTLD_LAZY ) )
@@ -57,7 +57,7 @@
  
          OString symName( buf.makeStringAndClear() );
 -//#iZ 22253 
-+#if __FreeBSD_version < 700022 /* #i22253# */
++#if __FreeBSD_version < 602103 /* #i22253# */
          rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
 +#else
 +        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
@@ -117,7 +117,7 @@
  };
  //__________________________________________________________________________________________________
  RTTI::RTTI() SAL_THROW( () )
-+#if __FreeBSD_version < 700022
++#if __FreeBSD_version < 602103
      : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
 +#else
 +    : m_hApp( dlopen( 0, RTLD_LAZY ) )
@@ -129,7 +129,7 @@
          buf.append( 'E' );
          
          OString symName( buf.makeStringAndClear() );
-+#if __FreeBSD_version < 700022  /* #i22253# */
++#if __FreeBSD_version < 602103  /* #i22253# */
          rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
 +#else
 +        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );