From e916d5daf5aff37ee4dc032dc2a8ef2445110993 Mon Sep 17 00:00:00 2001 From: mbr Date: Mon, 31 Mar 2003 21:32:38 +0000 Subject: Update to srx644_ooo20030412. --- editors/openoffice-3-devel/Makefile | 2 +- editors/openoffice-3-devel/distinfo | 2 +- .../files/patch-gnome+gnome-vfs-filetype-registration.cxx | 12 ------------ .../openoffice-3-devel/files/patch-solenv+inc+unxfbsdi.mk | 3 ++- 4 files changed, 4 insertions(+), 15 deletions(-) delete mode 100644 editors/openoffice-3-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx (limited to 'editors/openoffice-3-devel') 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 - #include - #include -+#if !(defined FREEBSD || defined NETBSD) - #include -+#endif - #include - - /* 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 -- cgit