- update to version 2.1.0 which includes many bugfixes and improvements

- remove some unnecessary patches and add a no_lang
pseudo flavor which allows people to do a build w/o language packs
(requested by kurt@)

- from now on we set the file descriptor limit to a higher value (256)
in the OpenOffice build environment to prevent build failures

- point explicitly to the licensing FAQ instead of pointing to the contents
of the FAQ

editors/openoffice/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.37 2006/11/28 09:35:27 robert Exp $
+# $OpenBSD: Makefile,v 1.38 2006/12/13 10:25:14 robert Exp $
 
 ONLY_FOR_ARCHS= amd64 i386
 
@@ -6,13 +6,13 @@ COMMENT-main=	"a multi-platform productivity suite"
 COMMENT-kde=	"optional integration of OpenOffice to the KDE environment"
 COMMENT-java=	"optional integration of OpenOffice java features"
 
-VERSION=	2.0.4
-DISTNAME=	OOo_${VERSION}_src
-WRKDIST=	${WRKDIR}/OOD680_m5
-PKGNAME=	openoffice-${VERSION}p20
-PKGNAME-main=	openoffice-${VERSION}p20
-PKGNAME-kde=	openoffice-kde-${VERSION}p16
-PKGNAME-java=	openoffice-java-${VERSION}p16
+VERSION=	2.1.0
+DISTNAME=	OOo_${VERSION}
+WRKDIST=	${WRKDIR}/OOE680_m6
+PKGNAME=	openoffice-${VERSION}
+PKGNAME-main=	openoffice-${VERSION}
+PKGNAME-kde=	openoffice-kde-${VERSION}
+PKGNAME-java=	openoffice-java-${VERSION}
 CATEGORIES=	editors productivity
 
 SHARED_LIBS=	icudata		26.0 \
@@ -33,12 +33,16 @@ MASTER_SITES=	ftp://sunsite.informatik.rwth-aachen.de/pub/mirror/OpenOffice/stab
 MASTER_SITES0=	http://www.bsd.hu/~robert/ooo/ \
 		http://humppa.hu/ooo/
 
-DISTFILES=	${DISTNAME}.tar.gz ooo-desktop.tar.gz:0
+DISTFILES=	${DISTNAME}_src.tar.bz2 ooo-desktop.tar.gz:0
+.for dfile in binfilter l10n sdk system
+DISTFILES+=	${DISTNAME}_src_${dfile}.tar.bz2
+.endfor
+
 DIST_SUBDIR=	openoffice
 
 # See http://www.openoffice.org/about.html#licenses
 # and http://www.openoffice.org/license.html
-# and http://www.openoffice.org/FAQs/faq-questions.html#licensing
+# and http://www.openoffice.org/FAQs/faq-licensing.html 
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
@@ -46,6 +50,11 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MULTI_PACKAGES=		-main -kde -java
 
+PSEUDO_FLAVORS=	cleanobj no_lang
+FLAVORS=	debug
+FLAVOR?=
+
+.if !${FLAVOR:L:Mno_lang}
 LANGS=			bg br-pt de es fi fr hu it ja ko \
 			lt lv nl pl ru sl sv
 
@@ -57,6 +66,7 @@ RUN_DEPENDS-i18n-$l=	::editors/openoffice
 WANTLIB-i18n-$l=
 LIB_DEPENDS-i18n-$l=
 .endfor
+.endif
 
 BUILD_DEPENDS=	:zip-*:archivers/zip \
 		:unzip-*:archivers/unzip \
@@ -107,7 +117,7 @@ NO_REGRESS=	Yes
 VMEM_WARNING=	Yes
 
 PATCHFILES=	go_oo_src680_20061105.diff:0 \
-		build-java-target.diff:0
+		build-java-target-${VERSION}.diff:0
 
 PATCHORIG=	.orig.port
 WRKCONF=	${WRKSRC}/config_office
@@ -149,10 +159,6 @@ CONFIGURE_ARGS=	--disable-gnome-vfs \
 		--with-db-jar=${LOCALBASE}/lib/db4/db.jar \
 		--with-lang="en-US ${LANGS}"
 
-PSEUDO_FLAVORS=	cleanobj
-FLAVORS=	debug
-FLAVOR?=
-
 .if ${FLAVOR:L:Mdebug}
 CONFIGURE_ARGS+=	--enable-symbols
 .endif
@@ -178,7 +184,7 @@ pre-patch:
 do-build:
 	@cd ${WRKBUILD} && \
 		./bootstrap && \
-		${SETENV} ${MAKE_ENV} ${TCSH} -c 'source OpenBSDEnv.Set && ${BUILD_CMD}' 
+		${SETENV} ${MAKE_ENV} ${TCSH} -c 'limit descriptors 256 && source OpenBSDEnv.Set && ${BUILD_CMD}' 
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/applications/openoffice

editors/openoffice/distinfo

@@ -1,16 +1,32 @@
-MD5 (openoffice/OOo_2.0.4_src.tar.gz) = df4bb26645e974a2358bc17f8381a197
-MD5 (openoffice/build-java-target.diff) = 04ea6e6dab028a6eb5f501a2a2703dd4
+MD5 (openoffice/OOo_2.1.0_src.tar.bz2) = bf80f2a2d6139787b17c018ad7a98c8e
+MD5 (openoffice/OOo_2.1.0_src_binfilter.tar.bz2) = 927c57be1e322d1d16a3e08f2e581b02
+MD5 (openoffice/OOo_2.1.0_src_l10n.tar.bz2) = 46c8140b4ab5ef2b528a0e0596c88dec
+MD5 (openoffice/OOo_2.1.0_src_sdk.tar.bz2) = cfb76978fa162b50d771bdbce4b691fa
+MD5 (openoffice/OOo_2.1.0_src_system.tar.bz2) = 0b8c704e536995a482838279ee146e2c
+MD5 (openoffice/build-java-target-2.1.0.diff) = 928af577620d23d90701188e092fc902
 MD5 (openoffice/go_oo_src680_20061105.diff) = 61f1bb82523de6b2f9ada575b8594fdb
 MD5 (openoffice/ooo-desktop.tar.gz) = e1f01689ee58b1a2aa7d82fae637786b
-RMD160 (openoffice/OOo_2.0.4_src.tar.gz) = 1d68ee8cee485459db78a8e1d8e2f19e260419b6
-RMD160 (openoffice/build-java-target.diff) = e81a8706a475e4020c0ad440140d310f6d6a74ac
+RMD160 (openoffice/OOo_2.1.0_src.tar.bz2) = 11256b125fdc412480d90983b0f80f35d4833e9a
+RMD160 (openoffice/OOo_2.1.0_src_binfilter.tar.bz2) = 69625f4ac6e1c72bf901b69173195009a78d33ba
+RMD160 (openoffice/OOo_2.1.0_src_l10n.tar.bz2) = 4b8e95a35f2222330790a442aa1a9a4988d9d37e
+RMD160 (openoffice/OOo_2.1.0_src_sdk.tar.bz2) = 64d8a113ad1307c8fa66880bb0edf83c769f5978
+RMD160 (openoffice/OOo_2.1.0_src_system.tar.bz2) = 936ca8997780a3f53d1226b6b1058ff6ef15a4a5
+RMD160 (openoffice/build-java-target-2.1.0.diff) = 5c81a39113089c4d9f19961b5af0a07deae37ee4
 RMD160 (openoffice/go_oo_src680_20061105.diff) = 29b13fcf65724d6dfd00f55fc9f4dd4b9592a40c
 RMD160 (openoffice/ooo-desktop.tar.gz) = a2aa3526f034a36a45b3705cb70f8ffcc33acf26
-SHA1 (openoffice/OOo_2.0.4_src.tar.gz) = e7934d4b7487939f9b2d4659d57f514ebba5c00c
-SHA1 (openoffice/build-java-target.diff) = c0e32feac4c84b0abb12146a57af2767454c3855
+SHA1 (openoffice/OOo_2.1.0_src.tar.bz2) = 9513216ae71267addf3625f5a41c3a43564da3bc
+SHA1 (openoffice/OOo_2.1.0_src_binfilter.tar.bz2) = 7c3c9ea5217f7cd5ee46dee90ce71f4e8fab3137
+SHA1 (openoffice/OOo_2.1.0_src_l10n.tar.bz2) = dd50756610e277f2886f6d423d57c084f0bee18a
+SHA1 (openoffice/OOo_2.1.0_src_sdk.tar.bz2) = d0e0e445e00aad67fc2cf9f4d550018c808a1a79
+SHA1 (openoffice/OOo_2.1.0_src_system.tar.bz2) = 77e97d1ed8eb3276e36ac54e4e021f703e40a587
+SHA1 (openoffice/build-java-target-2.1.0.diff) = c9f2f3d5e1d43caee0b05a0d62a7ebe3eeb813ac
 SHA1 (openoffice/go_oo_src680_20061105.diff) = 9072514055e6f4e04ca82f7daf8d9352566e3d32
 SHA1 (openoffice/ooo-desktop.tar.gz) = e16626b0ccfcc51498f6b682dc8b1d1f9209990a
-SIZE (openoffice/OOo_2.0.4_src.tar.gz) = 333861883
-SIZE (openoffice/build-java-target.diff) = 41280
+SIZE (openoffice/OOo_2.1.0_src.tar.bz2) = 122566860
+SIZE (openoffice/OOo_2.1.0_src_binfilter.tar.bz2) = 16349604
+SIZE (openoffice/OOo_2.1.0_src_l10n.tar.bz2) = 73603380
+SIZE (openoffice/OOo_2.1.0_src_sdk.tar.bz2) = 29297196
+SIZE (openoffice/OOo_2.1.0_src_system.tar.bz2) = 29761970
+SIZE (openoffice/build-java-target-2.1.0.diff) = 40586
 SIZE (openoffice/go_oo_src680_20061105.diff) = 9928
 SIZE (openoffice/ooo-desktop.tar.gz) = 43479

editors/openoffice/patches/patch-autodoc_source_display_idl_hi_ary_cxx

