summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--editors/openoffice.org-2-RC/Makefile2
-rw-r--r--editors/openoffice.org-2-RC/files/patch-i8512626
-rw-r--r--editors/openoffice.org-2-RC/files/patch-i9878124
-rw-r--r--editors/openoffice.org-2-devel/Makefile2
-rw-r--r--editors/openoffice.org-2-devel/files/patch-i8512626
-rw-r--r--editors/openoffice.org-2-devel/files/patch-i9878124
-rw-r--r--editors/openoffice.org-2/Makefile2
-rw-r--r--editors/openoffice.org-2/files/patch-i8512626
-rw-r--r--editors/openoffice.org-2/files/patch-i9878124
-rw-r--r--editors/openoffice.org-vcltesttool/Makefile2
-rw-r--r--editors/openoffice.org-vcltesttool/files/patch-i8512626
-rw-r--r--editors/openoffice.org-vcltesttool/files/patch-i9878124
12 files changed, 204 insertions, 4 deletions
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index 3b71264cb23f..ef96db590cc3 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -7,7 +7,7 @@
PORTNAME?= openoffice.org
PORTVERSION?= 2.4.${SNAPDATE}
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES+= editors java
MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
http://openoffice.lunarshells.com/sources/ \
diff --git a/editors/openoffice.org-2-RC/files/patch-i85126 b/editors/openoffice.org-2-RC/files/patch-i85126
index f70616a998e1..c6bb6410bcb4 100644
--- a/editors/openoffice.org-2-RC/files/patch-i85126
+++ b/editors/openoffice.org-2-RC/files/patch-i85126
@@ -1,4 +1,8 @@
Merge from Linux CWS pj87 (#i83022#: Make bridges warning free)
+also fixes
+http://www.openoffice.org/issues/show_bug.cgi?id=98781
+http://www.openoffice.org/issues/show_bug.cgi?id=82690
+http://www.freebsd.org/cgi/query-pr.cgi?pr=127946
--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx 16 Sep 2006 15:46:23 -0000 1.3
+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx 8 Jan 2008 16:57:00 -0000
@@ -117,3 +121,25 @@ Merge from Linux CWS pj87 (#i83022#: Make bridges warning free)
VtableSlot aVtableSlot(
getVtableSlot(
reinterpret_cast<
+
+
+--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 2008-02-04 22:43:50.000000000 +0900
++++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 2009-06-13 21:41:29.000000000 +0900
+@@ -126,7 +126,7 @@
+ };
+ //__________________________________________________________________________________________________
+ RTTI::RTTI() SAL_THROW( () )
+-#if __FreeBSD_version < 602103
++#ifdef FREEBSD /* #i22253# */
+ : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
+ #else
+ : m_hApp( dlopen( 0, RTLD_LAZY ) )
+@@ -165,7 +165,7 @@
+ buf.append( 'E' );
+
+ OString symName( buf.makeStringAndClear() );
+-#if __FreeBSD_version < 602103 /* #i22253# */
++#ifdef FREEBSD /* #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/files/patch-i98781 b/editors/openoffice.org-2-RC/files/patch-i98781
new file mode 100644
index 000000000000..90f951045aa8
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-i98781
@@ -0,0 +1,24 @@
+http://www.openoffice.org/issues/show_bug.cgi?id=98781
+http://www.openoffice.org/issues/show_bug.cgi?id=82690
+http://www.freebsd.org/cgi/query-pr.cgi?pr=127946
+
+--- bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 2009-06-14 07:53:52.000000000 +0900
++++ bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 2009-06-14 07:56:37.000000000 +0900
+@@ -126,7 +126,7 @@
+ };
+ //__________________________________________________________________________________________________
+ RTTI::RTTI() SAL_THROW( () )
+-#if __FreeBSD_version < 602103
++#ifdef FREEBSD /* #i22253# */
+ : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
+ #else
+ : m_hApp( dlopen( 0, RTLD_LAZY ) )
+@@ -165,7 +165,7 @@
+ buf.append( 'E' );
+
+ OString symName( buf.makeStringAndClear() );
+-#if __FreeBSD_version < 602103 /* #i22253# */
++#ifdef FREEBSD /* #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 f8693fb8d516..0b296e490743 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME?= openoffice.org
PORTVERSION?= 2.4.${SNAPDATE}
-PORTREVISION?= 6
+PORTREVISION?= 7
PORTEPOCH?= 1
CATEGORIES+= editors java
MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
diff --git a/editors/openoffice.org-2-devel/files/patch-i85126 b/editors/openoffice.org-2-devel/files/patch-i85126
index f70616a998e1..c6bb6410bcb4 100644
--- a/editors/openoffice.org-2-devel/files/patch-i85126
+++ b/editors/openoffice.org-2-devel/files/patch-i85126
@@ -1,4 +1,8 @@
Merge from Linux CWS pj87 (#i83022#: Make bridges warning free)
+also fixes
+http://www.openoffice.org/issues/show_bug.cgi?id=98781
+http://www.openoffice.org/issues/show_bug.cgi?id=82690
+http://www.freebsd.org/cgi/query-pr.cgi?pr=127946
--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx 16 Sep 2006 15:46:23 -0000 1.3
+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx 8 Jan 2008 16:57:00 -0000
@@ -117,3 +121,25 @@ Merge from Linux CWS pj87 (#i83022#: Make bridges warning free)
VtableSlot aVtableSlot(
getVtableSlot(
reinterpret_cast<
+
+
+--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 2008-02-04 22:43:50.000000000 +0900
++++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 2009-06-13 21:41:29.000000000 +0900
+@@ -126,7 +126,7 @@
+ };
+ //__________________________________________________________________________________________________
+ RTTI::RTTI() SAL_THROW( () )
+-#if __FreeBSD_version < 602103
++#ifdef FREEBSD /* #i22253# */
+ : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
+ #else
+ : m_hApp( dlopen( 0, RTLD_LAZY ) )
+@@ -165,7 +165,7 @@
+ buf.append( 'E' );
+
+ OString symName( buf.makeStringAndClear() );
+-#if __FreeBSD_version < 602103 /* #i22253# */
++#ifdef FREEBSD /* #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/files/patch-i98781 b/editors/openoffice.org-2-devel/files/patch-i98781
new file mode 100644
index 000000000000..90f951045aa8
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-i98781
@@ -0,0 +1,24 @@
+http://www.openoffice.org/issues/show_bug.cgi?id=98781
+http://www.openoffice.org/issues/show_bug.cgi?id=82690
+http://www.freebsd.org/cgi/query-pr.cgi?pr=127946
+
+--- bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 2009-06-14 07:53:52.000000000 +0900
++++ bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 2009-06-14 07:56:37.000000000 +0900
+@@ -126,7 +126,7 @@
+ };
+ //__________________________________________________________________________________________________
+ RTTI::RTTI() SAL_THROW( () )
+-#if __FreeBSD_version < 602103
++#ifdef FREEBSD /* #i22253# */
+ : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
+ #else
+ : m_hApp( dlopen( 0, RTLD_LAZY ) )
+@@ -165,7 +165,7 @@
+ buf.append( 'E' );
+
+ OString symName( buf.makeStringAndClear() );
+-#if __FreeBSD_version < 602103 /* #i22253# */
++#ifdef FREEBSD /* #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 8adbf3f7d390..242845f3324c 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -7,7 +7,7 @@
PORTNAME?= openoffice.org
PORTVERSION?= ${OOOVERSION}
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES+= editors java
MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
http://openoffice.lunarshells.com/sources/ \
diff --git a/editors/openoffice.org-2/files/patch-i85126 b/editors/openoffice.org-2/files/patch-i85126
index f70616a998e1..c6bb6410bcb4 100644
--- a/editors/openoffice.org-2/files/patch-i85126
+++ b/editors/openoffice.org-2/files/patch-i85126
@@ -1,4 +1,8 @@
Merge from Linux CWS pj87 (#i83022#: Make bridges warning free)
+also fixes
+http://www.openoffice.org/issues/show_bug.cgi?id=98781
+http://www.openoffice.org/issues/show_bug.cgi?id=82690
+http://www.freebsd.org/cgi/query-pr.cgi?pr=127946
--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx 16 Sep 2006 15:46:23 -0000 1.3
+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx 8 Jan 2008 16:57:00 -0000
@@ -117,3 +121,25 @@ Merge from Linux CWS pj87 (#i83022#: Make bridges warning free)
VtableSlot aVtableSlot(
getVtableSlot(
reinterpret_cast<
+
+
+--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 2008-02-04 22:43:50.000000000 +0900
++++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 2009-06-13 21:41:29.000000000 +0900
+@@ -126,7 +126,7 @@
+ };
+ //__________________________________________________________________________________________________
+ RTTI::RTTI() SAL_THROW( () )
+-#if __FreeBSD_version < 602103
++#ifdef FREEBSD /* #i22253# */
+ : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
+ #else
+ : m_hApp( dlopen( 0, RTLD_LAZY ) )
+@@ -165,7 +165,7 @@
+ buf.append( 'E' );
+
+ OString symName( buf.makeStringAndClear() );
+-#if __FreeBSD_version < 602103 /* #i22253# */
++#ifdef FREEBSD /* #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/files/patch-i98781 b/editors/openoffice.org-2/files/patch-i98781
new file mode 100644
index 000000000000..90f951045aa8
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-i98781
@@ -0,0 +1,24 @@
+http://www.openoffice.org/issues/show_bug.cgi?id=98781
+http://www.openoffice.org/issues/show_bug.cgi?id=82690
+http://www.freebsd.org/cgi/query-pr.cgi?pr=127946
+
+--- bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 2009-06-14 07:53:52.000000000 +0900
++++ bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 2009-06-14 07:56:37.000000000 +0900
+@@ -126,7 +126,7 @@
+ };
+ //__________________________________________________________________________________________________
+ RTTI::RTTI() SAL_THROW( () )
+-#if __FreeBSD_version < 602103
++#ifdef FREEBSD /* #i22253# */
+ : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
+ #else
+ : m_hApp( dlopen( 0, RTLD_LAZY ) )
+@@ -165,7 +165,7 @@
+ buf.append( 'E' );
+
+ OString symName( buf.makeStringAndClear() );
+-#if __FreeBSD_version < 602103 /* #i22253# */
++#ifdef FREEBSD /* #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 f8693fb8d516..0b296e490743 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -7,7 +7,7 @@
PORTNAME?= openoffice.org
PORTVERSION?= 2.4.${SNAPDATE}
-PORTREVISION?= 6
+PORTREVISION?= 7
PORTEPOCH?= 1
CATEGORIES+= editors java
MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i85126 b/editors/openoffice.org-vcltesttool/files/patch-i85126
index f70616a998e1..c6bb6410bcb4 100644
--- a/editors/openoffice.org-vcltesttool/files/patch-i85126
+++ b/editors/openoffice.org-vcltesttool/files/patch-i85126
@@ -1,4 +1,8 @@
Merge from Linux CWS pj87 (#i83022#: Make bridges warning free)
+also fixes
+http://www.openoffice.org/issues/show_bug.cgi?id=98781
+http://www.openoffice.org/issues/show_bug.cgi?id=82690
+http://www.freebsd.org/cgi/query-pr.cgi?pr=127946
--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx 16 Sep 2006 15:46:23 -0000 1.3
+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx 8 Jan 2008 16:57:00 -0000
@@ -117,3 +121,25 @@ Merge from Linux CWS pj87 (#i83022#: Make bridges warning free)
VtableSlot aVtableSlot(
getVtableSlot(
reinterpret_cast<
+
+
+--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 2008-02-04 22:43:50.000000000 +0900
++++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 2009-06-13 21:41:29.000000000 +0900
+@@ -126,7 +126,7 @@
+ };
+ //__________________________________________________________________________________________________
+ RTTI::RTTI() SAL_THROW( () )
+-#if __FreeBSD_version < 602103
++#ifdef FREEBSD /* #i22253# */
+ : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
+ #else
+ : m_hApp( dlopen( 0, RTLD_LAZY ) )
+@@ -165,7 +165,7 @@
+ buf.append( 'E' );
+
+ OString symName( buf.makeStringAndClear() );
+-#if __FreeBSD_version < 602103 /* #i22253# */
++#ifdef FREEBSD /* #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
new file mode 100644
index 000000000000..90f951045aa8
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-i98781
@@ -0,0 +1,24 @@
+http://www.openoffice.org/issues/show_bug.cgi?id=98781
+http://www.openoffice.org/issues/show_bug.cgi?id=82690
+http://www.freebsd.org/cgi/query-pr.cgi?pr=127946
+
+--- bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 2009-06-14 07:53:52.000000000 +0900
++++ bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 2009-06-14 07:56:37.000000000 +0900
+@@ -126,7 +126,7 @@
+ };
+ //__________________________________________________________________________________________________
+ RTTI::RTTI() SAL_THROW( () )
+-#if __FreeBSD_version < 602103
++#ifdef FREEBSD /* #i22253# */
+ : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
+ #else
+ : m_hApp( dlopen( 0, RTLD_LAZY ) )
+@@ -165,7 +165,7 @@
+ buf.append( 'E' );
+
+ OString symName( buf.makeStringAndClear() );
+-#if __FreeBSD_version < 602103 /* #i22253# */
++#ifdef FREEBSD /* #i22253# */
+ rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
+ #else
+ rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-13 01:46:25 +0000