From 5191c1d5a85d6037d951f877eee67b94b669da7e Mon Sep 17 00:00:00 2001 From: Martin Blapp Date: Sat, 7 Jun 2003 22:09:48 +0000 Subject: Upgrade to OO1.1 beta2. --- editors/openoffice.org-1.1-devel/distinfo | 2 +- .../debugpatch-setup2+mow+source+loader+loader.c | 8 +- .../files/openoffice-wrapper | 8 +- .../files/patch-berkeleydb+db-3.2.9.patch | 22 +- .../files/patch-bridges+prj+build.lst | 11 - ...patch-bridges+source+cpp_uno+gcc3_freebsd_intel | 131 --------- .../patch-bridges+source+jni_uno+jni_uno2java.cxx | 12 - .../files/patch-comphelper+util+makefile.mk | 15 - .../files/patch-config_office+configure.in | 32 --- .../files/patch-config_office+set_soenv.in | 97 ------- ...h-connectivity+source+drivers+mozab+makefile.mk | 12 - ...ity+source+drivers+mozab+mozillasrc+makefile.mk | 27 +- ...ivity+source+drivers+mozaddressbook+makefile.mk | 12 - .../files/patch-cppu+inc+uno+lbnames.h | 11 - .../files/patch-cppu+prj+build.lst | 8 - .../files/patch-cppuhelper+source+makefile.mk | 14 - .../files/patch-desktop+source+app+app.cxx | 22 -- .../patch-desktop+source+pkgchk+pkgchk_misc.h | 11 - .../files/patch-desktop+util+makefile.mk | 20 -- .../files/patch-dtrans+source+X11+makefile.mk | 12 - .../files/patch-eventattacher+source+makefile.mk | 14 - .../patch-extensions+source+scanner+makefile.mk | 12 + .../files/patch-external+gcc3_specific+makefile.mk | 14 +- .../files/patch-freetype+makefile.mk | 11 - .../files/patch-instsetoo+util+makefile.mk | 13 - .../files/patch-instsetoo+util+openoffice.lst | 10 - .../files/patch-javaunohelper+source+makefile.mk | 13 - .../files/patch-jni_uno+jni_java2uno.cxx | 12 - .../files/patch-jvmaccess+source+javainfoimpl.cxx | 10 - .../files/patch-jvmaccess+source+sunversion.cxx | 61 +---- .../files/patch-jvmaccess+util+makefile.mk | 11 - .../files/patch-nas+nas-1.6.patch | 301 --------------------- .../files/patch-odk+util+makefile.pmk | 16 -- .../patch-offapi+com+sun+star+setup+OSType.idl | 12 - .../files/patch-offapi+util+makefile.pmk | 11 - .../files/patch-package+inc+HashMaps.hxx | 20 -- .../files/patch-package+inc+ZipPackageFolder.hxx | 11 - ...patch-package+source+zippackage+ContentInfo.hxx | 34 --- ...-package+source+zippackage+ZipPackageFolder.cxx | 41 --- .../files/patch-registry+source+registry.cxx | 14 - .../files/patch-registry+source+regkey.cxx | 12 - .../files/patch-rsc+source+rscpp+cpp.h | 12 - .../files/patch-sal+osl+unx+nlsupport.c | 45 +-- .../files/patch-sal+osl+unx+pipe.c | 14 - .../files/patch-sal+osl+unx+process.c | 11 - .../files/patch-sal+osl+unx+socket.c | 26 -- .../files/patch-sal+osl+unx+system.h | 10 +- .../files/patch-sal+osl+unx+tempfile.c | 11 - .../files/patch-sal+textenc+tencinfo.c | 6 +- .../files/patch-sal+util+makefile.mk | 11 - .../files/patch-sal+workben+makefile.mk | 10 +- .../patch-salhelper+source+gcc2_freebsd_intel.map | 31 --- .../patch-salhelper+source+gcc3_freebsd_intel.map | 34 --- .../files/patch-salhelper+source+makefile.mk | 6 +- .../files/patch-salhelper+test+rtti+makefile.mk | 12 +- .../files/patch-sc+source+core+data+cell.cxx | 11 - .../files/patch-scp+source+global+setupzip.scp | 15 + .../files/patch-scp+source+global+udk_base.scp | 19 -- .../files/patch-scp+source+player+player.scp | 20 -- .../files/patch-scptools+source+linker+ziplst.cxx | 19 -- .../files/patch-setup2+inc+fields.hxx | 10 - .../files/patch-setup2+mow+source+loader+loader.c | 39 --- .../patch-setup2+mow+source+loader+makefile.mk | 14 - .../files/patch-setup2+patch+makefile.mk | 11 - .../files/patch-setup2+script+setupserver | 10 - .../files/patch-setup2+source+compiler+decltor.cxx | 20 -- .../patch-setup2+source+custom+jvmsetup+jvmdlg.cxx | 11 - ...etup2+source+custom+jvmsetup+loader+jvmsetup.sh | 10 - .../files/patch-sfx2+source+doc.src | 11 - .../files/patch-shell+source+cmdmail+makefile.mk | 16 -- .../patch-shell+source+proxysettings+makefile.mk | 16 -- .../files/patch-shell+source+unix+exec+makefile.mk | 16 -- .../files/patch-solenv+bin+mapgen.pl | 21 -- .../files/patch-solenv+config+ssrx644.ini | 33 --- .../files/patch-solenv+inc+tg_ext.mk | 12 - .../files/patch-solenv+inc+tg_moz.mk | 17 -- .../files/patch-solenv+inc+unxfbsdi.mk | 203 -------------- .../files/patch-soltools+checkdll+makefile.mk | 12 - .../files/patch-stlport+makefile.mk | 30 -- .../patch-stoc+source+corereflection+makefile.mk | 14 - .../patch-stoc+source+defaultregistry+makefile.mk | 14 - ...c+source+implementationregistration+implreg.cxx | 11 - ...c+source+implementationregistration+makefile.mk | 14 - .../files/patch-stoc+source+inspect+makefile.mk | 14 - .../files/patch-stoc+source+invocation+makefile.mk | 14 - ...oc+source+invocation_adapterfactory+makefile.mk | 14 - .../files/patch-stoc+source+javaloader+makefile.mk | 15 - .../files/patch-stoc+source+javavm+javavm.cxx | 29 -- .../files/patch-stoc+source+javavm+makefile.mk | 14 - .../files/patch-stoc+source+loader+makefile.mk | 14 - .../patch-stoc+source+namingservice+makefile.mk | 14 - .../patch-stoc+source+proxy_factory+makefile.mk | 14 - ...tch-stoc+source+registry_tdprovider+makefile.mk | 15 - .../patch-stoc+source+servicemanager+makefile.mk | 14 - ...h-stoc+source+servicemanager+servicemanager.cxx | 34 --- .../files/patch-stoc+source+tdmanager+makefile.mk | 15 - .../files/patch-stoc+source+typeconv+makefile.mk | 14 - .../files/patch-store+util+makefile.mk | 14 - .../files/patch-svx+source+fmcomp+makefile.mk | 12 - .../files/patch-svx+source+svrtf+rtfitem.cxx | 24 -- .../files/patch-svx+source+svrtf+svxrtf.cxx | 19 -- .../files/patch-sw+source+filter+rtf+swparrtf.cxx | 161 ----------- .../files/patch-sw+source+filter+rtf+swparrtf.hxx | 10 - .../files/patch-sw+source+filter+ww8+ww8par.cxx | 38 --- .../files/patch-sw+source+filter+ww8+ww8par6.cxx | 25 -- .../files/patch-sysui+desktop+gnome+makefile.mk | 12 + .../patch-sysui+oounix+office+gnome+makefile.mk | 12 - ...lkit+inc+toolkit+helper+IComboListBoxHelper.hxx | 17 ++ .../files/patch-tools+source+string+tstring.cxx | 8 +- .../files/patch-unzip+source+file_io.c | 21 -- .../files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx | 11 - .../patch-vcl+unx+source+gdi+getstyle+makefile.mk | 15 - ...ch-vcl+unx+source+gdi+native-msgbox+makefile.mk | 19 -- .../files/patch-vcl+workben+officeacceptthread.cxx | 16 +- 114 files changed, 141 insertions(+), 2555 deletions(-) delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-bridges+prj+build.lst delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-comphelper+util+makefile.mk delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-config_office+configure.in delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-config_office+set_soenv.in delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-connectivity+source+drivers+mozab+makefile.mk delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-cppu+inc+uno+lbnames.h delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-cppu+prj+build.lst delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-cppuhelper+source+makefile.mk delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-desktop+source+app+app.cxx delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-desktop+source+pkgchk+pkgchk_misc.h delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-desktop+util+makefile.mk delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-dtrans+source+X11+makefile.mk delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-eventattacher+source+makefile.mk create mode 100644 editors/openoffice.org-1.1-devel/files/patch-extensions+source+scanner+makefile.mk delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-freetype+makefile.mk delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-instsetoo+util+makefile.mk delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-instsetoo+util+openoffice.lst delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-javaunohelper+source+makefile.mk delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-jni_uno+jni_java2uno.cxx delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-jvmaccess+source+javainfoimpl.cxx delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-jvmaccess+util+makefile.mk delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-nas+nas-1.6.patch delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-odk+util+makefile.pmk delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-offapi+com+sun+star+setup+OSType.idl delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-offapi+util+makefile.pmk delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-package+inc+HashMaps.hxx delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-package+inc+ZipPackageFolder.hxx delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-package+source+zippackage+ContentInfo.hxx delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-package+source+zippackage+ZipPackageFolder.cxx delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-registry+source+registry.cxx delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-registry+source+regkey.cxx delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-rsc+source+rscpp+cpp.h delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+pipe.c delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+process.c delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+socket.c delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+tempfile.c delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-sal+util+makefile.mk delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-salhelper+source+gcc2_freebsd_intel.map delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-salhelper+source+gcc3_freebsd_intel.map delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-sc+source+core+data+cell.cxx create mode 100644 editors/openoffice.org-1.1-devel/files/patch-scp+source+global+setupzip.scp delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-scp+source+global+udk_base.scp delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-scp+source+player+player.scp delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-scptools+source+linker+ziplst.cxx delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-setup2+inc+fields.hxx delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-setup2+mow+source+loader+loader.c delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-setup2+mow+source+loader+makefile.mk delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-setup2+patch+makefile.mk delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-setup2+script+setupserver delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-setup2+source+compiler+decltor.cxx delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-sfx2+source+doc.src delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-shell+source+cmdmail+makefile.mk delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-shell+source+proxysettings+makefile.mk delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-shell+source+unix+exec+makefile.mk delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-solenv+bin+mapgen.pl delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-solenv+config+ssrx644.ini delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-solenv+inc+tg_ext.mk delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-solenv+inc+tg_moz.mk delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-soltools+checkdll+makefile.mk delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-stlport+makefile.mk delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-stoc+source+corereflection+makefile.mk delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-stoc+source+defaultregistry+makefile.mk delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-stoc+source+implementationregistration+implreg.cxx delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-stoc+source+implementationregistration+makefile.mk delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-stoc+source+inspect+makefile.mk delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-stoc+source+invocation+makefile.mk delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-stoc+source+invocation_adapterfactory+makefile.mk delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-stoc+source+javaloader+makefile.mk delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-stoc+source+javavm+javavm.cxx delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-stoc+source+javavm+makefile.mk delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-stoc+source+loader+makefile.mk delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-stoc+source+namingservice+makefile.mk delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-stoc+source+proxy_factory+makefile.mk delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-stoc+source+registry_tdprovider+makefile.mk delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-stoc+source+servicemanager+makefile.mk delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-stoc+source+servicemanager+servicemanager.cxx delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-stoc+source+tdmanager+makefile.mk delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-stoc+source+typeconv+makefile.mk delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-store+util+makefile.mk delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-svx+source+fmcomp+makefile.mk delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-svx+source+svrtf+rtfitem.cxx delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-svx+source+svrtf+svxrtf.cxx delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-sw+source+filter+rtf+swparrtf.cxx delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-sw+source+filter+rtf+swparrtf.hxx delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-sw+source+filter+ww8+ww8par.cxx delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-sw+source+filter+ww8+ww8par6.cxx create mode 100644 editors/openoffice.org-1.1-devel/files/patch-sysui+desktop+gnome+makefile.mk delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-sysui+oounix+office+gnome+makefile.mk create mode 100644 editors/openoffice.org-1.1-devel/files/patch-toolkit+inc+toolkit+helper+IComboListBoxHelper.hxx delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-unzip+source+file_io.c delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-vcl+unx+source+gdi+gcach_xpeer.hxx delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-vcl+unx+source+gdi+getstyle+makefile.mk delete mode 100644 editors/openoffice.org-1.1-devel/files/patch-vcl+unx+source+gdi+native-msgbox+makefile.mk (limited to 'editors/openoffice.org-1.1-devel') diff --git a/editors/openoffice.org-1.1-devel/distinfo b/editors/openoffice.org-1.1-devel/distinfo index a55458016a47..45c5950d3083 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_20030412.tar.bz2) = 2ec722a03a806de7f773f6b6086b485e +MD5 (openoffice/oo_644_src_20030601.tar.bz2) = df9c081ca85caef3d89e039295458c99 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/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-1.1-devel/files/debugpatch-setup2+mow+source+loader+loader.c index b6e2fd52d8f3..726e3ec21083 100644 --- a/editors/openoffice.org-1.1-devel/files/debugpatch-setup2+mow+source+loader+loader.c +++ b/editors/openoffice.org-1.1-devel/files/debugpatch-setup2+mow+source+loader+loader.c @@ -1,6 +1,6 @@ ---- ../setup2/mow/source/loader/loader.c.orig2 Thu Jun 6 11:23:17 2002 -+++ ../setup2/mow/source/loader/loader.c Thu Jun 6 11:24:14 2002 -@@ -1055,6 +1055,7 @@ +--- ../setup2/mow/source/loader/loader.c.orig Mon Jun 2 08:25:13 2003 ++++ ../setup2/mow/source/loader/loader.c Tue Jun 3 07:58:22 2003 +@@ -1069,6 +1069,7 @@ void KillSetupDir() { @@ -8,7 +8,7 @@ DIR* pDir; struct dirent* pFile; -@@ -1074,6 +1075,10 @@ +@@ -1088,6 +1089,10 @@ closedir( pDir ); chdir( strInitPath ); rmdir( strTmpPath ); diff --git a/editors/openoffice.org-1.1-devel/files/openoffice-wrapper b/editors/openoffice.org-1.1-devel/files/openoffice-wrapper index f241aff60521..9075808b172b 100644 --- a/editors/openoffice.org-1.1-devel/files/openoffice-wrapper +++ b/editors/openoffice.org-1.1-devel/files/openoffice-wrapper @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-1.1-devel/files/Attic/openoffice-wrapper,v 1.7 2003-04-16 06:51:35 mbr Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-1.1-devel/files/Attic/openoffice-wrapper,v 1.8 2003-06-07 22:09:46 mbr Exp $ oopath=%%PREFIX%%/OpenOffice.org-%%BUILD_NR%%/program/ program=`echo $0 | sed -e 's|.*-||'` @@ -9,9 +9,9 @@ if [ ! $LANG ]; then export LANG=%%LANG%% fi -if [ -e $HOME/OpenOffice.org644/setup.log ]; then - if [ ! -e $HOME/OpenOffice.org644/user/config/soffice.cfg ]; then - touch $HOME/OpenOffice.org644/user/config/soffice.cfg +if [ -e $HOME/OpenOffice.org1.1/setup.log ]; then + if [ ! -e $HOME/OpenOffice.org1.1/user/config/soffice.cfg ]; then + touch $HOME/OpenOffice.org1.1/user/config/soffice.cfg fi fi diff --git a/editors/openoffice.org-1.1-devel/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice.org-1.1-devel/files/patch-berkeleydb+db-3.2.9.patch index 2ccda4a44982..c06b00dc51c5 100644 --- a/editors/openoffice.org-1.1-devel/files/patch-berkeleydb+db-3.2.9.patch +++ b/editors/openoffice.org-1.1-devel/files/patch-berkeleydb+db-3.2.9.patch @@ -1,11 +1,11 @@ ---- ../berkeleydb/db-3.2.9.patch.orig Wed Mar 12 08:23:51 2003 -+++ ../berkeleydb/db-3.2.9.patch Wed Mar 12 08:23:59 2003 -@@ -4,7 +4,7 @@ - case "$host_os" in - solaris*) JINCSUBDIRS="solaris";; - linux*) JINCSUBDIRS="linux genunix";; --+ freebsd*) JINCSUBDIRS="freebsd genunix";; -++ freebsd*) JINCSUBDIRS="linux bsd freebsd genunix";; - *) JINCSUBDIRS="genunix";; - esac - +--- ../berkeleydb/db-3.2.9.patch.orig Thu May 22 05:16:22 2003 ++++ ../berkeleydb/db-3.2.9.patch Sat May 31 22:17:11 2003 +@@ -52,7 +52,7 @@ + solaris*) JINCSUBDIRS="solaris";; + linux*) JINCSUBDIRS="linux genunix";; + + irix*) JINCSUBDIRS="irix";; +-+ freebsd*) JINCSUBDIRS="freebsd genunix";; +++ freebsd*) JINCSUBDIRS="freebsd bsd linux genunix";; + *) JINCSUBDIRS="genunix";; + esac + diff --git a/editors/openoffice.org-1.1-devel/files/patch-bridges+prj+build.lst b/editors/openoffice.org-1.1-devel/files/patch-bridges+prj+build.lst deleted file mode 100644 index fee3d847c5e6..000000000000 --- a/editors/openoffice.org-1.1-devel/files/patch-bridges+prj+build.lst +++ /dev/null @@ -1,11 +0,0 @@ ---- ../bridges/prj/build.lst.orig Tue Oct 30 17:28:35 2001 -+++ ../bridges/prj/build.lst Fri Oct 18 22:13:04 2002 -@@ -13,5 +13,8 @@ - br bridges\source\cpp_uno\cc50_solaris_sparc nmake - u br_cc50sols br_unotypes NULL - br bridges\source\cpp_uno\cc50_solaris_intel nmake - u br_cc50soli br_unotypes NULL - br bridges\source\cpp_uno\gcc2_solaris_sparc nmake - u br_gccsols br_unotypes NULL -+br bridges\source\cpp_uno\gcc2_freebsd_intel nmake - u br_gccfi br_unotypes NULL -+br bridges\source\cpp_uno\gcc2_freebsd_intel-sjlj nmake - u br_gccfi br_unotypes NULL -+br bridges\source\cpp_uno\gcc3_freebsd_intel nmake - u br_gcc3fi br_unotypes NULL - br bridges\source\prot_uno nmake - all br_pruno br_unotypes NULL - br bridges\source\java_uno nmake - all br_java_uno br_rcon NULL diff --git a/editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel deleted file mode 100644 index de1bf4336254..000000000000 --- a/editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel +++ /dev/null @@ -1,131 +0,0 @@ ---- ../bridges/source/cpp_uno/gcc3_freebsd_intel.orig/except.cxx Tue Mar 11 18:14:16 2003 -+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx Tue Mar 11 18:15:40 2003 -@@ -253,6 +253,13 @@ - //================================================================================================== - void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) - { -+#if defined DEBUG -+ OString cstr( -+ OUStringToOString( -+ *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), -+ RTL_TEXTENCODING_ASCII_US ) ); -+ fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() ); -+#endif - void * pCppExc; - type_info * rtti; - -@@ -262,7 +269,12 @@ - TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType ); - OSL_ASSERT( pTypeDescr ); - if (! pTypeDescr) -- terminate(); -+ { -+ throw RuntimeException( -+ OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) + -+ *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), -+ Reference< XInterface >() ); -+ } - - pCppExc = __cxa_allocate_exception( pTypeDescr->nSize ); - ::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp ); -@@ -288,29 +300,59 @@ - TYPELIB_DANGER_RELEASE( pTypeDescr ); - OSL_ENSURE( rtti, "### no rtti for throwing exception!" ); - if (! rtti) -- terminate(); -+ { -+ throw RuntimeException( -+ OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) + -+ *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), -+ Reference< XInterface >() ); -+ } - } - - __cxa_throw( pCppExc, rtti, deleteException ); - } - - //================================================================================================== --void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno ) -+void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno ) - { -- OSL_ENSURE( header, "### no exception header!!!" ); - if (! header) -- terminate(); -+ { -+ RuntimeException aRE( -+ OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ), -+ Reference< XInterface >() ); -+ Type const & rType = ::getCppuType( &aRE ); -+ uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno ); -+#if defined _DEBUG -+ OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) ); -+ OSL_ENSURE( 0, cstr.getStr() ); -+#endif -+ return; -+ } - - typelib_TypeDescription * pExcTypeDescr = 0; - OUString unoName( toUNOname( header->exceptionType->name() ) ); -- ::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData ); -- OSL_ENSURE( pExcTypeDescr, "### can not get type description for exception!!!" ); -- if (! pExcTypeDescr) -- terminate(); -- -- // construct uno exception any -- ::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno ); -- ::typelib_typedescription_release( pExcTypeDescr ); -+#if defined DEBUG -+ OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) ); -+ fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() ); -+#endif -+ typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData ); -+ if (0 == pExcTypeDescr) -+ { -+ RuntimeException aRE( -+ OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName, -+ Reference< XInterface >() ); -+ Type const & rType = ::getCppuType( &aRE ); -+ uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno ); -+#if defined _DEBUG -+ OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) ); -+ OSL_ENSURE( 0, cstr.getStr() ); -+#endif -+ } -+ else -+ { -+ // construct uno exception any -+ uno_any_constructAndConvert( pUnoExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno ); -+ typelib_typedescription_release( pExcTypeDescr ); -+ } - } - - } ---- ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx.orig Thu Mar 27 22:05:43 2003 -+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx Thu Mar 27 22:08:18 2003 -@@ -97,7 +97,9 @@ - if (! pThis) dummy_can_throw_anything("xxx"); // address something - - volatile long edx = 0, eax = 0; // for register returns -+ void * stackptr; - asm volatile ( -+ "mov %%esp, %6\n\t" - // copy values - "mov %0, %%eax\n\t" - "mov %%eax, %%edx\n\t" -@@ -121,13 +123,11 @@ - "mov %%eax, %4\n\t" - "mov %%edx, %5\n\t" - // cleanup stack -- "mov %0, %%eax\n\t" -- "shl $2, %%eax\n\t" -- "add %%eax, %%esp\n\t" -+ "mov %6, %%esp\n\t" - : -- : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx) -+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), -+ "m"(eax), "m"(edx), "m"(stackptr) - : "eax", "edx" ); -- - switch( eReturnType ) - { - case typelib_TypeClass_HYPER: diff --git a/editors/openoffice.org-1.1-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx b/editors/openoffice.org-1.1-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx deleted file mode 100644 index 4622b7fe21c4..000000000000 --- a/editors/openoffice.org-1.1-devel/files/patch-bridges+source+jni_uno+jni_uno2java.cxx +++ /dev/null @@ -1,12 +0,0 @@ ---- ../bridges/source/jni_uno/jni_uno2java.cxx.orig Tue Mar 11 12:35:07 2003 -+++ ../bridges/source/jni_uno/jni_uno2java.cxx Tue Mar 11 12:35:29 2003 -@@ -62,7 +62,9 @@ - #if defined _MSC_VER - #include - #else -+#if !defined( FREEBSD) - #include -+#endif - #endif - - #include "rtl/ustrbuf.hxx" diff --git a/editors/openoffice.org-1.1-devel/files/patch-comphelper+util+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-comphelper+util+makefile.mk deleted file mode 100644 index f2d3092c2ddf..000000000000 --- a/editors/openoffice.org-1.1-devel/files/patch-comphelper+util+makefile.mk +++ /dev/null @@ -1,15 +0,0 @@ ---- ../comphelper/util/makefile.mk.orig Fri Feb 14 15:40:49 2003 -+++ ../comphelper/util/makefile.mk Wed Mar 5 20:43:02 2003 -@@ -86,10 +86,10 @@ - - SHL1TARGET=$(COMPHLP_TARGET)$(COMPHLP_MAJOR)$(COMID) - SHL1STDLIBS= \ -+ $(SALLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ -- $(VOSLIB) \ -- $(SALLIB) -+ $(VOSLIB) - - SHL1DEPN= - SHL1IMPLIB= i$(COMPHLP_TARGET) diff --git a/editors/openoffice.org-1.1-devel/files/patch-config_office+configure.in b/editors/openoffice.org-1.1-devel/files/patch-config_office+configure.in deleted file mode 100644 index e883fc540de6..000000000000 --- a/editors/openoffice.org-1.1-devel/files/patch-config_office+configure.in +++ /dev/null @@ -1,32 +0,0 @@ ---- configure.in.orig Thu Feb 20 15:49:32 2003 -+++ configure.in Wed Mar 5 21:22:34 2003 -@@ -556,8 +562,19 @@ - fi - - dnl =================================================================== --dnl Set the gxx include directories -+dnl Set the gcc/gxx include directories - dnl =================================================================== -+if test "$_os" = "FreeBSD" && test "$CC" != "cc"; then -+if test "$GXX" = "yes"; then -+ if test -n "$enable_gcc3"; then -+ _gccincname1="g++-v3" -+ else -+ _gccincname1="g++-3" -+ fi -+ _gcc_include_path=".." -+ _gxx_include_path="$_gcc_include_path/$_gccincname1" -+fi -+else - if test "$GXX" = "yes"; then - _gxx_include_path=`echo "#include " | $CXX -E -xc++ - | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -1` - if test "$_gxx_include_path" = "/usr/libexec/(null)/include"; then -@@ -566,7 +583,7 @@ - dnl This is the original code... - dnl _gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include - fi -- -+fi - - dnl =================================================================== - dnl Extra checking for the SUN OS compiler diff --git a/editors/openoffice.org-1.1-devel/files/patch-config_office+set_soenv.in b/editors/openoffice.org-1.1-devel/files/patch-config_office+set_soenv.in deleted file mode 100644 index f4abdf5b07c5..000000000000 --- a/editors/openoffice.org-1.1-devel/files/patch-config_office+set_soenv.in +++ /dev/null @@ -1,97 +0,0 @@ ---- set_soenv.in.orig Fri Mar 28 12:02:25 2003 -+++ set_soenv.in Fri Apr 4 10:36:54 2003 -@@ -52,7 +52,7 @@ - #------------------------------------------------- - # - # Platform independent constant values. --my @LANGUAGES = ("ARAB", "CHINSIM", "CHINTRAD", "DAN", "DTCH", "ENUS", "FREN", "GREEK", "ITAL", -+my @LANGUAGES = ("ARAB", "CHINSIM", "CHINTRAD", "DAN", "DTCH", "ENUS", "FREN", "GREEK", "ITAL", "GER", - "JAPN", "KOREAN", "POL", "PORT", "RUSS", "SPAN", "SWED", "TURK" ); - my ( $CALL_CDECL, $COMMON_OUTDIR, $NO_SRS_PATCH, $PRODUCT, $PROFULLSWITCH, $BIG_GOODIES, $BMP_WRITES_FLAG, - $common_build, $MK_UNROLL, $NO_REC_RES, $PROEXT, $SO3, $SOLAR_JAVA, -@@ -338,7 +338,7 @@ - $PTHREAD_LIBS = '@PTHREAD_LIBS@'; - $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386"; - $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client"; -- $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."green_threads"; -+ $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads"; - } - elsif ( $platform eq "$Linux" ) - { -@@ -888,7 +888,8 @@ - $ps.$JRETHREADDIR. - $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB; - } --elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64")) -+elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") -+|| ($platform eq "$Tru64") || ($platform eq "$FreeBSD")) - { $LD_LIBRARY_PATH = $cur_dir. - $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB. - $ps.$JRELIBDIR. -@@ -899,16 +900,6 @@ - $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. - $ps.$ENV{'LD_LIBRARY_PATH'}; - } --elsif ($platform eq "$FreeBSD") --{ $LD_LIBRARY_PATH = $cur_dir. -- $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB. -- $ps.$JRELIBDIR. -- $ps.$JRETOOLKITDIR. -- $ps.$JRETHREADDIR. -- $ps.$par_dir.$LIB. -- $ps_STLPORT_LIB. -- $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB; --} - elsif ($platform eq "$Irix" || $platform eq "$Irix64") - { $LD_LIBRARY_PATH = $cur_dir. - $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB. -@@ -1183,7 +1174,7 @@ - $L_STLPORT_LIB. - $L.$XLIB; - } --elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) -+elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64") || ($platform eq "$FreeBSD")) - { $SOLARLIB = $L.$par_dir.$LIB. - $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. - $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. -@@ -1195,15 +1186,6 @@ - $L_STLPORT_LIB. - $L.$XLIB; - } --elsif ($platform eq "$FreeBSD") --{ $SOLARLIB = $L.$par_dir.$LIB. -- $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. -- $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. -- $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. -- $L.'$JAVA_HOME'.$LIB. -- $L_STLPORT_LIB. -- $L.$XLIB; --} - elsif ($platform eq "$Winnt") - { $SOLARLIB = $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. - $L.$par_dir.$LIB. -@@ -1264,7 +1246,9 @@ - { $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; - } - elsif ($platform eq "$FreeBSD") --{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd"; -+{ -+ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd"; -+ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd"; - } - elsif ($platform eq "$NetBSD") - { $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd"; -@@ -1275,12 +1259,7 @@ - - #java threads include path - --if ($platform eq "$FreeBSD") --{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."green_threads".$ds."include"; --} --else --{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include"; --} -+ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include"; - - #The tail, if needed - if (($platform eq "$Linux") or ($platform eq "$FreeBSD") or ($platform eq "$NetBSD")) diff --git a/editors/openoffice.org-1.1-devel/files/patch-connectivity+source+drivers+mozab+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-connectivity+source+drivers+mozab+makefile.mk deleted file mode 100644 index 2b83f2cd2ec7..000000000000 --- a/editors/openoffice.org-1.1-devel/files/patch-connectivity+source+drivers+mozab+makefile.mk +++ /dev/null @@ -1,12 +0,0 @@ ---- ../connectivity/source/drivers/mozab/makefile.mk.orig Wed Oct 30 20:59:21 2002 -+++ ../connectivity/source/drivers/mozab/makefile.mk Wed Oct 30 20:59:31 2002 -@@ -115,9 +115,7 @@ - # --- MOZAB BASE Library ----------------------------------- - - SHL1VERSIONMAP= $(TARGET).map --.IF "$(OS)"!="FREEBSD" - SHL1TARGET= $(TARGET)$(MOZAB_MAJOR) --.ENDIF - SHL1OBJS=$(SLOFILES) - SHL1STDLIBS=\ - $(CPPULIB) \ diff --git a/editors/openoffice.org-1.1-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk index 3601766ee561..2f79f5a07f6e 100644 --- a/editors/openoffice.org-1.1-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk +++ b/editors/openoffice.org-1.1-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk @@ -1,5 +1,5 @@ ---- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig Tue Mar 19 12:56:24 2002 -+++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk Sat May 18 15:51:13 2002 +--- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig Tue Apr 15 19:39:14 2003 ++++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk Sat May 31 22:34:31 2003 @@ -64,8 +64,8 @@ #mozilla specific stuff. MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT) @@ -11,44 +11,35 @@ #End of mozilla specific stuff. PRJ=..$/..$/..$/.. -@@ -107,7 +107,7 @@ +@@ -132,7 +132,7 @@ -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \ -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \ -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \ -- -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap +- -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap + -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr CDEFS += -DWINVER=0x400 -DMOZILLA_CLIENT \ -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \ -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \ -@@ -123,7 +123,7 @@ +@@ -150,7 +150,7 @@ -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \ -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \ -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \ -- -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -+ -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr - CDEFS += -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \ - -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \ - -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \ -@@ -141,7 +141,7 @@ - -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \ - -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \ - -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \ -- -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap +- -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap + -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr CDEFS+= -DMOZILLA_CLIENT \ -DOSTYPE=\"Linux2.2.14-5\" -DOJI .IF "$(OS)" == "LINUX" -@@ -157,6 +157,13 @@ +@@ -166,6 +166,13 @@ -fno-rtti -Wall -Wconversion -Wpointer-arith \ -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \ - -Wno-long-long + -Wno-long-long +CDEFS += -DTRACING +.ELIF "$(OS)" == "FREEBSD" +CFLAGS += -fPIC +CFLAGSCXX += \ + -fno-rtti -Wall -Wconversion -Wpointer-arith \ + -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \ -+ -Wno-long-long -pthread ++ -Wno-long-long -pthread CDEFS += -DTRACING .ENDIF .ENDIF diff --git a/editors/openoffice.org-1.1-devel/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk deleted file mode 100644 index b63d2a25f184..000000000000 --- a/editors/openoffice.org-1.1-devel/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk +++ /dev/null @@ -1,12 +0,0 @@ ---- ../connectivity/source/drivers/mozaddressbook/makefile.mk.orig Wed Jun 12 01:40:36 2002 -+++ ../connectivity/source/drivers/mozaddressbook/makefile.mk Wed Jun 12 01:40:37 2002 -@@ -134,9 +134,7 @@ - SLOFILES+=$(SLO)$/staticmbmozab.obj - .ENDIF - --.IF "$(OS)"!="FREEBSD" - SHL1VERSIONMAP= $(TARGET).map --.ENDIF - # --- Library ----------------------------------- - - SHL1TARGET=$(TARGET)$(UPD)$(DLLPOSTFIX) diff --git a/editors/openoffice.org-1.1-devel/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice.org-1.1-devel/files/patch-cppu+inc+uno+lbnames.h deleted file mode 100644 index cb43c2d165e9..000000000000 --- a/editors/openoffice.org-1.1-devel/files/patch-cppu+inc+uno+lbnames.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ../cppu/inc/uno/lbnames.h.orig Fri May 31 00:06:58 2002 -+++ ../cppu/inc/uno/lbnames.h Fri May 31 00:07:22 2002 -@@ -94,7 +94,7 @@ - #define __CPPU_ENV gcc2 - #elif (__GNUC__ == 2) - #error "Tested gcc 2 versions are 2.91 and 2.95. Patch uno/lbnames.h to try your gcc 2 version." --#elif (__GNUC__ == 3 && __GNUC_MINOR__ == 0) -+#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2)) - #define __CPPU_ENV gcc3 - #elif (__GNUC__ == 3) - #error "Tested gcc 3 version is 3.0. Patch uno/lbnames.h to try your gcc 3 version." diff --git a/editors/openoffice.org-1.1-devel/files/patch-cppu+prj+build.lst b/editors/openoffice.org-1.1-devel/files/patch-cppu+prj+build.lst deleted file mode 100644 index 78fd210a1193..000000000000 --- a/editors/openoffice.org-1.1-devel/files/patch-cppu+prj+build.lst +++ /dev/null @@ -1,8 +0,0 @@ ---- ../cppu/prj/build.lst.orig Mon Mar 11 14:13:47 2002 -+++ ../cppu/prj/build.lst Mon Mar 11 14:14:30 2002 -@@ -1,4 +1,4 @@ --cu cppu : codemaker udkapi NULL -+cu cppu : codemaker udkapi offuh NULL - cu cppu usr1 - all cu_mkout NULL - cu cppu\source nmake - all cu_source NULL - cu cppu\source\uno nmake - all cu_uno cu_source NULL diff --git a/editors/openoffice.org-1.1-devel/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-cppuhelper+source+makefile.mk deleted file mode 100644 index 5fb5bd636eb1..000000000000 --- a/editors/openoffice.org-1.1-devel/files/patch-cppuhelper+source+makefile.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- ../cppuhelper/source/makefile.mk.orig Thu Feb 20 17:04:36 2003 -+++ ../cppuhelper/source/makefile.mk Wed Mar 5 20:32:03 2003 -@@ -194,9 +194,9 @@ - .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" - SHL1VERSIONMAP=gcc3_linux_intel.map - .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2" --#SHL1VERSIONMAP=gcc2_freebsd_intel.map -+SHL1VERSIONMAP=gcc2_linux_intel.map - .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3" --#SHL1VERSIONMAP=gcc3_freebsd_intel.map -+SHL1VERSIONMAP=gcc3_linux_intel.map - .ENDIF - - # --- Targets ------------------------------------------------------ diff --git a/editors/openoffice.org-1.1-devel/files/patch-desktop+source+app+app.cxx b/editors/openoffice.org-1.1-devel/files/patch-desktop+source+app+app.cxx deleted file mode 100644 index 4e82d5277384..000000000000 --- a/editors/openoffice.org-1.1-devel/files/patch-desktop+source+app+app.cxx +++ /dev/null @@ -1,22 +0,0 @@ ---- ../desktop/source/app/app.cxx.orig Sun Mar 30 22:26:15 2003 -+++ ../desktop/source/app/app.cxx Sun Mar 30 22:27:02 2003 -@@ -587,7 +587,8 @@ - ::comphelper::setProcessServiceFactory( NULL ); - - // clear lockfile -- m_pLockfile->clean(); -+ if (m_pLockfile != NULL) -+ m_pLockfile->clean(); - - if( !Application::IsRemoteServer() ) - { -@@ -621,7 +622,8 @@ - a <<= (sal_Bool)sal_False; - xPropertySet->setPropertyValue( OUSTRING(RTL_CONSTASCII_USTRINGPARAM( SUSPEND_QUICKSTARTVETO )), a ); - } else { -- m_pLockfile->clean(); -+ if (m_pLockfile != NULL) -+ m_pLockfile->clean(); - } - - return bExit; diff --git a/editors/openoffice.org-1.1-devel/files/patch-desktop+source+pkgchk+pkgchk_misc.h b/editors/openoffice.org-1.1-devel/files/patch-desktop+source+pkgchk+pkgchk_misc.h deleted file mode 100644 index 391667b66ebd..000000000000 --- a/editors/openoffice.org-1.1-devel/files/patch-desktop+source+pkgchk+pkgchk_misc.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ../desktop/source/pkgchk/pkgchk_misc.h.orig Wed Mar 5 20:51:46 2003 -+++ ../desktop/source/pkgchk/pkgchk_misc.h Wed Mar 5 20:52:45 2003 -@@ -208,6 +208,8 @@ - #define THIS_PLATFORM_PATH "/macosx_powerpc.plt" - #elif defined (NETBSD) && defined (SPARC) - #define THIS_PLATFORM_PATH "/netbsd_sparc.plt" -+#elif defined (FREEBSD) && defined (INTEL) -+#define THIS_PLATFORM_PATH "/freebsd_x86.plt" - #else - #error "unknown platform" - insert your platform identifier above; inserted for the case the preprocessor ignores error diff --git a/editors/openoffice.org-1.1-devel/files/patch-desktop+util+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-desktop+util+makefile.mk deleted file mode 100644 index 025d644a8077..000000000000 --- a/editors/openoffice.org-1.1-devel/files/patch-desktop+util+makefile.mk +++ /dev/null @@ -1,20 +0,0 @@ ---- ../desktop/util/makefile.mk.orig Fri Feb 14 14:43:59 2003 -+++ ../desktop/util/makefile.mk Wed Mar 5 20:54:04 2003 -@@ -102,7 +102,7 @@ - - # --- Linken der Applikation --------------------------------------- - --.IF "$(OS)" == "LINUX" -+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" - # #74158# linux needs sal/vos/tools at end of link list, solaris needs it first, - # winXX is handled like solaris for now - APP1_STDPRE= -@@ -139,7 +139,7 @@ - .ENDIF - - .IF "$(GUI)" == "UNX" --.IF "$(OS)" == "LINUX" -+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" - APP1STDLIBS+= -lXext -lSM -lICE - .ENDIF - .ENDIF diff --git a/editors/openoffice.org-1.1-devel/files/patch-dtrans+source+X11+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-dtrans+source+X11+makefile.mk deleted file mode 100644 index 5881f5d7f6a5..000000000000 --- a/editors/openoffice.org-1.1-devel/files/patch-dtrans+source+X11+makefile.mk +++ /dev/null @@ -1,12 +0,0 @@ ---- ../dtrans/source/X11/makefile.mk.orig Tue Dec 11 18:48:36 2001 -+++ ../dtrans/source/X11/makefile.mk Wed Apr 3 00:31:56 2002 -@@ -116,7 +116,8 @@ - APP1STDLIBS=\ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ -- $(SALLIB) -+ $(SALLIB) \ -+ -lX11 - - .ENDIF # "$(OS)"=="MACOSX" - diff --git a/editors/openoffice.org-1.1-devel/files/patch-eventattacher+source+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-eventattacher+source+makefile.mk deleted file mode 100644 index 4552698eb132..000000000000 --- a/editors/openoffice.org-1.1-devel/files/patch-eventattacher+source+makefile.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- ../eventattacher/source/makefile.mk.orig Tue Oct 1 09:45:21 2002 -+++ ../eventattacher/source/makefile.mk Wed Mar 5 21:06:11 2003 -@@ -104,9 +104,9 @@ - SHL1TARGET= $(TARGET) - - SHL1STDLIBS= \ -+ $(SALLIB) \ - $(CPPULIB) \ -- $(CPPUHELPERLIB) \ -- $(SALLIB) -+ $(CPPUHELPERLIB) - - SHL1DEPN= - SHL1IMPLIB= i$(TARGET) diff --git a/editors/openoffice.org-1.1-devel/files/patch-extensions+source+scanner+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-extensions+source+scanner+makefile.mk new file mode 100644 index 000000000000..b096f4ea9ccc --- /dev/null +++ b/editors/openoffice.org-1.1-devel/files/patch-extensions+source+scanner+makefile.mk @@ -0,0 +1,12 @@ +--- ../extensions/source/scanner/makefile.mk.orig Mon Jun 2 04:37:00 2003 ++++ ../extensions/source/scanner/makefile.mk Mon Jun 2 04:37:03 2003 +@@ -135,7 +135,9 @@ + $(GOODIESLIB) + + .IF "$(GUI)"=="UNX" ++.IF "$(OS)"!="FREEBSD" + SHL1STDLIBS+=$(SVTOOLLIB) -ldl ++.ENDIF + .ENDIF + + SHL1DEF=$(MISC)$/$(SHL1TARGET).def diff --git a/editors/openoffice.org-1.1-devel/files/patch-external+gcc3_specific+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-external+gcc3_specific+makefile.mk index 6b8071f4030e..73786761322e 100644 --- a/editors/openoffice.org-1.1-devel/files/patch-external+gcc3_specific+makefile.mk +++ b/editors/openoffice.org-1.1-devel/files/patch-external+gcc3_specific+makefile.mk @@ -1,18 +1,18 @@ ---- ../external/gcc3_specific/makefile.mk.orig Wed Mar 5 23:01:32 2003 -+++ ../external/gcc3_specific/makefile.mk Wed Mar 5 23:01:59 2003 -@@ -10,6 +10,7 @@ - .IF "$(COMID)"=="gcc3" +--- ../external/gcc3_specific/makefile.mk.orig Sat May 31 22:43:57 2003 ++++ ../external/gcc3_specific/makefile.mk Sat May 31 22:43:59 2003 +@@ -11,6 +11,7 @@ .IF "$(OS)"!="MACOSX" + .IF "$(OS)"!="IRIX" +.IF "$(OS)"!="FREEBSD" - all : $(SOLARLIBDIR)$/libstdc++.so.$(LIBSTDCPP3) $(SOLARLIBDIR)$/libgcc_s.so.1 $(SOLARLIBDIR)$/libstdc++.so.$(SHORTSTDCPP3) $(SOLARLIBDIR)$/libgcc_s.so -@@ -29,6 +30,7 @@ + all : $(SOLARLIBDIR)$/libstdc++.so.$(SHORTSTDCPP3) $(SOLARLIBDIR)$/libgcc_s.so.1 $(SOLARLIBDIR)$/libgcc_s.so +@@ -26,6 +27,7 @@ -rm -f $@ +ln -s libgcc_s.so.1 $@ +.ENDIF .ENDIF + .ENDIF - .ENDIF diff --git a/editors/openoffice.org-1.1-devel/files/patch-freetype+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-freetype+makefile.mk deleted file mode 100644 index 3e5a8dd19f18..000000000000 --- a/editors/openoffice.org-1.1-devel/files/patch-freetype+makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- ../freetype/makefile.mk.orig Tue Mar 11 14:13:25 2003 -+++ ../freetype/makefile.mk Tue Mar 11 14:13:27 2003 -@@ -100,7 +100,7 @@ - .IF "$(OS)"=="MACOSX" - OUT2LIB+=objs$/.libs$/libfreetype.*.dylib - .ELIF "$(OS)"=="FREEBSD" --OUT2LIB+=objs$/.libs$/libfreetype.so.7* -+OUT2LIB+=objs$/.libs$/libfreetype.so.9* - .ELSE - OUT2LIB+=objs$/.libs$/libfreetype.so.6* - .ENDIF # "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD" diff --git a/editors/openoffice.org-1.1-devel/files/patch-instsetoo+util+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-instsetoo+util+makefile.mk deleted file mode 100644 index 48f019d5484b..000000000000 --- a/editors/openoffice.org-1.1-devel/files/patch-instsetoo+util+makefile.mk +++ /dev/null @@ -1,13 +0,0 @@ ---- ../instsetoo/util/makefile.mk.orig Sat Apr 12 15:24:45 2003 -+++ ../instsetoo/util/makefile.mk Sat Apr 12 15:24:55 2003 -@@ -87,9 +87,7 @@ - - .IF "$(alllangext)"!="" - --#pack: $(foreach,i,$(alllangext) pack_$i) --#temp mh only 49 and 01 for the moment --pack: pack_01 pack_49 -+pack: $(foreach,i,$(alllangext) pack_$i) - - pack_%: - +-$(MKDIRHIER) $(INSTALLDIR)$/$(@:s/pack_//)$/normal diff --git a/editors/openoffice.org-1.1-devel/files/patch-instsetoo+util+openoffice.lst b/editors/openoffice.org-1.1-devel/files/patch-instsetoo+util+openoffice.lst deleted file mode 100644 index 633d22570428..000000000000 --- a/editors/openoffice.org-1.1-devel/files/patch-instsetoo+util+openoffice.lst +++ /dev/null @@ -1,10 +0,0 @@ ---- ../instsetoo/util/openoffice.lst.orig Sat Feb 1 00:38:02 2003 -+++ ../instsetoo/util/openoffice.lst Thu Apr 17 22:55:06 2003 -@@ -9,6 +9,6 @@ - active 1 - compression 5 - script setup_osl -- include .,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarpath}/bin.{minor}/01/,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor},{solarcommonpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarcommonpath}/bin.{minor}/$(LANG)/fat,{solarcommonpath}/bin.{minor}/01/,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},{solarcommonpath}/xml.{minor}/office/instance,{solarcommonpath}/xml,../../external/common,. -+ include .,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor},{solarcommonpath}/bin.{minor}/$(LANG),{solarcommonpath}/bin.{minor}/$(LANG)/osl,{solarcommonpath}/bin.{minor}/$(LANG)/fat,{solarpath}/bin.{minor}/01/,{solarpath}/bin.{minor}/01/osl/,{solarcommonpath}/bin.{minor}/01/,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},{solarcommonpath}/xml.{minor}/office/instance,{solarcommonpath}/xml,../../external/common,. - } - } diff --git a/editors/openoffice.org-1.1-devel/files/patch-javaunohelper+source+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-javaunohelper+source+makefile.mk deleted file mode 100644 index 19f6b86e5ab5..000000000000 --- a/editors/openoffice.org-1.1-devel/files/patch-javaunohelper+source+makefile.mk +++ /dev/null @@ -1,13 +0,0 @@ ---- ../javaunohelper/source/makefile.mk.orig Thu Feb 20 17:28:43 2003 -+++ ../javaunohelper/source/makefile.mk Wed Mar 5 21:04:09 2003 -@@ -118,9 +118,9 @@ - SHL1TARGET=juhx - - SHL1STDLIBS= \ -+ $(SALLIB) \ - $(JVMACCESSLIB) \ - $(SALHELPERLIB) \ -- $(SALLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) - diff --git a/editors/openoffice.org-1.1-devel/files/patch-jni_uno+jni_java2uno.cxx b/editors/openoffice.org-1.1-devel/files/patch-jni_uno+jni_java2uno.cxx deleted file mode 100644 index a9ff9e3fed88..000000000000 --- a/editors/openoffice.org-1.1-devel/files/patch-jni_uno+jni_java2uno.cxx +++ /dev/null @@ -1,12 +0,0 @@ ---- ../bridges/source/jni_uno/jni_java2uno.cxx.orig Tue Mar 11 12:33:06 2003 -+++ ../bridges/source/jni_uno/jni_java2uno.cxx Tue Mar 11 12:34:03 2003 -@@ -62,7 +62,9 @@ - #if defined _MSC_VER - #include - #else -+#if !defined( FREEBSD) - #include -+#endif - #endif - - #include "jni_bridge.h" diff --git a/editors/openoffice.org-1.1-devel/files/patch-jvmaccess+source+javainfoimpl.cxx b/editors/openoffice.org-1.1-devel/files/patch-jvmaccess+source+javainfoimpl.cxx deleted file mode 100644 index e627363cb118..000000000000 --- a/editors/openoffice.org-1.1-devel/files/patch-jvmaccess+source+javainfoimpl.cxx +++ /dev/null @@ -1,10 +0,0 @@ ---- ../jvmaccess/source/javainfoimpl.cxx.orig Sat Mar 29 23:58:55 2003 -+++ ../jvmaccess/source/javainfoimpl.cxx Sun Mar 30 00:00:47 2003 -@@ -123,6 +123,7 @@ - #define JAVA_DIR_NAMES "j2re1.4.1_01", \ - "j2sdk1.4.1_01", \ - "j2re1.4.1", \ -+ "jdk1.4.1", \ - "j2sdk1.4.1", \ - "j2re1.4.0_02", \ - "j2sdk1.4.0_02", \ diff --git a/editors/openoffice.org-1.1-devel/files/patch-jvmaccess+source+sunversion.cxx b/editors/openoffice.org-1.1-devel/files/patch-jvmaccess+source+sunversion.cxx index 67e014595219..44cec840184a 100644 --- a/editors/openoffice.org-1.1-devel/files/patch-jvmaccess+source+sunversion.cxx +++ b/editors/openoffice.org-1.1-devel/files/patch-jvmaccess+source+sunversion.cxx @@ -1,50 +1,11 @@ ---- ../jvmaccess/source/sunversion.cxx.orig Sun Mar 30 00:40:02 2003 -+++ ../jvmaccess/source/sunversion.cxx Sun Mar 30 01:31:48 2003 -@@ -102,6 +102,7 @@ - { - //token can be "1", or "2_02" - char* pUnderscore= strpbrk(tok,"_"); -+ char* pLine= strpbrk(tok,"-"); - if( pUnderscore != NULL) - { - // get the value before and after the underscore -@@ -115,6 +116,19 @@ - // now get the part after "_" - m_nMinor= atoi( pUnderscore + 1); - } -+ else if (pLine != NULL) -+ { -+ // get the value before and after the underscore -+ int len= pLine - tok; -+ char* pre= new char[len + 1]; -+ strncpy( pre, tok, len); -+ pre[len]= 0; -+ // convert the value before the "_" into a numeric value -+ arTokens[index]= atoi(pre); -+ delete[] pre; -+ // now get the part after "-" -+ m_nMinor= atoi( pLine + 1); -+ } - else - { - arTokens[index]= atoi(tok); -@@ -172,6 +186,19 @@ - continue; - } - } -+ if(cCur == '-') -+ { -+ //check previous char -+ if(cLast >= 48 && cLast <= 57) -+ { -+ if(cNext == 'p') -+ continue; -+ } -+ } -+ if(cCur == 'p') -+ { -+ continue; -+ } - //If we get here then the current character is not a number (0..9),'.','_' - ret= false; - break; +--- ../jvmaccess/source/sunversion.cxx.orig Mon Jun 2 00:00:25 2003 ++++ ../jvmaccess/source/sunversion.cxx Mon Jun 2 00:06:00 2003 +@@ -231,6 +231,8 @@ + m_preRelease = Rel_BETA; + else if (! strcmp(pCur, "rc1")) + m_preRelease = Rel_RC1; ++ else if (*pCur == 'p') ++ m_preRelease = Rel_BETA; + else + return false; + } diff --git a/editors/openoffice.org-1.1-devel/files/patch-jvmaccess+util+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-jvmaccess+util+makefile.mk deleted file mode 100644 index b0fac21d2ec9..000000000000 --- a/editors/openoffice.org-1.1-devel/files/patch-jvmaccess+util+makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- ../jvmaccess/util/makefile.mk.orig Wed Mar 12 23:52:25 2003 -+++ ../jvmaccess/util/makefile.mk Wed Mar 12 23:52:50 2003 -@@ -90,6 +90,8 @@ - SHL1VERSIONMAP = cc5_solaris_sparc.map - .ELIF "$(OS)$(CPU)$(COMNAME)" == "LINUXIgcc3" - SHL1VERSIONMAP = gcc3_linux_intel.map -+.ELIF "$(OS)$(CPU)$(COMNAME)" == "FREEBSDIgcc3" -+SHL1VERSIONMAP = gcc3_linux_intel.map - .ENDIF - - DEF1NAME = $(SHL1TARGET) diff --git a/editors/openoffice.org-1.1-devel/files/patch-nas+nas-1.6.patch b/editors/openoffice.org-1.1-devel/files/patch-nas+nas-1.6.patch deleted file mode 100644 index b6096654ebaf..000000000000 --- a/editors/openoffice.org-1.1-devel/files/patch-nas+nas-1.6.patch +++ /dev/null @@ -1,301 +0,0 @@ ---- ../nas/nas-1.6.patch.orig Tue Mar 11 15:04:35 2003 -+++ ../nas/nas-1.6.patch Tue Mar 11 15:29:52 2003 -@@ -69,3 +69,298 @@ - number : NUMBER { $$ = $1; } - ; - -+--- misc/nas-1.6/clients/audio/auctl/auctl.c Tue Mar 11 14:56:14 2003 -++++ misc/build/nas-1.6/clients/audio/auctl/auctl.c Tue Mar 11 15:01:04 2003 -+@@ -23,7 +23,7 @@ -+ */ -+ -+ #include -+-#include -++#include -+ #include "auctl.h" -+ -+ char *ProgramName; -+--- misc/nas-1.6/clients/audio/audemo/audemo.c Tue Mar 11 14:56:14 2003 -++++ misc/build/nas-1.6/clients/audio/audemo/audemo.c Tue Mar 11 15:01:04 2003 -+@@ -32,7 +32,7 @@ -+ #include -+ #endif -+ #include -+-#include -++#include -+ -+ #if !defined(SYSV) || defined(WIN32) -+ #include