@@ -1,7 +1,7 @@
-$OpenBSD: patch-autodoc_source_display_idl_hi_ary_cxx,v 1.1 2006/10/25 22:49:50 kurt Exp $
---- autodoc/source/display/idl/hi_ary.cxx.orig.port	Wed Sep  7 13:50:24 2005
-+++ autodoc/source/display/idl/hi_ary.cxx	Tue Oct 24 14:06:38 2006
-@@ -177,7 +177,7 @@ AryAccess::Search_Ce( StringVector &    
+$OpenBSD: patch-autodoc_source_display_idl_hi_ary_cxx,v 1.2 2006/12/13 10:25:14 robert Exp $
+--- autodoc/source/display/idl/hi_ary.cxx.orig.port	Fri Dec  1 18:51:38 2006
++++ autodoc/source/display/idl/hi_ary.cxx	Mon Dec 11 22:27:36 2006
+@@ -180,7 +180,7 @@ AryAccess::Search_Ce( StringVector &    
      o_mainEntity = sNextName;
  
      // Find member:
@@ -10,7 +10,7 @@ $OpenBSD: patch-autodoc_source_display_idl_hi_ary_cxx,v 1.1 2006/10/25 22:49:50
          return true; 
  	nextName(pNext, o_memberEntity);
      if (strchr(o_memberEntity,':') != 0)
-@@ -185,7 +185,7 @@ AryAccess::Search_Ce( StringVector &    
+@@ -188,7 +188,7 @@ AryAccess::Search_Ce( StringVector &    
                     
      int nMemberLen = o_memberEntity.length();
      if ( nMemberLen > 2

editors/openoffice/patches/patch-automation_source_testtool_objtest_cxx

@@ -1,12 +1,12 @@
-$OpenBSD: patch-automation_source_testtool_objtest_cxx,v 1.2 2006/08/20 03:36:52 kurt Exp $
---- automation/source/testtool/objtest.cxx.orig.port	Thu Jul  6 10:33:04 2006
-+++ automation/source/testtool/objtest.cxx	Fri Aug 18 15:47:41 2006
-@@ -532,6 +532,8 @@ void TestToolObj::LoadIniFile()				// La
-     abGP.Append( "14" );
- #elif defined LINUX && defined X86_64
+$OpenBSD: patch-automation_source_testtool_objtest_cxx,v 1.3 2006/12/13 10:25:14 robert Exp $
+--- automation/source/testtool/objtest.cxx.orig.port	Fri Dec  1 18:51:39 2006
++++ automation/source/testtool/objtest.cxx	Mon Dec 11 22:27:36 2006
+@@ -537,6 +537,8 @@ void TestToolObj::LoadIniFile()				// La
      abGP.Append( "15" );  // Linux x86-64
+ #elif defined LINUX && defined SPARC
+     abGP.Append( "16" );  // Linux SPARC
 +#elif defined OPENBSD
-+    abGP.Append( "16" );
++    abGP.Append( "17" );
  #else
  #error ("unknown platform. please request an ID for your platform on qa/dev")
  #endif

editors/openoffice/patches/patch-berkeleydb_db-4_2_52_patch

@@ -1,6 +1,6 @@
-$OpenBSD: patch-berkeleydb_db-4_2_52_patch,v 1.2 2006/08/20 03:36:52 kurt Exp $
---- berkeleydb/db-4.2.52.patch.orig.port	Tue Jul 25 06:23:22 2006
-+++ berkeleydb/db-4.2.52.patch	Fri Aug 18 15:47:42 2006
+$OpenBSD: patch-berkeleydb_db-4_2_52_patch,v 1.3 2006/12/13 10:25:14 robert Exp $
+--- berkeleydb/db-4.2.52.patch.orig.port	Fri Dec  1 18:51:42 2006
++++ berkeleydb/db-4.2.52.patch	Mon Dec 11 22:27:36 2006
 @@ -521,6 +521,19 @@
  *** misc/db-4.2.52.NC/dist/configure	Wed Dec  3 22:10:02 2003
  --- misc/build/db-4.2.52.NC/dist/configure	Tue Jul 25 09:05:20 2006
@@ -30,9 +30,9 @@ $OpenBSD: patch-berkeleydb_db-4_2_52_patch,v 1.2 2006/08/20 03:36:52 kurt Exp $
          # Check to see if the program is GNU ld.  I'd rather use --version,
          # but apparently some GNU ld's only accept -v.
          # Break only if it was the GNU/non-GNU ld that we prefer.
-@@ -538,6 +551,41 @@
-   	test "$with_gnu_ld" != no && break
-   	;;
+@@ -555,6 +568,41 @@
+       # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+   		  archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
  ***************
 +*** 5889,5900 ****
 +    ;;
@@ -72,7 +72,7 @@ $OpenBSD: patch-berkeleydb_db-4_2_52_patch,v 1.2 2006/08/20 03:36:52 kurt Exp $
  *** 11180,11186 ****
        # linker, instead of GNU ld.  If possible, this setting should
        # overridden to take advantage of the native linker features on
-@@ -546,7 +594,7 @@
+@@ -563,7 +611,7 @@
      fi
    
      # Commands to make compiler produce verbose output that lists
@@ -81,7 +81,7 @@ $OpenBSD: patch-berkeleydb_db-4_2_52_patch,v 1.2 2006/08/20 03:36:52 kurt Exp $
        # linker, instead of GNU ld.  If possible, this setting should
        # overridden to take advantage of the native linker features on
        # the platform it is being used on.
-@@ -1010,3 +1058,1256 @@
+@@ -1027,3 +1075,1256 @@
  ! 			$(SLO)$/xa_map.obj
  ! 
  ! .INCLUDE :  target.mk

editors/openoffice/patches/patch-config_office_configure_in

@@ -1,7 +1,6 @@
-$OpenBSD: patch-config_office_configure_in,v 1.9 2006/11/12 19:27:40 robert Exp $
---- config_office/configure.in.orig.port	Sat Nov 11 15:49:14 2006
-+++ config_office/configure.in	Sat Nov 11 18:40:30 2006
-@@ -784,6 +784,16 @@ case "$build_os" in
+--- config_office/configure.in.orig.port	Fri Dec  1 18:52:35 2006
++++ config_office/configure.in	Mon Dec 11 22:27:36 2006
+@@ -779,6 +779,16 @@ case "$build_os" in
  		AC_MSG_RESULT([$PTHREAD_LIBS])
  		_os=FreeBSD
  		;;
@@ -18,7 +17,7 @@ $OpenBSD: patch-config_office_configure_in,v 1.9 2006/11/12 19:27:40 robert Exp
  	osf)
  		test_x=dontknow
  		test_cups=no
-@@ -2428,11 +2438,11 @@ dnl ====================================
+@@ -2360,11 +2370,11 @@ dnl ====================================
  dnl Checks for programs.
  dnl ===================================================================
  dnl Check whether there's a C pre-processor.
@@ -32,7 +31,7 @@ $OpenBSD: patch-config_office_configure_in,v 1.9 2006/11/12 19:27:40 robert Exp
     AC_PROG_CXXCPP
  fi
  
-@@ -2562,6 +2572,9 @@ if test "$_os" != "WINNT" -a \( "z$enabl
+@@ -2494,6 +2504,9 @@ if test "$_os" != "WINNT" -a \( "z$enabl
  	AIX)
  		PKGFORMAT=aix
  		;;
@@ -42,7 +41,7 @@ $OpenBSD: patch-config_office_configure_in,v 1.9 2006/11/12 19:27:40 robert Exp
  	*BSD)
  		PKGFORMAT=bsd
  		;;
-@@ -2891,7 +2904,7 @@ if test -n "$with_system_libwpd" -o -n "
+@@ -2823,7 +2836,7 @@ if test -n "$with_system_libwpd" -o -n "
          test "$with_system_libwpd" != "no"; then
      AC_MSG_RESULT([external])
      SYSTEM_LIBWPD=YES
@@ -51,7 +50,7 @@ $OpenBSD: patch-config_office_configure_in,v 1.9 2006/11/12 19:27:40 robert Exp
  else
      AC_MSG_RESULT([internal])
      SYSTEM_LIBWPD=NO
-@@ -2934,12 +2947,13 @@ if test -n "$with_system_python" && test
+@@ -2887,12 +2900,13 @@ if test -n "$with_system_python" && test
  
     python_include=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('INCLUDEPY');"`
     python_version=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('VERSION');"`
@@ -66,7 +65,7 @@ $OpenBSD: patch-config_office_configure_in,v 1.9 2006/11/12 19:27:40 robert Exp
     fi
     
     dnl check if the headers really work:
-@@ -2964,16 +2978,13 @@ if test -n "$with_system_db" -o -n "$wit
+@@ -2917,16 +2931,13 @@ if test -n "$with_system_db" -o -n "$wit
  	test "$with_system_db" != "no"; then
      SYSTEM_DB=YES
      AC_MSG_RESULT([external])
@@ -87,7 +86,7 @@ $OpenBSD: patch-config_office_configure_in,v 1.9 2006/11/12 19:27:40 robert Exp
      for v in 1 2; do
         AC_TRY_RUN([
  #include <db.h>
-@@ -2984,6 +2995,7 @@ int main(int argc, char **argv) {
+@@ -2937,6 +2948,7 @@ int main(int argc, char **argv) {
  }
         ], [DB_VERSION_MINOR=$v], [])
      done
@@ -95,7 +94,7 @@ $OpenBSD: patch-config_office_configure_in,v 1.9 2006/11/12 19:27:40 robert Exp
      if test "$DB_VERSION_MINOR" -gt "1"; then
         AC_MSG_RESULT([OK])
         DB_VERSION=4.$DB_VERSION_MINOR
-@@ -3639,7 +3651,7 @@ elif test "$_os" != "WINNT" ; then
+@@ -3597,7 +3609,7 @@ elif test "$_os" != "WINNT" ; then
        AC_MSG_ERROR([No X includes found]) # Exit
     fi
     CFLAGS=$X_CFLAGS
@@ -104,7 +103,15 @@ $OpenBSD: patch-config_office_configure_in,v 1.9 2006/11/12 19:27:40 robert Exp
     AC_CHECK_LIB(X11, XOpenDisplay, x_libs="-lX11 $X_EXTRA_LIBS", [AC_MSG_ERROR([X Development libraries not found])])
  else
     x_includes="no_x_includes"
-@@ -4613,7 +4625,7 @@ if test "$test_kde" = "yes" -a "$ENABLE_
+@@ -3778,7 +3790,6 @@ if test -n "$with_system_neon" -o -n "$w
+ 	test "$with_system_neon" != "no"; then
+         AC_MSG_RESULT([external])
+         PKG_CHECK_MODULES(NEON, neon >= 0.24.0)
+-        PKG_CHECK_MODULES(NEON, neon < 0.27.0, , AC_MSG_ERROR([you need neon 0.24.x to 0.26.x for system-neon]))
+         NEON_VERSION="`$PKG_CONFIG --modversion neon | $SED 's/\.//g'`"
+         NEON_CFLAGS="$NEON_CFLAGS -DSYSTEM_NEON -DUSE_DAV_LOCKS=1"
+         SYSTEM_NEON=YES
+@@ -4562,7 +4573,7 @@ if test "$test_kde" = "yes" -a "$ENABLE_
  
      dnl What to test
      qt_test_include="qstyle.h"
@@ -113,7 +120,7 @@ $OpenBSD: patch-config_office_configure_in,v 1.9 2006/11/12 19:27:40 robert Exp
      kde_test_include="ksharedptr.h"
      kde_test_library="libkdeui.la"
  
-@@ -4636,7 +4648,7 @@ your Qt installation by exporting QTDIR 
+@@ -4585,7 +4596,7 @@ your Qt installation by exporting QTDIR 
      AC_MSG_CHECKING([for Qt libraries])
      qt_libdir="no"
      for qt_check in $qt_libdirs ; do

editors/openoffice/patches/patch-config_office_set_soenv_in

@@ -1,6 +1,6 @@
-$OpenBSD: patch-config_office_set_soenv_in,v 1.8 2006/11/09 15:18:01 kurt Exp $
---- config_office/set_soenv.in.orig.port	Thu Nov  9 08:55:33 2006
-+++ config_office/set_soenv.in	Thu Nov  9 08:55:34 2006
+$OpenBSD: patch-config_office_set_soenv_in,v 1.9 2006/12/13 10:25:14 robert Exp $
+--- config_office/set_soenv.in.orig.port	Fri Dec  1 18:52:35 2006
++++ config_office/set_soenv.in	Mon Dec 11 22:27:36 2006
 @@ -368,6 +368,46 @@ elsif ( $platform =~ m/freebsd/ ) 
        $INPATH         = $OUTPATH.$PROEXT;
        $GVERDIR        = $INPATH;
@@ -48,7 +48,7 @@ $OpenBSD: patch-config_office_set_soenv_in,v 1.8 2006/11/09 15:18:01 kurt Exp $
  elsif ( $platform =~ m/linux-gnu/ ) 
  {
  # General Linux settings:
-@@ -943,7 +983,7 @@ if ($platform =~ m/solaris/) 
+@@ -969,7 +1009,7 @@ if ($platform =~ m/solaris/) 
                          $ps.$JRETHREADDIR.
                          $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
  }
@@ -57,7 +57,7 @@ $OpenBSD: patch-config_office_set_soenv_in,v 1.8 2006/11/09 15:18:01 kurt Exp $
  {  $LD_LIBRARY_PATH   = $cur_dir.
                          $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
                          $ps.$JRELIBDIR.
-@@ -992,7 +1032,7 @@ if ($platform =~ m/solaris/) 
+@@ -1018,7 +1058,7 @@ if ($platform =~ m/solaris/) 
                          $D."SUPD=$UPD".
                          $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"';
  }
@@ -66,7 +66,7 @@ $OpenBSD: patch-config_office_set_soenv_in,v 1.8 2006/11/09 15:18:01 kurt Exp $
  {  $SOLARDEF          = $D."UNX".
                          $D.$COM.
                          $D.$CVER.
-@@ -1029,7 +1069,7 @@ if ($platform =~ m/solaris/) 
+@@ -1055,7 +1095,7 @@ if ($platform =~ m/solaris/) 
                          $L.$USR_DT.$LIB.
                          $L.$USR_OPENWIN.$LIB;
  }
@@ -75,7 +75,7 @@ $OpenBSD: patch-config_office_set_soenv_in,v 1.8 2006/11/09 15:18:01 kurt Exp $
  {
     $SOLAREXTRALIB     = $L.$par_dir.$LIB64;
  }
-@@ -1070,7 +1110,7 @@ if ($platform =~ m/cygwin/)
+@@ -1091,7 +1131,7 @@ if ($platform =~ m/cygwin/)
  }
       
  # The general environment path.
@@ -84,7 +84,7 @@ $OpenBSD: patch-config_office_set_soenv_in,v 1.8 2006/11/09 15:18:01 kurt Exp $
  {  $PATH              = $cur_dir.
                          $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
                          $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
-@@ -1260,6 +1300,19 @@ elsif ($platform =~ m/linux-gnu|netbasd|
+@@ -1277,6 +1317,19 @@ elsif ($platform =~ m/linux-gnu|netbasd|
                          $L_STLPORT_LIB.
                          $L.$XLIB;
  }
@@ -104,7 +104,7 @@ $OpenBSD: patch-config_office_set_soenv_in,v 1.8 2006/11/09 15:18:01 kurt Exp $
  elsif ($platform =~ m/cygwin/)
  {  $SOLARLIB          = $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
                          $L.$par_dir.$LIB.
-@@ -1291,10 +1344,10 @@ $SOLARINC             = $I.$cur_dir.
+@@ -1308,10 +1361,10 @@ $SOLARINC             = $I.$cur_dir.
                          $I.'$SOLARENV'.$INC.
                          $I.'$SRC_ROOT'.$ds."res";
  
@@ -117,7 +117,7 @@ $OpenBSD: patch-config_office_set_soenv_in,v 1.8 2006/11/09 15:18:01 kurt Exp $
  {
  # This simply adds an include path, so even cases that break the FHS work
  $SOLARINC            .= $STLPORT_inc_stlport;
-@@ -1315,10 +1368,15 @@ if ($platform =~ m/linux-gnu/)
+@@ -1332,10 +1385,15 @@ if ($platform =~ m/linux-gnu/)
     $SOLARINC         .= $STLPORT_inc_stlport;
  }
  
@@ -135,7 +135,7 @@ $OpenBSD: patch-config_office_set_soenv_in,v 1.8 2006/11/09 15:18:01 kurt Exp $
  	#include system dependent Java include directory
  	if (!($JDK eq "gcj"))
  	{
-@@ -1334,6 +1392,10 @@ if ($platform =~ m/linux-gnu/)
+@@ -1351,6 +1409,10 @@ if ($platform =~ m/linux-gnu/)
        		$SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd";
        		$SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
     		}
@@ -146,7 +146,7 @@ $OpenBSD: patch-config_office_set_soenv_in,v 1.8 2006/11/09 15:18:01 kurt Exp $
     		elsif ($platform =~ m/netbsd/)
     		{  $SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
     		}
-@@ -1346,7 +1408,7 @@ if ($platform =~ m/linux-gnu/)
+@@ -1363,7 +1425,7 @@ if ($platform =~ m/linux-gnu/)
     		$SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include";
  	}
      #The tail, if needed

editors/openoffice/patches/patch-cppu_source_typelib_typelib_cxx

@@ -1,93 +0,0 @@
-$OpenBSD: patch-cppu_source_typelib_typelib_cxx,v 1.2 2006/08/20 03:36:52 kurt Exp $
---- cppu/source/typelib/typelib.cxx.orig.port	Mon Jun 19 09:13:24 2006
-+++ cppu/source/typelib/typelib.cxx	Fri Aug 18 15:47:42 2006
-@@ -643,7 +643,7 @@ extern "C" void SAL_CALL typelib_typedes
- 			pRet = (typelib_TypeDescription *)pTmp;
- #if OSL_DEBUG_LEVEL > 1
- 			osl_incrementInterlockedCount(
--                Init::get().nArrayTypeDescriptionCount );
-+                &Init::get().nArrayTypeDescriptionCount );
- #endif
- 			pIndirect->pType = 0;
- 			pTmp->nDimensions = 0;
-@@ -658,7 +658,7 @@ extern "C" void SAL_CALL typelib_typedes
- 			pRet = (typelib_TypeDescription *)pTmp;
- #if OSL_DEBUG_LEVEL > 1
- 			osl_incrementInterlockedCount(
--                Init::get().nIndirectTypeDescriptionCount );
-+                &Init::get().nIndirectTypeDescriptionCount );
- #endif
- 			pTmp->pType = 0;
- 		}
-@@ -671,7 +671,7 @@ extern "C" void SAL_CALL typelib_typedes
- 			pRet = (typelib_TypeDescription *)pTmp;
- #if OSL_DEBUG_LEVEL > 1
- 			osl_incrementInterlockedCount(
--                Init::get().nUnionTypeDescriptionCount );
-+                &Init::get().nUnionTypeDescriptionCount );
- #endif
- 			pTmp->nMembers = 0;
- 			pTmp->pDiscriminantTypeRef = 0;
-@@ -690,7 +690,7 @@ extern "C" void SAL_CALL typelib_typedes
- 			pRet = (typelib_TypeDescription *)pTmp;
- #if OSL_DEBUG_LEVEL > 1
- 			osl_incrementInterlockedCount(
--                Init::get().nCompoundTypeDescriptionCount );
-+                &Init::get().nCompoundTypeDescriptionCount );
- #endif
- 			pTmp->aBase.pBaseTypeDescription = 0;
- 			pTmp->aBase.nMembers = 0;
-@@ -709,7 +709,7 @@ extern "C" void SAL_CALL typelib_typedes
- 			pRet = (typelib_TypeDescription *)pTmp;
- #if OSL_DEBUG_LEVEL > 1
- 			osl_incrementInterlockedCount(
--                Init::get().nCompoundTypeDescriptionCount );
-+                &Init::get().nCompoundTypeDescriptionCount );
- #endif
- 			pTmp->pBaseTypeDescription = 0;
- 			pTmp->nMembers = 0;
-@@ -725,7 +725,7 @@ extern "C" void SAL_CALL typelib_typedes
- 			pRet = (typelib_TypeDescription *)pTmp;
- #if OSL_DEBUG_LEVEL > 1
- 			osl_incrementInterlockedCount(
--                Init::get().nEnumTypeDescriptionCount );
-+                &Init::get().nEnumTypeDescriptionCount );
- #endif
- 			pTmp->nDefaultEnumValue = 0;
- 			pTmp->nEnumValues		= 0;
-@@ -740,7 +740,7 @@ extern "C" void SAL_CALL typelib_typedes
- 			pRet = (typelib_TypeDescription *)pTmp;
- #if OSL_DEBUG_LEVEL > 1
- 			osl_incrementInterlockedCount(
--                Init::get().nInterfaceTypeDescriptionCount );
-+                &Init::get().nInterfaceTypeDescriptionCount );
- #endif
- 			pTmp->pBaseTypeDescription = 0;
- 			pTmp->nMembers = 0;
-@@ -761,7 +761,7 @@ extern "C" void SAL_CALL typelib_typedes
- 			pRet = (typelib_TypeDescription *)pTmp;
- #if OSL_DEBUG_LEVEL > 1
- 			osl_incrementInterlockedCount(
--                Init::get().nInterfaceMethodTypeDescriptionCount );
-+                &Init::get().nInterfaceMethodTypeDescriptionCount );
- #endif
- 			pTmp->aBase.pMemberName = 0;
- 			pTmp->pReturnTypeRef = 0;
-@@ -781,7 +781,7 @@ extern "C" void SAL_CALL typelib_typedes
- 			pRet = (typelib_TypeDescription *)pTmp;
- #if OSL_DEBUG_LEVEL > 1
- 			osl_incrementInterlockedCount(
--                Init::get().nInterfaceAttributeTypeDescriptionCount );
-+                &Init::get().nInterfaceAttributeTypeDescriptionCount );
- #endif
- 			pTmp->aBase.pMemberName = 0;
- 			pTmp->pAttributeTypeRef = 0;
-@@ -799,7 +799,7 @@ extern "C" void SAL_CALL typelib_typedes
- 		{
- 			pRet = new typelib_TypeDescription();
- #if OSL_DEBUG_LEVEL > 1
--			osl_incrementInterlockedCount( Init::get().nTypeDescriptionCount );
-+			osl_incrementInterlockedCount( &Init::get().nTypeDescriptionCount );
- #endif
- 		}
- 	}

