Update to srx644_ooo20030412.

svn path=/head/; revision=77849
2003-03-31 21:32:38 +00:00 · 2003-03-31 21:32:38 +00:00 · 36f042efc3 · 2021-03-31 03:12:20 +00:00
commit 36f042efc3
parent 23f701b695
68 changed files with 68 additions and 255 deletions
--- 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%/ \
--- 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
--- 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
@ -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>
- 
- /* 
--- 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
--- 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%/ \
--- 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
--- 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
@ -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>
- 
- /* 
--- 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
--- 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%/ \
--- 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
--- 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
@ -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>
- 
- /* 
--- 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
--- 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%/ \
--- 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
--- 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
@ -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>
- 
- /* 
--- 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
--- 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%/ \
--- 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
--- a/editors/openoffice-3/files/patch-gnome+gnome-vfs-filetype-registration.cxx
+++ b/editors/openoffice-3/files/patch-gnome+gnome-vfs-filetype-registration.cxx
@ -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>
- 
- /* 
--- 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
--- 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%/ \
--- 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
--- a/editors/openoffice-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
+++ b/editors/openoffice-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx
@ -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>
- 
- /* 
--- 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
--- 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%/ \
--- 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
--- 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
@ -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>
- 
- /* 
--- 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
--- 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%/ \
--- 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
--- 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
@ -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>
- 
- /* 
--- 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
--- 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%/ \
--- 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
--- 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
@ -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>
- 
- /* 
--- 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
--- 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%/ \
--- 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
--- 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
@ -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>
- 
- /* 
--- 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
--- 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%/ \
--- 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
--- 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
@ -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>
- 
- /* 
--- 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
--- 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%/ \
--- 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
--- 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
@ -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>
- 
- /* 
--- 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
--- 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%/ \
--- 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
--- 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
@ -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>
- 
- /* 
--- 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
--- 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%/ \
--- 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
--- 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
@ -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>
- 
- /* 
--- 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
--- 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%/ \
--- 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
--- 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
@ -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>
- 
- /* 
--- 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
--- 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%/ \
--- 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
--- 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
@ -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>
- 
- /* 
--- 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
--- 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%/ \
--- 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
--- 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
@ -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>
- 
- /* 
--- 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