From dbad8cd18f0dc972225dcb7d0cbddb68799a3a9e Mon Sep 17 00:00:00 2001 From: Maho Nakata Date: Wed, 15 Jul 2009 12:10:36 +0000 Subject: Now (For __FreeBSD_version >= 702104) bridge part should work in the original form. Bump portrevision for openoffice.org-2 and -3 ports. --- editors/openoffice.org-vcltesttool/files/patch-i85126 | 4 ++-- editors/openoffice.org-vcltesttool/files/patch-i98781 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'editors/openoffice.org-vcltesttool/files') diff --git a/editors/openoffice.org-vcltesttool/files/patch-i85126 b/editors/openoffice.org-vcltesttool/files/patch-i85126 index c6bb6410bcb4..61263d3e1d21 100644 --- a/editors/openoffice.org-vcltesttool/files/patch-i85126 +++ b/editors/openoffice.org-vcltesttool/files/patch-i85126 @@ -130,7 +130,7 @@ http://www.freebsd.org/cgi/query-pr.cgi?pr=127946 //__________________________________________________________________________________________________ RTTI::RTTI() SAL_THROW( () ) -#if __FreeBSD_version < 602103 -+#ifdef FREEBSD /* #i22253# */ ++#if __FreeBSD_version < 702104 : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) ) #else : m_hApp( dlopen( 0, RTLD_LAZY ) ) @@ -139,7 +139,7 @@ http://www.freebsd.org/cgi/query-pr.cgi?pr=127946 OString symName( buf.makeStringAndClear() ); -#if __FreeBSD_version < 602103 /* #i22253# */ -+#ifdef FREEBSD /* #i22253# */ ++#if __FreeBSD_version < 702104 /* #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/files/patch-i98781 b/editors/openoffice.org-vcltesttool/files/patch-i98781 index 90f951045aa8..c334d5b97b02 100644 --- a/editors/openoffice.org-vcltesttool/files/patch-i98781 +++ b/editors/openoffice.org-vcltesttool/files/patch-i98781 @@ -9,7 +9,7 @@ http://www.freebsd.org/cgi/query-pr.cgi?pr=127946 //__________________________________________________________________________________________________ RTTI::RTTI() SAL_THROW( () ) -#if __FreeBSD_version < 602103 -+#ifdef FREEBSD /* #i22253# */ ++#if __FreeBSD_version < 702104 /* #i22253# */ : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) ) #else : m_hApp( dlopen( 0, RTLD_LAZY ) ) @@ -18,7 +18,7 @@ http://www.freebsd.org/cgi/query-pr.cgi?pr=127946 OString symName( buf.makeStringAndClear() ); -#if __FreeBSD_version < 602103 /* #i22253# */ -+#ifdef FREEBSD /* #i22253# */ ++#if __FreeBSD_version < 702104 /* #i22253# */ rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() ); #else rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); -- cgit v1.2.3