editors/openoffice/patches/patch-cppu_source_uno_data_cxx

@@ -1,7 +1,7 @@
-$OpenBSD: patch-cppu_source_uno_data_cxx,v 1.2 2006/08/20 03:36:52 kurt Exp $
---- cppu/source/uno/data.cxx.orig.port	Fri Feb  3 12:32:32 2006
-+++ cppu/source/uno/data.cxx	Fri Aug 18 15:47:42 2006
-@@ -364,7 +364,7 @@ sal_Bool SAL_CALL uno_type_isAssignableF
+$OpenBSD: patch-cppu_source_uno_data_cxx,v 1.3 2006/12/13 10:25:14 robert Exp $
+--- cppu/source/uno/data.cxx.orig.port	Fri Dec  1 18:52:39 2006
++++ cppu/source/uno/data.cxx	Mon Dec 11 22:27:36 2006
+@@ -367,7 +367,7 @@ sal_Bool SAL_CALL uno_type_isAssignableF
  #endif
  
  #if defined(INTEL) \

editors/openoffice/patches/patch-desktop_source_app_main_cxx

@@ -1,8 +1,8 @@
-$OpenBSD: patch-desktop_source_app_main_cxx,v 1.2 2006/08/20 03:36:52 kurt Exp $
---- desktop/source/app/main.cxx.orig.port	Thu Sep  8 13:11:14 2005
-+++ desktop/source/app/main.cxx	Fri Aug 18 15:47:42 2006
-@@ -34,7 +34,7 @@
-  ************************************************************************/
+$OpenBSD: patch-desktop_source_app_main_cxx,v 1.3 2006/12/13 10:25:14 robert Exp $
+--- desktop/source/app/main.cxx.orig.port	Fri Dec  1 18:53:04 2006
++++ desktop/source/app/main.cxx	Mon Dec 11 22:27:36 2006
+@@ -37,7 +37,7 @@
+ #include "precompiled_desktop.hxx"
  
  #if defined(UNX)
 -#if defined(MACOSX) || defined(FREEBSD)

editors/openoffice/patches/patch-dmake_unix_runargv_c

@@ -1,7 +1,7 @@
-$OpenBSD: patch-dmake_unix_runargv_c,v 1.2 2006/08/20 03:36:52 kurt Exp $
---- dmake/unix/runargv.c.orig.port	Thu Apr 20 08:19:12 2006
-+++ dmake/unix/runargv.c	Fri Aug 18 15:47:42 2006
-@@ -132,7 +132,7 @@ private_strerror (errnum)
+$OpenBSD: patch-dmake_unix_runargv_c,v 1.3 2006/12/13 10:25:14 robert Exp $
+--- dmake/unix/runargv.c.orig.port	Fri Dec  1 18:53:09 2006
++++ dmake/unix/runargv.c	Mon Dec 11 22:27:37 2006
+@@ -133,7 +133,7 @@ private_strerror (errnum)
  #ifdef arm32
    extern  const char * const sys_errlist[];
  #else

editors/openoffice/patches/patch-dtrans_source_X11_X11_selection_cxx

@@ -1,7 +1,7 @@
-$OpenBSD: patch-dtrans_source_X11_X11_selection_cxx,v 1.2 2006/08/20 03:36:52 kurt Exp $
---- dtrans/source/X11/X11_selection.cxx.orig.port	Mon Jul 10 12:31:52 2006
-+++ dtrans/source/X11/X11_selection.cxx	Fri Aug 18 15:47:42 2006
-@@ -42,7 +42,7 @@
+$OpenBSD: patch-dtrans_source_X11_X11_selection_cxx,v 1.3 2006/12/13 10:25:14 robert Exp $
+--- dtrans/source/X11/X11_selection.cxx.orig.port	Fri Dec  1 18:53:09 2006
++++ dtrans/source/X11/X11_selection.cxx	Mon Dec 11 22:27:37 2006
+@@ -45,7 +45,7 @@
  #include <X11/Xlib.h>
  #include <X11/X.h>
  #include <X11/Xutil.h>

editors/openoffice/patches/patch-external_gcc3_specific_makefile_mk

@@ -1,19 +1,17 @@
-$OpenBSD: patch-external_gcc3_specific_makefile_mk,v 1.2 2006/08/20 03:36:52 kurt Exp $
---- external/gcc3_specific/makefile.mk.orig.port	Mon Sep 12 10:49:17 2005
-+++ external/gcc3_specific/makefile.mk	Fri Aug 18 15:47:42 2006
-@@ -12,8 +12,8 @@ TARGET=gcc3_specific
+$OpenBSD: patch-external_gcc3_specific_makefile_mk,v 1.3 2006/12/13 10:25:14 robert Exp $
+--- external/gcc3_specific/makefile.mk.orig.port	Fri Dec  1 18:53:14 2006
++++ external/gcc3_specific/makefile.mk	Mon Dec 11 22:27:37 2006
+@@ -13,6 +13,7 @@ TARGET=gcc3_specific
  .IF "$(OS)"!="MACOSX"
  .IF "$(OS)"!="IRIX"
  .IF "$(OS)"!="FREEBSD"
 +.IF "$(OS)"!="OPENBSD"
  
--
- all .SEQUENTIAL : $(SOLARLIBDIR)$/libstdc++.so.$(SHORTSTDCPP3) $(SOLARLIBDIR)$/libgcc_s.so.1 $(SOLARLIBDIR)$/libgcc_s.so 
+ .EXPORT : CC
  
- 
-@@ -27,6 +27,7 @@ $(SOLARLIBDIR)$/libgcc_s.so : $(SOLARLIB
-         -rm -f $@
-         +ln -s libgcc_s.so.1 $@
+@@ -25,6 +26,7 @@ $(LB)$/libstdc++.so.$(SHORTSTDCPP3) :
+ $(LB)$/libgcc_s.so.1 :
+        $(GCCINSTLIB) libgcc_s.so.1 $(LB)
  
 +.ENDIF
  .ENDIF

editors/openoffice/patches/patch-external_glibc_glibcpatch_sh

@@ -1,21 +0,0 @@
-$OpenBSD: patch-external_glibc_glibcpatch_sh,v 1.2 2006/08/20 03:36:52 kurt Exp $
---- external/glibc/glibcpatch.sh.orig.port	Tue Sep  6 10:21:32 2005
-+++ external/glibc/glibcpatch.sh	Fri Aug 18 15:47:42 2006
-@@ -43,6 +43,7 @@ if test -s "$tarball"; then
-     _gnutar=`tar --version 2> /dev/null`
-     gnutar=`echo $_gnutar | awk '/GNU/ { print "true" }'`
-     if test "$gnutar" = "true"; then
-+
-        tar -T flist.cp -x -z -f $tarball
-        chmod -R +w glibc-2.1.3 
-     else
-@@ -53,6 +54,9 @@ if test -s "$tarball"; then
-     fi
-   elif test "$OS" = "MACOSX"; then
- #Only MACOSX
-+    tar -x -z -f $tarball `cat flist.cp`
-+  elif test "$OS" = "OPENBSD"; then
-+#Only OPENBSD
-     tar -x -z -f $tarball `cat flist.cp`
-   else
- #LINUX and others

editors/openoffice/patches/patch-external_glibc_sdfiles_makefile_mk

@@ -1,21 +0,0 @@
-$OpenBSD: patch-external_glibc_sdfiles_makefile_mk,v 1.2 2006/08/20 03:36:52 kurt Exp $
---- external/glibc/sdfiles/makefile.mk.orig.port	Tue Jun 20 07:47:56 2006
-+++ external/glibc/sdfiles/makefile.mk	Fri Aug 18 15:47:42 2006
-@@ -53,14 +53,14 @@ CDEFS+=-DHAVE_STRING_H  -DHAVE_CONFIG_H
- 
- # --- Files --------------------------------------------------------
- 
--OBJFILES=	$(OBJ)$/getopt.obj		\
--			$(OBJ)$/getopt1.obj
-+OBJFILES=	$(OBJ)$/getopt.obj	\
-+		$(OBJ)$/getopt1.obj
- 
- LIB1TARGET=$(SLB)$/$(TARGET).lib
- LIB1ARCHIV=$(LB)$/lib$(TARGET).a
- LIB1OBJFILES=$(OBJFILES)
- 
--.IF "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="NETBSD" || "$(OS)"=="OPENBSD"
- TARGET2=gnu_readdir_r
- OBJFILES+= $(OBJ)$/readdir_r.obj
- LIB2TARGET=$(SLB)$/$(TARGET2).lib

editors/openoffice/patches/patch-external_prj_d_lst

@@ -1,11 +0,0 @@
-$OpenBSD: patch-external_prj_d_lst,v 1.2 2006/08/20 03:36:52 kurt Exp $
---- external/prj/d.lst.orig.port	Mon May  8 12:10:34 2006
-+++ external/prj/d.lst	Fri Aug 18 15:47:42 2006
-@@ -46,6 +46,7 @@ mkdir: %_DEST%\pck%_EXT%
- ..\%__SRC%\slo\PluginNew.* %_DEST%\lib%_EXT%\*
- ..\%__SRC%\slb\gnu_getopt.lib %_DEST%\lib%_EXT%\gnu_getopt.lib
- ..\%__SRC%\lib\libgnu_getopt.a %_DEST%\lib%_EXT%\libgnu_getopt.a
-+..\%__SRC%\lib\libgnu_readdir_r.a %_DEST%\lib%_EXT%\libgnu_readdir_r.a
- ..\%__SRC%\slb\zlib.lib %_DEST%\lib%_EXT%\zlib.lib
- ..\%__SRC%\lib\libzlib.a %_DEST%\lib%_EXT%\libzlib.a
- ..\%__SRC%\lib\libfreetype.a %_DEST%\lib%_EXT%\libfreetype.a

editors/openoffice/patches/patch-idlc_source_idlccompile_cxx

@@ -1,7 +1,7 @@
-$OpenBSD: patch-idlc_source_idlccompile_cxx,v 1.2 2006/08/20 03:36:52 kurt Exp $
---- idlc/source/idlccompile.cxx.orig.port	Mon Jun 19 23:48:52 2006
-+++ idlc/source/idlccompile.cxx	Fri Aug 18 15:47:43 2006
-@@ -61,7 +61,7 @@
+$OpenBSD: patch-idlc_source_idlccompile_cxx,v 1.3 2006/12/13 10:25:14 robert Exp $
+--- idlc/source/idlccompile.cxx.orig.port	Fri Dec  1 18:55:07 2006
++++ idlc/source/idlccompile.cxx	Mon Dec 11 22:27:37 2006
+@@ -64,7 +64,7 @@
  
  #ifdef	SAL_UNX
  #include <unistd.h>

editors/openoffice/patches/patch-instsetoo_native_util_makefile_mk

@@ -1,7 +1,7 @@
-$OpenBSD: patch-instsetoo_native_util_makefile_mk,v 1.3 2006/10/25 22:49:50 kurt Exp $
---- instsetoo_native/util/makefile.mk.orig.port	Thu Jul 13 11:15:45 2006
-+++ instsetoo_native/util/makefile.mk	Tue Oct 24 21:12:54 2006
-@@ -189,7 +189,7 @@ openoffice_%{$(PKGFORMAT:^".")} :
+$OpenBSD: patch-instsetoo_native_util_makefile_mk,v 1.4 2006/12/13 10:25:14 robert Exp $
+--- instsetoo_native/util/makefile.mk.orig.port	Fri Dec  1 18:55:09 2006
++++ instsetoo_native/util/makefile.mk	Mon Dec 11 22:27:37 2006
+@@ -195,7 +195,7 @@ openoffice_%{$(PKGFORMAT:^".")} :
  openoffice_% :
  .ENDIF			# "$(PKGFORMAT)"!=""
  .IF "$(OS)"!="MACOSX" || "$(PKGFORMAT)"!="portable"
@@ -10,7 +10,7 @@ $OpenBSD: patch-instsetoo_native_util_makefile_mk,v 1.3 2006/10/25 22:49:50 kurt
  .ELSE                   # "$(OS)"!="MACOSX" || "$(PKGFORMAT)"!=""
  	+$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -packagelist $(PRJ)$/inc_openoffice$/unix$/packagelist.txt -u $(OUT) -buildid $(BUILD) -destdir $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b))_inprogress$/ -simple staging
  	+$(RM) $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b))$/gid_*
