aboutsummaryrefslogtreecommitdiffstats
path: root/editors
diff options
context:
space:
mode:
authormbr <mbr@FreeBSD.org>2003-04-01 05:32:38 +0800
committermbr <mbr@FreeBSD.org>2003-04-01 05:32:38 +0800
commite916d5daf5aff37ee4dc032dc2a8ef2445110993 (patch)
tree274184dcf64c5e4c264ab02e5f5fa2ddcfa7d738 /editors
parentad4f14aa7c72e81baf249a401714a8772f9071b9 (diff)
downloadfreebsd-ports-gnome-e916d5daf5aff37ee4dc032dc2a8ef2445110993.tar.gz
freebsd-ports-gnome-e916d5daf5aff37ee4dc032dc2a8ef2445110993.tar.zst
freebsd-ports-gnome-e916d5daf5aff37ee4dc032dc2a8ef2445110993.zip
Update to srx644_ooo20030412.
Diffstat (limited to 'editors')
-rw-r--r--editors/openoffice-1.1-devel/Makefile2
-rw-r--r--editors/openoffice-1.1-devel/distinfo2
-rw-r--r--editors/openoffice-1.1-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx12
-rw-r--r--editors/openoffice-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk3
-rw-r--r--editors/openoffice-1.1/Makefile2
-rw-r--r--editors/openoffice-1.1/distinfo2
-rw-r--r--editors/openoffice-1.1/files/patch-gnome+gnome-vfs-filetype-registration.cxx12
-rw-r--r--editors/openoffice-1.1/files/patch-solenv+inc+unxfbsdi.mk3
-rw-r--r--editors/openoffice-2.0-devel/Makefile2
-rw-r--r--editors/openoffice-2.0-devel/distinfo2
-rw-r--r--editors/openoffice-2.0-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx12
-rw-r--r--editors/openoffice-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk3
-rw-r--r--editors/openoffice-3-devel/Makefile2
-rw-r--r--editors/openoffice-3-devel/distinfo2
-rw-r--r--editors/openoffice-3-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx12
-rw-r--r--editors/openoffice-3-devel/files/patch-solenv+inc+unxfbsdi.mk3
-rw-r--r--editors/openoffice-3/Makefile2
-rw-r--r--editors/openoffice-3/distinfo2
-rw-r--r--editors/openoffice-3/files/patch-gnome+gnome-vfs-filetype-registration.cxx12
-rw-r--r--editors/openoffice-3/files/patch-solenv+inc+unxfbsdi.mk3
-rw-r--r--editors/openoffice-devel/Makefile2
-rw-r--r--editors/openoffice-devel/distinfo2
-rw-r--r--editors/openoffice-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx12
-rw-r--r--editors/openoffice-devel/files/patch-solenv+inc+unxfbsdi.mk3
-rw-r--r--editors/openoffice.org-1.1-devel/Makefile2
-rw-r--r--editors/openoffice.org-1.1-devel/distinfo2
-rw-r--r--editors/openoffice.org-1.1-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx12
-rw-r--r--editors/openoffice.org-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk3
-rw-r--r--editors/openoffice.org-1.1/Makefile2
-rw-r--r--editors/openoffice.org-1.1/distinfo2
-rw-r--r--editors/openoffice.org-1.1/files/patch-gnome+gnome-vfs-filetype-registration.cxx12
-rw-r--r--editors/openoffice.org-1.1/files/patch-solenv+inc+unxfbsdi.mk3
-rw-r--r--editors/openoffice.org-2-RC/Makefile2
-rw-r--r--editors/openoffice.org-2-RC/distinfo2
-rw-r--r--editors/openoffice.org-2-RC/files/patch-gnome+gnome-vfs-filetype-registration.cxx12
-rw-r--r--editors/openoffice.org-2-RC/files/patch-solenv+inc+unxfbsdi.mk3
-rw-r--r--editors/openoffice.org-2-devel/Makefile2
-rw-r--r--editors/openoffice.org-2-devel/distinfo2
-rw-r--r--editors/openoffice.org-2-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx12
-rw-r--r--editors/openoffice.org-2-devel/files/patch-solenv+inc+unxfbsdi.mk3
-rw-r--r--editors/openoffice.org-2.0-devel/Makefile2
-rw-r--r--editors/openoffice.org-2.0-devel/distinfo2
-rw-r--r--editors/openoffice.org-2.0-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx12
-rw-r--r--editors/openoffice.org-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk3
-rw-r--r--editors/openoffice.org-2.0/Makefile2
-rw-r--r--editors/openoffice.org-2.0/distinfo2
-rw-r--r--editors/openoffice.org-2.0/files/patch-gnome+gnome-vfs-filetype-registration.cxx12
-rw-r--r--editors/openoffice.org-2.0/files/patch-solenv+inc+unxfbsdi.mk3
-rw-r--r--editors/openoffice.org-2/Makefile2
-rw-r--r--editors/openoffice.org-2/distinfo2
-rw-r--r--editors/openoffice.org-2/files/patch-gnome+gnome-vfs-filetype-registration.cxx12
-rw-r--r--editors/openoffice.org-2/files/patch-solenv+inc+unxfbsdi.mk3
-rw-r--r--editors/openoffice.org-3-RC/Makefile2
-rw-r--r--editors/openoffice.org-3-RC/distinfo2
-rw-r--r--editors/openoffice.org-3-RC/files/patch-gnome+gnome-vfs-filetype-registration.cxx12
-rw-r--r--editors/openoffice.org-3-RC/files/patch-solenv+inc+unxfbsdi.mk3
-rw-r--r--editors/openoffice.org-3-devel/Makefile2
-rw-r--r--editors/openoffice.org-3-devel/distinfo2
-rw-r--r--editors/openoffice.org-3-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx12
-rw-r--r--editors/openoffice.org-3-devel/files/patch-solenv+inc+unxfbsdi.mk3
-rw-r--r--editors/openoffice.org-3/Makefile2
-rw-r--r--editors/openoffice.org-3/distinfo2
-rw-r--r--editors/openoffice.org-3/files/patch-gnome+gnome-vfs-filetype-registration.cxx12
-rw-r--r--editors/openoffice.org-3/files/patch-solenv+inc+unxfbsdi.mk3
-rw-r--r--editors/openoffice.org-vcltesttool/Makefile2
-rw-r--r--editors/openoffice.org-vcltesttool/distinfo2
-rw-r--r--editors/openoffice.org-vcltesttool/files/patch-gnome+gnome-vfs-filetype-registration.cxx12
-rw-r--r--editors/openoffice.org-vcltesttool/files/patch-solenv+inc+unxfbsdi.mk3
68 files changed, 68 insertions, 255 deletions
diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile
index 893d707c1e6f..537e4511364f 100644
--- a/editors/openoffice-1.1-devel/Makefile
+++ b/editors/openoffice-1.1-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openoffice
PORTVERSION= 644
-SNAPDATE= 20030324
+SNAPDATE= 20030412
CATEGORIES+= editors
MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \
http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
diff --git a/editors/openoffice-1.1-devel/distinfo b/editors/openoffice-1.1-devel/distinfo
index 9a90f7df5378..0004033ec259 100644
--- a/editors/openoffice-1.1-devel/distinfo
+++ b/editors/openoffice-1.1-devel/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_644_src_20030324.tar.bz2) = 78c8152634d2cbefb48b3da93af105dd
+MD5 (openoffice/oo_644_src_20030412.tar.bz2) = 2ec722a03a806de7f773f6b6086b485e
MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5
diff --git a/editors/openoffice-1.1-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice-1.1-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
deleted file mode 100644
index b15dbd1d6faf..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Tue Mar 11 12:43:34 2003
-+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx Tue Mar 11 12:43:58 2003
-@@ -62,7 +62,9 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <dlfcn.h>
-+#if !(defined FREEBSD || defined NETBSD)
- #include <alloca.h>
-+#endif
- #include <string.h>
-
- /*
diff --git a/editors/openoffice-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk
index ac04cf1d24a3..9da9a684d7c0 100644
--- a/editors/openoffice-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk
@@ -42,8 +42,9 @@
-CXX= g++
-CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400
-CDEFS+= -D_REENTRANT -D_PTHREADS -D_THREAD_SAFE
+-CFLAGS+= -c $(INCLUDE)
+# flags for C and C++ Compile
- CFLAGS+= -w -c $(INCLUDE)
++CFLAGS+= -w -c $(INCLUDE)
CFLAGS+= -I/usr/X11R6/include
+
+# flags for the C++ Compiler
diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile
index 893d707c1e6f..537e4511364f 100644
--- a/editors/openoffice-1.1/Makefile
+++ b/editors/openoffice-1.1/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openoffice
PORTVERSION= 644
-SNAPDATE= 20030324
+SNAPDATE= 20030412
CATEGORIES+= editors
MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \
http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
diff --git a/editors/openoffice-1.1/distinfo b/editors/openoffice-1.1/distinfo
index 9a90f7df5378..0004033ec259 100644
--- a/editors/openoffice-1.1/distinfo
+++ b/editors/openoffice-1.1/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_644_src_20030324.tar.bz2) = 78c8152634d2cbefb48b3da93af105dd
+MD5 (openoffice/oo_644_src_20030412.tar.bz2) = 2ec722a03a806de7f773f6b6086b485e
MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5
diff --git a/editors/openoffice-1.1/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice-1.1/files/patch-gnome+gnome-vfs-filetype-registration.cxx
deleted file mode 100644
index b15dbd1d6faf..000000000000
--- a/editors/openoffice-1.1/files/patch-gnome+gnome-vfs-filetype-registration.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Tue Mar 11 12:43:34 2003
-+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx Tue Mar 11 12:43:58 2003
-@@ -62,7 +62,9 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <dlfcn.h>
-+#if !(defined FREEBSD || defined NETBSD)
- #include <alloca.h>
-+#endif
- #include <string.h>
-
- /*
diff --git a/editors/openoffice-1.1/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice-1.1/files/patch-solenv+inc+unxfbsdi.mk
index ac04cf1d24a3..9da9a684d7c0 100644
--- a/editors/openoffice-1.1/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice-1.1/files/patch-solenv+inc+unxfbsdi.mk
@@ -42,8 +42,9 @@
-CXX= g++
-CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400
-CDEFS+= -D_REENTRANT -D_PTHREADS -D_THREAD_SAFE
+-CFLAGS+= -c $(INCLUDE)
+# flags for C and C++ Compile
- CFLAGS+= -w -c $(INCLUDE)
++CFLAGS+= -w -c $(INCLUDE)
CFLAGS+= -I/usr/X11R6/include
+
+# flags for the C++ Compiler
diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile
index 893d707c1e6f..537e4511364f 100644
--- a/editors/openoffice-2.0-devel/Makefile
+++ b/editors/openoffice-2.0-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openoffice
PORTVERSION= 644
-SNAPDATE= 20030324
+SNAPDATE= 20030412
CATEGORIES+= editors
MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \
http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
diff --git a/editors/openoffice-2.0-devel/distinfo b/editors/openoffice-2.0-devel/distinfo
index 9a90f7df5378..0004033ec259 100644
--- a/editors/openoffice-2.0-devel/distinfo
+++ b/editors/openoffice-2.0-devel/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_644_src_20030324.tar.bz2) = 78c8152634d2cbefb48b3da93af105dd
+MD5 (openoffice/oo_644_src_20030412.tar.bz2) = 2ec722a03a806de7f773f6b6086b485e
MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5
diff --git a/editors/openoffice-2.0-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice-2.0-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
deleted file mode 100644
index b15dbd1d6faf..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Tue Mar 11 12:43:34 2003
-+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx Tue Mar 11 12:43:58 2003
-@@ -62,7 +62,9 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <dlfcn.h>
-+#if !(defined FREEBSD || defined NETBSD)
- #include <alloca.h>
-+#endif
- #include <string.h>
-
- /*
diff --git a/editors/openoffice-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk
index ac04cf1d24a3..9da9a684d7c0 100644
--- a/editors/openoffice-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk
@@ -42,8 +42,9 @@
-CXX= g++
-CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400
-CDEFS+= -D_REENTRANT -D_PTHREADS -D_THREAD_SAFE
+-CFLAGS+= -c $(INCLUDE)
+# flags for C and C++ Compile
- CFLAGS+= -w -c $(INCLUDE)
++CFLAGS+= -w -c $(INCLUDE)
CFLAGS+= -I/usr/X11R6/include
+
+# flags for the C++ Compiler
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 893d707c1e6f..537e4511364f 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openoffice
PORTVERSION= 644
-SNAPDATE= 20030324
+SNAPDATE= 20030412
CATEGORIES+= editors
MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \
http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index 9a90f7df5378..0004033ec259 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_644_src_20030324.tar.bz2) = 78c8152634d2cbefb48b3da93af105dd
+MD5 (openoffice/oo_644_src_20030412.tar.bz2) = 2ec722a03a806de7f773f6b6086b485e
MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5
diff --git a/editors/openoffice-3-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice-3-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
deleted file mode 100644
index b15dbd1d6faf..000000000000
--- a/editors/openoffice-3-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Tue Mar 11 12:43:34 2003
-+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx Tue Mar 11 12:43:58 2003
-@@ -62,7 +62,9 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <dlfcn.h>
-+#if !(defined FREEBSD || defined NETBSD)
- #include <alloca.h>
-+#endif
- #include <string.h>
-
- /*
diff --git a/editors/openoffice-3-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice-3-devel/files/patch-solenv+inc+unxfbsdi.mk
index ac04cf1d24a3..9da9a684d7c0 100644
--- a/editors/openoffice-3-devel/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice-3-devel/files/patch-solenv+inc+unxfbsdi.mk
@@ -42,8 +42,9 @@
-CXX= g++
-CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400
-CDEFS+= -D_REENTRANT -D_PTHREADS -D_THREAD_SAFE
+-CFLAGS+= -c $(INCLUDE)
+# flags for C and C++ Compile
- CFLAGS+= -w -c $(INCLUDE)
++CFLAGS+= -w -c $(INCLUDE)
CFLAGS+= -I/usr/X11R6/include
+
+# flags for the C++ Compiler
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 893d707c1e6f..537e4511364f 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openoffice
PORTVERSION= 644
-SNAPDATE= 20030324
+SNAPDATE= 20030412
CATEGORIES+= editors
MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \
http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
diff --git a/editors/openoffice-3/distinfo b/editors/openoffice-3/distinfo
index 9a90f7df5378..0004033ec259 100644
--- a/editors/openoffice-3/distinfo
+++ b/editors/openoffice-3/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_644_src_20030324.tar.bz2) = 78c8152634d2cbefb48b3da93af105dd
+MD5 (openoffice/oo_644_src_20030412.tar.bz2) = 2ec722a03a806de7f773f6b6086b485e
MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5
diff --git a/editors/openoffice-3/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice-3/files/patch-gnome+gnome-vfs-filetype-registration.cxx
deleted file mode 100644
index b15dbd1d6faf..000000000000
--- a/editors/openoffice-3/files/patch-gnome+gnome-vfs-filetype-registration.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Tue Mar 11 12:43:34 2003
-+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx Tue Mar 11 12:43:58 2003
-@@ -62,7 +62,9 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <dlfcn.h>
-+#if !(defined FREEBSD || defined NETBSD)
- #include <alloca.h>
-+#endif
- #include <string.h>
-
- /*
diff --git a/editors/openoffice-3/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice-3/files/patch-solenv+inc+unxfbsdi.mk
index ac04cf1d24a3..9da9a684d7c0 100644
--- a/editors/openoffice-3/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice-3/files/patch-solenv+inc+unxfbsdi.mk
@@ -42,8 +42,9 @@
-CXX= g++
-CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400
-CDEFS+= -D_REENTRANT -D_PTHREADS -D_THREAD_SAFE
+-CFLAGS+= -c $(INCLUDE)
+# flags for C and C++ Compile
- CFLAGS+= -w -c $(INCLUDE)
++CFLAGS+= -w -c $(INCLUDE)
CFLAGS+= -I/usr/X11R6/include
+
+# flags for the C++ Compiler
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index 893d707c1e6f..537e4511364f 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openoffice
PORTVERSION= 644
-SNAPDATE= 20030324
+SNAPDATE= 20030412
CATEGORIES+= editors
MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \
http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
diff --git a/editors/openoffice-devel/distinfo b/editors/openoffice-devel/distinfo
index 9a90f7df5378..0004033ec259 100644
--- a/editors/openoffice-devel/distinfo
+++ b/editors/openoffice-devel/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_644_src_20030324.tar.bz2) = 78c8152634d2cbefb48b3da93af105dd
+MD5 (openoffice/oo_644_src_20030412.tar.bz2) = 2ec722a03a806de7f773f6b6086b485e
MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5
diff --git a/editors/openoffice-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
deleted file mode 100644
index b15dbd1d6faf..000000000000
--- a/editors/openoffice-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Tue Mar 11 12:43:34 2003
-+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx Tue Mar 11 12:43:58 2003
-@@ -62,7 +62,9 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <dlfcn.h>
-+#if !(defined FREEBSD || defined NETBSD)
- #include <alloca.h>
-+#endif
- #include <string.h>
-
- /*
diff --git a/editors/openoffice-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice-devel/files/patch-solenv+inc+unxfbsdi.mk
index ac04cf1d24a3..9da9a684d7c0 100644
--- a/editors/openoffice-devel/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice-devel/files/patch-solenv+inc+unxfbsdi.mk
@@ -42,8 +42,9 @@
-CXX= g++
-CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400
-CDEFS+= -D_REENTRANT -D_PTHREADS -D_THREAD_SAFE
+-CFLAGS+= -c $(INCLUDE)
+# flags for C and C++ Compile
- CFLAGS+= -w -c $(INCLUDE)
++CFLAGS+= -w -c $(INCLUDE)
CFLAGS+= -I/usr/X11R6/include
+
+# flags for the C++ Compiler
diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile
index 893d707c1e6f..537e4511364f 100644
--- a/editors/openoffice.org-1.1-devel/Makefile
+++ b/editors/openoffice.org-1.1-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openoffice
PORTVERSION= 644
-SNAPDATE= 20030324
+SNAPDATE= 20030412
CATEGORIES+= editors
MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \
http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
diff --git a/editors/openoffice.org-1.1-devel/distinfo b/editors/openoffice.org-1.1-devel/distinfo
index 9a90f7df5378..0004033ec259 100644
--- a/editors/openoffice.org-1.1-devel/distinfo
+++ b/editors/openoffice.org-1.1-devel/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_644_src_20030324.tar.bz2) = 78c8152634d2cbefb48b3da93af105dd
+MD5 (openoffice/oo_644_src_20030412.tar.bz2) = 2ec722a03a806de7f773f6b6086b485e
MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5
diff --git a/editors/openoffice.org-1.1-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice.org-1.1-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
deleted file mode 100644
index b15dbd1d6faf..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Tue Mar 11 12:43:34 2003
-+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx Tue Mar 11 12:43:58 2003
-@@ -62,7 +62,9 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <dlfcn.h>
-+#if !(defined FREEBSD || defined NETBSD)
- #include <alloca.h>
-+#endif
- #include <string.h>
-
- /*
diff --git a/editors/openoffice.org-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk
index ac04cf1d24a3..9da9a684d7c0 100644
--- a/editors/openoffice.org-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk
@@ -42,8 +42,9 @@
-CXX= g++
-CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400
-CDEFS+= -D_REENTRANT -D_PTHREADS -D_THREAD_SAFE
+-CFLAGS+= -c $(INCLUDE)
+# flags for C and C++ Compile
- CFLAGS+= -w -c $(INCLUDE)
++CFLAGS+= -w -c $(INCLUDE)
CFLAGS+= -I/usr/X11R6/include
+
+# flags for the C++ Compiler
diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile
index 893d707c1e6f..537e4511364f 100644
--- a/editors/openoffice.org-1.1/Makefile
+++ b/editors/openoffice.org-1.1/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openoffice
PORTVERSION= 644
-SNAPDATE= 20030324
+SNAPDATE= 20030412
CATEGORIES+= editors
MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \
http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
diff --git a/editors/openoffice.org-1.1/distinfo b/editors/openoffice.org-1.1/distinfo
index 9a90f7df5378..0004033ec259 100644
--- a/editors/openoffice.org-1.1/distinfo
+++ b/editors/openoffice.org-1.1/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_644_src_20030324.tar.bz2) = 78c8152634d2cbefb48b3da93af105dd
+MD5 (openoffice/oo_644_src_20030412.tar.bz2) = 2ec722a03a806de7f773f6b6086b485e
MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5
diff --git a/editors/openoffice.org-1.1/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice.org-1.1/files/patch-gnome+gnome-vfs-filetype-registration.cxx
deleted file mode 100644
index b15dbd1d6faf..000000000000
--- a/editors/openoffice.org-1.1/files/patch-gnome+gnome-vfs-filetype-registration.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Tue Mar 11 12:43:34 2003
-+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx Tue Mar 11 12:43:58 2003
-@@ -62,7 +62,9 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <dlfcn.h>
-+#if !(defined FREEBSD || defined NETBSD)
- #include <alloca.h>
-+#endif
- #include <string.h>
-
- /*
diff --git a/editors/openoffice.org-1.1/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-1.1/files/patch-solenv+inc+unxfbsdi.mk
index ac04cf1d24a3..9da9a684d7c0 100644
--- a/editors/openoffice.org-1.1/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-1.1/files/patch-solenv+inc+unxfbsdi.mk
@@ -42,8 +42,9 @@
-CXX= g++
-CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400
-CDEFS+= -D_REENTRANT -D_PTHREADS -D_THREAD_SAFE
+-CFLAGS+= -c $(INCLUDE)
+# flags for C and C++ Compile
- CFLAGS+= -w -c $(INCLUDE)
++CFLAGS+= -w -c $(INCLUDE)
CFLAGS+= -I/usr/X11R6/include
+
+# flags for the C++ Compiler
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index 893d707c1e6f..537e4511364f 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openoffice
PORTVERSION= 644
-SNAPDATE= 20030324
+SNAPDATE= 20030412
CATEGORIES+= editors
MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \
http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
diff --git a/editors/openoffice.org-2-RC/distinfo b/editors/openoffice.org-2-RC/distinfo
index 9a90f7df5378..0004033ec259 100644
--- a/editors/openoffice.org-2-RC/distinfo
+++ b/editors/openoffice.org-2-RC/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_644_src_20030324.tar.bz2) = 78c8152634d2cbefb48b3da93af105dd
+MD5 (openoffice/oo_644_src_20030412.tar.bz2) = 2ec722a03a806de7f773f6b6086b485e
MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5
diff --git a/editors/openoffice.org-2-RC/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice.org-2-RC/files/patch-gnome+gnome-vfs-filetype-registration.cxx
deleted file mode 100644
index b15dbd1d6faf..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-gnome+gnome-vfs-filetype-registration.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Tue Mar 11 12:43:34 2003
-+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx Tue Mar 11 12:43:58 2003
-@@ -62,7 +62,9 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <dlfcn.h>
-+#if !(defined FREEBSD || defined NETBSD)
- #include <alloca.h>
-+#endif
- #include <string.h>
-
- /*
diff --git a/editors/openoffice.org-2-RC/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2-RC/files/patch-solenv+inc+unxfbsdi.mk
index ac04cf1d24a3..9da9a684d7c0 100644
--- a/editors/openoffice.org-2-RC/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-2-RC/files/patch-solenv+inc+unxfbsdi.mk
@@ -42,8 +42,9 @@
-CXX= g++
-CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400
-CDEFS+= -D_REENTRANT -D_PTHREADS -D_THREAD_SAFE
+-CFLAGS+= -c $(INCLUDE)
+# flags for C and C++ Compile
- CFLAGS+= -w -c $(INCLUDE)
++CFLAGS+= -w -c $(INCLUDE)
CFLAGS+= -I/usr/X11R6/include
+
+# flags for the C++ Compiler
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index 893d707c1e6f..537e4511364f 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openoffice
PORTVERSION= 644
-SNAPDATE= 20030324
+SNAPDATE= 20030412
CATEGORIES+= editors
MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \
http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo
index 9a90f7df5378..0004033ec259 100644
--- a/editors/openoffice.org-2-devel/distinfo
+++ b/editors/openoffice.org-2-devel/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_644_src_20030324.tar.bz2) = 78c8152634d2cbefb48b3da93af105dd
+MD5 (openoffice/oo_644_src_20030412.tar.bz2) = 2ec722a03a806de7f773f6b6086b485e
MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5
diff --git a/editors/openoffice.org-2-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice.org-2-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
deleted file mode 100644
index b15dbd1d6faf..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Tue Mar 11 12:43:34 2003
-+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx Tue Mar 11 12:43:58 2003
-@@ -62,7 +62,9 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <dlfcn.h>
-+#if !(defined FREEBSD || defined NETBSD)
- #include <alloca.h>
-+#endif
- #include <string.h>
-
- /*
diff --git a/editors/openoffice.org-2-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2-devel/files/patch-solenv+inc+unxfbsdi.mk
index ac04cf1d24a3..9da9a684d7c0 100644
--- a/editors/openoffice.org-2-devel/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-2-devel/files/patch-solenv+inc+unxfbsdi.mk
@@ -42,8 +42,9 @@
-CXX= g++
-CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400
-CDEFS+= -D_REENTRANT -D_PTHREADS -D_THREAD_SAFE
+-CFLAGS+= -c $(INCLUDE)
+# flags for C and C++ Compile
- CFLAGS+= -w -c $(INCLUDE)
++CFLAGS+= -w -c $(INCLUDE)
CFLAGS+= -I/usr/X11R6/include
+
+# flags for the C++ Compiler
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index 893d707c1e6f..537e4511364f 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openoffice
PORTVERSION= 644
-SNAPDATE= 20030324
+SNAPDATE= 20030412
CATEGORIES+= editors
MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \
http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
diff --git a/editors/openoffice.org-2.0-devel/distinfo b/editors/openoffice.org-2.0-devel/distinfo
index 9a90f7df5378..0004033ec259 100644
--- a/editors/openoffice.org-2.0-devel/distinfo
+++ b/editors/openoffice.org-2.0-devel/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_644_src_20030324.tar.bz2) = 78c8152634d2cbefb48b3da93af105dd
+MD5 (openoffice/oo_644_src_20030412.tar.bz2) = 2ec722a03a806de7f773f6b6086b485e
MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5
diff --git a/editors/openoffice.org-2.0-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice.org-2.0-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
deleted file mode 100644
index b15dbd1d6faf..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Tue Mar 11 12:43:34 2003
-+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx Tue Mar 11 12:43:58 2003
-@@ -62,7 +62,9 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <dlfcn.h>
-+#if !(defined FREEBSD || defined NETBSD)
- #include <alloca.h>
-+#endif
- #include <string.h>
-
- /*
diff --git a/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk
index ac04cf1d24a3..9da9a684d7c0 100644
--- a/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk
@@ -42,8 +42,9 @@
-CXX= g++
-CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400
-CDEFS+= -D_REENTRANT -D_PTHREADS -D_THREAD_SAFE
+-CFLAGS+= -c $(INCLUDE)
+# flags for C and C++ Compile
- CFLAGS+= -w -c $(INCLUDE)
++CFLAGS+= -w -c $(INCLUDE)
CFLAGS+= -I/usr/X11R6/include
+
+# flags for the C++ Compiler
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index 893d707c1e6f..537e4511364f 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openoffice
PORTVERSION= 644
-SNAPDATE= 20030324
+SNAPDATE= 20030412
CATEGORIES+= editors
MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \
http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
diff --git a/editors/openoffice.org-2.0/distinfo b/editors/openoffice.org-2.0/distinfo
index 9a90f7df5378..0004033ec259 100644
--- a/editors/openoffice.org-2.0/distinfo
+++ b/editors/openoffice.org-2.0/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_644_src_20030324.tar.bz2) = 78c8152634d2cbefb48b3da93af105dd
+MD5 (openoffice/oo_644_src_20030412.tar.bz2) = 2ec722a03a806de7f773f6b6086b485e
MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5
diff --git a/editors/openoffice.org-2.0/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice.org-2.0/files/patch-gnome+gnome-vfs-filetype-registration.cxx
deleted file mode 100644
index b15dbd1d6faf..000000000000
--- a/editors/openoffice.org-2.0/files/patch-gnome+gnome-vfs-filetype-registration.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Tue Mar 11 12:43:34 2003
-+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx Tue Mar 11 12:43:58 2003
-@@ -62,7 +62,9 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <dlfcn.h>
-+#if !(defined FREEBSD || defined NETBSD)
- #include <alloca.h>
-+#endif
- #include <string.h>
-
- /*
diff --git a/editors/openoffice.org-2.0/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2.0/files/patch-solenv+inc+unxfbsdi.mk
index ac04cf1d24a3..9da9a684d7c0 100644
--- a/editors/openoffice.org-2.0/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-2.0/files/patch-solenv+inc+unxfbsdi.mk
@@ -42,8 +42,9 @@
-CXX= g++
-CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400
-CDEFS+= -D_REENTRANT -D_PTHREADS -D_THREAD_SAFE
+-CFLAGS+= -c $(INCLUDE)
+# flags for C and C++ Compile
- CFLAGS+= -w -c $(INCLUDE)
++CFLAGS+= -w -c $(INCLUDE)
CFLAGS+= -I/usr/X11R6/include
+
+# flags for the C++ Compiler
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index 893d707c1e6f..537e4511364f 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openoffice
PORTVERSION= 644
-SNAPDATE= 20030324
+SNAPDATE= 20030412
CATEGORIES+= editors
MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \
http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
diff --git a/editors/openoffice.org-2/distinfo b/editors/openoffice.org-2/distinfo
index 9a90f7df5378..0004033ec259 100644
--- a/editors/openoffice.org-2/distinfo
+++ b/editors/openoffice.org-2/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_644_src_20030324.tar.bz2) = 78c8152634d2cbefb48b3da93af105dd
+MD5 (openoffice/oo_644_src_20030412.tar.bz2) = 2ec722a03a806de7f773f6b6086b485e
MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5
diff --git a/editors/openoffice.org-2/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice.org-2/files/patch-gnome+gnome-vfs-filetype-registration.cxx
deleted file mode 100644
index b15dbd1d6faf..000000000000
--- a/editors/openoffice.org-2/files/patch-gnome+gnome-vfs-filetype-registration.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Tue Mar 11 12:43:34 2003
-+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx Tue Mar 11 12:43:58 2003
-@@ -62,7 +62,9 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <dlfcn.h>
-+#if !(defined FREEBSD || defined NETBSD)
- #include <alloca.h>
-+#endif
- #include <string.h>
-
- /*
diff --git a/editors/openoffice.org-2/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2/files/patch-solenv+inc+unxfbsdi.mk
index ac04cf1d24a3..9da9a684d7c0 100644
--- a/editors/openoffice.org-2/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-2/files/patch-solenv+inc+unxfbsdi.mk
@@ -42,8 +42,9 @@
-CXX= g++
-CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400
-CDEFS+= -D_REENTRANT -D_PTHREADS -D_THREAD_SAFE
+-CFLAGS+= -c $(INCLUDE)
+# flags for C and C++ Compile
- CFLAGS+= -w -c $(INCLUDE)
++CFLAGS+= -w -c $(INCLUDE)
CFLAGS+= -I/usr/X11R6/include
+
+# flags for the C++ Compiler
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 893d707c1e6f..537e4511364f 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openoffice
PORTVERSION= 644
-SNAPDATE= 20030324
+SNAPDATE= 20030412
CATEGORIES+= editors
MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \
http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
diff --git a/editors/openoffice.org-3-RC/distinfo b/editors/openoffice.org-3-RC/distinfo
index 9a90f7df5378..0004033ec259 100644
--- a/editors/openoffice.org-3-RC/distinfo
+++ b/editors/openoffice.org-3-RC/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_644_src_20030324.tar.bz2) = 78c8152634d2cbefb48b3da93af105dd
+MD5 (openoffice/oo_644_src_20030412.tar.bz2) = 2ec722a03a806de7f773f6b6086b485e
MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5
diff --git a/editors/openoffice.org-3-RC/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice.org-3-RC/files/patch-gnome+gnome-vfs-filetype-registration.cxx
deleted file mode 100644
index b15dbd1d6faf..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-gnome+gnome-vfs-filetype-registration.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Tue Mar 11 12:43:34 2003
-+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx Tue Mar 11 12:43:58 2003
-@@ -62,7 +62,9 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <dlfcn.h>
-+#if !(defined FREEBSD || defined NETBSD)
- #include <alloca.h>
-+#endif
- #include <string.h>
-
- /*
diff --git a/editors/openoffice.org-3-RC/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-3-RC/files/patch-solenv+inc+unxfbsdi.mk
index ac04cf1d24a3..9da9a684d7c0 100644
--- a/editors/openoffice.org-3-RC/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-3-RC/files/patch-solenv+inc+unxfbsdi.mk
@@ -42,8 +42,9 @@
-CXX= g++
-CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400
-CDEFS+= -D_REENTRANT -D_PTHREADS -D_THREAD_SAFE
+-CFLAGS+= -c $(INCLUDE)
+# flags for C and C++ Compile
- CFLAGS+= -w -c $(INCLUDE)
++CFLAGS+= -w -c $(INCLUDE)
CFLAGS+= -I/usr/X11R6/include
+
+# flags for the C++ Compiler
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 893d707c1e6f..537e4511364f 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openoffice
PORTVERSION= 644
-SNAPDATE= 20030324
+SNAPDATE= 20030412
CATEGORIES+= editors
MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \
http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index 9a90f7df5378..0004033ec259 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_644_src_20030324.tar.bz2) = 78c8152634d2cbefb48b3da93af105dd
+MD5 (openoffice/oo_644_src_20030412.tar.bz2) = 2ec722a03a806de7f773f6b6086b485e
MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5
diff --git a/editors/openoffice.org-3-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice.org-3-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
deleted file mode 100644
index b15dbd1d6faf..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Tue Mar 11 12:43:34 2003
-+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx Tue Mar 11 12:43:58 2003
-@@ -62,7 +62,9 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <dlfcn.h>
-+#if !(defined FREEBSD || defined NETBSD)
- #include <alloca.h>
-+#endif
- #include <string.h>
-
- /*
diff --git a/editors/openoffice.org-3-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-3-devel/files/patch-solenv+inc+unxfbsdi.mk
index ac04cf1d24a3..9da9a684d7c0 100644
--- a/editors/openoffice.org-3-devel/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-3-devel/files/patch-solenv+inc+unxfbsdi.mk
@@ -42,8 +42,9 @@
-CXX= g++
-CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400
-CDEFS+= -D_REENTRANT -D_PTHREADS -D_THREAD_SAFE
+-CFLAGS+= -c $(INCLUDE)
+# flags for C and C++ Compile
- CFLAGS+= -w -c $(INCLUDE)
++CFLAGS+= -w -c $(INCLUDE)
CFLAGS+= -I/usr/X11R6/include
+
+# flags for the C++ Compiler
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 893d707c1e6f..537e4511364f 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openoffice
PORTVERSION= 644
-SNAPDATE= 20030324
+SNAPDATE= 20030412
CATEGORIES+= editors
MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \
http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
diff --git a/editors/openoffice.org-3/distinfo b/editors/openoffice.org-3/distinfo
index 9a90f7df5378..0004033ec259 100644
--- a/editors/openoffice.org-3/distinfo
+++ b/editors/openoffice.org-3/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_644_src_20030324.tar.bz2) = 78c8152634d2cbefb48b3da93af105dd
+MD5 (openoffice/oo_644_src_20030412.tar.bz2) = 2ec722a03a806de7f773f6b6086b485e
MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5
diff --git a/editors/openoffice.org-3/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice.org-3/files/patch-gnome+gnome-vfs-filetype-registration.cxx
deleted file mode 100644
index b15dbd1d6faf..000000000000
--- a/editors/openoffice.org-3/files/patch-gnome+gnome-vfs-filetype-registration.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Tue Mar 11 12:43:34 2003
-+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx Tue Mar 11 12:43:58 2003
-@@ -62,7 +62,9 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <dlfcn.h>
-+#if !(defined FREEBSD || defined NETBSD)
- #include <alloca.h>
-+#endif
- #include <string.h>
-
- /*
diff --git a/editors/openoffice.org-3/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-3/files/patch-solenv+inc+unxfbsdi.mk
index ac04cf1d24a3..9da9a684d7c0 100644
--- a/editors/openoffice.org-3/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-3/files/patch-solenv+inc+unxfbsdi.mk
@@ -42,8 +42,9 @@
-CXX= g++
-CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400
-CDEFS+= -D_REENTRANT -D_PTHREADS -D_THREAD_SAFE
+-CFLAGS+= -c $(INCLUDE)
+# flags for C and C++ Compile
- CFLAGS+= -w -c $(INCLUDE)
++CFLAGS+= -w -c $(INCLUDE)
CFLAGS+= -I/usr/X11R6/include
+
+# flags for the C++ Compiler
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 893d707c1e6f..537e4511364f 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openoffice
PORTVERSION= 644
-SNAPDATE= 20030324
+SNAPDATE= 20030412
CATEGORIES+= editors
MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \
http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \
diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo
index 9a90f7df5378..0004033ec259 100644
--- a/editors/openoffice.org-vcltesttool/distinfo
+++ b/editors/openoffice.org-vcltesttool/distinfo
@@ -1,4 +1,4 @@
-MD5 (openoffice/oo_644_src_20030324.tar.bz2) = 78c8152634d2cbefb48b3da93af105dd
+MD5 (openoffice/oo_644_src_20030412.tar.bz2) = 2ec722a03a806de7f773f6b6086b485e
MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5
diff --git a/editors/openoffice.org-vcltesttool/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice.org-vcltesttool/files/patch-gnome+gnome-vfs-filetype-registration.cxx
deleted file mode 100644
index b15dbd1d6faf..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-gnome+gnome-vfs-filetype-registration.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Tue Mar 11 12:43:34 2003
-+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx Tue Mar 11 12:43:58 2003
-@@ -62,7 +62,9 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <dlfcn.h>
-+#if !(defined FREEBSD || defined NETBSD)
- #include <alloca.h>
-+#endif
- #include <string.h>
-
- /*
diff --git a/editors/openoffice.org-vcltesttool/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-vcltesttool/files/patch-solenv+inc+unxfbsdi.mk
index ac04cf1d24a3..9da9a684d7c0 100644
--- a/editors/openoffice.org-vcltesttool/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-vcltesttool/files/patch-solenv+inc+unxfbsdi.mk
@@ -42,8 +42,9 @@
-CXX= g++
-CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400
-CDEFS+= -D_REENTRANT -D_PTHREADS -D_THREAD_SAFE
+-CFLAGS+= -c $(INCLUDE)
+# flags for C and C++ Compile
- CFLAGS+= -w -c $(INCLUDE)
++CFLAGS+= -w -c $(INCLUDE)
CFLAGS+= -I/usr/X11R6/include
+
+# flags for the C++ Compiler