-@@ -394,11 +394,11 @@ hack_msitemplates .PHONY:
+@@ -403,11 +403,11 @@ hack_msitemplates .PHONY:
  	+-$(MKDIRHIER) $(MSIURETEMPLATEDIR)
  	+-$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)
  	+-$(MKDIRHIER) $(MSIURETEMPLATEDIR)

editors/openoffice/patches/patch-jvmfwk_plugins_sunmajor_pluginlib_sunversion_cxx

@@ -1,7 +1,7 @@
-$OpenBSD: patch-jvmfwk_plugins_sunmajor_pluginlib_sunversion_cxx,v 1.2 2006/08/20 03:36:52 kurt Exp $
---- jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx.orig.port	Mon Jun 19 20:09:54 2006
-+++ jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx	Fri Aug 18 15:47:43 2006
-@@ -205,7 +205,7 @@ bool SunVersion::init(const char *szVers
+$OpenBSD: patch-jvmfwk_plugins_sunmajor_pluginlib_sunversion_cxx,v 1.3 2006/12/13 10:25:14 robert Exp $
+--- jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx.orig.port	Fri Dec  1 18:55:10 2006
++++ jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx	Mon Dec 11 22:27:38 2006
+@@ -208,7 +208,7 @@ bool SunVersion::init(const char *szVers
          m_preRelease = getPreRelease(pCur);
          if (m_preRelease == Rel_NONE)
              return false;
@@ -10,7 +10,7 @@ $OpenBSD: patch-jvmfwk_plugins_sunmajor_pluginlib_sunversion_cxx,v 1.2 2006/08/2
        if (m_preRelease == Rel_FreeBSD)
        {
            pCur++; //elemnate `p'
-@@ -256,7 +256,7 @@ SunVersion::PreRelease SunVersion::getPr
+@@ -259,7 +259,7 @@ SunVersion::PreRelease SunVersion::getPr
          return Rel_RC2;
      else if (! strcmp(szRelease, "rc3"))
          return Rel_RC3;

editors/openoffice/patches/patch-jvmfwk_sunmajor_pluginlib_sunjre_cxx

@@ -1,7 +1,7 @@
-$OpenBSD: patch-jvmfwk_sunmajor_pluginlib_sunjre_cxx,v 1.2 2006/11/09 15:18:01 kurt Exp $
---- jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx.orig.port	Wed Jul 19 05:37:51 2006
-+++ jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx	Wed Nov  8 11:47:18 2006
-@@ -91,6 +91,7 @@ char const* const* SunInfo::getLibraryPa
+$OpenBSD: patch-jvmfwk_sunmajor_pluginlib_sunjre_cxx,v 1.3 2006/12/13 10:25:14 robert Exp $
+--- jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx.orig.port	Fri Dec  1 18:55:10 2006
++++ jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx	Mon Dec 11 22:27:38 2006
+@@ -94,6 +94,7 @@ char const* const* SunInfo::getLibraryPa
      static char const * ar[] = {
  
          "/lib/" JFW_PLUGIN_ARCH "/client",

editors/openoffice/patches/patch-lingucomponent_source_spellcheck_hunspell_affixmgr_cxx

@@ -1,7 +1,7 @@
-$OpenBSD: patch-lingucomponent_source_spellcheck_hunspell_affixmgr_cxx,v 1.2 2006/08/20 03:36:52 kurt Exp $
---- lingucomponent/source/spellcheck/hunspell/affixmgr.cxx.orig.port	Wed Jul 19 12:15:53 2006
-+++ lingucomponent/source/spellcheck/hunspell/affixmgr.cxx	Fri Aug 18 15:47:43 2006
-@@ -2439,12 +2439,11 @@ char * AffixMgr::suffix_check_twosfx_mor
+$OpenBSD: patch-lingucomponent_source_spellcheck_hunspell_affixmgr_cxx,v 1.3 2006/12/13 10:25:14 robert Exp $
+--- lingucomponent/source/spellcheck/hunspell/affixmgr.cxx.orig.port	Fri Dec  1 18:55:11 2006
++++ lingucomponent/source/spellcheck/hunspell/affixmgr.cxx	Mon Dec 11 22:27:38 2006
+@@ -2477,12 +2477,12 @@ char * AffixMgr::suffix_check_twosfx_mor
                  result3[0] = '\0';
  #ifdef DEBUG
                  unsigned short flag = sptr->getFlag();
@@ -12,20 +12,22 @@ $OpenBSD: patch-lingucomponent_source_spellcheck_hunspell_affixmgr_cxx,v 1.2 200
                  } else if (flag_mode == FLAG_LONG) {
 -                    sprintf(result3, "%c%c", flagch[0], flagch[1]);                
 -                } else sprintf(result3, "%c", flagch[1]);                
-+                    sprintf(result3, "%c%c", (char)(flag>>8), (char)(flag & 0x00ff));                
-+                } else sprintf(result3, "%c", (char)(flag & 0x00ff));                
++                    sprintf(result3, "%c%c", (char)(flag>>8), (char)(flag & 0x00ff));
++                } else sprintf(result3, "%c", (char)(flag & 0x00ff));
++
                  strcat(result3, ":");
  #endif
                  if (sptr->getMorph()) strcat(result3, sptr->getMorph());
-@@ -2466,10 +2465,16 @@ char * AffixMgr::suffix_check_morph(cons
+@@ -2504,10 +2504,17 @@ char * AffixMgr::suffix_check_morph(cons
         int sfxopts, AffEntry * ppfx, const FLAG cclass, const FLAG needflag, char in_compound)
  {
      char result[MAXLNLEN];
 -    
++
 +#ifdef DEBUG
 +    char result2[MAXLNLEN];
 +#endif
-+
++ 
      struct hentry * rv = NULL;
  
      result[0] = '\0';
@@ -35,32 +37,21 @@ $OpenBSD: patch-lingucomponent_source_spellcheck_hunspell_affixmgr_cxx,v 1.2 200
  
      PfxEntry* ep = (PfxEntry *) ppfx;
  
-@@ -2555,13 +2560,12 @@ char * AffixMgr::suffix_check_morph(cons
+@@ -2593,13 +2600,12 @@ char * AffixMgr::suffix_check_morph(cons
                          !TESTAFF(rv->astr, lemma_present, rv->alen))) strcat(result, rv->word);
                      if (!complexprefixes && rv->description) strcat(result, rv->description);
  #ifdef DEBUG
 -                unsigned short flag = sptr->getKey();
 -                char flagch[2] = &flag;
-+                unsigned short flag = sptr->getFlag();
++		unsigned short flag = sptr->getFlag();
                  if (flag_mode == FLAG_NUM) {
 -                    sprintf(result2, "%d", sptr->getKey());
 +                    sprintf(result2, "%p", sptr->getKey());
                  } else if (flag_mode == FLAG_LONG) {
 -                    sprintf(result2, "%c%c", flagch[0], flagch[1]);                
 -                } else sprintf(result2, "%c", flagch[1]);                
-+                    sprintf(result2, "%c%c", (char)(flag>>8), (char)(flag & 0x00FF));                
-+                } else sprintf(result2, "%c", (char)(flag & 0x00FF));                
++                    sprintf(result2, "%c%c", (char)(flag>>8), (char)(flag & 0x00FF));
++                } else sprintf(result2, "%c", (char)(flag & 0x00FF));
                  strcat(result2, ":");
                  strcat(result, result2);
  #endif
-@@ -3684,7 +3688,9 @@ int  AffixMgr::parse_affix(char * line, 
-    int i = 0;
- 
-    // checking lines with bad syntax
--//   int basefieldnum = 0;
-+#if DEBUG
-+   int basefieldnum = 0;
-+#endif
- 
-    // split affix header line into pieces
- 

editors/openoffice/patches/patch-psprint_source_fontmanager_fontmanager_cxx

@@ -1,15 +0,0 @@
-$OpenBSD: patch-psprint_source_fontmanager_fontmanager_cxx,v 1.2 2006/08/20 03:36:52 kurt Exp $
---- psprint/source/fontmanager/fontmanager.cxx.orig.port	Mon Jun 19 06:24:03 2006
-+++ psprint/source/fontmanager/fontmanager.cxx	Fri Aug 18 15:47:43 2006
-@@ -427,7 +427,11 @@ bool PrintFontManager::BuiltinFont::quer
- 
- // -------------------------------------------------------------------------
- 
-+#if OSL_DEBUG_LEVEL > 1
-+bool PrintFontManager::TrueTypeFontFile::queryMetricPage( int nPage, MultiAtomProvider* pProvider )
-+#else
- bool PrintFontManager::TrueTypeFontFile::queryMetricPage( int nPage, MultiAtomProvider* /*pProvider*/ )
-+#endif
- {
-     bool bSuccess = false;
- 

editors/openoffice/patches/patch-psprint_source_printer_cupsmgr_cxx

@@ -1,7 +1,7 @@
-$OpenBSD: patch-psprint_source_printer_cupsmgr_cxx,v 1.1 2006/10/27 16:02:02 kurt Exp $
---- psprint/source/printer/cupsmgr.cxx.orig.port	Thu Oct 26 10:46:55 2006
-+++ psprint/source/printer/cupsmgr.cxx	Thu Oct 26 10:47:09 2006
-@@ -57,7 +57,7 @@ typedef void cups_option_t;
+$OpenBSD: patch-psprint_source_printer_cupsmgr_cxx,v 1.2 2006/12/13 10:25:14 robert Exp $
+--- psprint/source/printer/cupsmgr.cxx.orig.port	Fri Dec  1 18:55:41 2006
++++ psprint/source/printer/cupsmgr.cxx	Mon Dec 11 22:27:39 2006
+@@ -60,7 +60,7 @@ typedef void cups_option_t;
  #ifdef MACOSX
  #define CUPS_LIB_NAME "libcups.2.dylib"
  #else

editors/openoffice/patches/patch-psprint_source_printer_printerinfomanager_cxx

@@ -1,7 +1,7 @@
-$OpenBSD: patch-psprint_source_printer_printerinfomanager_cxx,v 1.2 2006/08/20 03:36:52 kurt Exp $
---- psprint/source/printer/printerinfomanager.cxx.orig.port	Mon Jul 10 12:30:50 2006
-+++ psprint/source/printer/printerinfomanager.cxx	Fri Aug 18 15:47:43 2006
-@@ -1172,7 +1172,7 @@ struct SystemCommandParameters
+$OpenBSD: patch-psprint_source_printer_printerinfomanager_cxx,v 1.3 2006/12/13 10:25:14 robert Exp $
+--- psprint/source/printer/printerinfomanager.cxx.orig.port	Fri Dec  1 18:55:41 2006
++++ psprint/source/printer/printerinfomanager.cxx	Mon Dec 11 22:27:39 2006
+@@ -1180,7 +1180,7 @@ struct SystemCommandParameters
  
  static const struct SystemCommandParameters aParms[] =
  {

editors/openoffice/patches/patch-psprint_source_printergfx_printerjob_cxx

@@ -1,7 +1,7 @@
-$OpenBSD: patch-psprint_source_printergfx_printerjob_cxx,v 1.2 2006/08/20 03:36:52 kurt Exp $
---- psprint/source/printergfx/printerjob.cxx.orig.port	Tue Jul 25 05:36:11 2006
-+++ psprint/source/printergfx/printerjob.cxx	Fri Aug 18 15:47:43 2006
-@@ -262,7 +262,7 @@ getUserName (char* pName, int nSize)
+$OpenBSD: patch-psprint_source_printergfx_printerjob_cxx,v 1.3 2006/12/13 10:25:14 robert Exp $
+--- psprint/source/printergfx/printerjob.cxx.orig.port	Fri Dec  1 18:55:41 2006
++++ psprint/source/printergfx/printerjob.cxx	Mon Dec 11 22:27:39 2006
+@@ -265,7 +265,7 @@ getUserName (char* pName, int nSize)
  
      sal_Bool bSuccess = sal_False;
  

editors/openoffice/patches/patch-sal_osl_unx_backtrace_c

@@ -1,7 +1,7 @@
-$OpenBSD: patch-sal_osl_unx_backtrace_c,v 1.2 2006/08/20 03:36:52 kurt Exp $
---- sal/osl/unx/backtrace.c.orig.port	Tue Jun 20 00:16:46 2006
-+++ sal/osl/unx/backtrace.c	Fri Aug 18 15:47:43 2006
-@@ -124,7 +124,7 @@ void backtrace_symbols_fd( void **buffer
+$OpenBSD: patch-sal_osl_unx_backtrace_c,v 1.3 2006/12/13 10:25:14 robert Exp $
+--- sal/osl/unx/backtrace.c.orig.port	Fri Dec  1 18:56:15 2006
++++ sal/osl/unx/backtrace.c	Mon Dec 11 22:27:40 2006
+@@ -142,7 +142,7 @@ void backtrace_symbols_fd( void **buffer
  #endif /* defined SOLARIS */
  
  

editors/openoffice/patches/patch-sal_osl_unx_file_cxx

@@ -1,7 +1,7 @@
-$OpenBSD: patch-sal_osl_unx_file_cxx,v 1.2 2006/08/20 03:36:52 kurt Exp $
---- sal/osl/unx/file.cxx.orig.port	Tue Jun 20 00:17:10 2006
-+++ sal/osl/unx/file.cxx	Fri Aug 18 15:47:43 2006
-@@ -115,7 +115,7 @@ static const sal_Char* MOUNTTAB="/etc/mn
+$OpenBSD: patch-sal_osl_unx_file_cxx,v 1.3 2006/12/13 10:25:14 robert Exp $
+--- sal/osl/unx/file.cxx.orig.port	Fri Dec  1 18:56:15 2006
++++ sal/osl/unx/file.cxx	Mon Dec 11 22:27:40 2006
+@@ -118,7 +118,7 @@ static const sal_Char* MOUNTTAB="/etc/mn
  #include <ctype.h>
  static const sal_Char* MOUNTTAB="/etc/mtab";
  
@@ -10,7 +10,7 @@ $OpenBSD: patch-sal_osl_unx_file_cxx,v 1.2 2006/08/20 03:36:52 kurt Exp $
  #include <sys/param.h>
  #include <sys/ucred.h>
  #include <sys/mount.h>
-@@ -1383,12 +1383,11 @@ oslFileError SAL_CALL osl_syncFile(oslFi
+@@ -1424,12 +1424,11 @@ oslFileError SAL_CALL osl_syncFile(oslFi
  
  #ifdef HAVE_STATFS_H
  
@@ -24,7 +24,7 @@ $OpenBSD: patch-sal_osl_unx_file_cxx,v 1.2 2006/08/20 03:36:52 kurt Exp $
  
  /* always return true if queried for the properties of
     the file system. If you think this is wrong under any
-@@ -1407,7 +1406,6 @@ oslFileError SAL_CALL osl_syncFile(oslFi
+@@ -1448,7 +1447,6 @@ oslFileError SAL_CALL osl_syncFile(oslFi
  #   define __OSL_STATFS_BLKSIZ(a)    			 ((sal_uInt64)((a).f_bsize))
  #   define __OSL_STATFS_IS_NFS(a)     			 (__OSL_NFS_SUPER_MAGIC == (a).f_type) 
  #   define __OSL_STATFS_IS_SMB(a)     			 (__OSL_SMB_SUPER_MAGIC == (a).f_type) 
@@ -32,7 +32,7 @@ $OpenBSD: patch-sal_osl_unx_file_cxx,v 1.2 2006/08/20 03:36:52 kurt Exp $
  #	define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)  ((__OSL_MSDOS_SUPER_MAGIC != (a).f_type) && (__OSL_NTFS_SUPER_MAGIC != (a).f_type))
  #	define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) ((__OSL_MSDOS_SUPER_MAGIC != (a).f_type))
  #endif /* LINUX */
-@@ -1417,7 +1415,6 @@ oslFileError SAL_CALL osl_syncFile(oslFi
+@@ -1458,7 +1456,6 @@ oslFileError SAL_CALL osl_syncFile(oslFi
  #   define __OSL_STATFS(dir, sfs)	    		 statvfs((dir), (sfs))
  #   define __OSL_STATFS_BLKSIZ(a)       		 ((sal_uInt64)((a).f_frsize))
  #   define __OSL_STATFS_TYPENAME(a)     		 ((a).f_basetype)
@@ -40,7 +40,7 @@ $OpenBSD: patch-sal_osl_unx_file_cxx,v 1.2 2006/08/20 03:36:52 kurt Exp $
  
  /* always return true if queried for the properties of
     the file system. If you think this is wrong under any
-@@ -1433,7 +1430,6 @@ oslFileError SAL_CALL osl_syncFile(oslFi
+@@ -1474,7 +1471,6 @@ oslFileError SAL_CALL osl_syncFile(oslFi
  #   define __OSL_STATFS_STRUCT        			 struct dummy {int i;}
  #   define __OSL_STATFS_INIT(a)       			 ((void)0)
  #   define __OSL_STATFS(dir, sfs)     		     (1)
@@ -48,7 +48,7 @@ $OpenBSD: patch-sal_osl_unx_file_cxx,v 1.2 2006/08/20 03:36:52 kurt Exp $
  #	define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)	 (1)
  #	define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (1)
  #endif /* HAVE_STATFS_H */
-@@ -1461,10 +1457,6 @@ static oslFileError osl_psz_getVolumeInf
+@@ -1502,10 +1498,6 @@ static oslFileError osl_psz_getVolumeInf
      /* FIXME: how to detect the kind of storage (fixed, cdrom, ...) */
  	if (uFieldMask & osl_VolumeInfo_Mask_Attributes)
  	{	
@@ -59,7 +59,7 @@ $OpenBSD: patch-sal_osl_unx_file_cxx,v 1.2 2006/08/20 03:36:52 kurt Exp $
  	}
  
  	if (uFieldMask & osl_VolumeInfo_Mask_FileSystemCaseHandling)
-@@ -2183,7 +2175,7 @@ int UnicodeToText( char * buffer, size_t
+@@ -2224,7 +2216,7 @@ int UnicodeToText( char * buffer, size_t
  
      if( nInfo & RTL_UNICODETOTEXT_INFO_DESTBUFFERTOSMALL )
      {
@@ -68,7 +68,7 @@ $OpenBSD: patch-sal_osl_unx_file_cxx,v 1.2 2006/08/20 03:36:52 kurt Exp $
          return 0;
      }
  
-@@ -2235,7 +2227,7 @@ int TextToUnicode(
+@@ -2276,7 +2268,7 @@ int TextToUnicode(
  
      if (nInfo & RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL)
      {
@@ -77,7 +77,7 @@ $OpenBSD: patch-sal_osl_unx_file_cxx,v 1.2 2006/08/20 03:36:52 kurt Exp $
          return 0;
      }
  
-@@ -3360,35 +3352,35 @@ static sal_Bool osl_isFloppyMounted(oslV
+@@ -3401,35 +3393,35 @@ static sal_Bool osl_isFloppyMounted(oslV
   *
   *****************************************************************************/
  

editors/openoffice/patches/patch-sal_osl_unx_file_error_transl_cxx

@@ -1,7 +1,7 @@
-$OpenBSD: patch-sal_osl_unx_file_error_transl_cxx,v 1.2 2006/08/20 03:36:52 kurt Exp $
---- sal/osl/unx/file_error_transl.cxx.orig.port	Thu Sep  8 10:54:25 2005
-+++ sal/osl/unx/file_error_transl.cxx	Fri Aug 18 15:47:43 2006
-@@ -219,19 +219,19 @@ oslFileError oslTranslateFileError(sal_B
+$OpenBSD: patch-sal_osl_unx_file_error_transl_cxx,v 1.3 2006/12/13 10:25:14 robert Exp $
+--- sal/osl/unx/file_error_transl.cxx.orig.port	Fri Dec  1 18:56:15 2006
++++ sal/osl/unx/file_error_transl.cxx	Mon Dec 11 22:27:40 2006
+@@ -222,19 +222,19 @@ oslFileError oslTranslateFileError(sal_B
              osl_error = osl_File_E_LOOP;
              break;
  
@@ -24,7 +24,7 @@ $OpenBSD: patch-sal_osl_unx_file_error_transl_cxx,v 1.2 2006/08/20 03:36:52 kurt
          case EMULTIHOP:
              osl_error = osl_File_E_MULTIHOP;
              break;
-@@ -241,9 +241,11 @@ oslFileError oslTranslateFileError(sal_B
+@@ -244,9 +244,11 @@ oslFileError oslTranslateFileError(sal_B
              osl_error = osl_File_E_USERS;
              break;
  

editors/openoffice/patches/patch-salhelper_test_rtti_makefile_mk

@@ -1,7 +1,7 @@
-$OpenBSD: patch-salhelper_test_rtti_makefile_mk,v 1.2 2006/08/20 03:36:53 kurt Exp $
---- salhelper/test/rtti/makefile.mk.orig.port	Thu Sep  8 13:02:46 2005
-+++ salhelper/test/rtti/makefile.mk	Fri Aug 18 15:47:44 2006
-@@ -93,6 +93,8 @@ SHL1VERSIONMAP= lngi.map
+$OpenBSD: patch-salhelper_test_rtti_makefile_mk,v 1.3 2006/12/13 10:25:14 robert Exp $
+--- salhelper/test/rtti/makefile.mk.orig.port	Fri Dec  1 18:56:19 2006
++++ salhelper/test/rtti/makefile.mk	Mon Dec 11 22:27:41 2006
+@@ -87,6 +87,8 @@ SHL1VERSIONMAP= lngi.map
  SHL1VERSIONMAP= gcc2_freebsd_intel.map
  .ELIF "$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3"
  SHL1VERSIONMAP= gcc3_freebsd_intel.map

editors/openoffice/patches/patch-scp2_source_ooo_file_library_ooo_scp

@@ -1,7 +1,7 @@
-$OpenBSD: patch-scp2_source_ooo_file_library_ooo_scp,v 1.4 2006/10/27 16:02:02 kurt Exp $
---- scp2/source/ooo/file_library_ooo.scp.orig.port	Fri Aug  4 08:39:52 2006
-+++ scp2/source/ooo/file_library_ooo.scp	Thu Oct 26 11:00:11 2006
-@@ -831,6 +831,8 @@ File gid_File_Lib_Freetype
+$OpenBSD: patch-scp2_source_ooo_file_library_ooo_scp,v 1.5 2006/12/13 10:25:14 robert Exp $
+--- scp2/source/ooo/file_library_ooo.scp.orig.port	Fri Dec  1 18:56:41 2006
++++ scp2/source/ooo/file_library_ooo.scp	Mon Dec 11 22:27:41 2006
+@@ -851,6 +851,8 @@ File gid_File_Lib_Freetype
      Styles = (PACKED);
    #if defined (FREEBSD) || defined (NETBSD)
      Name = "libfreetype.so.9";
@@ -10,7 +10,7 @@ $OpenBSD: patch-scp2_source_ooo_file_library_ooo_scp,v 1.4 2006/10/27 16:02:02 k
    #else
      Name = "libfreetype.so.6";
    #endif
-@@ -872,7 +874,7 @@ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Fwl
+@@ -892,7 +894,7 @@ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Fwl
  
  STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Fwm , fwm)
  
@@ -19,7 +19,7 @@ $OpenBSD: patch-scp2_source_ooo_file_library_ooo_scp,v 1.4 2006/10/27 16:02:02 k
  #if defined( _gcc3 )
  
  File gid_File_Lib_Gcc
-@@ -886,7 +888,7 @@ End
+@@ -906,7 +908,7 @@ End
  
  #endif
  
@@ -28,7 +28,7 @@ $OpenBSD: patch-scp2_source_ooo_file_library_ooo_scp,v 1.4 2006/10/27 16:02:02 k
  #if defined( _gcc3 )
  
  File gid_File_Lib_Stdc
-@@ -900,7 +902,7 @@ End
+@@ -920,7 +922,7 @@ End
  
  #endif
  
@@ -37,7 +37,7 @@ $OpenBSD: patch-scp2_source_ooo_file_library_ooo_scp,v 1.4 2006/10/27 16:02:02 k
  
  File gid_File_Lib_Gcc2_Uno
      TXT_FILE_BODY;
-@@ -1913,7 +1915,7 @@ File gid_File_Lib_Stlport
+@@ -1933,7 +1935,7 @@ File gid_File_Lib_Stlport
    #ifdef _STLP_DEBUG
    #ifdef UNX
    #if defined(_gcc3) || defined(_GCC)
@@ -46,7 +46,7 @@ $OpenBSD: patch-scp2_source_ooo_file_library_ooo_scp,v 1.4 2006/10/27 16:02:02 k
      Name = STRING(CONCAT3(libstlport_,gcc_stldebug,.so.4.5));
    #else
      Name = STRING(CONCAT3(libstlport_,gcc_stldebug,UNXSUFFIX));
-@@ -1937,7 +1939,7 @@ File gid_File_Lib_Stlport
+@@ -1957,7 +1959,7 @@ File gid_File_Lib_Stlport
    #else
    #ifdef UNX
    #if defined(_gcc3) || defined(_GCC)

editors/openoffice/patches/patch-scp2_source_ure_ure_scp

@@ -1,7 +1,7 @@
-$OpenBSD: patch-scp2_source_ure_ure_scp,v 1.2 2006/08/20 03:36:53 kurt Exp $
---- scp2/source/ure/ure.scp.orig.port	Thu Sep  8 21:46:59 2005
-+++ scp2/source/ure/ure.scp	Fri Aug 18 15:47:45 2006
-@@ -606,7 +606,7 @@ End
+$OpenBSD: patch-scp2_source_ure_ure_scp,v 1.3 2006/12/13 10:25:14 robert Exp $
+--- scp2/source/ure/ure.scp.orig.port	Fri Dec  1 18:56:42 2006
++++ scp2/source/ure/ure.scp	Mon Dec 11 22:27:41 2006
+@@ -610,7 +610,7 @@ End
  
  #if defined _gcc3 && \
      !(defined FREEBSD || defined NETBSD || defined MACOSX \
@@ -10,7 +10,7 @@ $OpenBSD: patch-scp2_source_ure_ure_scp,v 1.2 2006/08/20 03:36:53 kurt Exp $
  File gid_File_Dl_GccS
      TXT_FILE_BODY;
      Dir = SCP2_URE_DL_DIR;
-@@ -617,7 +617,7 @@ End
+@@ -621,7 +621,7 @@ End
  
  #if defined _gcc3 && \
      !(defined FREEBSD || defined NETBSD || defined MACOSX \

editors/openoffice/patches/patch-shell_source_backends_localebe_localebackend_cxx

@@ -1,7 +1,7 @@
-$OpenBSD: patch-shell_source_backends_localebe_localebackend_cxx,v 1.2 2006/08/20 03:36:53 kurt Exp $
---- shell/source/backends/localebe/localebackend.cxx.orig.port	Mon Jun 19 10:16:34 2006
-+++ shell/source/backends/localebe/localebackend.cxx	Fri Aug 18 15:47:45 2006
-@@ -50,7 +50,7 @@
+$OpenBSD: patch-shell_source_backends_localebe_localebackend_cxx,v 1.3 2006/12/13 10:25:14 robert Exp $
+--- shell/source/backends/localebe/localebackend.cxx.orig.port	Fri Dec  1 18:57:03 2006
++++ shell/source/backends/localebe/localebackend.cxx	Mon Dec 11 22:27:41 2006
+@@ -53,7 +53,7 @@
  
  #include <stdio.h>
  
@@ -10,7 +10,7 @@ $OpenBSD: patch-shell_source_backends_localebe_localebackend_cxx,v 1.2 2006/08/2
  
  #include <rtl/ustrbuf.hxx>
  #include <locale.h>
-@@ -267,7 +267,7 @@ LocaleBackend* LocaleBackend::createInst
+@@ -270,7 +270,7 @@ LocaleBackend* LocaleBackend::createInst
  
  rtl::OUString LocaleBackend::getLocale(void)
  {
@@ -19,7 +19,7 @@ $OpenBSD: patch-shell_source_backends_localebe_localebackend_cxx,v 1.2 2006/08/2
      return ImplGetLocale(LC_CTYPE);
  #elif defined (MACOSX)
  	return ImplGetLocale("AppleLocale");
-@@ -280,7 +280,7 @@ rtl::OUString LocaleBackend::getLocale(v
+@@ -283,7 +283,7 @@ rtl::OUString LocaleBackend::getLocale(v
  
  rtl::OUString LocaleBackend::getUILocale(void)
  {

editors/openoffice/patches/patch-solenv_bin_modules_installer_globals_pm

@@ -1,7 +1,7 @@
-$OpenBSD: patch-solenv_bin_modules_installer_globals_pm,v 1.2 2006/08/20 03:36:53 kurt Exp $
---- solenv/bin/modules/installer/globals.pm.orig.port	Mon Jul 10 14:49:40 2006
-+++ solenv/bin/modules/installer/globals.pm	Fri Aug 18 15:47:45 2006
-@@ -144,7 +144,7 @@ BEGIN
+$OpenBSD: patch-solenv_bin_modules_installer_globals_pm,v 1.3 2006/12/13 10:25:14 robert Exp $
+--- solenv/bin/modules/installer/globals.pm.orig.port	Fri Dec  1 18:57:06 2006
++++ solenv/bin/modules/installer/globals.pm	Mon Dec 11 22:27:42 2006
+@@ -145,7 +145,7 @@ BEGIN
  	$jdklib = "";
  	$jrepath = "";
  	

editors/openoffice/patches/patch-solenv_config_ssrc680_ini

@@ -1,60 +0,0 @@
-$OpenBSD: patch-solenv_config_ssrc680_ini,v 1.3 2006/10/19 15:16:50 kurt Exp $
---- solenv/config/ssrc680.ini.orig.port	Wed Aug  9 05:05:13 2006
-+++ solenv/config/ssrc680.ini	Thu Oct 19 10:47:54 2006
-@@ -2455,7 +2455,7 @@ unxmacxp
- 	}
- }
- 
--unxfbsdi
-+unxobsdi
- {
- 	extern
- 	{
-@@ -2629,7 +2629,7 @@ unxfbsdi
- 		}
- 		common2
- 		{
--			OS FREEBSD
-+			OS OPENBSD
- 			GLIBC GLIBC
- 			GUI UNX
- 			GUIBASE unx
-@@ -2637,22 +2637,22 @@ unxfbsdi
- 			COM GCC
- 			CPU I
- 			CPUNAME INTEL
--			INPATH unxfbsdi%PROEXT%
--			GVERDIR unxfbsdi%PROEXT%
--			OUTPATH unxfbsdi
-+			INPATH unxobsdi%PROEXT%
-+			GVERDIR unxobsdi%PROEXT%
-+			OUTPATH unxobsdi
- 			CVER C300
- 			GVER VCL
- 			XPVERSION 3
- 			SOLARUPD %UPD%
- 			TEMP /tmp
- 			TMP /tmp
--			BUILD_TOOLS %SOLARROOT%/bt_unxfbsdi/bin
--			ENV_TOOLS %SOLARROOT%/et_unxfbsdi/bin
-+			BUILD_TOOLS %SOLARROOT%/bt_unxobsdi/bin
-+			ENV_TOOLS %SOLARROOT%/et_unxobsdi/bin
- 			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
- 			COMMON_ENV_TOOLS %SOLARROOT%$/etools
- 			SYSBASE	%SOLAR_SYSBASE_ROOT%
--			SOLAR_STLPATH  %SOLARVERSION%$/unxfbsdi%PROEXT%$/inc%UPDMINOREXT%$/stl
--			SOLAR_STLLIBPATH  %SOLARVERSION%$/unxfbsdi%PROEXT%$/lib%UPDMINOREXT%
-+			SOLAR_STLPATH  %SOLARVERSION%$/unxobsdi%PROEXT%$/inc%UPDMINOREXT%$/stl
-+			SOLAR_STLLIBPATH  %SOLARVERSION%$/unxobsdi%PROEXT%$/lib%UPDMINOREXT%
- 			JDK13PATH %SOLAR_JDK13PATH%
- 			JDK14PATH %SOLAR_JDK14PATH%
- 			JDK15PATH %SOLAR_JDK15PATH%
-@@ -2669,7 +2669,7 @@ unxfbsdi
- 			LD_LIBRARY_PATH .:/usr/local/lib:%HOME%/%WORK_STAMP%/%INPATH%/lib:../lib:%SOLARVERSION%/%INPATH%/lib%UPDMINOREXT%:%COMPATH%/libexec
- 			SOLAREXTRALIB -L../lib -L%SYSBASE%/usr/X11R6/lib -L%SYSBASE%/usr/lib -L/usr/X11R6/lib  -L%SOLAR_STLLIBPATH%
- 			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/include/X11
--			SOLARDEF -DUNX -DGCC -DC301 -D_PTHREADS -DFREEBSD -DBSD -DINTEL -DX86 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DGLIBC=%GLIBC% -DSUPD=%UPD% %PROSWITCH% -DUPDVER=""'"'"SV%UPD%"'"'""
-+			SOLARDEF -DUNX -DGCC -DC301 -D_PTHREADS -DOPENBSD -DBSD -DINTEL -DX86 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DGLIBC=%GLIBC% -DSUPD=%UPD% %PROSWITCH% -DUPDVER=""'"'"SV%UPD%"'"'""
- 			*build perl %SOLARENV%/bin/build.pl %PROFULLSWITCH%
- 			*copyprj perl %COMMON_ENV_TOOLS%/copyprj.pl
- 			COPYPRJ perl %COMMON_ENV_TOOLS%/copyprj.pl

editors/openoffice/patches/patch-solenv_config_stand_lst

@@ -1,39 +0,0 @@
-$OpenBSD: patch-solenv_config_stand_lst,v 1.5 2006/10/25 22:49:50 kurt Exp $
---- solenv/config/stand.lst.orig.port	Fri Aug 25 10:39:02 2006
-+++ solenv/config/stand.lst	Tue Oct 24 10:45:06 2006
-@@ -37,6 +37,11 @@ SRC680
- 	}
- 	Environments
- 	{
-+		unxobsdi.pro
-+		{
-+			prio 12
-+			setsolar -SRC680 -pro -bsclient unxobsdi
-+		}
- 		unxfbsdi.pro
- 		{
- 			prio 12
-@@ -97,6 +102,11 @@ SRC680
- 			prio 15
- 			setsolar -SRC680 -pro -bsclient unxsols64b1
- 		}
-+		unxobsdi
-+		{
-+			prio 15
-+			setsolar -SRC680 -bsclient unxobsdi
-+		}
- 		unxfbsdi
- 		{
- 			prio 15
-@@ -996,6 +1006,11 @@ OOD680
- 		{
- 			prio 12
- 			setsolar -OOD680 -pro -bsclient unxfbsdi
-+		}
-+		unxobsdi.pro
-+		{
-+			prio 12
-+			setsolar -OOD680 -pro -bsclient unxobsdi
- 		}
- 		unxlngi5.pro
- 		{

editors/openoffice/patches/patch-solenv_inc_libs_mk

@@ -1,7 +1,7 @@
-$OpenBSD: patch-solenv_inc_libs_mk,v 1.3 2006/10/19 15:16:50 kurt Exp $
---- solenv/inc/libs.mk.orig.port	Thu Aug 10 10:45:20 2006
-+++ solenv/inc/libs.mk	Thu Oct 19 10:47:54 2006
-@@ -176,7 +176,7 @@ ZLIB3RDLIB=-lz
+$OpenBSD: patch-solenv_inc_libs_mk,v 1.4 2006/12/13 10:25:14 robert Exp $
+--- solenv/inc/libs.mk.orig.port	Fri Dec  1 18:57:06 2006
++++ solenv/inc/libs.mk	Mon Dec 11 22:27:42 2006
+@@ -172,7 +172,7 @@ ZLIB3RDLIB=-lz
  ZLIB3RDLIB=-lzlib
  .ENDIF
  .IF "$(SYSTEM_JPEG)"=="YES"

editors/openoffice/patches/patch-solenv_inc_settings_mk

@@ -1,7 +1,7 @@
-$OpenBSD: patch-solenv_inc_settings_mk,v 1.2 2006/11/09 15:18:01 kurt Exp $
---- solenv/inc/settings.mk.orig.port	Wed Nov  8 11:46:32 2006
-+++ solenv/inc/settings.mk	Wed Nov  8 11:47:20 2006
-@@ -1109,6 +1109,8 @@ RSCDEFS+=-DOSL_DEBUG_LEVEL=$(DBG_LEVEL)
+$OpenBSD: patch-solenv_inc_settings_mk,v 1.3 2006/12/13 10:25:14 robert Exp $
+--- solenv/inc/settings.mk.orig.port	Fri Dec  1 18:57:07 2006
++++ solenv/inc/settings.mk	Mon Dec 11 22:27:42 2006
+@@ -1110,6 +1110,8 @@ RSCDEFS+=-DOSL_DEBUG_LEVEL=$(DBG_LEVEL)
  CDEFS+=-DSVX_LIGHT
  .ENDIF
  
@@ -10,7 +10,7 @@ $OpenBSD: patch-solenv_inc_settings_mk,v 1.2 2006/11/09 15:18:01 kurt Exp $
  .IF "$(optimize)"!=""
  CDEFS+=$(CDEFSOPT)
  CFLAGS+=$(CFLAGSOPT)
-@@ -1255,7 +1257,7 @@ CFLAGSAPPEND+=$(ENVWARNFLAGS)
+@@ -1256,7 +1258,7 @@ CFLAGSAPPEND+=$(ENVWARNFLAGS)
  
  CDEFS+= $(ADDCDEFS)
  CDEFS+= $(ENVCDEFS)

editors/openoffice/patches/patch-solenv_inc_unxobsd_mk

@@ -1,4 +1,4 @@
-$OpenBSD: patch-solenv_inc_unxobsd_mk,v 1.1 2006/11/08 09:34:03 robert Exp $
+$OpenBSD: patch-solenv_inc_unxobsd_mk,v 1.2 2006/12/13 10:25:14 robert Exp $
 --- solenv/inc/unxobsd.mk.orig.port	Thu Nov  2 21:12:56 2006
 +++ solenv/inc/unxobsd.mk	Thu Nov  2 21:12:49 2006
 @@ -0,0 +1,235 @@
@@ -8,9 +8,9 @@ $OpenBSD: patch-solenv_inc_unxobsd_mk,v 1.1 2006/11/08 09:34:03 robert Exp $
 +#
 +#   $RCSfile: patch-solenv_inc_unxobsd_mk,v $
 +#
-+#   $Revision: 1.1 $
++#   $Revision: 1.2 $
 +#
-+#   last change: $Author: robert $ $Date: 2006/11/08 09:34:03 $
++#   last change: $Author: robert $ $Date: 2006/12/13 10:25:14 $
 +#
 +#   The Contents of this file are made available subject to
 +#   the terms of GNU Lesser General Public License Version 2.1.
@@ -163,7 +163,7 @@ $OpenBSD: patch-solenv_inc_unxobsd_mk,v 1.1 2006/11/08 09:34:03 robert Exp $
 +#LINKFLAGSDEFS*=#-Wl,-z,defs
 +#LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
 +#LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
-+LINKFLAGS=-Wl,-z,combreloc
++LINKFLAGS=-Wl,-z,combreloc $(PTHREAD_LIBS)
 +SOLARLIB+=-L$(LOCALBASE)/lib
 +
 +# linker flags for linking applications

editors/openoffice/patches/patch-stlport_STLport-4_5_patch

@@ -1,6 +1,6 @@
-$OpenBSD: patch-stlport_STLport-4_5_patch,v 1.5 2006/11/08 09:34:03 robert Exp $
---- stlport/STLport-4.5.patch.orig.port	Thu Apr 27 03:47:20 2006
-+++ stlport/STLport-4.5.patch	Thu Oct 26 15:40:08 2006
+$OpenBSD: patch-stlport_STLport-4_5_patch,v 1.6 2006/12/13 10:25:14 robert Exp $
+--- stlport/STLport-4.5.patch.orig.port	Fri Dec  1 18:57:09 2006
++++ stlport/STLport-4.5.patch	Mon Dec 11 22:27:43 2006
 @@ -115,6 +115,81 @@
    template class _STLP_CLASS_DECLSPEC __node_alloc<false,0>;
    template class _STLP_CLASS_DECLSPEC __node_alloc<true,0>;
@@ -83,7 +83,7 @@ $OpenBSD: patch-stlport_STLport-4_5_patch,v 1.5 2006/11/08 09:34:03 robert Exp $
  *** misc/STLport-4.5/src/gcc-3.0-freebsd.mak	2006-02-16 16:21:24.224363000 +0100
  --- misc/build/STLport-4.5/src/gcc-3.0-freebsd.mak	2006-02-16 16:18:28.228881000 +0100
  ***************
-@@ -848,3 +923,115 @@
+@@ -848,6 +923,118 @@
    # define _STLP_MUTEX_INITIALIZER
    # endif
    
@@ -199,3 +199,6 @@ $OpenBSD: patch-stlport_STLport-4_5_patch,v 1.5 2006/11/08 09:34:03 robert Exp $
 +    inline char* _Stl_ecvtR(double x, int n, int* pt, int* sign, char* buf)
 +      { return ecvt_r(x, n, pt, sign, buf); }
 +    inline char* _Stl_fcvtR(double x, int n, int* pt, int* sign, char* buf)
+ *** misc/build/STLport-4.5/stlport/stl/_rope.h	Mon Aug  6 04:21:25 2001
+ --- misc/modified/STLport-4.5/stlport/stl/_rope.h	Thu Jul 27 15:19:10 2006
+ ***************

editors/openoffice/patches/patch-stlport_makefile_mk

@@ -1,6 +1,6 @@
-$OpenBSD: patch-stlport_makefile_mk,v 1.1 2006/10/27 16:02:02 kurt Exp $
---- stlport/makefile.mk.orig.port	Thu Oct 26 14:53:02 2006
-+++ stlport/makefile.mk	Thu Oct 26 14:58:56 2006
+$OpenBSD: patch-stlport_makefile_mk,v 1.2 2006/12/13 10:25:14 robert Exp $
+--- stlport/makefile.mk.orig.port	Fri Dec  1 18:57:09 2006
++++ stlport/makefile.mk	Mon Dec 11 22:27:43 2006
 @@ -111,7 +111,7 @@ PATCH_FILE_NAME=STLport-4.5-0119.patch
  TAR_EXCLUDES=*/SC5/*
  .ENDIF          # "$(USE_SHELL)"=="4nt"
@@ -10,7 +10,7 @@ $OpenBSD: patch-stlport_makefile_mk,v 1.1 2006/10/27 16:02:02 kurt Exp $
  
  
  CONFIGURE_ACTION=none
-@@ -133,6 +133,8 @@ BUILD_FLAGS=-f vc7.mak
+@@ -133,6 +133,8 @@ BUILD_FLAGS=-f vc7.mak EXFLAGS="/EHa /Zc
  		# FreeBSD needs a special makefile
  		.IF "$(OS)"=="FREEBSD"
  			BUILD_FLAGS=-f gcc-3.0-freebsd.mak

editors/openoffice/patches/patch-tools_bootstrp_command_cxx

@@ -1,7 +1,7 @@
-$OpenBSD: patch-tools_bootstrp_command_cxx,v 1.2 2006/08/20 03:36:53 kurt Exp $
---- tools/bootstrp/command.cxx.orig.port	Wed Jul 19 13:12:27 2006
-+++ tools/bootstrp/command.cxx	Fri Aug 18 15:47:45 2006
-@@ -73,7 +73,7 @@
+$OpenBSD: patch-tools_bootstrp_command_cxx,v 1.3 2006/12/13 10:25:14 robert Exp $
+--- tools/bootstrp/command.cxx.orig.port	Fri Dec  1 18:57:50 2006
++++ tools/bootstrp/command.cxx	Mon Dec 11 22:27:43 2006
+@@ -76,7 +76,7 @@
  #include <sys/types.h>
  #include <unistd.h>
  #if ( defined NETBSD ) || defined (FREEBSD) || defined (AIX) \

editors/openoffice/patches/patch-tools_source_fsys_unx_cxx

@@ -1,7 +1,7 @@
-$OpenBSD: patch-tools_source_fsys_unx_cxx,v 1.2 2006/08/20 03:36:53 kurt Exp $
---- tools/source/fsys/unx.cxx.orig.port	Mon Jun 19 09:42:57 2006
-+++ tools/source/fsys/unx.cxx	Fri Aug 18 15:47:45 2006
-@@ -49,7 +49,7 @@
+$OpenBSD: patch-tools_source_fsys_unx_cxx,v 1.3 2006/12/13 10:25:14 robert Exp $
+--- tools/source/fsys/unx.cxx.orig.port	Fri Dec  1 18:57:51 2006
++++ tools/source/fsys/unx.cxx	Mon Dec 11 22:27:44 2006
+@@ -52,7 +52,7 @@
  extern "C" int mntctl( int cmd, size_t size, char* buf );
  #elif defined(NETBSD) 
  #include <sys/mount.h>
@@ -10,7 +10,7 @@ $OpenBSD: patch-tools_source_fsys_unx_cxx,v 1.2 2006/08/20 03:36:53 kurt Exp $
  #elif defined DECUNIX
  struct mnttab
  {
-@@ -102,7 +102,7 @@ struct mymnttab
+@@ -105,7 +105,7 @@ struct mymnttab
  };
  
  

editors/openoffice/patches/patch-tools_source_stream_strmunx_cxx

@@ -1,7 +1,7 @@
-$OpenBSD: patch-tools_source_stream_strmunx_cxx,v 1.2 2006/08/20 03:36:53 kurt Exp $
---- tools/source/stream/strmunx.cxx.orig.port	Mon Jun 19 09:52:12 2006
-+++ tools/source/stream/strmunx.cxx	Fri Aug 18 15:47:45 2006
-@@ -219,7 +219,7 @@ static sal_uInt32 GetSvError( int nErrno
+$OpenBSD: patch-tools_source_stream_strmunx_cxx,v 1.3 2006/12/13 10:25:14 robert Exp $
+--- tools/source/stream/strmunx.cxx.orig.port	Fri Dec  1 18:57:51 2006
++++ tools/source/stream/strmunx.cxx	Mon Dec 11 22:27:44 2006
+@@ -222,7 +222,7 @@ static sal_uInt32 GetSvError( int nErrno
          { 0,            SVSTREAM_OK },
          { EACCES,       SVSTREAM_ACCESS_DENIED },
          { EBADF,        SVSTREAM_INVALID_HANDLE },
@@ -10,7 +10,7 @@ $OpenBSD: patch-tools_source_stream_strmunx_cxx,v 1.2 2006/08/20 03:36:53 kurt E
          { EDEADLK,      SVSTREAM_LOCKING_VIOLATION },
  #else
          { EDEADLOCK,    SVSTREAM_LOCKING_VIOLATION },
-@@ -233,7 +233,7 @@ static sal_uInt32 GetSvError( int nErrno
+@@ -236,7 +236,7 @@ static sal_uInt32 GetSvError( int nErrno
          { EAGAIN,       SVSTREAM_LOCKING_VIOLATION },
          { EISDIR,       SVSTREAM_PATH_NOT_FOUND },
          { ELOOP,        SVSTREAM_PATH_NOT_FOUND },

editors/openoffice/patches/patch-vcl_unx_source_app_i18n_ic_cxx

@@ -1,7 +1,7 @@
-$OpenBSD: patch-vcl_unx_source_app_i18n_ic_cxx,v 1.2 2006/08/20 03:36:53 kurt Exp $
---- vcl/unx/source/app/i18n_ic.cxx.orig.port	Mon Jun 19 15:48:53 2006
-+++ vcl/unx/source/app/i18n_ic.cxx	Fri Aug 18 15:47:46 2006
-@@ -361,7 +361,7 @@ SalI18N_InputContext::SalI18N_InputConte
+$OpenBSD: patch-vcl_unx_source_app_i18n_ic_cxx,v 1.3 2006/12/13 10:25:14 robert Exp $
+--- vcl/unx/source/app/i18n_ic.cxx.orig.port	Fri Dec  1 18:58:04 2006
++++ vcl/unx/source/app/i18n_ic.cxx	Mon Dec 11 22:27:44 2006
+@@ -364,7 +364,7 @@ SalI18N_InputContext::SalI18N_InputConte
  
          if ( mnPreeditStyle != XIMPreeditNone )
          {
@@ -10,7 +10,7 @@ $OpenBSD: patch-vcl_unx_source_app_i18n_ic_cxx,v 1.2 2006/08/20 03:36:53 kurt Ex
              if ( mpPreeditAttributes != NULL )
  #endif
                  mpAttributes = XVaAddToNestedList( mpAttributes,
-@@ -369,7 +369,7 @@ SalI18N_InputContext::SalI18N_InputConte
+@@ -372,7 +372,7 @@ SalI18N_InputContext::SalI18N_InputConte
          }
          if ( mnStatusStyle != XIMStatusNone )
          {

editors/openoffice/patches/patch-vcl_unx_source_app_i18n_xkb_cxx

@@ -1,7 +1,7 @@
-$OpenBSD: patch-vcl_unx_source_app_i18n_xkb_cxx,v 1.2 2006/08/20 03:36:53 kurt Exp $
---- vcl/unx/source/app/i18n_xkb.cxx.orig.port	Mon Jun 19 15:49:52 2006
-+++ vcl/unx/source/app/i18n_xkb.cxx	Fri Aug 18 15:47:46 2006
-@@ -36,7 +36,7 @@
+$OpenBSD: patch-vcl_unx_source_app_i18n_xkb_cxx,v 1.3 2006/12/13 10:25:14 robert Exp $
+--- vcl/unx/source/app/i18n_xkb.cxx.orig.port	Fri Dec  1 18:58:04 2006
++++ vcl/unx/source/app/i18n_xkb.cxx	Mon Dec 11 22:27:44 2006
+@@ -39,7 +39,7 @@
  
  #include <stdio.h>
  

editors/openoffice/patches/patch-vcl_unx_source_app_saldisp_cxx

@@ -1,12 +1,12 @@
-$OpenBSD: patch-vcl_unx_source_app_saldisp_cxx,v 1.3 2006/10/19 15:16:50 kurt Exp $
---- vcl/unx/source/app/saldisp.cxx.orig.port	Fri Aug 18 04:02:50 2006
-+++ vcl/unx/source/app/saldisp.cxx	Thu Oct 19 10:47:55 2006
-@@ -1022,7 +1022,7 @@ bHandleStartupNotification
-             sscanf( pProperties, "%li", &nProperties_ );
-         else
-         {
+$OpenBSD: patch-vcl_unx_source_app_saldisp_cxx,v 1.4 2006/12/13 10:25:14 robert Exp $
+--- vcl/unx/source/app/saldisp.cxx.orig.port	Fri Dec  1 18:58:04 2006
++++ vcl/unx/source/app/saldisp.cxx	Mon Dec 11 22:27:44 2006
+@@ -973,7 +973,7 @@ bHandleStartupNotification
+         sscanf( pProperties, "%li", &nProperties_ );
+     else
+     {
 -#if defined DBG_UTIL || defined SUN || defined LINUX || defined FREEBSD || defined IRIX || defined MACOSX
 +#if defined DBG_UTIL || defined SUN || defined LINUX || defined FREEBSD || defined IRIX || defined MACOSX || defined OPENBSD
-             nProperties_ |= PROPERTY_FEATURE_Maximize;
+         nProperties_ |= PROPERTY_FEATURE_Maximize;
  #endif
-             // Server Bugs & Properties
+         // Server Bugs & Properties

editors/openoffice/patches/patch-vcl_unx_source_gdi_gcach_xpeer_cxx

@@ -1,7 +1,7 @@
-$OpenBSD: patch-vcl_unx_source_gdi_gcach_xpeer_cxx,v 1.2 2006/08/20 03:36:53 kurt Exp $
---- vcl/unx/source/gdi/gcach_xpeer.cxx.orig.port	Tue Jun 20 12:20:38 2006
-+++ vcl/unx/source/gdi/gcach_xpeer.cxx	Fri Aug 18 15:47:46 2006
-@@ -108,7 +108,7 @@ void X11GlyphPeer::SetDisplay( Display* 
+$OpenBSD: patch-vcl_unx_source_gdi_gcach_xpeer_cxx,v 1.3 2006/12/13 10:25:14 robert Exp $
+--- vcl/unx/source/gdi/gcach_xpeer.cxx.orig.port	Fri Dec  1 18:58:04 2006
++++ vcl/unx/source/gdi/gcach_xpeer.cxx	Mon Dec 11 22:27:44 2006
+@@ -165,7 +165,7 @@ void X11GlyphPeer::SetDisplay( const Sal
  #ifdef MACOSX
      OUString xrenderLibraryName( RTL_CONSTASCII_USTRINGPARAM( "libXrender.dylib" ));
  #else

editors/openoffice/patches/patch-vcl_unx_source_gdi_salogl_cxx

@@ -1,7 +1,7 @@
-$OpenBSD: patch-vcl_unx_source_gdi_salogl_cxx,v 1.1 2006/10/27 16:02:02 kurt Exp $
---- vcl/unx/source/gdi/salogl.cxx.orig.port	Thu Oct 26 11:04:41 2006
-+++ vcl/unx/source/gdi/salogl.cxx	Thu Oct 26 11:04:53 2006
-@@ -64,7 +64,7 @@ using namespace rtl;
+$OpenBSD: patch-vcl_unx_source_gdi_salogl_cxx,v 1.2 2006/12/13 10:25:14 robert Exp $
+--- vcl/unx/source/gdi/salogl.cxx.orig.port	Fri Dec  1 18:58:04 2006
++++ vcl/unx/source/gdi/salogl.cxx	Mon Dec 11 22:27:45 2006
+@@ -67,7 +67,7 @@ using namespace rtl;
  #ifdef MACOSX
  #define OGL_LIBNAME "libGL.dylib"
  #else

editors/openoffice/patches/patch-vcl_unx_source_plugadapt_salmain_cxx

@@ -1,9 +1,9 @@
-$OpenBSD: patch-vcl_unx_source_plugadapt_salmain_cxx,v 1.2 2006/08/20 03:36:53 kurt Exp $
---- vcl/unx/source/plugadapt/salmain.cxx.orig.port	Mon Jun 19 15:56:52 2006
-+++ vcl/unx/source/plugadapt/salmain.cxx	Fri Aug 18 15:47:46 2006
-@@ -33,7 +33,7 @@
-  *
-  ************************************************************************/
+$OpenBSD: patch-vcl_unx_source_plugadapt_salmain_cxx,v 1.3 2006/12/13 10:25:14 robert Exp $
+--- vcl/unx/source/plugadapt/salmain.cxx.orig.port	Fri Dec  1 18:58:04 2006
++++ vcl/unx/source/plugadapt/salmain.cxx	Mon Dec 11 22:27:45 2006
+@@ -36,7 +36,7 @@
+ // MARKER(update_precomp.py): autogen include statement, do not remove
+ #include "precompiled_vcl.hxx"
  
 -#if defined(MACOSX) || defined(FREEBSD)
 +#if defined(MACOSX) || defined(FREEBSD) || defined(OPENBSD)

editors/openoffice/patches/patch-vcl_util_makefile_mk

@@ -1,7 +1,7 @@
-$OpenBSD: patch-vcl_util_makefile_mk,v 1.3 2006/10/25 22:49:50 kurt Exp $
---- vcl/util/makefile.mk.orig.port	Tue Aug  1 05:30:37 2006
-+++ vcl/util/makefile.mk	Wed Oct 25 09:14:34 2006
-@@ -186,7 +186,7 @@ SHL1USE_EXPORTS=ordinal
+$OpenBSD: patch-vcl_util_makefile_mk,v 1.4 2006/12/13 10:25:14 robert Exp $
+--- vcl/util/makefile.mk.orig.port	Fri Dec  1 18:58:04 2006
++++ vcl/util/makefile.mk	Mon Dec 11 22:27:45 2006
+@@ -187,7 +187,7 @@ SHL1USE_EXPORTS=ordinal
  SHL1LIBS=   $(LIB1TARGET)
  .IF "$(GUI)"!="UNX"
  SHL1OBJS=   $(SLO)$/salshl.obj
@@ -10,7 +10,7 @@ $OpenBSD: patch-vcl_util_makefile_mk,v 1.3 2006/10/25 22:49:50 kurt Exp $
  SHL1STDLIBS+=-ldl
  .ENDIF
  
-@@ -226,7 +226,7 @@ LINKFLAGSSHL += /ENTRY:LibMain@12
+@@ -227,7 +227,7 @@ LINKFLAGSSHL += /ENTRY:LibMain@12
  
  .IF "$(GUI)"=="UNX"
  
@@ -19,7 +19,7 @@ $OpenBSD: patch-vcl_util_makefile_mk,v 1.3 2006/10/25 22:49:50 kurt Exp $
  SHL1STDLIBS+= -ldl
  .ENDIF
  
-@@ -315,7 +315,7 @@ SHL2STDLIBS+=$(LIBSN_LIBS)
+@@ -316,7 +316,7 @@ SHL2STDLIBS+=$(LIBSN_LIBS)
  .ENDIF
  
  SHL2STDLIBS += -lXext -lSM -lICE -lX11
@@ -28,7 +28,7 @@ $OpenBSD: patch-vcl_util_makefile_mk,v 1.3 2006/10/25 22:49:50 kurt Exp $
  # needed by salprnpsp.cxx
  SHL2STDLIBS+= -ldl
  .ENDIF
-@@ -371,7 +371,7 @@ SHL4NOCHECK=TRUE
+@@ -372,7 +372,7 @@ SHL4NOCHECK=TRUE
  
  
  SHL4STDLIBS+=-l$(SHL2TARGET)
@@ -37,7 +37,7 @@ $OpenBSD: patch-vcl_util_makefile_mk,v 1.3 2006/10/25 22:49:50 kurt Exp $
  SHL4STDLIBS+=$(SHL3STDLIBS) -lX11
  .ELSE
  SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl
-@@ -389,7 +389,7 @@ SHL5DEPN=$(SHL2TARGETN)
+@@ -390,7 +390,7 @@ SHL5DEPN=$(SHL2TARGETN)
  # libs for KDE plugin
  SHL5STDLIBS=$(KDE_LIBS)
  SHL5STDLIBS+=-l$(SHL2TARGET)

editors/openoffice/pkg/PFRAG.shared-main

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.shared-main,v 1.1 2006/11/25 10:30:58 espie Exp $
+@comment $OpenBSD: PFRAG.shared-main,v 1.2 2006/12/13 10:25:14 robert Exp $
 openoffice/program/acceptor.uno.so
 openoffice/program/basprov680.uno.so
 openoffice/program/behelper.uno.so
@@ -68,6 +68,7 @@ openoffice/program/libdbu680.so
 openoffice/program/libdict_ja.so
 openoffice/program/libdict_zh.so
 openoffice/program/libdtransX11680.so
+openoffice/program/libeggtray680.so
 openoffice/program/libegi680.so
 openoffice/program/libembobj.so
 openoffice/program/libemboleobj.so
@@ -146,6 +147,7 @@ openoffice/program/libpreload680.so
 openoffice/program/libprotocolhandler680.so
 openoffice/program/libpsp680.so
 openoffice/program/libpyuno.so
+openoffice/program/libqstart_gtk680.so
 openoffice/program/librecentfile.so
 openoffice/program/libreg.so
 openoffice/program/libres680.so

editors/openoffice/pkg/PLIST-java

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-java,v 1.1 2006/11/03 05:11:09 kurt Exp $
+@comment $OpenBSD: PLIST-java,v 1.2 2006/12/13 10:25:14 robert Exp $
 %%SHARED%%
 openoffice/program/JREProperties.class
 openoffice/program/classes/
@@ -33,6 +33,7 @@ openoffice/program/classes/report.jar
 openoffice/program/classes/ridl.jar
 openoffice/program/classes/sandbox.jar
 openoffice/program/classes/sdbc_hsqldb.jar
+openoffice/program/classes/serializer.jar
 openoffice/program/classes/table.jar
 openoffice/program/classes/unoil.jar
 openoffice/program/classes/unoloader.jar

editors/openoffice/pkg/PLIST-main

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.2 2006/11/28 09:35:28 robert Exp $
+@comment $OpenBSD: PLIST-main,v 1.3 2006/12/13 10:25:14 robert Exp $
 @pkgpath editors/openoffice
 %%SHARED%%
 bin/sbase
@@ -224,7 +224,6 @@ openoffice/program/libuno_salhelpergcc3.so.3
 openoffice/program/mailmerge.py
 openoffice/program/msfontextract
 openoffice/program/officehelper.py
-openoffice/program/oo_product.bmp
 openoffice/program/open-url
 openoffice/program/pagein
 openoffice/program/pagein-calc
@@ -555,6 +554,17 @@ openoffice/share/config/soffice.cfg/modules/StartModule/statusbar/statusbar.xml
 openoffice/share/config/soffice.cfg/modules/StartModule/toolbar/
 openoffice/share/config/soffice.cfg/modules/StartModule/toolbar/standardbar.xml
 openoffice/share/config/soffice.cfg/modules/dbapp/
+openoffice/share/config/soffice.cfg/modules/dbapp/accelerator/
+openoffice/share/config/soffice.cfg/modules/dbapp/accelerator/de/
+openoffice/share/config/soffice.cfg/modules/dbapp/accelerator/de/default.xml
+openoffice/share/config/soffice.cfg/modules/dbapp/accelerator/en-GB/
+openoffice/share/config/soffice.cfg/modules/dbapp/accelerator/en-GB/default.xml
+openoffice/share/config/soffice.cfg/modules/dbapp/accelerator/en-US/
+openoffice/share/config/soffice.cfg/modules/dbapp/accelerator/en-US/default.xml
+openoffice/share/config/soffice.cfg/modules/dbapp/accelerator/es/
+openoffice/share/config/soffice.cfg/modules/dbapp/accelerator/es/default.xml
+openoffice/share/config/soffice.cfg/modules/dbapp/accelerator/fr/
+openoffice/share/config/soffice.cfg/modules/dbapp/accelerator/fr/default.xml
 openoffice/share/config/soffice.cfg/modules/dbapp/menubar/
 openoffice/share/config/soffice.cfg/modules/dbapp/menubar/menubar.xml
 openoffice/share/config/soffice.cfg/modules/dbapp/statusbar/
@@ -566,6 +576,17 @@ openoffice/share/config/soffice.cfg/modules/dbapp/toolbar/reportobjectbar.xml
 openoffice/share/config/soffice.cfg/modules/dbapp/toolbar/tableobjectbar.xml
 openoffice/share/config/soffice.cfg/modules/dbapp/toolbar/toolbar.xml
 openoffice/share/config/soffice.cfg/modules/dbbrowser/
+openoffice/share/config/soffice.cfg/modules/dbbrowser/accelerator/
+openoffice/share/config/soffice.cfg/modules/dbbrowser/accelerator/de/
+openoffice/share/config/soffice.cfg/modules/dbbrowser/accelerator/de/default.xml
+openoffice/share/config/soffice.cfg/modules/dbbrowser/accelerator/en-GB/
+openoffice/share/config/soffice.cfg/modules/dbbrowser/accelerator/en-GB/default.xml
+openoffice/share/config/soffice.cfg/modules/dbbrowser/accelerator/en-US/
+openoffice/share/config/soffice.cfg/modules/dbbrowser/accelerator/en-US/default.xml
+openoffice/share/config/soffice.cfg/modules/dbbrowser/accelerator/es/
+openoffice/share/config/soffice.cfg/modules/dbbrowser/accelerator/es/default.xml
+openoffice/share/config/soffice.cfg/modules/dbbrowser/accelerator/fr/
+openoffice/share/config/soffice.cfg/modules/dbbrowser/accelerator/fr/default.xml
 openoffice/share/config/soffice.cfg/modules/dbbrowser/menubar/
 openoffice/share/config/soffice.cfg/modules/dbbrowser/menubar/menubar.xml
 openoffice/share/config/soffice.cfg/modules/dbbrowser/toolbar/
@@ -573,6 +594,11 @@ openoffice/share/config/soffice.cfg/modules/dbbrowser/toolbar/browserobjectbar.x
 openoffice/share/config/soffice.cfg/modules/dbbrowser/toolbar/copyobjectbar.xml
 openoffice/share/config/soffice.cfg/modules/dbbrowser/toolbar/toolbar.xml
 openoffice/share/config/soffice.cfg/modules/dbquery/
+openoffice/share/config/soffice.cfg/modules/dbquery/accelerator/
+openoffice/share/config/soffice.cfg/modules/dbquery/accelerator/de/
+openoffice/share/config/soffice.cfg/modules/dbquery/accelerator/de/default.xml
+openoffice/share/config/soffice.cfg/modules/dbquery/accelerator/en-US/
+openoffice/share/config/soffice.cfg/modules/dbquery/accelerator/en-US/default.xml
 openoffice/share/config/soffice.cfg/modules/dbquery/menubar/
 openoffice/share/config/soffice.cfg/modules/dbquery/menubar/menubar.xml
 openoffice/share/config/soffice.cfg/modules/dbquery/toolbar/
@@ -1111,8 +1137,10 @@ openoffice/share/dict/ooo/README_de_AT.txt
 openoffice/share/dict/ooo/README_de_CH.txt
 openoffice/share/dict/ooo/README_de_DE.txt
 openoffice/share/dict/ooo/README_en_GB.txt
+openoffice/share/dict/ooo/README_et_EE.txt
 openoffice/share/dict/ooo/README_hu_HU.txt
 openoffice/share/dict/ooo/README_hyph_de_DE.txt
+openoffice/share/dict/ooo/README_hyph_et_EE.txt
 openoffice/share/dict/ooo/README_hyph_hu_HU.txt
 openoffice/share/dict/ooo/README_it_IT.txt
 openoffice/share/dict/ooo/README_nl_NL.txt
@@ -1132,12 +1160,15 @@ openoffice/share/dict/ooo/en_GB.aff
 openoffice/share/dict/ooo/en_GB.dic
 openoffice/share/dict/ooo/en_US.aff
 openoffice/share/dict/ooo/en_US.dic
+openoffice/share/dict/ooo/et_EE.aff
+openoffice/share/dict/ooo/et_EE.dic
 openoffice/share/dict/ooo/hu_HU.aff
 openoffice/share/dict/ooo/hu_HU.dic
 openoffice/share/dict/ooo/hyph_da_DK.dic
 openoffice/share/dict/ooo/hyph_de_DE.dic
 openoffice/share/dict/ooo/hyph_en_GB.dic
 openoffice/share/dict/ooo/hyph_en_US.dic
+openoffice/share/dict/ooo/hyph_et_EE.dic
 openoffice/share/dict/ooo/hyph_hu_HU.dic
 openoffice/share/dict/ooo/hyph_it_IT.dic
 openoffice/share/dict/ooo/hyph_nl_NL.dic
@@ -2016,6 +2047,7 @@ openoffice/share/registry/schema/org/openoffice/Office/SFX.xcs
 openoffice/share/registry/schema/org/openoffice/Office/Scripting.xcs
 openoffice/share/registry/schema/org/openoffice/Office/Security.xcs
 openoffice/share/registry/schema/org/openoffice/Office/Substitution.xcs
+openoffice/share/registry/schema/org/openoffice/Office/TabBrowse.xcs
 openoffice/share/registry/schema/org/openoffice/Office/TableWizard.xcs
 openoffice/share/registry/schema/org/openoffice/Office/TypeDetection.xcs
 openoffice/share/registry/schema/org/openoffice/Office/UI/
@@ -2392,6 +2424,7 @@ openoffice/share/template/wizard/letter/pl/pri-bottle_l.ott
 openoffice/share/template/wizard/letter/pl/pri-mail_l.ott
 openoffice/share/template/wizard/letter/pl/pri-marine_l.ott
 openoffice/share/template/wizard/letter/pl/pri-redline_l.ott
+openoffice/share/template/wizard/letter/pt/
 openoffice/share/template/wizard/letter/pt-BR/
 openoffice/share/template/wizard/letter/pt-BR/bus-elegant_l.ott
 openoffice/share/template/wizard/letter/pt-BR/bus-modern_l.ott
@@ -2403,6 +2436,16 @@ openoffice/share/template/wizard/letter/pt-BR/pri-bottle_l.ott
 openoffice/share/template/wizard/letter/pt-BR/pri-mail_l.ott
 openoffice/share/template/wizard/letter/pt-BR/pri-marine_l.ott
 openoffice/share/template/wizard/letter/pt-BR/pri-redline_l.ott
+openoffice/share/template/wizard/letter/pt/bus-elegant_l.ott
+openoffice/share/template/wizard/letter/pt/bus-modern_l.ott
+openoffice/share/template/wizard/letter/pt/bus-office_l.ott
+openoffice/share/template/wizard/letter/pt/off-elegant_l.ott
+openoffice/share/template/wizard/letter/pt/off-modern_l.ott
+openoffice/share/template/wizard/letter/pt/off-office_l.ott
+openoffice/share/template/wizard/letter/pt/pri-bottle_l.ott
+openoffice/share/template/wizard/letter/pt/pri-mail_l.ott
+openoffice/share/template/wizard/letter/pt/pri-marine_l.ott
+openoffice/share/template/wizard/letter/pt/pri-redline_l.ott
 openoffice/share/template/wizard/letter/ru/
 openoffice/share/template/wizard/letter/ru/bus-elegant_l.ott
 openoffice/share/template/wizard/letter/ru/bus-modern_l.ott
@@ -2491,6 +2534,7 @@ openoffice/share/xdg/draw.desktop
 openoffice/share/xdg/impress.desktop
 openoffice/share/xdg/math.desktop
 openoffice/share/xdg/printeradmin.desktop
+openoffice/share/xdg/qstart.desktop
 openoffice/share/xdg/writer.desktop
 openoffice/share/xslt/
 openoffice/share/xslt/common/