Index: Makefile =================================================================== RCS file: /cvs/ports/editors/openoffice/Makefile,v retrieving revision 1.47 diff -u -r1.47 Makefile --- Makefile 9 Feb 2007 00:50:17 -0000 1.47 +++ Makefile 21 Feb 2007 11:21:52 -0000 @@ -6,25 +6,26 @@ COMMENT-kde= "optional integration of OpenOffice to the KDE environment" COMMENT-java= "optional integration of OpenOffice java features" -VERSION= 2.1.0 +VERSION= 2.2.0m8 DISTNAME= OOo_${VERSION} -WRKDIST= ${WRKDIR}/OOE680_m6 +WRKDIST= ${WRKDIR}/ooo_OOF680_m8_src PKGNAME= openoffice-${VERSION} -PKGNAME-main= openoffice-${VERSION}p4 +PKGNAME-main= openoffice-${VERSION} PKGNAME-kde= openoffice-kde-${VERSION} -PKGNAME-java= openoffice-java-${VERSION}p0 +PKGNAME-java= openoffice-java-${VERSION} CATEGORIES= editors productivity -SHARED_LIBS= icudata 26.0 \ - icui18n 26.0 \ - icule 26.0 \ - icuuc 26.0 \ +SHARED_LIBS= icudata 36.0 \ + icui18n 36.0 \ + icule 36.0 \ + icuuc 36.0 \ stlport_gcc 4.5 MAINTAINER= Robert Nagy HOMEPAGE= http://www.openoffice.org/ -MASTER_SITES= ftp://sunsite.informatik.rwth-aachen.de/pub/mirror/OpenOffice/stable/${VERSION}/ \ +MASTER_SITES= http://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/Sources/ \ + ftp://sunsite.informatik.rwth-aachen.de/pub/mirror/OpenOffice/stable/${VERSION}/ \ ftp://ftp.tu-chemnitz.de/pub/openoffice/stable/${VERSION}/ \ ftp://ftp.nluug.nl/pub/office/openoffice/stable/${VERSION}/ \ http://vlaai.snt.utwente.nl/pub/software/openoffice/stable/${VERSION}/ \ @@ -33,10 +34,7 @@ MASTER_SITES0= http://www.bsd.hu/~robert/ooo/ \ http://humppa.hu/ooo/ -DISTFILES= ${DISTNAME}_src.tar.bz2 ooo-desktop.tar.gz:0 -.for dfile in binfilter l10n sdk system -DISTFILES+= ${DISTNAME}_src_${dfile}.tar.bz2 -.endfor +DISTFILES= OOo_OOF680_m8_source.tar.gz ooo-desktop.tar.gz:0 DIST_SUBDIR= openoffice @@ -60,7 +58,7 @@ .for l in ${LANGS} MULTI_PACKAGES+= -i18n-$l -PKGNAME-i18n-$l= openoffice-i18n-$l-${VERSION}p0 +PKGNAME-i18n-$l= openoffice-i18n-$l-${VERSION} COMMENT-i18n-$l= $l language pack for OpenOffice.Org RUN_DEPENDS-i18n-$l= ::editors/openoffice WANTLIB-i18n-$l= @@ -87,7 +85,7 @@ neon.>=24::net/neon \ sndfile.>=1::audio/libsndfile \ wpd.>=8::textproc/libwpd -WANTLIB-main= ICE SM X11 Xext Xrender atk-1.0 c cairo expat fontconfig \ +WANTLIB-main= ICE SM X11 Xau Xext Xrender atk-1.0 c cairo expat fontconfig \ freetype glib-2.0 glitz gmodule-2.0 gobject-2.0 \ gthread-2.0 iconv intl ossaudio jpeg m pango-1.0 \ pangocairo-1.0 pangoft2-1.0 png pthread stdc++ util xml2 z @@ -97,7 +95,7 @@ RUN_DEPENDS-kde= ::editors/openoffice LIB_DEPENDS-kde= ${MODQT_LIB_DEPENDS} \ kabc,kdecore,kdeui,kio::x11/kde/libs3 -WANTLIB-kde= X11 m +WANTLIB-kde= X11 Xext m MODULES+= java MODJAVA_VER= 1.4+ Index: distinfo =================================================================== RCS file: /cvs/ports/editors/openoffice/distinfo,v retrieving revision 1.8 diff -u -r1.8 distinfo --- distinfo 13 Dec 2006 10:25:14 -0000 1.8 +++ distinfo 21 Feb 2007 11:21:52 -0000 @@ -1,32 +1,20 @@ -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/OOo_OOF680_m8_source.tar.gz) = 41f3a9759c393f0b3078516fd8454063 +MD5 (openoffice/build-java-target-2.2.0m8.diff) = ef98c99dcfc18d622356348c4e34ab23 MD5 (openoffice/go_oo_src680_20061105.diff) = 61f1bb82523de6b2f9ada575b8594fdb MD5 (openoffice/ooo-desktop.tar.gz) = e1f01689ee58b1a2aa7d82fae637786b -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/OOo_OOF680_m8_source.tar.gz) = d85b86bc92cb368c0b367d83ce121739245b5164 +RMD160 (openoffice/build-java-target-2.2.0m8.diff) = 13acf997d5b5345aad7abac149933fb9a75bcdac RMD160 (openoffice/go_oo_src680_20061105.diff) = 29b13fcf65724d6dfd00f55fc9f4dd4b9592a40c RMD160 (openoffice/ooo-desktop.tar.gz) = a2aa3526f034a36a45b3705cb70f8ffcc33acf26 -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/OOo_OOF680_m8_source.tar.gz) = e8165a0ed45d3ba8046d49c8437c930e9d10f100 +SHA1 (openoffice/build-java-target-2.2.0m8.diff) = b450f2ca703f38c367d67601dc7064d2212c3e00 SHA1 (openoffice/go_oo_src680_20061105.diff) = 9072514055e6f4e04ca82f7daf8d9352566e3d32 SHA1 (openoffice/ooo-desktop.tar.gz) = e16626b0ccfcc51498f6b682dc8b1d1f9209990a -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 +SHA256 (openoffice/OOo_OOF680_m8_source.tar.gz) = fa6a891bfc58a0abfd0367e67bcbc61143f38132c48024c823227b5e63dd9b0e +SHA256 (openoffice/build-java-target-2.2.0m8.diff) = 9dd2ec4d83e1535bb259110b67e2bb8c84a2a09c356db15467999ed44afbd26b +SHA256 (openoffice/go_oo_src680_20061105.diff) = cb0e4f15f5b3c57e72ab05f390b849879e853047bdc42db5294d0b45b0e3703d +SHA256 (openoffice/ooo-desktop.tar.gz) = afd45d198a990de6db3cd346bc6d9d1fce94e89efe3d05ab73c678a443d0eca1 +SIZE (openoffice/OOo_OOF680_m8_source.tar.gz) = 333527002 +SIZE (openoffice/build-java-target-2.2.0m8.diff) = 40685 SIZE (openoffice/go_oo_src680_20061105.diff) = 9928 SIZE (openoffice/ooo-desktop.tar.gz) = 43479 Index: patches/patch-berkeleydb_db-4_2_52_patch =================================================================== RCS file: /cvs/ports/editors/openoffice/patches/patch-berkeleydb_db-4_2_52_patch,v retrieving revision 1.3 diff -u -r1.3 patch-berkeleydb_db-4_2_52_patch --- patches/patch-berkeleydb_db-4_2_52_patch 13 Dec 2006 10:25:14 -0000 1.3 +++ patches/patch-berkeleydb_db-4_2_52_patch 21 Feb 2007 11:21:52 -0000 @@ -1,9 +1,9 @@ $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 +--- berkeleydb/db-4.2.52.patch.orig.port Wed Jan 17 07:42:03 2007 ++++ berkeleydb/db-4.2.52.patch Tue Feb 6 23:13:33 2007 +@@ -224,6 +224,19 @@ + *** misc/db-4.2.52.NC/dist/configure 2003-12-03 22:10:02.000000000 +0100 + --- misc/build/db-4.2.52.NC/dist/configure 2006-12-01 13:57:19.000000000 +0100 *************** +*** 3492,3497 **** +--- 3492,3501 ---- @@ -21,7 +21,7 @@ *** 5624,5630 **** # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some GNU ld's only accept -v. -@@ -529,7 +542,7 @@ +@@ -232,7 +245,7 @@ *GNU* | *'with BFD'*) test "$with_gnu_ld" != no && break ;; @@ -30,7 +30,7 @@ # 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. -@@ -555,6 +568,41 @@ +@@ -258,6 +271,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}' *************** @@ -72,7 +72,7 @@ *** 11180,11186 **** # linker, instead of GNU ld. If possible, this setting should # overridden to take advantage of the native linker features on -@@ -563,7 +611,7 @@ +@@ -266,7 +314,7 @@ fi # Commands to make compiler produce verbose output that lists @@ -81,7 +81,7 @@ # 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. -@@ -1027,3 +1075,1256 @@ +@@ -1059,3 +1107,1256 @@ ! $(SLO)$/xa_map.obj ! ! .INCLUDE : target.mk Index: patches/patch-binfilter_bf_sc_source_core_data_sc_cell_cxx =================================================================== RCS file: /cvs/ports/editors/openoffice/patches/patch-binfilter_bf_sc_source_core_data_sc_cell_cxx,v retrieving revision 1.2 diff -u -r1.2 patch-binfilter_bf_sc_source_core_data_sc_cell_cxx --- patches/patch-binfilter_bf_sc_source_core_data_sc_cell_cxx 20 Aug 2006 03:36:52 -0000 1.2 +++ patches/patch-binfilter_bf_sc_source_core_data_sc_cell_cxx 21 Feb 2007 11:21:52 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-binfilter_bf_sc_source_core_data_sc_cell_cxx,v 1.2 2006/08/20 03:36:52 kurt Exp $ ---- binfilter/bf_sc/source/core/data/sc_cell.cxx.orig.port Thu Jul 6 05:12:29 2006 -+++ binfilter/bf_sc/source/core/data/sc_cell.cxx Fri Aug 18 15:47:42 2006 -@@ -49,7 +49,7 @@ +--- binfilter/bf_sc/source/core/data/sc_cell.cxx.orig.port Wed Jan 17 07:42:06 2007 ++++ binfilter/bf_sc/source/core/data/sc_cell.cxx Tue Feb 6 23:13:33 2007 +@@ -48,7 +48,7 @@ #include #endif Index: patches/patch-bridges_prj_build_lst =================================================================== RCS file: /cvs/ports/editors/openoffice/patches/patch-bridges_prj_build_lst,v retrieving revision 1.4 diff -u -r1.4 patch-bridges_prj_build_lst --- patches/patch-bridges_prj_build_lst 9 Nov 2006 15:18:01 -0000 1.4 +++ patches/patch-bridges_prj_build_lst 21 Feb 2007 11:21:52 -0000 @@ -1,12 +1,11 @@ -$OpenBSD: patch-bridges_prj_build_lst,v 1.4 2006/11/09 15:18:01 kurt Exp $ ---- bridges/prj/build.lst.orig.port Wed Jul 19 05:28:51 2006 -+++ bridges/prj/build.lst Wed Nov 8 11:47:17 2006 -@@ -19,6 +19,8 @@ br bridges\source\cpp_uno\cc50_solaris_i - br bridges\source\cpp_uno\gcc3_solaris_sparc nmake - u br_gcc3sogs br_cppuno_shared br_unotypes NULL - br bridges\source\cpp_uno\gcc3_solaris_intel nmake - u br_gcc3sogi br_cppuno_shared br_unotypes NULL - br bridges\source\cpp_uno\gcc3_netbsd_intel nmake - u br_gccni br_unotypes NULL -+br bridges\source\cpp_uno\gcc3_openbsd_intel nmake - u br_gcc3oi br_cppuno_shared br_unotypes NULL -+br bridges\source\cpp_uno\gcc3_openbsd_x86-64 nmake - u br_gcc3ox br_cppuno_shared br_unotypes NULL - br bridges\source\cpp_uno\shared nmake - all br_cppuno_shared br_unotypes NULL - br bridges\source\cli_uno nmake - w,vc7 br_cli_uno br_unotypes NULL - br bridges\source\jni_uno nmake - all br_jni_uno br_unotypes NULL +--- bridges/prj/build.lst.orig.port Sat Jan 13 00:23:54 2007 ++++ bridges/prj/build.lst Sat Jan 13 00:24:00 2007 +@@ -20,6 +20,8 @@ br bridges\source\cpp_uno\cc50_solaris_i + br bridges\source\cpp_uno\gcc3_solaris_sparc nmake - u br_gcc3sogs br_cppuno_shared br_unotypes br_inc NULL + br bridges\source\cpp_uno\gcc3_solaris_intel nmake - u br_gcc3sogi br_cppuno_shared br_unotypes br_inc NULL + br bridges\source\cpp_uno\gcc3_netbsd_intel nmake - u br_gccni br_unotypes br_inc NULL ++br bridges\source\cpp_uno\gcc3_openbsd_intel nmake - u br_gcc3oi br_cppuno_shared br_unotypes NULL ++br bridges\source\cpp_uno\gcc3_openbsd_x86-64 nmake - u br_gcc3ox br_cppuno_shared br_unotypes NULL + br bridges\source\cpp_uno\shared nmake - all br_cppuno_shared br_unotypes br_inc NULL + br bridges\source\cli_uno nmake - w,vc7 br_cli_uno br_unotypes br_inc NULL + br bridges\source\jni_uno nmake - all br_jni_uno br_unotypes br_inc NULL Index: patches/patch-config_office_configure_in =================================================================== RCS file: /cvs/ports/editors/openoffice/patches/patch-config_office_configure_in,v retrieving revision 1.11 diff -u -r1.11 patch-config_office_configure_in --- patches/patch-config_office_configure_in 14 Dec 2006 13:12:24 -0000 1.11 +++ patches/patch-config_office_configure_in 21 Feb 2007 11:21:52 -0000 @@ -1,6 +1,6 @@ ---- config_office/configure.in.orig.port Wed Dec 13 21:21:20 2006 -+++ config_office/configure.in Wed Dec 13 21:21:23 2006 -@@ -790,6 +790,16 @@ case "$build_os" in +--- config_office/configure.in.orig.port Mon Jan 22 11:06:15 2007 ++++ config_office/configure.in Tue Feb 6 23:13:33 2007 +@@ -797,6 +797,16 @@ case "$build_os" in AC_MSG_RESULT([$PTHREAD_LIBS]) _os=FreeBSD ;; @@ -15,9 +15,9 @@ + _os=OpenBSD + ;; osf) - test_x=dontknow test_cups=no -@@ -2421,11 +2431,11 @@ dnl ==================================== + _os=OSF1 +@@ -2408,11 +2418,11 @@ dnl ==================================== dnl Checks for programs. dnl =================================================================== dnl Check whether there's a C pre-processor. @@ -31,7 +31,7 @@ AC_PROG_CXXCPP fi -@@ -2555,6 +2565,9 @@ if test "$_os" != "WINNT" -a \( "z$enabl +@@ -2542,6 +2552,9 @@ if test "$_os" != "WINNT" -a \( "z$enabl AIX) PKGFORMAT=aix ;; @@ -41,7 +41,7 @@ *BSD) PKGFORMAT=bsd ;; -@@ -2884,7 +2897,7 @@ if test -n "$with_system_libwpd" -o -n " +@@ -2871,7 +2884,7 @@ if test -n "$with_system_libwpd" -o -n " test "$with_system_libwpd" != "no"; then AC_MSG_RESULT([external]) SYSTEM_LIBWPD=YES @@ -50,7 +50,7 @@ else AC_MSG_RESULT([internal]) SYSTEM_LIBWPD=NO -@@ -2948,12 +2961,13 @@ if test -n "$with_system_python" && test +@@ -2935,12 +2948,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');"` @@ -65,7 +65,7 @@ fi dnl check if the headers really work: -@@ -2978,16 +2992,13 @@ if test -n "$with_system_db" -o -n "$wit +@@ -2970,16 +2984,13 @@ if test -n "$with_system_db" -o -n "$wit test "$with_system_db" != "no"; then SYSTEM_DB=YES AC_MSG_RESULT([external]) @@ -86,7 +86,7 @@ for v in 1 2; do AC_TRY_RUN([ #include -@@ -2998,6 +3009,7 @@ int main(int argc, char **argv) { +@@ -2990,6 +3001,7 @@ int main(int argc, char **argv) { } ], [DB_VERSION_MINOR=$v], []) done @@ -94,16 +94,16 @@ if test "$DB_VERSION_MINOR" -gt "1"; then AC_MSG_RESULT([OK]) DB_VERSION=4.$DB_VERSION_MINOR -@@ -3658,7 +3670,7 @@ elif test "$_os" != "WINNT" ; then +@@ -3715,7 +3727,7 @@ elif test "$_os" != "WINNT" ; then AC_MSG_ERROR([No X includes found]) # Exit fi CFLAGS=$X_CFLAGS - LDFLAGS="$X_LDFLAGS $X_LIBS" + LDFLAGS="$LDFLAGS $X_LDFLAGS $X_LIBS" 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" -@@ -3839,7 +3851,6 @@ if test -n "$with_system_neon" -o -n "$w + dnl Check if the XauDisposeAuth symbol is provided by libXau. + AC_CHECK_LIB(Xau, XauDisposeAuth, XAU_LIBS="-lXau", []) +@@ -3908,7 +3920,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) @@ -111,7 +111,7 @@ NEON_VERSION="`$PKG_CONFIG --modversion neon | $SED 's/\.//g'`" NEON_CFLAGS="$NEON_CFLAGS -DSYSTEM_NEON -DUSE_DAV_LOCKS=1" SYSTEM_NEON=YES -@@ -4623,7 +4634,7 @@ if test "$test_kde" = "yes" -a "$ENABLE_ +@@ -4670,7 +4681,7 @@ if test "$test_kde" = "yes" -a "$ENABLE_ dnl What to test qt_test_include="qstyle.h" @@ -120,7 +120,7 @@ kde_test_include="ksharedptr.h" kde_test_library="libkdeui.la" -@@ -4646,7 +4657,7 @@ your Qt installation by exporting QTDIR +@@ -4693,7 +4704,7 @@ your Qt installation by exporting QTDIR AC_MSG_CHECKING([for Qt libraries]) qt_libdir="no" for qt_check in $qt_libdirs ; do Index: patches/patch-config_office_set_soenv_in =================================================================== RCS file: /cvs/ports/editors/openoffice/patches/patch-config_office_set_soenv_in,v retrieving revision 1.9 diff -u -r1.9 patch-config_office_set_soenv_in --- patches/patch-config_office_set_soenv_in 13 Dec 2006 10:25:14 -0000 1.9 +++ patches/patch-config_office_set_soenv_in 21 Feb 2007 11:21:52 -0000 @@ -1,6 +1,6 @@ $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 +--- config_office/set_soenv.in.orig.port Wed Jan 17 09:39:29 2007 ++++ config_office/set_soenv.in Wed Jan 17 09:51:17 2007 @@ -368,6 +368,46 @@ elsif ( $platform =~ m/freebsd/ ) $INPATH = $OUTPATH.$PROEXT; $GVERDIR = $INPATH; @@ -50,7 +50,7 @@ # General Linux settings: @@ -969,7 +1009,7 @@ if ($platform =~ m/solaris/) $ps.$JRETHREADDIR. - $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB; + $ps.'$SOLARVER'.$ds.'$INPATH'.$LIB; } -elsif ($platform =~ m/linux-gnu|netbsd|osf1|freebsd|aix/) +elsif ($platform =~ m/linux-gnu|netbsd|osf1|openbsd|freebsd|aix/) @@ -82,29 +82,37 @@ -if ($platform =~ m/linux-gnu|netbsd|odf1|irix|freebsd|aix|solaris/) +if ($platform =~ m/linux-gnu|netbsd|odf1|irix|openbsd|freebsd|aix|solaris/) { $PATH = $cur_dir. - $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN. + $ps.'$SOLARVER'.$ds.'$INPATH'.$BIN. $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. -@@ -1277,6 +1317,19 @@ elsif ($platform =~ m/linux-gnu|netbasd| +@@ -1260,6 +1300,7 @@ elsif ($platform =~ m/linux-gnu|netbasd| + $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. + $L.'$SOLARVER'.$ds.'$INPATH'.$LIB. + $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. ++ $L.$USR_LOCAL.$LIB. + $L.'$JAVA_HOME'.$LIB64. + $L.$JRELIBDIR. + $L.$JRETOOLKITDIR. +@@ -1267,6 +1308,19 @@ elsif ($platform =~ m/linux-gnu|netbasd| $L_STLPORT_LIB. $L.$XLIB; } +elsif ($platform =~ m/openbsd/) +{ $SOLARLIB = $L.$par_dir.$LIB. + $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. -+ $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. ++ $L.'$SOLARVER'.$ds.'$INPATH'.$LIB. + $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. -+ $L_STLPORT_LIB. + $L.$USR_LOCAL.$LIB. + $L.'$JAVA_HOME'.$LIB64. + $L.$JRELIBDIR. + $L.$JRETOOLKITDIR. + $L.$JRETHREADDIR. ++ $L_STLPORT_LIB. + $L.$XLIB; +} elsif ($platform =~ m/cygwin/) - { $SOLARLIB = $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. + { $SOLARLIB = $L.'$SOLARVER'.$ds.'$INPATH'.$LIB. $L.$par_dir.$LIB. -@@ -1308,10 +1361,10 @@ $SOLARINC = $I.$cur_dir. +@@ -1298,10 +1352,10 @@ $SOLARINC = $I.$cur_dir. $I.'$SOLARENV'.$INC. $I.'$SRC_ROOT'.$ds."res"; @@ -117,7 +125,7 @@ { # This simply adds an include path, so even cases that break the FHS work $SOLARINC .= $STLPORT_inc_stlport; -@@ -1332,10 +1385,15 @@ if ($platform =~ m/linux-gnu/) +@@ -1322,10 +1376,15 @@ if ($platform =~ m/linux-gnu/) $SOLARINC .= $STLPORT_inc_stlport; } @@ -135,7 +143,7 @@ #include system dependent Java include directory if (!($JDK eq "gcj")) { -@@ -1351,6 +1409,10 @@ if ($platform =~ m/linux-gnu/) +@@ -1341,6 +1400,10 @@ if ($platform =~ m/linux-gnu/) $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd"; $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; } @@ -146,7 +154,7 @@ elsif ($platform =~ m/netbsd/) { $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd"; } -@@ -1363,7 +1425,7 @@ if ($platform =~ m/linux-gnu/) +@@ -1353,7 +1416,7 @@ if ($platform =~ m/linux-gnu/) $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include"; } #The tail, if needed Index: patches/patch-cppuhelper_source_makefile_mk =================================================================== RCS file: /cvs/ports/editors/openoffice/patches/patch-cppuhelper_source_makefile_mk,v retrieving revision 1.2 diff -u -r1.2 patch-cppuhelper_source_makefile_mk --- patches/patch-cppuhelper_source_makefile_mk 20 Aug 2006 03:36:52 -0000 1.2 +++ patches/patch-cppuhelper_source_makefile_mk 21 Feb 2007 11:21:53 -0000 @@ -1,9 +1,9 @@ $OpenBSD: patch-cppuhelper_source_makefile_mk,v 1.2 2006/08/20 03:36:52 kurt Exp $ ---- cppuhelper/source/makefile.mk.orig.port Tue Jun 20 07:58:34 2006 -+++ cppuhelper/source/makefile.mk Fri Aug 18 15:47:42 2006 -@@ -177,6 +177,8 @@ SHL1VERSIONMAP=gcc3_linux_intel.map +--- cppuhelper/source/makefile.mk.orig.port Fri Feb 2 19:37:19 2007 ++++ cppuhelper/source/makefile.mk Tue Feb 6 23:13:33 2007 +@@ -179,6 +179,8 @@ SHL1VERSIONMAP=gcc3_linux_intel.map SHL1VERSIONMAP=gcc3_linux_intel.map - .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXSgcc3" + .ELIF "$(OS)$(CPU)$(COMNAME)"=="MACOSXIgcc3" SHL1VERSIONMAP=gcc3_linux_intel.map +.ELIF "$(OS)$(CPU)$(COMNAME)"=="OPENBSDIgcc3" +SHL1VERSIONMAP=gcc3_linux_intel.map Index: patches/patch-desktop_source_deployment_registry_package_dp_package_cxx =================================================================== RCS file: patches/patch-desktop_source_deployment_registry_package_dp_package_cxx diff -N patches/patch-desktop_source_deployment_registry_package_dp_package_cxx --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-desktop_source_deployment_registry_package_dp_package_cxx 21 Feb 2007 11:21:53 -0000 @@ -0,0 +1,36 @@ +$OpenBSD$ +--- desktop/source/deployment/registry/package/dp_package.cxx.orig.port Wed Jan 17 07:43:46 2007 ++++ desktop/source/deployment/registry/package/dp_package.cxx Fri Feb 16 09:06:19 2007 +@@ -660,9 +660,9 @@ bool BackendImpl::PackageImpl::checkDepe + try + { + css::uno::Reference xRoot = desc.getRootElement(); +- css::uno::Reference xPath( +- DescriptionInfoset(getMyBackend()->getComponentContext(), xRoot). +- getXpath()); ++ css::uno::Reference xPath = ++ DescriptionInfoset(getMyBackend()->getComponentContext(), xRoot). ++ getXpath(); + + css::uno::Reference nodeSimpleLic = + xPath->selectSingleNode(xRoot, +@@ -688,7 +688,8 @@ bool BackendImpl::PackageImpl::checkDepe + OSL_ASSERT(aContextName.getLength()); + if (sAccept.equals(OUSTR("user")) && aContextName.equals(OUSTR("shared"))) + { +- css::deployment::LicenseIndividualAgreementException exc(OUString(), 0, m_name); ++ css::deployment::LicenseIndividualAgreementException exc = ++ css::deployment::LicenseIndividualAgreementException(OUString(), 0, m_name); + + bool approve = false; + bool abort = false; +@@ -722,7 +723,8 @@ bool BackendImpl::PackageImpl::checkDepe + + if ( !(bInstalled && bSuppress)) + { +- css::deployment::LicenseException licExc(OUString(), 0, m_name, sLicense); ++ css::deployment::LicenseException licExc = ++ css::deployment::LicenseException(OUString(), 0, m_name, sLicense); + bool approve = false; + bool abort = false; + if (! interactContinuation( Index: patches/patch-extensions_source_plugin_unx_makefile_mk =================================================================== RCS file: /cvs/ports/editors/openoffice/patches/patch-extensions_source_plugin_unx_makefile_mk,v retrieving revision 1.2 diff -u -r1.2 patch-extensions_source_plugin_unx_makefile_mk --- patches/patch-extensions_source_plugin_unx_makefile_mk 20 Aug 2006 03:36:52 -0000 1.2 +++ patches/patch-extensions_source_plugin_unx_makefile_mk 21 Feb 2007 11:21:53 -0000 @@ -1,12 +1,11 @@ -$OpenBSD: patch-extensions_source_plugin_unx_makefile_mk,v 1.2 2006/08/20 03:36:52 kurt Exp $ ---- extensions/source/plugin/unx/makefile.mk.orig.port Mon Jun 19 06:45:51 2006 -+++ extensions/source/plugin/unx/makefile.mk Fri Aug 18 15:47:42 2006 -@@ -73,7 +73,7 @@ APP1STDLIBS=\ - .IF "$(OS)"=="SOLARIS" || "$(OS)"=="SCO" || "$(OS)"=="HPUX" - APP1STDLIBS+=-lXm -lXt -lXext -lX11 -ldl - .ELSE +--- extensions/source/plugin/unx/makefile.mk.orig.port Sat Jan 13 00:23:55 2007 ++++ extensions/source/plugin/unx/makefile.mk Sat Jan 13 00:24:00 2007 +@@ -80,7 +80,7 @@ APP1STDLIBS+=-lXm -lXt -lXext -lX11 -ldl + .IF "$(DISABLE_XAW)" != "TRUE" + APP1STDLIBS+=-lXaw + .ENDIF -.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" +.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || "$(OS)"=="OPENBSD" - APP1STDLIBS+=-lXaw -lXt -lXext -lX11 + APP1STDLIBS+= -lXt -lXext -lX11 .ELSE - APP1STDLIBS+=-lXaw -lXt -lXext -lX11 -ldl + APP1STDLIBS+= -lXt -lXext -lX11 -ldl Index: patches/patch-icu_icu-2_6_patch =================================================================== RCS file: patches/patch-icu_icu-2_6_patch diff -N patches/patch-icu_icu-2_6_patch --- patches/patch-icu_icu-2_6_patch 13 Dec 2006 10:25:14 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,1006 +0,0 @@ -$OpenBSD: patch-icu_icu-2_6_patch,v 1.3 2006/12/13 10:25:14 robert Exp $ ---- icu/icu-2.6.patch.orig.port Mon Dec 11 22:57:49 2006 -+++ icu/icu-2.6.patch Mon Dec 11 23:01:20 2006 -@@ -1,21 +1,5 @@ --*** misc/icu/source/icudefs.mk.in Tue Jun 3 08:44:40 2003 ----- misc/build/icu/source/icudefs.mk.in Thu Aug 31 13:24:31 2006 --*************** --*** 136,142 **** ----- 136,146 ---- -- SHLIB.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -- -- # Environment variable to set a runtime search path --+ ifeq ($(OS), IRIX) --+ LDLIBRARYPATH_ENVVAR = LD_LIBRARYN32_PATH --+ else -- LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH --+ endif -- -- # Versioned target for a shared library. -- FINAL_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION) - *** misc/icu/source/common/putil.c Tue Jun 3 08:44:38 2003 ----- misc/build/icu/source/common/putil.c Thu Aug 31 13:27:44 2006 -+--- misc/build/icu/source/common/putil.c Mon Dec 11 22:58:07 2006 - *************** - *** 35,40 **** - --- 35,43 ---- -@@ -55,7 +39,7 @@ - #ifndef __USE_POSIX - #define __USE_POSIX - *** misc/icu/source/common/unicode/rbbi.h Tue Jun 10 20:04:02 2003 ----- misc/build/icu/source/common/unicode/rbbi.h Thu Aug 31 13:24:31 2006 -+--- misc/build/icu/source/common/unicode/rbbi.h Mon Dec 11 22:58:07 2006 - *************** - *** 106,119 **** - //======================================================================= -@@ -74,7 +58,7 @@ - * are created via this constructor; the rules are compiled - --- 106,111 ---- - *************** --*** 128,137 **** -+*** 128,136 **** - friend class RBBIRuleBuilder; /** @internal */ - friend class BreakIterator; - -@@ -84,13 +68,12 @@ - - /** Default constructor. Creates an empty shell of an iterator, with no - * rules or text to iterate over. Object can subsequently be assigned to. -- * @draft ICU 2.2 ----- 120,135 ---- -+--- 120,134 ---- - friend class RBBIRuleBuilder; /** @internal */ - friend class BreakIterator; - - public: -- -++ - + /** - + * This constructor uses the udata interface to create a BreakIterator - + * whose internal tables live in a memory-mapped file. "image" is a pointer -@@ -98,12 +81,11 @@ - + * @internal - + */ - + RuleBasedBreakIterator(UDataMemory* image, UErrorCode &status); --+ -+ - /** Default constructor. Creates an empty shell of an iterator, with no - * rules or text to iterate over. Object can subsequently be assigned to. -- * @draft ICU 2.2 - *** misc/icu/source/common/unicode/unistr.h Fri Jun 6 21:06:42 2003 ----- misc/build/icu/source/common/unicode/unistr.h Thu Aug 31 13:24:33 2006 -+--- misc/build/icu/source/common/unicode/unistr.h Mon Dec 11 22:58:07 2006 - *************** - *** 3183,3189 **** - //======================================== -@@ -206,11 +188,53 @@ - } - } - -+*** misc/icu/source/common/unicode/urename.h Tue Jun 10 00:43:14 2003 -+--- misc/build/icu/source/common/unicode/urename.h Mon Dec 11 22:58:08 2006 -+*************** -+*** 25,31 **** -+ that do not use Autoconf. */ -+ /* #define U_DISABLE_RENAMING 1 */ -+ -+! #if !U_DISABLE_RENAMING -+ -+ /* C exports renaming data */ -+ -+--- 25,31 ---- -+ that do not use Autoconf. */ -+ /* #define U_DISABLE_RENAMING 1 */ -+ -+! #if !defined U_DISABLE_RENAMING || !U_DISABLE_RENAMING -+ -+ /* C exports renaming data */ -+ -+*** misc/icu/source/common/unicode/utypes.h Tue Jun 10 20:18:00 2003 -+--- misc/build/icu/source/common/unicode/utypes.h Mon Dec 11 22:58:08 2006 -+*************** -+*** 420,428 **** -+ * -+ * Note: This is currently only done on Windows because -+ * some Linux/Unix compilers have problems with defining global new/delete. -+! * On Windows, WIN32 is defined, and it is _MSC_Ver>=1200 for MSVC 6.0 and higher. -+ */ -+! #if defined(XP_CPLUSPLUS) && defined(WIN32) && (_MSC_Ver>=1200) && (defined(U_COMMON_IMPLEMENTATION) || defined(U_I18N_IMPLEMENTATION) || defined(U_LAYOUT_IMPLEMENTATION) || defined(U_USTDIO_IMPLEMENTATION)) -+ -+ /** -+ * Global operator new, defined only inside ICU4C, must not be used. -+--- 420,428 ---- -+ * -+ * Note: This is currently only done on Windows because -+ * some Linux/Unix compilers have problems with defining global new/delete. -+! * On Windows, WIN32 is defined, and it is _MSC_VER>=1200 for MSVC 6.0 and higher. -+ */ -+! #if defined(XP_CPLUSPLUS) && defined(WIN32) && (_MSC_VER>=1200) && (defined(U_COMMON_IMPLEMENTATION) || defined(U_I18N_IMPLEMENTATION) || defined(U_LAYOUT_IMPLEMENTATION) || defined(U_USTDIO_IMPLEMENTATION)) -+ -+ /** -+ * Global operator new, defined only inside ICU4C, must not be used. - *** misc/icu/source/config/mh-bsd-gcc Thu May 2 01:48:10 2002 ----- misc/build/icu/source/config/mh-bsd-gcc Thu Aug 31 13:24:31 2006 -+--- misc/build/icu/source/config/mh-bsd-gcc Mon Dec 11 22:58:07 2006 - *************** --*** 10,15 **** ----- 10,18 ---- -+*** 10,21 **** -+--- 10,30 ---- - GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS) - - ## Flags for position independent code -@@ -220,9 +244,6 @@ - SHAREDLIBCFLAGS = -fPIC - SHAREDLIBCXXFLAGS = -fPIC - SHAREDLIBCPPFLAGS = -DPIC --*************** --*** 16,21 **** ----- 19,30 ---- - - ## Compiler switch to embed a runtime search path - LD_RPATH= -@@ -236,7 +257,7 @@ - - ## Compiler switch to embed a library name - *** misc/icu/source/config/mh-darwin Tue Jun 3 22:52:56 2003 ----- misc/build/icu/source/config/mh-darwin Thu Aug 31 13:24:31 2006 -+--- misc/build/icu/source/config/mh-darwin Mon Dec 11 22:58:07 2006 - *************** - *** 15,30 **** - LD_FLAGS += -headerpad_max_install_names -@@ -313,7 +334,7 @@ - - ## End Darwin-specific setup - *** misc/icu/source/config/mh-irix Thu Jan 10 03:41:40 2002 ----- misc/build/icu/source/config/mh-irix Thu Aug 31 13:24:31 2006 -+--- misc/build/icu/source/config/mh-irix Mon Dec 11 22:58:07 2006 - *************** - *** 10,15 **** - --- 10,19 ---- -@@ -328,7 +349,7 @@ - GEN_DEPS.c= $(CC) -E -M $(DEFS) $(CPPFLAGS) - GEN_DEPS.cc= $(CXX) -E -M $(DEFS) $(CPPFLAGS) - *** misc/icu/source/config/mh-linux Thu Jan 24 18:35:04 2002 ----- misc/build/icu/source/config/mh-linux Thu Aug 31 13:24:31 2006 -+--- misc/build/icu/source/config/mh-linux Mon Dec 11 22:58:07 2006 - *************** - *** 10,15 **** - --- 10,18 ---- -@@ -342,25 +363,25 @@ - SHAREDLIBCXXFLAGS = -fPIC - SHAREDLIBCPPFLAGS = -DPIC - *************** --*** 22,27 **** ----- 25,37 ---- -+*** 21,26 **** -+--- 24,36 ---- -+ ## Compiler switch to embed a runtime search path - LD_RPATH= - LD_RPATH_PRE = -Wl,-rpath, -- -++ - + ## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH - + ENABLE_RPATH=YES - + RPATHLDFLAGS=${LD_RPATH_PRE}'$$ORIGIN' - + - + #SH# ENABLE_RPATH=YES - + #SH# RPATHLDFLAGS="${LD_RPATH_PRE}'$$ORIGIN'" --+ -+ - ## Compiler switch to embed a library name - LD_SONAME = -Wl,-soname -Wl,$(MIDDLE_SO_TARGET) -- - *** misc/icu/source/config/mh-solaris Tue Jul 30 04:46:10 2002 ----- misc/build/icu/source/config/mh-solaris Thu Aug 31 13:24:31 2006 -+--- misc/build/icu/source/config/mh-solaris Mon Dec 11 22:58:07 2006 - *************** --*** 23,39 **** -+*** 23,38 **** - - ## Commands to link - ## For Sun Workshop, use CC to link to bring in C++ runtime -@@ -377,9 +398,8 @@ - - ## Compiler switch to embed a library name - LD_SONAME = -h $(MIDDLE_SO_TARGET) -+--- 23,46 ---- - ----- 23,47 ---- -- - ## Commands to link - ## For Sun Workshop, use CC to link to bring in C++ runtime - ! ## For Sun Workshop, -norunpath stops compiler to record a useless RPATH -@@ -393,19 +413,18 @@ - ## Compiler switch to embed a runtime search path - LD_RPATH= -R - LD_RPATH_PRE= -- -++ - + ## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH - + ENABLE_RPATH=YES - + RPATHLDFLAGS=${LD_RPATH}'$$ORIGIN' - + - + #SH# ENABLE_RPATH=YES - + #SH# RPATHLDFLAGS="${LD_RPATH}'$$ORIGIN'" --+ -+ - ## Compiler switch to embed a library name - LD_SONAME = -h $(MIDDLE_SO_TARGET) -- - *** misc/icu/source/data/icupkg.inc.in Fri Apr 19 04:19:16 2002 ----- misc/build/icu/source/data/icupkg.inc.in Thu Aug 31 13:24:31 2006 -+--- misc/build/icu/source/data/icupkg.inc.in Mon Dec 11 22:58:07 2006 - *************** - *** 16,22 **** - include $(top_builddir)/icudefs.mk -@@ -417,7 +436,7 @@ - ICULIBS=$(LIBS) -licu-uc -licu-i18n - --- 16,21 ---- - *** misc/icu/source/data/makedata.mak Tue Jun 3 22:52:56 2003 ----- misc/build/icu/source/data/makedata.mak Thu Aug 31 13:24:31 2006 -+--- misc/build/icu/source/data/makedata.mak Mon Dec 11 22:58:07 2006 - *************** - *** 27,32 **** - --- 27,33 ---- -@@ -480,7 +499,7 @@ - $(INDEX_RES_FILES): - @echo Generating </source/data directory -@@ -709,7 +728,7 @@ - ! #icu-internal-25546.ucm lmb-excp.ucm - - *** misc/icu/source/extra/ustdio/ufile.c Tue Oct 1 03:26:48 2002 ----- misc/build/icu/source/extra/ustdio/ufile.c Thu Aug 31 13:24:31 2006 -+--- misc/build/icu/source/extra/ustdio/ufile.c Mon Dec 11 22:58:07 2006 - *************** - *** 89,95 **** - -@@ -728,7 +747,7 @@ - #else - result->fFile = f; - *** misc/icu/source/i18n/tblcoll.cpp Fri Jun 6 07:05:22 2003 ----- misc/build/icu/source/i18n/tblcoll.cpp Thu Aug 31 13:24:31 2006 -+--- misc/build/icu/source/i18n/tblcoll.cpp Mon Dec 11 22:58:07 2006 - *************** - *** 84,89 **** - --- 84,101 ---- -@@ -751,7 +770,7 @@ - UErrorCode& status) : - dataIsOwned(FALSE) - *** misc/icu/source/i18n/ucol.cpp Wed Jun 11 01:05:58 2003 ----- misc/build/icu/source/i18n/ucol.cpp Thu Aug 31 13:24:31 2006 -+--- misc/build/icu/source/i18n/ucol.cpp Mon Dec 11 22:58:07 2006 - *************** - *** 512,517 **** - --- 512,570 ---- -@@ -815,7 +834,7 @@ - int32_t rulesLength, - UColAttributeValue normalizationMode, - *** misc/icu/source/i18n/ucol_imp.h Wed Jun 11 23:50:54 2003 ----- misc/build/icu/source/i18n/ucol_imp.h Thu Aug 31 13:24:31 2006 -+--- misc/build/icu/source/i18n/ucol_imp.h Mon Dec 11 22:58:07 2006 - *************** - *** 457,462 **** - --- 457,473 ---- -@@ -837,7 +856,7 @@ - * service. - */ - *** misc/icu/source/i18n/unicode/tblcoll.h Mon Jun 9 08:13:14 2003 ----- misc/build/icu/source/i18n/unicode/tblcoll.h Thu Aug 31 13:24:31 2006 -+--- misc/build/icu/source/i18n/unicode/tblcoll.h Mon Dec 11 22:58:07 2006 - *************** - *** 119,124 **** - --- 119,126 ---- -@@ -849,8 +868,24 @@ - /** - * RuleBasedCollator constructor. This takes the table rules and builds a - * collation table out of them. Please see RuleBasedCollator class -+*** misc/icu/source/icudefs.mk.in Tue Jun 3 08:44:40 2003 -+--- misc/build/icu/source/icudefs.mk.in Mon Dec 11 22:58:07 2006 -+*************** -+*** 136,142 **** -+--- 136,146 ---- -+ SHLIB.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -+ -+ # Environment variable to set a runtime search path -++ ifeq ($(OS), IRIX) -++ LDLIBRARYPATH_ENVVAR = LD_LIBRARYN32_PATH -++ else -+ LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH -++ endif -+ -+ # Versioned target for a shared library. -+ FINAL_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION) - *** misc/icu/source/layout/ArabicLayoutEngine.cpp Tue Jun 3 22:58:22 2003 ----- misc/build/icu/source/layout/ArabicLayoutEngine.cpp Thu Aug 31 13:24:32 2006 -+--- misc/build/icu/source/layout/ArabicLayoutEngine.cpp Mon Dec 11 22:58:07 2006 - *************** - *** 3,8 **** - --- 3,9 ---- -@@ -900,21 +935,21 @@ - - LE_DELETE_ARRAY(tempChars); - *************** --*** 267,272 **** ----- 287,297 ---- -+*** 266,271 **** -+--- 286,296 ---- -+ success = LE_ILLEGAL_ARGUMENT_ERROR; - return; - } -- -++ - + #if 1 // HDU: #105697# TODO: improve handling of deleted/mark glyphs - + if( count != glyphCount ) - + return; - + #endif --+ -+ - GDEFMarkFilter filter(fGDEFTable); - -- // FIXME: we could avoid the memory allocation and copying here by - *** misc/icu/source/layout/GXLayoutEngine.cpp Tue Jun 3 22:58:22 2003 ----- misc/build/icu/source/layout/GXLayoutEngine.cpp Thu Aug 31 13:24:32 2006 -+--- misc/build/icu/source/layout/GXLayoutEngine.cpp Mon Dec 11 22:58:07 2006 - *************** - *** 39,45 **** - return 0; -@@ -933,7 +968,7 @@ - if (LE_FAILURE(success)) { - return 0; - *** misc/icu/source/layout/GlyphIterator.cpp Tue Jun 3 22:58:22 2003 ----- misc/build/icu/source/layout/GlyphIterator.cpp Thu Aug 31 13:24:32 2006 -+--- misc/build/icu/source/layout/GlyphIterator.cpp Mon Dec 11 22:58:07 2006 - *************** - *** 297,302 **** - --- 297,321 ---- -@@ -963,7 +998,7 @@ - { - if (direction < 0) { - *** misc/icu/source/layout/GlyphIterator.h Tue Jun 3 22:58:22 2003 ----- misc/build/icu/source/layout/GlyphIterator.h Thu Aug 31 13:24:32 2006 -+--- misc/build/icu/source/layout/GlyphIterator.h Mon Dec 11 22:58:07 2006 - *************** - *** 61,68 **** - void setCurrStreamPosition(le_int32 position); -@@ -986,7 +1021,7 @@ - void setCursiveFirstExitPoint(); - void resetCursiveLastExitPoint(); - *** misc/icu/source/layout/HebrewShaping.cpp Tue Jun 3 22:58:22 2003 ----- misc/build/icu/source/layout/HebrewShaping.cpp Thu Aug 31 13:24:32 2006 -+--- misc/build/icu/source/layout/HebrewShaping.cpp Mon Dec 11 22:58:07 2006 - *************** - *** 12,22 **** - U_NAMESPACE_BEGIN -@@ -1016,7 +1051,7 @@ - - void HebrewShaping::shape(const LEUnicode * /*chars*/, le_int32 /*offset*/, le_int32 charCount, le_int32 /*charMax*/, - *** misc/icu/source/layout/IndicClassTables.cpp Tue Jun 3 22:58:22 2003 ----- misc/build/icu/source/layout/IndicClassTables.cpp Thu Aug 31 13:24:32 2006 -+--- misc/build/icu/source/layout/IndicClassTables.cpp Mon Dec 11 22:58:07 2006 - *************** - *** 83,89 **** - -@@ -1035,7 +1070,7 @@ - _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _xx, _ct, _ct, _bb, _ct, _ct, _pb, // 09A0 - 09AF - _rv, _xx, _ct, _xx, _xx, _xx, _ct, _ct, _ct, _ct, _xx, _xx, _nu, _xx, _dr, _dl, // 09B0 - 09BF - *** misc/icu/source/layout/IndicReordering.cpp Tue Jun 3 22:58:22 2003 ----- misc/build/icu/source/layout/IndicReordering.cpp Thu Aug 31 13:24:32 2006 -+--- misc/build/icu/source/layout/IndicReordering.cpp Mon Dec 11 22:58:07 2006 - *************** - *** 366,372 **** - -@@ -1054,8 +1089,8 @@ - IndicClassTable::CharClass charClass = classTable->getCharClass(ch); - - if (IndicClassTable::isConsonant(charClass)) { --*** misc/icu/source/layout/KhmerLayoutEngine.cpp Thu Aug 31 13:28:01 2006 ----- misc/build/icu/source/layout/KhmerLayoutEngine.cpp Thu Aug 31 13:24:32 2006 -+*** misc/icu/source/layout/KhmerLayoutEngine.cpp Mon Dec 11 22:58:49 2006 -+--- misc/build/icu/source/layout/KhmerLayoutEngine.cpp Mon Dec 11 22:58:07 2006 - *************** - *** 1 **** - ! dummy -@@ -1144,8 +1179,8 @@ - ! } - ! - ! U_NAMESPACE_END --*** misc/icu/source/layout/KhmerLayoutEngine.h Thu Aug 31 13:28:01 2006 ----- misc/build/icu/source/layout/KhmerLayoutEngine.h Thu Aug 31 13:24:32 2006 -+*** misc/icu/source/layout/KhmerLayoutEngine.h Mon Dec 11 22:58:49 2006 -+--- misc/build/icu/source/layout/KhmerLayoutEngine.h Mon Dec 11 22:58:07 2006 - *************** - *** 1 **** - ! dummy -@@ -1285,8 +1320,8 @@ - ! U_NAMESPACE_END - ! #endif - ! --*** misc/icu/source/layout/KhmerReordering.cpp Thu Aug 31 13:28:01 2006 ----- misc/build/icu/source/layout/KhmerReordering.cpp Thu Aug 31 13:24:32 2006 -+*** misc/icu/source/layout/KhmerReordering.cpp Mon Dec 11 22:58:49 2006 -+--- misc/build/icu/source/layout/KhmerReordering.cpp Mon Dec 11 22:58:07 2006 - *************** - *** 1 **** - ! dummy -@@ -1822,8 +1857,8 @@ - ! - ! - ! U_NAMESPACE_END --*** misc/icu/source/layout/KhmerReordering.h Thu Aug 31 13:28:01 2006 ----- misc/build/icu/source/layout/KhmerReordering.h Thu Aug 31 13:24:32 2006 -+*** misc/icu/source/layout/KhmerReordering.h Mon Dec 11 22:58:49 2006 -+--- misc/build/icu/source/layout/KhmerReordering.h Mon Dec 11 22:58:07 2006 - *************** - *** 1 **** - ! dummy -@@ -1963,7 +1998,7 @@ - ! U_NAMESPACE_END - ! #endif - *** misc/icu/source/layout/LESwaps.h Tue Jun 3 22:58:22 2003 ----- misc/build/icu/source/layout/LESwaps.h Thu Aug 31 13:24:32 2006 -+--- misc/build/icu/source/layout/LESwaps.h Mon Dec 11 22:58:07 2006 - *************** - *** 3,8 **** - --- 3,9 ---- -@@ -1975,7 +2010,7 @@ - */ - - *************** --*** 13,35 **** -+*** 13,34 **** - - U_NAMESPACE_BEGIN - -@@ -1998,8 +2033,7 @@ - - /** - * This class is used to access data which stored in big endian order -- * regardless of the conventions of the platform. It has been designed ----- 14,51 ---- -+--- 14,50 ---- - - U_NAMESPACE_BEGIN - -@@ -2026,20 +2060,19 @@ - ! const le_uint8* p = reinterpret_cast(&rValue); - ! return ((p[0] << 8) + p[1]); - ! } -+! -+! inline le_uint32 loadBigEndianLong( const le_uint32& rValue ) -+! { -+! const le_uint8* p = reinterpret_cast(&rValue); -+! return ((p[0]<<24) + (p[1]<<16) + (p[2]<<8) + p[3]); -+! } -+! -+! #endif - --+ inline le_uint32 loadBigEndianLong( const le_uint32& rValue ) --+ { --+ const le_uint8* p = reinterpret_cast(&rValue); --+ return ((p[0]<<24) + (p[1]<<16) + (p[2]<<8) + p[3]); --+ } --+ --+ #endif --+ - /** - * This class is used to access data which stored in big endian order -- * regardless of the conventions of the platform. It has been designed - *** misc/icu/source/layout/LayoutEngine.cpp Thu Jun 5 00:39:18 2003 ----- misc/build/icu/source/layout/LayoutEngine.cpp Thu Aug 31 13:24:32 2006 -+--- misc/build/icu/source/layout/LayoutEngine.cpp Mon Dec 11 22:58:07 2006 - *************** - *** 14,19 **** - --- 14,21 ---- -@@ -2062,24 +2095,24 @@ - break; - - *************** --*** 452,457 **** ----- 455,468 ---- -+*** 450,455 **** -+--- 453,466 ---- -+ break; -+ } - -- break; -- -++ break; -++ - + case khmrScriptCode: - + result = new KhmerOpenTypeLayoutEngine(fontInstance, scriptCode, languageCode, gsubTable); - + break; - + - + case tibtScriptCode: - + result = new TibetanLayoutEngine(fontInstance, scriptCode, languageCode, gsubTable); --+ break; --+ -- default: -- result = new OpenTypeLayoutEngine(fontInstance, scriptCode, languageCode, gsubTable); - break; -+ -+ default: - *** misc/icu/source/layout/LookupProcessor.cpp Tue Jun 3 22:58:22 2003 ----- misc/build/icu/source/layout/LookupProcessor.cpp Thu Aug 31 13:24:32 2006 -+--- misc/build/icu/source/layout/LookupProcessor.cpp Mon Dec 11 22:58:07 2006 - *************** - *** 92,106 **** - le_int32 LookupProcessor::selectLookups(const FeatureTable *featureTable, LETag featureTag, le_int32 order) -@@ -2130,7 +2163,7 @@ - featureTable = featureListTable->getFeatureTable(featureIndex, &featureTag); - count = selectLookups(featureTable, featureTag, order); - *** misc/icu/source/layout/Makefile.in Tue Jun 3 22:58:22 2003 ----- misc/build/icu/source/layout/Makefile.in Thu Aug 31 13:24:32 2006 -+--- misc/build/icu/source/layout/Makefile.in Mon Dec 11 22:58:07 2006 - *************** - *** 52,57 **** - --- 52,59 ---- -@@ -2153,9 +2186,9 @@ - LookupProcessor.o \ - Lookups.o \ - *** misc/icu/source/layout/MarkToBasePosnSubtables.cpp Tue Jun 3 22:58:22 2003 ----- misc/build/icu/source/layout/MarkToBasePosnSubtables.cpp Thu Aug 31 13:24:32 2006 -+--- misc/build/icu/source/layout/MarkToBasePosnSubtables.cpp Mon Dec 11 22:58:07 2006 - *************** --*** 78,84 **** -+*** 78,91 **** - glyphIterator->setCurrGlyphBaseOffset(baseIterator.getCurrStreamPosition()); - - if (glyphIterator->isRightToLeft()) { -@@ -2163,7 +2196,14 @@ - } else { - LEPoint baseAdvance; - ----- 78,84 ---- -+ fontInstance->getGlyphAdvance(baseGlyph, pixels); -+ fontInstance->pixelsToUnits(pixels, baseAdvance); -+ -+! glyphIterator->adjustCurrGlyphPositionAdjustment(anchorDiffX - baseAdvance.fX, anchorDiffY - baseAdvance.fY, -markAdvance.fX, -markAdvance.fY); -+ } -+ -+ return 1; -+--- 78,91 ---- - glyphIterator->setCurrGlyphBaseOffset(baseIterator.getCurrStreamPosition()); - - if (glyphIterator->isRightToLeft()) { -@@ -2171,27 +2211,17 @@ - } else { - LEPoint baseAdvance; - --*************** --*** 85,91 **** - fontInstance->getGlyphAdvance(baseGlyph, pixels); - fontInstance->pixelsToUnits(pixels, baseAdvance); - --! glyphIterator->adjustCurrGlyphPositionAdjustment(anchorDiffX - baseAdvance.fX, anchorDiffY - baseAdvance.fY, -markAdvance.fX, -markAdvance.fY); -- } -- -- return 1; ----- 85,91 ---- -- fontInstance->getGlyphAdvance(baseGlyph, pixels); -- fontInstance->pixelsToUnits(pixels, baseAdvance); -- - ! glyphIterator->setCurrGlyphPositionAdjustment(anchorDiffX - baseAdvance.fX, anchorDiffY - baseAdvance.fY, -markAdvance.fX, -markAdvance.fY); - } - - return 1; - *** misc/icu/source/layout/MarkToLigaturePosnSubtables.cpp Tue Jun 3 22:58:22 2003 ----- misc/build/icu/source/layout/MarkToLigaturePosnSubtables.cpp Thu Aug 31 13:24:32 2006 -+--- misc/build/icu/source/layout/MarkToLigaturePosnSubtables.cpp Mon Dec 11 22:58:07 2006 - *************** --*** 89,95 **** -+*** 89,102 **** - glyphIterator->setCurrGlyphBaseOffset(ligatureIterator.getCurrStreamPosition()); - - if (glyphIterator->isRightToLeft()) { -@@ -2199,7 +2229,14 @@ - } else { - LEPoint ligatureAdvance; - ----- 89,95 ---- -+ fontInstance->getGlyphAdvance(ligatureGlyph, pixels); -+ fontInstance->pixelsToUnits(pixels, ligatureAdvance); -+ -+! glyphIterator->adjustCurrGlyphPositionAdjustment(anchorDiffX - ligatureAdvance.fX, anchorDiffY - ligatureAdvance.fY, -markAdvance.fX, -markAdvance.fY); -+ } -+ -+ return 1; -+--- 89,102 ---- - glyphIterator->setCurrGlyphBaseOffset(ligatureIterator.getCurrStreamPosition()); - - if (glyphIterator->isRightToLeft()) { -@@ -2207,27 +2244,17 @@ - } else { - LEPoint ligatureAdvance; - --*************** --*** 96,102 **** - fontInstance->getGlyphAdvance(ligatureGlyph, pixels); - fontInstance->pixelsToUnits(pixels, ligatureAdvance); - --! glyphIterator->adjustCurrGlyphPositionAdjustment(anchorDiffX - ligatureAdvance.fX, anchorDiffY - ligatureAdvance.fY, -markAdvance.fX, -markAdvance.fY); -- } -- -- return 1; ----- 96,102 ---- -- fontInstance->getGlyphAdvance(ligatureGlyph, pixels); -- fontInstance->pixelsToUnits(pixels, ligatureAdvance); -- - ! glyphIterator->setCurrGlyphPositionAdjustment(anchorDiffX - ligatureAdvance.fX, anchorDiffY - ligatureAdvance.fY, -markAdvance.fX, -markAdvance.fY); - } - - return 1; - *** misc/icu/source/layout/MarkToMarkPosnSubtables.cpp Tue Jun 3 22:58:22 2003 ----- misc/build/icu/source/layout/MarkToMarkPosnSubtables.cpp Thu Aug 31 13:24:32 2006 -+--- misc/build/icu/source/layout/MarkToMarkPosnSubtables.cpp Mon Dec 11 22:58:07 2006 - *************** --*** 78,84 **** -+*** 78,91 **** - glyphIterator->setCurrGlyphBaseOffset(mark2Iterator.getCurrStreamPosition()); - - if (glyphIterator->isRightToLeft()) { -@@ -2235,7 +2262,14 @@ - } else { - LEPoint mark2Advance; - ----- 78,84 ---- -+ fontInstance->getGlyphAdvance(mark2Glyph, pixels); -+ fontInstance->pixelsToUnits(pixels, mark2Advance); -+ -+! glyphIterator->adjustCurrGlyphPositionAdjustment(anchorDiffX - mark2Advance.fX, anchorDiffY - mark2Advance.fY, -markAdvance.fX, -markAdvance.fY); -+ } -+ -+ return 1; -+--- 78,91 ---- - glyphIterator->setCurrGlyphBaseOffset(mark2Iterator.getCurrStreamPosition()); - - if (glyphIterator->isRightToLeft()) { -@@ -2243,25 +2277,15 @@ - } else { - LEPoint mark2Advance; - --*************** --*** 85,91 **** - fontInstance->getGlyphAdvance(mark2Glyph, pixels); - fontInstance->pixelsToUnits(pixels, mark2Advance); - --! glyphIterator->adjustCurrGlyphPositionAdjustment(anchorDiffX - mark2Advance.fX, anchorDiffY - mark2Advance.fY, -markAdvance.fX, -markAdvance.fY); -- } -- -- return 1; ----- 85,91 ---- -- fontInstance->getGlyphAdvance(mark2Glyph, pixels); -- fontInstance->pixelsToUnits(pixels, mark2Advance); -- - ! glyphIterator->setCurrGlyphPositionAdjustment(anchorDiffX - mark2Advance.fX, anchorDiffY - mark2Advance.fY, -markAdvance.fX, -markAdvance.fY); - } - - return 1; - *** misc/icu/source/layout/OpenTypeLayoutEngine.h Tue Jun 3 22:58:22 2003 ----- misc/build/icu/source/layout/OpenTypeLayoutEngine.h Thu Aug 31 13:24:32 2006 -+--- misc/build/icu/source/layout/OpenTypeLayoutEngine.h Mon Dec 11 22:58:07 2006 - *************** - *** 319,324 **** - --- 319,337 ---- -@@ -2284,8 +2308,8 @@ - return tempGlyphCount; - }; - --*** misc/icu/source/layout/TibetanLayoutEngine.cpp Thu Aug 31 13:28:01 2006 ----- misc/build/icu/source/layout/TibetanLayoutEngine.cpp Thu Aug 31 13:24:32 2006 -+*** misc/icu/source/layout/TibetanLayoutEngine.cpp Mon Dec 11 22:58:49 2006 -+--- misc/build/icu/source/layout/TibetanLayoutEngine.cpp Mon Dec 11 22:58:07 2006 - *************** - *** 1 **** - ! dummy -@@ -2394,8 +2418,8 @@ - ! } - ! - ! U_NAMESPACE_END --*** misc/icu/source/layout/TibetanLayoutEngine.h Thu Aug 31 13:28:01 2006 ----- misc/build/icu/source/layout/TibetanLayoutEngine.h Thu Aug 31 13:24:32 2006 -+*** misc/icu/source/layout/TibetanLayoutEngine.h Mon Dec 11 22:58:49 2006 -+--- misc/build/icu/source/layout/TibetanLayoutEngine.h Mon Dec 11 22:58:07 2006 - *************** - *** 1 **** - ! dummy -@@ -2614,10 +2638,10 @@ - ! #endif - ! - *** misc/icu/source/layout/layout.vcproj Thu May 1 00:50:20 2003 ----- misc/build/icu/source/layout/layout.vcproj Thu Aug 31 13:24:32 2006 -+--- misc/build/icu/source/layout/layout.vcproj Mon Dec 11 22:58:08 2006 - *************** --*** 215,220 **** ----- 215,223 ---- -+*** 215,226 **** -+--- 215,232 ---- - RelativePath=".\IndicLayoutEngine.cpp"> - - - - - - - -+*** 424,429 **** -+--- 433,441 ---- - - -+ RelativePath=".\IndicReordering.h"> - + - + -+ -+ -- - *** misc/icu/source/layout/layoutobj.inc Tue Nov 14 23:15:30 2000 ----- misc/build/icu/source/layout/layoutobj.inc Thu Aug 31 13:24:33 2006 -+--- misc/build/icu/source/layout/layoutobj.inc Mon Dec 11 22:58:08 2006 - *************** - *** 8,13 **** - --- 8,14 ---- -@@ -2685,8 +2706,60 @@ - LigatureSubstitutionSubtables.o \ - LookupProcessor.o \ - Lookups.o \ -+*** misc/icu/source/stubdata/stubdata.c Wed Nov 21 03:28:14 2001 -+--- misc/build/icu/source/stubdata/stubdata.c Mon Dec 11 23:01:05 2006 -+*************** -+*** 28,41 **** -+ UDataInfo info; -+ char padding[8]; -+ uint32_t count, reserved; -+- /* -+ const struct { -+ const char *const name; -+ const void *const data; -+! } toc[1]; -+! */ -+! int fakeNameAndData[4]; /* TODO: Change this header type from */ -+! /* pointerTOC to OffsetTOC. */ -+ } ICU_Data_Header; -+ -+ U_EXPORT const ICU_Data_Header U_ICUDATA_ENTRY_POINT = { -+--- 28,37 ---- -+ UDataInfo info; -+ char padding[8]; -+ uint32_t count, reserved; -+ const struct { -+ const char *const name; -+ const void *const data; -+! } toc[295]; /* set to real toc size to avoid symbol size mismatch runtime link errors */ -+ } ICU_Data_Header; -+ -+ U_EXPORT const ICU_Data_Header U_ICUDATA_ENTRY_POINT = { -+*************** -+*** 64,73 **** -+ 0, /* count */ -+ 0, /* Reserved */ -+ { /* TOC structure */ -+! /* { */ -+! 0 , 0 , 0, 0 /* name and data entries. Count says there are none, */ -+ /* but put one in just in case. */ -+! /* } */ -+ } -+ }; -+ -+--- 60,69 ---- -+ 0, /* count */ -+ 0, /* Reserved */ -+ { /* TOC structure */ -+! { -+! {0 , 0} /* name and data entries. Count says there are none, */ -+ /* but put one in just in case. */ -+! } -+ } -+ }; -+ - *** misc/icu/source/test/ieeetest/ieeetest.cpp Wed Mar 21 20:46:50 2001 ----- misc/build/icu/source/test/ieeetest/ieeetest.cpp Thu Aug 31 13:24:33 2006 -+--- misc/build/icu/source/test/ieeetest/ieeetest.cpp Mon Dec 11 22:58:08 2006 - *************** - *** 13,23 **** - ******************************************************************************* -@@ -2713,7 +2786,7 @@ - - //============================== - *** misc/icu/source/test/intltest/loctest.cpp Thu Jun 5 01:56:50 2003 ----- misc/build/icu/source/test/intltest/loctest.cpp Thu Aug 31 13:24:33 2006 -+--- misc/build/icu/source/test/intltest/loctest.cpp Mon Dec 11 22:58:08 2006 - *************** - *** 4,9 **** - --- 4,10 ---- -@@ -2725,7 +2798,7 @@ - #include - #include - *** misc/icu/source/test/intltest/testidn.cpp Mon Jun 9 06:54:46 2003 ----- misc/build/icu/source/test/intltest/testidn.cpp Thu Aug 31 13:24:33 2006 -+--- misc/build/icu/source/test/intltest/testidn.cpp Mon Dec 11 22:58:08 2006 - *************** - *** 19,27 **** - * in various IDNA conversion processes. -@@ -2748,7 +2821,7 @@ - #if !UCONFIG_NO_IDNA && !UCONFIG_NO_TRANSLITERATION - - *** misc/icu/source/test/intltest/tsmutex.cpp Fri May 24 01:56:48 2002 ----- misc/build/icu/source/test/intltest/tsmutex.cpp Thu Aug 31 13:24:33 2006 -+--- misc/build/icu/source/test/intltest/tsmutex.cpp Mon Dec 11 22:58:08 2006 - *************** - *** 4,9 **** - --- 4,10 ---- -@@ -2760,7 +2833,7 @@ - #include - #include - *** misc/icu/source/test/intltest/tsputil.cpp Fri Oct 5 20:47:10 2001 ----- misc/build/icu/source/test/intltest/tsputil.cpp Thu Aug 31 13:24:33 2006 -+--- misc/build/icu/source/test/intltest/tsputil.cpp Mon Dec 11 22:58:08 2006 - *************** - *** 4,9 **** - --- 4,10 ---- -@@ -2772,7 +2845,7 @@ - - #include // DBL_MAX, DBL_MIN - *** misc/icu/source/test/intltest/uobjtest.cpp Tue Jun 3 22:56:50 2003 ----- misc/build/icu/source/test/intltest/uobjtest.cpp Thu Aug 31 13:24:33 2006 -+--- misc/build/icu/source/test/intltest/uobjtest.cpp Mon Dec 11 22:58:08 2006 - *************** - *** 4,9 **** - --- 4,10 ---- -@@ -2784,7 +2857,7 @@ - #include - - *** misc/icu/source/test/intltest/ustrtest.cpp Fri May 9 18:15:50 2003 ----- misc/build/icu/source/test/intltest/ustrtest.cpp Thu Aug 31 13:24:33 2006 -+--- misc/build/icu/source/test/intltest/ustrtest.cpp Mon Dec 11 22:58:08 2006 - *************** - *** 4,9 **** - --- 4,10 ---- -@@ -2796,7 +2869,7 @@ - #include "unicode/unistr.h" - #include "unicode/uchar.h" - *** misc/icu/source/tools/genbrk/genbrk.cpp Tue Jun 3 22:56:52 2003 ----- misc/build/icu/source/tools/genbrk/genbrk.cpp Thu Aug 31 13:24:33 2006 -+--- misc/build/icu/source/tools/genbrk/genbrk.cpp Mon Dec 11 22:58:08 2006 - *************** - *** 26,33 **** - // -@@ -2817,7 +2890,7 @@ - #include "unicode/unistr.h" - #include "unicode/rbbi.h" - *** misc/icu/source/tools/gennorm/gennorm.c Tue May 6 03:36:14 2003 ----- misc/build/icu/source/tools/gennorm/gennorm.c Thu Aug 31 13:24:33 2006 -+--- misc/build/icu/source/tools/gennorm/gennorm.c Mon Dec 11 22:58:08 2006 - *************** - *** 241,249 **** - return; -@@ -2840,7 +2913,7 @@ - } else { - return; - *** misc/icu/source/tools/genpname/genpname.cpp Wed Jun 4 00:23:50 2003 ----- misc/build/icu/source/tools/genpname/genpname.cpp Thu Aug 31 13:24:33 2006 -+--- misc/build/icu/source/tools/genpname/genpname.cpp Mon Dec 11 22:58:08 2006 - *************** - *** 8,16 **** - ********************************************************************** -@@ -2863,7 +2936,7 @@ - #include "cmemory.h" - #include "cstring.h" - *** misc/icu/source/tools/gentz/gentz.cpp Tue Jun 3 22:56:54 2003 ----- misc/build/icu/source/tools/gentz/gentz.cpp Thu Aug 31 13:24:33 2006 -+--- misc/build/icu/source/tools/gentz/gentz.cpp Mon Dec 11 22:58:08 2006 - *************** - *** 25,33 **** - * See tz.pl for the file format that is READ by this program. -@@ -2886,7 +2959,7 @@ - #include "cmemory.h" - #include "cstring.h" - *** misc/icu/source/tools/genuca/genuca.cpp Tue Jun 3 22:56:54 2003 ----- misc/build/icu/source/tools/genuca/genuca.cpp Thu Aug 31 13:24:33 2006 -+--- misc/build/icu/source/tools/genuca/genuca.cpp Mon Dec 11 22:58:08 2006 - *************** - *** 23,30 **** - * 05/09/2001 weiv Case bits are now in the CEs, not in front -@@ -2907,7 +2980,7 @@ - #include "ucol_imp.h" - #include "genuca.h" - *** misc/icu/source/tools/pkgdata/dllmode.c Tue Jun 3 22:56:54 2003 ----- misc/build/icu/source/tools/pkgdata/dllmode.c Thu Aug 31 13:24:33 2006 -+--- misc/build/icu/source/tools/pkgdata/dllmode.c Mon Dec 11 22:58:08 2006 - *************** - *** 131,137 **** - } -@@ -2960,7 +3033,7 @@ - #else - - *** misc/icu/source/tools/pkgdata/gmake.c Tue Aug 6 21:06:32 2002 ----- misc/build/icu/source/tools/pkgdata/gmake.c Thu Aug 31 13:24:33 2006 -+--- misc/build/icu/source/tools/pkgdata/gmake.c Mon Dec 11 22:58:08 2006 - *************** - *** 203,209 **** - commands = pkg_appendToList(commands, NULL, uprv_strdup(stanza)); -@@ -2978,45 +3051,3 @@ - commands = pkg_appendToList(commands, NULL, uprv_strdup(stanza)); - - sprintf(stanza, "@$(RMV) $(TEMP_DIR)/%s", cfile+genFileOffset); --*** misc/icu/source/common/unicode/urename.h ----- misc/build/icu/source/common/unicode/urename.h --*************** --*** 25,31 **** -- that do not use Autoconf. */ -- /* #define U_DISABLE_RENAMING 1 */ -- --! #if !U_DISABLE_RENAMING -- -- /* C exports renaming data */ -- ----- 25,31 ---- -- that do not use Autoconf. */ -- /* #define U_DISABLE_RENAMING 1 */ -- --! #if !defined U_DISABLE_RENAMING || !U_DISABLE_RENAMING -- -- /* C exports renaming data */ -- --*** misc/icu/source/common/unicode/utypes.h ----- misc/build/icu/source/common/unicode/utypes.h --*************** --*** 420,428 **** -- * -- * Note: This is currently only done on Windows because -- * some Linux/Unix compilers have problems with defining global new/delete. --! * On Windows, WIN32 is defined, and it is _MSC_Ver>=1200 for MSVC 6.0 and higher. -- */ --! #if defined(XP_CPLUSPLUS) && defined(WIN32) && (_MSC_Ver>=1200) && (defined(U_COMMON_IMPLEMENTATION) || defined(U_I18N_IMPLEMENTATION) || defined(U_LAYOUT_IMPLEMENTATION) || defined(U_USTDIO_IMPLEMENTATION)) -- -- /** -- * Global operator new, defined only inside ICU4C, must not be used. ----- 420,428 ---- -- * -- * Note: This is currently only done on Windows because -- * some Linux/Unix compilers have problems with defining global new/delete. --! * On Windows, WIN32 is defined, and it is _MSC_VER>=1200 for MSVC 6.0 and higher. -- */ --! #if defined(XP_CPLUSPLUS) && defined(WIN32) && (_MSC_VER>=1200) && (defined(U_COMMON_IMPLEMENTATION) || defined(U_I18N_IMPLEMENTATION) || defined(U_LAYOUT_IMPLEMENTATION) || defined(U_USTDIO_IMPLEMENTATION)) -- -- /** -- * Global operator new, defined only inside ICU4C, must not be used. Index: patches/patch-icu_icu-3_6_patch =================================================================== RCS file: patches/patch-icu_icu-3_6_patch diff -N patches/patch-icu_icu-3_6_patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-icu_icu-3_6_patch 21 Feb 2007 11:21:53 -0000 @@ -0,0 +1,343 @@ +$OpenBSD$ +--- icu/icu-3.6.patch.orig.port Tue Jan 30 09:37:09 2007 ++++ icu/icu-3.6.patch Tue Feb 20 09:51:58 2007 +@@ -1,5 +1,5 @@ + *** misc/icu/source/common/putil.c Mon Jul 31 20:14:28 2006 +---- misc/build/icu/source/common/putil.c Wed Jan 3 09:40:21 2007 ++--- misc/build/icu/source/common/putil.c Tue Feb 20 09:50:08 2007 + *************** + *** 48,54 **** + #endif +@@ -19,7 +19,7 @@ + #endif + + *** misc/icu/source/config/mh-darwin Wed Feb 1 08:52:42 2006 +---- misc/build/icu/source/config/mh-darwin Wed Jan 3 09:41:43 2007 ++--- misc/build/icu/source/config/mh-darwin Tue Feb 20 09:50:08 2007 + *************** + *** 25,31 **** + SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) +@@ -38,7 +38,7 @@ + ## Compiler switch to embed a runtime search path + LD_RPATH= + *** misc/icu/source/config/mh-irix Thu Mar 23 19:51:52 2006 +---- misc/build/icu/source/config/mh-irix Wed Jan 3 09:40:21 2007 ++--- misc/build/icu/source/config/mh-irix Tue Feb 20 09:50:08 2007 + *************** + *** 23,28 **** + --- 23,31 ---- +@@ -52,7 +52,7 @@ + THREADSCPPFLAGS = -D_REENTRANT -D_PTHREADS + LIBCPPFLAGS = + *** misc/icu/source/config/mh-linux Thu Mar 23 19:51:52 2006 +---- misc/build/icu/source/config/mh-linux Wed Jan 3 09:40:21 2007 ++--- misc/build/icu/source/config/mh-linux Tue Feb 20 09:50:08 2007 + *************** + *** 20,25 **** + --- 20,32 ---- +@@ -70,9 +70,9 @@ + LDFLAGSICUDT=-nodefaultlibs -nostdlib + + *** misc/icu/source/config/mh-solaris Fri Feb 24 20:31:14 2006 +---- misc/build/icu/source/config/mh-solaris Wed Jan 3 09:40:21 2007 ++--- misc/build/icu/source/config/mh-solaris Tue Feb 20 09:50:08 2007 + *************** +-*** 18,34 **** ++*** 18,33 **** + + ## Commands to link + ## For Sun Workshop, use CC to link to bring in C++ runtime +@@ -89,8 +89,7 @@ + + #LIBRARY_PATH_PREFIX=/usr/lib/lwp: + +- ## Compiler switch to embed a library name +---- 18,42 ---- ++--- 18,41 ---- + + ## Commands to link + ## For Sun Workshop, use CC to link to bring in C++ runtime +@@ -105,19 +104,37 @@ + ## Compiler switch to embed a runtime search path + LD_RPATH= -R + LD_RPATH_PRE= +- +++ + + ## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH + + ENABLE_RPATH=YES + + RPATHLDFLAGS=${LD_RPATH}'$$ORIGIN' + + + + #SH# ENABLE_RPATH=YES + + #SH# RPATHLDFLAGS="${LD_RPATH}'$$ORIGIN'" +-+ ++ + #LIBRARY_PATH_PREFIX=/usr/lib/lwp: + +- ## Compiler switch to embed a library name ++*** misc/icu/source/configure Tue Aug 15 10:24:14 2006 ++--- misc/build/icu/source/configure Tue Feb 20 09:51:08 2007 ++*************** ++*** 4400,4406 **** ++ ++ GENCCODE_ASSEMBLY= ++ case "${host}" in ++! i*86-*-linux*|x86_64-*-linux*|powerpc*-*-linux*|i*86-*-*bsd*|i*86-*-solaris*) ++ if test "$GCC" = yes; then ++ GENCCODE_ASSEMBLY="-a gcc" ++ fi ;; ++--- 4400,4406 ---- ++ ++ GENCCODE_ASSEMBLY= ++ case "${host}" in ++! i*86-*-linux*|x86_64-*-linux*|powerpc*-*-linux*|i*86-*-solaris*) ++ if test "$GCC" = yes; then ++ GENCCODE_ASSEMBLY="-a gcc" ++ fi ;; + *** misc/icu/source/data/Makefile.in Sat Aug 12 00:22:24 2006 +---- misc/build/icu/source/data/Makefile.in Wed Jan 3 09:40:21 2007 ++--- misc/build/icu/source/data/Makefile.in Tue Feb 20 09:50:08 2007 + *************** + *** 344,350 **** + ifneq ($(ICUDATA_SOURCE_IS_NATIVE_TARGET),YES) +@@ -136,7 +153,7 @@ + @echo "$@" > $@ + endif + *** misc/icu/source/layout/CoverageTables.cpp Sat May 8 01:28:42 2004 +---- misc/build/icu/source/layout/CoverageTables.cpp Fri Jan 19 16:03:21 2007 ++--- misc/build/icu/source/layout/CoverageTables.cpp Tue Feb 20 09:50:08 2007 + *************** + *** 44,49 **** + --- 44,53 ---- +@@ -151,7 +168,7 @@ + le_uint16 probe = power; + le_uint16 index = 0; + *** misc/icu/source/layout/DeviceTables.cpp Fri Jan 14 18:25:12 2005 +---- misc/build/icu/source/layout/DeviceTables.cpp Fri Jan 19 16:03:20 2007 ++--- misc/build/icu/source/layout/DeviceTables.cpp Tue Feb 20 09:50:08 2007 + *************** + *** 22,28 **** + le_uint16 format = SWAPW(deltaFormat) - 1; +@@ -171,7 +188,7 @@ + le_uint16 bits = fieldBits[format]; + le_uint16 count = 16 / bits; + *** misc/icu/source/layout/GXLayoutEngine.cpp Fri Sep 2 20:22:10 2005 +---- misc/build/icu/source/layout/GXLayoutEngine.cpp Wed Jan 3 09:40:21 2007 ++--- misc/build/icu/source/layout/GXLayoutEngine.cpp Tue Feb 20 09:50:08 2007 + *************** + *** 39,45 **** + return 0; +@@ -190,7 +207,7 @@ + if (LE_FAILURE(success)) { + return 0; + *** misc/icu/source/layout/IndicClassTables.cpp Wed Aug 23 02:12:40 2006 +---- misc/build/icu/source/layout/IndicClassTables.cpp Fri Jan 19 16:03:21 2007 ++--- misc/build/icu/source/layout/IndicClassTables.cpp Tue Feb 20 09:50:08 2007 + *************** + *** 94,100 **** + _dr, _db, _db, _db, _db, _xx, _xx, _l1, _dl, _xx, _xx, _s1, _s2, _vr, _xx, _xx, // 09C0 - 09CF +@@ -209,14 +226,14 @@ + + static const IndicClassTable::CharClass punjCharClasses[] = + *************** +-*** 120,125 **** +---- 120,138 ---- ++*** 120,127 **** ++--- 120,140 ---- + _iv, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx // 0AE0 - 0AEF + }; + + + #if 1 +-+ static const IndicClassTable::CharClass oryaCharClasses[] = +-+ { ++ static const IndicClassTable::CharClass oryaCharClasses[] = ++ { + + _xx, _ma, _mp, _mp, _xx, _iv, _iv, _iv, _iv, _iv, _iv, _iv, _iv, _xx, _xx, _iv, /* 0B00 - 0B0F */ + + _iv, _xx, _xx, _iv, _iv, _bb, _bb, _bb, _bb, _bb, _bb, _bb, _bb, _bb, _ct, _bb, /* 0B10 - 0B1F */ + + _bb, _bb, _bb, _bb, _bb, _bb, _bb, _bb, _bb, _xx, _bb, _bb, _bb, _bb, _bb, _pb, /* 0B20 - 0B2F */ +@@ -227,9 +244,11 @@ + + _xx, _bb /* 0B70 - 0B71 */ + + }; + + #else +- static const IndicClassTable::CharClass oryaCharClasses[] = +- { +++ static const IndicClassTable::CharClass oryaCharClasses[] = +++ { + _xx, _ma, _mp, _mp, _xx, _iv, _iv, _iv, _iv, _iv, _iv, _iv, _iv, _xx, _xx, _iv, // 0B00 - 0B0F ++ _iv, _xx, _xx, _iv, _iv, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, // 0B10 - 0B1F ++ _ct, _ct, _ct, _ct, _bb, _ct, _ct, _ct, _bb, _xx, _ct, _ct, _bb, _bb, _bb, _pb, // 0B20 - 0B2F + *************** + *** 131,136 **** + --- 144,150 ---- +@@ -324,7 +343,7 @@ + // + // IndicClassTable addresses + *** misc/icu/source/layout/IndicReordering.cpp Tue Apr 25 21:08:12 2006 +---- misc/build/icu/source/layout/IndicReordering.cpp Fri Jan 19 16:03:20 2007 ++--- misc/build/icu/source/layout/IndicReordering.cpp Tue Feb 20 09:50:08 2007 + *************** + *** 50,55 **** + --- 50,63 ---- +@@ -406,11 +425,13 @@ + {-1, -1, -1, -1, -1, -1, 3, 2, -1, -1, -1, -1, -1, -1, -1}, // 7 - consonant virama ZWJ, consonant ZWJ virama + {-1, 6, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 4, -1}, // 8 - independent vowels that can take a virama + *************** +-*** 629,634 **** +---- 651,670 ---- ++*** 627,632 **** ++--- 649,668 ---- ++ // write base consonant ++ for (i = baseConsonant; i < bcSpan; i += 1) { + output.writeChar(chars[i], i, tagArray4); +- } +- +++ } +++ + + /* for the special conjuction of Cons+0x0d4d+0x0d31 or Cons+0x0d4d+0x0d30 of Malayalam */ + + if ((baseConsonant - 2 >= 0) && + + (chars[baseConsonant - 1] == 0x0d4d) && +@@ -423,13 +444,11 @@ + + + + if (mpreFixups) + + mpreFixups->reduce(); +-+ } +-+ ++ } ++ + if ((classTable->scriptFlags & SF_MATRAS_AFTER_BASE) != 0) { +- output.writeMbelow(); +- output.writeSMbelow(); // FIXME: there are no SMs in these scripts... + *** misc/icu/source/layout/LESwaps.h Thu Jun 23 00:39:36 2005 +---- misc/build/icu/source/layout/LESwaps.h Wed Jan 3 09:40:21 2007 ++--- misc/build/icu/source/layout/LESwaps.h Tue Feb 20 09:50:08 2007 + *************** + *** 2,7 **** + --- 2,8 ---- +@@ -477,11 +496,12 @@ + #if U_IS_BIG_ENDIAN + #define SWAPW(value) (value) + *************** +-*** 49,54 **** +---- 59,83 ---- ++*** 48,53 **** ++--- 58,82 ---- ++ #else + #define SWAPL(value) (LESwaps::isBigEndian() ? (value) : LESwaps::swapLong(value)) + #endif +- +++ + + #else // ALLOW_UNALIGNED_HACK + + + + #define SWAPW(rValue) loadBigEndianWord(reinterpret_cast(rValue)) +@@ -500,12 +520,11 @@ + + } + + + + #endif // ALLOW_UNALIGNED_HACK +-+ ++ + /** + * This class is used to access data which stored in big endian order +- * regardless of the conventions of the platform. It has been designed + *** misc/icu/source/layout/MPreFixups.cpp Sat May 8 01:28:44 2004 +---- misc/build/icu/source/layout/MPreFixups.cpp Fri Jan 19 16:03:20 2007 ++--- misc/build/icu/source/layout/MPreFixups.cpp Tue Feb 20 09:50:08 2007 + *************** + *** 40,45 **** + --- 40,51 ---- +@@ -522,7 +541,7 @@ + { + for (le_int32 fixup = 0; fixup < fFixupCount; fixup += 1) { + *** misc/icu/source/layout/MPreFixups.h Mon Apr 12 20:51:32 2004 +---- misc/build/icu/source/layout/MPreFixups.h Fri Jan 19 16:03:20 2007 ++--- misc/build/icu/source/layout/MPreFixups.h Tue Feb 20 09:50:08 2007 + *************** + *** 31,36 **** + --- 31,38 ---- +@@ -534,8 +553,60 @@ + private: + FixupData *fFixupData; + le_int32 fFixupCount; ++*** misc/icu/source/stubdata/stubdata.c Wed Nov 21 03:28:14 2001 ++--- misc/build/icu/source/stubdata/stubdata.c Tue Feb 20 09:50:08 2007 ++*************** ++*** 28,41 **** ++ UDataInfo info; ++ char padding[8]; ++ uint32_t count, reserved; ++- /* ++ const struct { ++ const char *const name; ++ const void *const data; ++! } toc[1]; ++! */ ++! int fakeNameAndData[4]; /* TODO: Change this header type from */ ++! /* pointerTOC to OffsetTOC. */ ++ } ICU_Data_Header; ++ ++ U_EXPORT const ICU_Data_Header U_ICUDATA_ENTRY_POINT = { ++--- 28,37 ---- ++ UDataInfo info; ++ char padding[8]; ++ uint32_t count, reserved; ++ const struct { ++ const char *const name; ++ const void *const data; ++! } toc[537]; /* set to real toc size to avoid symbol size mismatch runtime link errors */ ++ } ICU_Data_Header; ++ ++ U_EXPORT const ICU_Data_Header U_ICUDATA_ENTRY_POINT = { ++*************** ++*** 64,73 **** ++ 0, /* count */ ++ 0, /* Reserved */ ++ { /* TOC structure */ ++! /* { */ ++! 0 , 0 , 0, 0 /* name and data entries. Count says there are none, */ ++ /* but put one in just in case. */ ++! /* } */ ++ } ++ }; ++ ++--- 60,69 ---- ++ 0, /* count */ ++ 0, /* Reserved */ ++ { /* TOC structure */ ++! { ++! {0 , 0} /* name and data entries. Count says there are none, */ ++ /* but put one in just in case. */ ++! } ++ } ++ }; ++ + *** misc/icu/source/test/intltest/loctest.cpp Thu Jul 6 03:50:04 2006 +---- misc/build/icu/source/test/intltest/loctest.cpp Wed Jan 3 09:40:21 2007 ++--- misc/build/icu/source/test/intltest/loctest.cpp Tue Feb 20 09:50:08 2007 + *************** + *** 4,9 **** + --- 4,10 ---- +@@ -547,7 +618,7 @@ + #include "unicode/decimfmt.h" + #include "unicode/ucurr.h" + *** misc/icu/source/test/intltest/tsputil.cpp Wed Jul 19 00:18:10 2006 +---- misc/build/icu/source/test/intltest/tsputil.cpp Wed Jan 3 09:40:21 2007 ++--- misc/build/icu/source/test/intltest/tsputil.cpp Tue Feb 20 09:50:08 2007 + *************** + *** 4,9 **** + --- 4,10 ---- +@@ -559,7 +630,7 @@ + + #include // DBL_MAX, DBL_MIN + *** misc/icu/source/test/intltest/uobjtest.cpp Thu Mar 23 01:54:12 2006 +---- misc/build/icu/source/test/intltest/uobjtest.cpp Wed Jan 3 09:40:21 2007 ++--- misc/build/icu/source/test/intltest/uobjtest.cpp Tue Feb 20 09:50:08 2007 + *************** + *** 4,9 **** + --- 4,10 ---- +@@ -571,7 +642,7 @@ + #include "cmemory.h" // UAlignedMemory + #include + *** misc/icu/source/test/intltest/ustrtest.cpp Tue Dec 28 22:13:54 2004 +---- misc/build/icu/source/test/intltest/ustrtest.cpp Wed Jan 3 09:40:21 2007 ++--- misc/build/icu/source/test/intltest/ustrtest.cpp Tue Feb 20 09:50:08 2007 + *************** + *** 4,9 **** + --- 4,10 ---- Index: patches/patch-icu_makefile_mk =================================================================== RCS file: /cvs/ports/editors/openoffice/patches/patch-icu_makefile_mk,v retrieving revision 1.2 diff -u -r1.2 patch-icu_makefile_mk --- patches/patch-icu_makefile_mk 9 Nov 2006 15:18:01 -0000 1.2 +++ patches/patch-icu_makefile_mk 21 Feb 2007 11:21:53 -0000 @@ -1,12 +1,11 @@ -$OpenBSD: patch-icu_makefile_mk,v 1.2 2006/11/09 15:18:01 kurt Exp $ ---- icu/makefile.mk.orig.port Tue Mar 7 12:08:03 2006 -+++ icu/makefile.mk Wed Nov 8 11:47:18 2006 -@@ -77,7 +77,7 @@ icu_CXXFLAGS+=-O $(ARCH_FLAGS) +--- icu/makefile.mk.orig.port Mon Jan 22 11:13:24 2007 ++++ icu/makefile.mk Tue Feb 6 23:13:33 2007 +@@ -82,7 +82,7 @@ DISABLE_64BIT=--enable-64bit-libs=no CONFIGURE_DIR=source --CONFIGURE_ACTION=sh -c 'CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS)" ./configure --enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no' -+CONFIGURE_ACTION=sh -c 'CFLAGS="$(icu_CFLAGS) -fPIC" CXXFLAGS="$(icu_CXXFLAGS) -fPIC" LDFLAGS="$(icu_LDFLAGS) -fPIC" ./configure --enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no' +-CONFIGURE_ACTION=sh -c 'CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS)" ./configure --enable-layout --enable-static --enable-shared=yes $(DISABLE_64BIT)' ++CONFIGURE_ACTION=sh -c 'CFLAGS="$(icu_CFLAGS) -fPIC" CXXFLAGS="$(icu_CXXFLAGS) -fPIC" LDFLAGS="$(icu_LDFLAGS) -fPIC" ./configure --enable-layout --enable-static --enable-shared=yes $(DISABLE_64BIT)' #CONFIGURE_FLAGS=--enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no CONFIGURE_FLAGS= Index: patches/patch-instsetoo_native_inc_openoffice_unix_packagelist_txt =================================================================== RCS file: /cvs/ports/editors/openoffice/patches/patch-instsetoo_native_inc_openoffice_unix_packagelist_txt,v retrieving revision 1.3 diff -u -r1.3 patch-instsetoo_native_inc_openoffice_unix_packagelist_txt --- patches/patch-instsetoo_native_inc_openoffice_unix_packagelist_txt 19 Oct 2006 15:16:50 -0000 1.3 +++ patches/patch-instsetoo_native_inc_openoffice_unix_packagelist_txt 21 Feb 2007 11:21:53 -0000 @@ -1,8 +1,7 @@ -$OpenBSD: patch-instsetoo_native_inc_openoffice_unix_packagelist_txt,v 1.3 2006/10/19 15:16:50 kurt Exp $ ---- instsetoo_native/inc_openoffice/unix/packagelist.txt.orig.port Fri Aug 4 05:49:52 2006 -+++ instsetoo_native/inc_openoffice/unix/packagelist.txt Thu Oct 19 10:50:43 2006 -@@ -28,7 +28,7 @@ findrequires = "find-requires-gnome.sh" - copyright = "1999-2006 by OpenOffice.org" +--- instsetoo_native/inc_openoffice/unix/packagelist.txt.orig.port Mon Feb 12 09:34:36 2007 ++++ instsetoo_native/inc_openoffice/unix/packagelist.txt Mon Feb 12 09:35:34 2007 +@@ -29,7 +29,7 @@ copyright = "1999-2006 by OpenOffice.org + solariscopyright = "solariscopyrightfile" vendor = "OpenOffice.org" description = "Gnome integration module for %PRODUCTNAME %PRODUCTVERSION" -destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION" @@ -10,8 +9,8 @@ End Start -@@ -42,7 +42,7 @@ requires = "%UNIXPRODUCTNAME-core01" - copyright = "1999-2006 by OpenOffice.org" +@@ -44,7 +44,7 @@ copyright = "1999-2006 by OpenOffice.org + solariscopyright = "solariscopyrightfile" vendor = "OpenOffice.org" description = "KDE integration module for %PRODUCTNAME %PRODUCTVERSION" -destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION" @@ -19,8 +18,8 @@ End Start -@@ -56,7 +56,7 @@ freebsdrequires = "%UNIXPRODUCTNAME-core - copyright = "1999-2006 by OpenOffice.org" +@@ -59,7 +59,7 @@ copyright = "1999-2006 by OpenOffice.org + solariscopyright = "solariscopyrightfile" vendor = "OpenOffice.org" description = "Core module for %PRODUCTNAME %PRODUCTVERSION" -destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION" @@ -28,8 +27,8 @@ End Start -@@ -71,7 +71,7 @@ requires = "%UNIXPRODUCTNAME-core01" - copyright = "1999-2006 by OpenOffice.org" +@@ -75,7 +75,7 @@ copyright = "1999-2006 by OpenOffice.org + solariscopyright = "solariscopyrightfile" vendor = "OpenOffice.org" description = "Writer module for %PRODUCTNAME %PRODUCTVERSION" -destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION" @@ -37,8 +36,8 @@ End Start -@@ -86,7 +86,7 @@ requires = "%UNIXPRODUCTNAME-core01" - copyright = "1999-2006 by OpenOffice.org" +@@ -91,7 +91,7 @@ copyright = "1999-2006 by OpenOffice.org + solariscopyright = "solariscopyrightfile" vendor = "OpenOffice.org" description = "Calc module for %PRODUCTNAME %PRODUCTVERSION" -destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION" @@ -46,8 +45,8 @@ End Start -@@ -101,7 +101,7 @@ requires = "%UNIXPRODUCTNAME-core01" - copyright = "1999-2006 by OpenOffice.org" +@@ -107,7 +107,7 @@ copyright = "1999-2006 by OpenOffice.org + solariscopyright = "solariscopyrightfile" vendor = "OpenOffice.org" description = "Draw module for %PRODUCTNAME %PRODUCTVERSION" -destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION" @@ -55,8 +54,8 @@ End Start -@@ -116,7 +116,7 @@ requires = "%UNIXPRODUCTNAME-core01" - copyright = "1999-2006 by OpenOffice.org" +@@ -123,7 +123,7 @@ copyright = "1999-2006 by OpenOffice.org + solariscopyright = "solariscopyrightfile" vendor = "OpenOffice.org" description = "Impress module for %PRODUCTNAME %PRODUCTVERSION" -destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION" @@ -64,8 +63,8 @@ End Start -@@ -131,7 +131,7 @@ requires = "%UNIXPRODUCTNAME-core01" - copyright = "1999-2006 by OpenOffice.org" +@@ -139,7 +139,7 @@ copyright = "1999-2006 by OpenOffice.org + solariscopyright = "solariscopyrightfile" vendor = "OpenOffice.org" description = "Base module for %PRODUCTNAME %PRODUCTVERSION" -destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION" @@ -73,8 +72,8 @@ End Start -@@ -146,7 +146,7 @@ requires = "%UNIXPRODUCTNAME-core01" - copyright = "1999-2006 by OpenOffice.org" +@@ -155,7 +155,7 @@ copyright = "1999-2006 by OpenOffice.org + solariscopyright = "solariscopyrightfile" vendor = "OpenOffice.org" description = "Math module for %PRODUCTNAME %PRODUCTVERSION" -destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION" @@ -82,8 +81,8 @@ End Start -@@ -160,7 +160,7 @@ requires = "%UNIXPRODUCTNAME-core01" - copyright = "1999-2006 by OpenOffice.org" +@@ -170,7 +170,7 @@ copyright = "1999-2006 by OpenOffice.org + solariscopyright = "solariscopyrightfile" vendor = "OpenOffice.org" description = "Graphic filter module for %PRODUCTNAME %PRODUCTVERSION" -destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION" @@ -91,8 +90,8 @@ End Start -@@ -174,7 +174,7 @@ requires = "%UNIXPRODUCTNAME-core01" - copyright = "1999-2006 by OpenOffice.org" +@@ -185,7 +185,7 @@ copyright = "1999-2006 by OpenOffice.org + solariscopyright = "solariscopyrightfile" vendor = "OpenOffice.org" description = "Testtool module for %PRODUCTNAME %PRODUCTVERSION" -destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION" @@ -100,8 +99,8 @@ End Start -@@ -188,7 +188,7 @@ requires = "%UNIXPRODUCTNAME-core01" - copyright = "1999-2006 by OpenOffice.org" +@@ -200,7 +200,7 @@ copyright = "1999-2006 by OpenOffice.org + solariscopyright = "solariscopyrightfile" vendor = "OpenOffice.org" description = "English spellchecker module for %PRODUCTNAME %PRODUCTVERSION" -destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION" @@ -109,8 +108,8 @@ End Start -@@ -202,7 +202,7 @@ requires = "%UNIXPRODUCTNAME-core01" - copyright = "1999-2006 by OpenOffice.org" +@@ -215,7 +215,7 @@ copyright = "1999-2006 by OpenOffice.org + solariscopyright = "solariscopyrightfile" vendor = "OpenOffice.org" description = "XSLT filter samples module for %PRODUCTNAME %PRODUCTVERSION" -destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION" @@ -118,8 +117,8 @@ End Start -@@ -216,7 +216,7 @@ requires = "%UNIXPRODUCTNAME-core01" - copyright = "1999-2006 by OpenOffice.org" +@@ -230,7 +230,7 @@ copyright = "1999-2006 by OpenOffice.org + solariscopyright = "solariscopyrightfile" vendor = "OpenOffice.org" description = "Java filter module for %PRODUCTNAME %PRODUCTVERSION" -destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION" @@ -127,8 +126,8 @@ End Start -@@ -230,7 +230,7 @@ requires = "%UNIXPRODUCTNAME-core01" - copyright = "1999-2006 by OpenOffice.org" +@@ -245,7 +245,7 @@ copyright = "1999-2006 by OpenOffice.org + solariscopyright = "solariscopyrightfile" vendor = "OpenOffice.org" description = "Optional gallery for %PRODUCTNAME %PRODUCTVERSION" -destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION" @@ -136,8 +135,8 @@ End Start -@@ -244,7 +244,7 @@ requires = "%UNIXPRODUCTNAME-core01" - copyright = "1999-2006 by OpenOffice.org" +@@ -260,7 +260,7 @@ copyright = "1999-2006 by OpenOffice.org + solariscopyright = "solariscopyrightfile" vendor = "OpenOffice.org" description = "Language utilities for %PRODUCTNAME %PRODUCTVERSION" -destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION" @@ -145,8 +144,8 @@ End Start -@@ -258,7 +258,7 @@ requires = "%UNIXPRODUCTNAME-core01" - copyright = "1999-2006 by OpenOffice.org" +@@ -275,7 +275,7 @@ copyright = "1999-2006 by OpenOffice.org + solariscopyright = "solariscopyrightfile" vendor = "OpenOffice.org" description = "ActiveX control for %PRODUCTNAME %PRODUCTVERSION" -destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION" @@ -154,8 +153,8 @@ End Start -@@ -270,7 +270,7 @@ requires = "%UNIXPRODUCTNAME-core01" - copyright = "1999-2005 by Sun Microsystems" +@@ -288,7 +288,7 @@ copyright = "1999-2005 by Sun Microsyste + solariscopyright = "solariscopyrightfile" vendor = "Sun Microsystems, Inc." description = "Online update modul for %PRODUCTNAME %PRODUCTVERSION" -destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION" @@ -163,8 +162,8 @@ End Start -@@ -284,7 +284,7 @@ requires = "%UNIXPRODUCTNAME-core01" - copyright = "1999-2006 by OpenOffice.org" +@@ -303,7 +303,7 @@ copyright = "1999-2006 by OpenOffice.org + solariscopyright = "solariscopyrightfile" vendor = "OpenOffice.org" description = "Pyuno module for %PRODUCTNAME %PRODUCTVERSION" -destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION" @@ -172,13 +171,8 @@ End Start -@@ -294,11 +294,12 @@ solarisrequires = "%WITHOUTDOTUNIXPRODUC - packagename = "%UNIXPRODUCTNAME-emailmerge" - linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-emailmerge" - freebsdrequires = "%UNIXPRODUCTNAME-core01" -+openbsdrequires = "%UNIXPRODUCTNAME-core01" - requires = "%UNIXPRODUCTNAME-pyuno" - copyright = "1999-2006 by OpenOffice.org" +@@ -318,7 +318,7 @@ copyright = "1999-2006 by OpenOffice.org + solariscopyright = "solariscopyrightfile" vendor = "OpenOffice.org" description = "Email mailmerge module for %PRODUCTNAME %PRODUCTVERSION" -destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION" @@ -186,8 +180,8 @@ End Start -@@ -312,7 +313,7 @@ requires = "%UNIXPRODUCTNAME-core01" - copyright = "1999-2006 by OpenOffice.org" +@@ -333,7 +333,7 @@ copyright = "1999-2006 by OpenOffice.org + solariscopyright = "solariscopyrightfile" vendor = "OpenOffice.org" description = "Mailcap module for %PRODUCTNAME %PRODUCTVERSION" -destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION" @@ -195,14 +189,8 @@ End Start -@@ -322,12 +323,12 @@ solarispackagename = "%WITHOUTDOTUNIXPRO - solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01" - packagename = "%UNIXPRODUCTNAME-core02" - linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core02" --requires = "%UNIXPRODUCTNAME-core01" -+requires = "" - freebsdrequires = "" - copyright = "1999-2006 by OpenOffice.org" +@@ -349,7 +349,7 @@ copyright = "1999-2006 by OpenOffice.org + solariscopyright = "solariscopyrightfile" vendor = "OpenOffice.org" description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION" @@ -210,14 +198,8 @@ End Start -@@ -336,12 +337,12 @@ solarispackagename = "%WITHOUTDOTUNIXPRO - solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01" - packagename = "%UNIXPRODUCTNAME-core03" - linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core03" --requires = "%UNIXPRODUCTNAME-core01" -+requires = "" - freebsdrequires = "" - copyright = "1999-2006 by OpenOffice.org" +@@ -364,7 +364,7 @@ copyright = "1999-2006 by OpenOffice.org + solariscopyright = "solariscopyrightfile" vendor = "OpenOffice.org" description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION" @@ -225,14 +207,8 @@ End Start -@@ -350,12 +351,12 @@ solarispackagename = "%WITHOUTDOTUNIXPRO - solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01" - packagename = "%UNIXPRODUCTNAME-core04" - linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core04,%UNIXPRODUCTNAME-spellcheck" --requires = "%UNIXPRODUCTNAME-core01" -+requires = "" - freebsdrequires = "" - copyright = "1999-2006 by OpenOffice.org" +@@ -379,7 +379,7 @@ copyright = "1999-2006 by OpenOffice.org + solariscopyright = "solariscopyrightfile" vendor = "OpenOffice.org" description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION" @@ -240,14 +216,8 @@ End Start -@@ -364,12 +365,12 @@ solarispackagename = "%WITHOUTDOTUNIXPRO - solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01" - packagename = "%UNIXPRODUCTNAME-core05" - linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core05" --requires = "%UNIXPRODUCTNAME-core01" -+requires = "" - freebsdrequires = "" - copyright = "1999-2006 by OpenOffice.org" +@@ -394,7 +394,7 @@ copyright = "1999-2006 by OpenOffice.org + solariscopyright = "solariscopyrightfile" vendor = "OpenOffice.org" description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION" @@ -255,14 +225,8 @@ End Start -@@ -378,12 +379,12 @@ solarispackagename = "%WITHOUTDOTUNIXPRO - solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01" - packagename = "%UNIXPRODUCTNAME-core06" - linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core06" --requires = "%UNIXPRODUCTNAME-core01" -+requires = "" - freebsdrequires = "" - copyright = "1999-2006 by OpenOffice.org" +@@ -409,7 +409,7 @@ copyright = "1999-2006 by OpenOffice.org + solariscopyright = "solariscopyrightfile" vendor = "OpenOffice.org" description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION" @@ -270,14 +234,8 @@ End Start -@@ -392,12 +393,12 @@ solarispackagename = "%WITHOUTDOTUNIXPRO - solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01" - packagename = "%UNIXPRODUCTNAME-core07" - linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core07" --requires = "%UNIXPRODUCTNAME-core01" -+requires = "" - freebsdrequires = "" - copyright = "1999-2006 by OpenOffice.org" +@@ -424,7 +424,7 @@ copyright = "1999-2006 by OpenOffice.org + solariscopyright = "solariscopyrightfile" vendor = "OpenOffice.org" description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION" @@ -285,14 +243,8 @@ End Start -@@ -406,12 +407,12 @@ solarispackagename = "%WITHOUTDOTUNIXPRO - solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01" - packagename = "%UNIXPRODUCTNAME-core08" - linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core08" --requires = "%UNIXPRODUCTNAME-core01" -+requires = "" - freebsdrequires = "" - copyright = "1999-2006 by OpenOffice.org" +@@ -439,7 +439,7 @@ copyright = "1999-2006 by OpenOffice.org + solariscopyright = "solariscopyrightfile" vendor = "OpenOffice.org" description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION" @@ -300,14 +252,8 @@ End Start -@@ -420,12 +421,12 @@ solarispackagename = "%WITHOUTDOTUNIXPRO - solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01" - packagename = "%UNIXPRODUCTNAME-core09" - linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core09" --requires = "%UNIXPRODUCTNAME-core01" -+requires = "" - freebsdrequires = "" - copyright = "1999-2006 by OpenOffice.org" +@@ -454,7 +454,7 @@ copyright = "1999-2006 by OpenOffice.org + solariscopyright = "solariscopyrightfile" vendor = "OpenOffice.org" description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION" @@ -315,14 +261,8 @@ End Start -@@ -435,10 +436,10 @@ solarispackagename = "%WITHOUTDOTUNIXPRO - solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01" - packagename = "%UNIXPRODUCTNAME-core10" - linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core10" --requires = "%UNIXPRODUCTNAME-core01" -+requires = "" - freebsdrequires = "" - copyright = "1999-2006 by OpenOffice.org" +@@ -470,5 +470,5 @@ copyright = "1999-2006 by OpenOffice.org + solariscopyright = "solariscopyrightfile" vendor = "OpenOffice.org" description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION" Index: patches/patch-instsetoo_native_inc_sdkoo_unix_packagelist_txt =================================================================== RCS file: /cvs/ports/editors/openoffice/patches/patch-instsetoo_native_inc_sdkoo_unix_packagelist_txt,v retrieving revision 1.1 diff -u -r1.1 patch-instsetoo_native_inc_sdkoo_unix_packagelist_txt --- patches/patch-instsetoo_native_inc_sdkoo_unix_packagelist_txt 25 Oct 2006 22:49:50 -0000 1.1 +++ patches/patch-instsetoo_native_inc_sdkoo_unix_packagelist_txt 21 Feb 2007 11:21:53 -0000 @@ -1,8 +1,8 @@ $OpenBSD: patch-instsetoo_native_inc_sdkoo_unix_packagelist_txt,v 1.1 2006/10/25 22:49:50 kurt Exp $ ---- instsetoo_native/inc_sdkoo/unix/packagelist.txt.orig.port Tue Oct 24 16:54:44 2006 -+++ instsetoo_native/inc_sdkoo/unix/packagelist.txt Tue Oct 24 16:56:21 2006 -@@ -35,5 +35,5 @@ packagename = "openoffice.org-sdk" - copyright = "2005-2006 by OpenOffice.org" +--- instsetoo_native/inc_sdkoo/unix/packagelist.txt.orig.port Mon Jan 22 11:13:32 2007 ++++ instsetoo_native/inc_sdkoo/unix/packagelist.txt Tue Feb 6 23:13:33 2007 +@@ -36,5 +36,5 @@ copyright = "2005-2006 by OpenOffice.org + solariscopyright = "solariscopyrightfile" vendor = "OpenOffice.org" description = "OpenOffice.org %PRODUCTVERSION SDK" -destpath = "/opt/openoffice.org%PRODUCTVERSION_sdk" Index: patches/patch-instsetoo_native_inc_ure_unix_packagelist_txt =================================================================== RCS file: /cvs/ports/editors/openoffice/patches/patch-instsetoo_native_inc_ure_unix_packagelist_txt,v retrieving revision 1.1 diff -u -r1.1 patch-instsetoo_native_inc_ure_unix_packagelist_txt --- patches/patch-instsetoo_native_inc_ure_unix_packagelist_txt 25 Oct 2006 22:49:50 -0000 1.1 +++ patches/patch-instsetoo_native_inc_ure_unix_packagelist_txt 21 Feb 2007 11:21:53 -0000 @@ -1,8 +1,8 @@ $OpenBSD: patch-instsetoo_native_inc_ure_unix_packagelist_txt,v 1.1 2006/10/25 22:49:50 kurt Exp $ ---- instsetoo_native/inc_ure/unix/packagelist.txt.orig.port Tue Oct 24 16:57:09 2006 -+++ instsetoo_native/inc_ure/unix/packagelist.txt Tue Oct 24 16:57:21 2006 -@@ -40,5 +40,5 @@ packagename = "openoffice.org-ure" - copyright = "2005-2006 by OpenOffice.org" +--- instsetoo_native/inc_ure/unix/packagelist.txt.orig.port Mon Jan 22 11:13:32 2007 ++++ instsetoo_native/inc_ure/unix/packagelist.txt Tue Feb 6 23:13:33 2007 +@@ -41,5 +41,5 @@ copyright = "2005-2006 by OpenOffice.org + solariscopyright = "solariscopyrightfile" vendor = "OpenOffice.org" description = "UNO Runtime Environment" -destpath = "/opt/openoffice.org/ure" Index: patches/patch-instsetoo_native_util_makefile_mk =================================================================== RCS file: /cvs/ports/editors/openoffice/patches/patch-instsetoo_native_util_makefile_mk,v retrieving revision 1.5 diff -u -r1.5 patch-instsetoo_native_util_makefile_mk --- patches/patch-instsetoo_native_util_makefile_mk 14 Dec 2006 13:12:24 -0000 1.5 +++ patches/patch-instsetoo_native_util_makefile_mk 21 Feb 2007 11:21:53 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-instsetoo_native_util_makefile_mk,v 1.5 2006/12/14 13:12:24 robert Exp $ ---- instsetoo_native/util/makefile.mk.orig.port Fri Dec 1 18:55:09 2006 -+++ instsetoo_native/util/makefile.mk Thu Dec 14 11:41:55 2006 +--- instsetoo_native/util/makefile.mk.orig.port Wed Jan 17 09:23:51 2007 ++++ instsetoo_native/util/makefile.mk Tue Feb 6 23:13:33 2007 @@ -53,12 +53,14 @@ PYTHONPATH:=$(PWD)$/$(BIN):$(SOLARLIBDIR .ENDIF # "$(GUI)"=="WNT" .EXPORT: PYTHONPATH @@ -16,7 +16,7 @@ .EXPORT: ENABLE_DOWNLOADSETS .EXPORT: LAST_MINOR -@@ -195,7 +197,7 @@ openoffice_%{$(PKGFORMAT:^".")} : +@@ -198,7 +200,7 @@ openoffice_%{$(PKGFORMAT:^".")} : openoffice_% : .ENDIF # "$(PKGFORMAT)"!="" .IF "$(OS)"!="MACOSX" || "$(PKGFORMAT)"!="portable" @@ -25,7 +25,7 @@ .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_* -@@ -403,11 +405,11 @@ hack_msitemplates .PHONY: +@@ -407,11 +409,11 @@ hack_msitemplates .PHONY: +-$(MKDIRHIER) $(MSIURETEMPLATEDIR) +-$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR) +-$(MKDIRHIER) $(MSIURETEMPLATEDIR) Index: patches/patch-jvmaccess_util_makefile_mk =================================================================== RCS file: /cvs/ports/editors/openoffice/patches/patch-jvmaccess_util_makefile_mk,v retrieving revision 1.2 diff -u -r1.2 patch-jvmaccess_util_makefile_mk --- patches/patch-jvmaccess_util_makefile_mk 20 Aug 2006 03:36:52 -0000 1.2 +++ patches/patch-jvmaccess_util_makefile_mk 21 Feb 2007 11:21:53 -0000 @@ -1,9 +1,9 @@ $OpenBSD: patch-jvmaccess_util_makefile_mk,v 1.2 2006/08/20 03:36:52 kurt Exp $ ---- jvmaccess/util/makefile.mk.orig.port Wed Sep 7 15:23:59 2005 -+++ jvmaccess/util/makefile.mk Fri Aug 18 15:47:43 2006 -@@ -68,6 +68,8 @@ SHL1VERSIONMAP = gcc3_linux_intel.map +--- jvmaccess/util/makefile.mk.orig.port Fri Feb 2 19:52:10 2007 ++++ jvmaccess/util/makefile.mk Tue Feb 6 23:13:34 2007 +@@ -70,6 +70,8 @@ SHL1VERSIONMAP = gcc3_linux_intel.map SHL1VERSIONMAP = gcc3_linux_intel.map - .ELIF "$(OS)$(CPU)$(COMNAME)" == "LINUXSgcc3" + .ELIF "$(OS)$(CPU)$(COMNAME)"=="MACOSXIgcc3" SHL1VERSIONMAP = gcc3_linux_intel.map +.ELIF "$(OS)$(CPU)$(COMNAME)" == "OPENBSDIgcc3" +SHL1VERSIONMAP = gcc3_linux_intel.map Index: patches/patch-lingucomponent_source_spellcheck_myspell_Makefile =================================================================== RCS file: patches/patch-lingucomponent_source_spellcheck_myspell_Makefile diff -N patches/patch-lingucomponent_source_spellcheck_myspell_Makefile --- patches/patch-lingucomponent_source_spellcheck_myspell_Makefile 20 Aug 2006 03:36:52 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,27 +0,0 @@ -$OpenBSD: patch-lingucomponent_source_spellcheck_myspell_Makefile,v 1.2 2006/08/20 03:36:52 kurt Exp $ ---- lingucomponent/source/spellcheck/myspell/Makefile.orig.port Tue Mar 9 07:40:54 2004 -+++ lingucomponent/source/spellcheck/myspell/Makefile Fri Aug 18 15:47:43 2006 -@@ -60,6 +60,23 @@ ifeq "$(PLATFORM)" "FreeBSD" - RANLIB=ranlib - endif - -+ifeq "$(PLATFORM)" "OpenBSD" -+ CXX ?= g++ -+ CXXFLAGS ?= -O2 -Wall -ansi -pedantic -I. -+ CC ?= gcc -+ CFLAGS ?= -O2 -Wall -ansi -pedantic -I. -+ PICFLAGS = -fPIC -+ SHARED = -shared -fPIC -+ SOSUFFIX = so -+ SOPREFIX = lib -+ UNIXVERSIONING=YES -+ SONAME = -Wl,-h -+ LIBPATH = LD_LIBRARY_PATH -+ STATICLIB=libmyspell-$(VERSION)_pic.a -+ AR=ar rc -+ RANLIB=ranlib -+endif -+ - ifeq "$(PLATFORM)" "Darwin" - CXX ?= g++ - CXXFLAGS ?= -O2 -Wall -ansi -pedantic -I. Index: patches/patch-odk_setsdkenv_unix_sh_in =================================================================== RCS file: /cvs/ports/editors/openoffice/patches/patch-odk_setsdkenv_unix_sh_in,v retrieving revision 1.3 diff -u -r1.3 patch-odk_setsdkenv_unix_sh_in --- patches/patch-odk_setsdkenv_unix_sh_in 27 Oct 2006 16:02:02 -0000 1.3 +++ patches/patch-odk_setsdkenv_unix_sh_in 21 Feb 2007 11:21:53 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-odk_setsdkenv_unix_sh_in,v 1.3 2006/10/27 16:02:02 kurt Exp $ ---- odk/setsdkenv_unix.sh.in.orig.port Wed Nov 9 04:29:22 2005 -+++ odk/setsdkenv_unix.sh.in Thu Oct 26 09:04:38 2006 -@@ -206,6 +206,28 @@ case $sd_platform in +--- odk/setsdkenv_unix.sh.in.orig.port Wed Jan 17 07:47:27 2007 ++++ odk/setsdkenv_unix.sh.in Tue Feb 6 23:13:34 2007 +@@ -211,6 +211,28 @@ case $sd_platform in export PTHREAD_LIBS fi ;; Index: patches/patch-odk_settings_settings_mk =================================================================== RCS file: /cvs/ports/editors/openoffice/patches/patch-odk_settings_settings_mk,v retrieving revision 1.2 diff -u -r1.2 patch-odk_settings_settings_mk --- patches/patch-odk_settings_settings_mk 20 Aug 2006 03:36:52 -0000 1.2 +++ patches/patch-odk_settings_settings_mk 21 Feb 2007 11:21:53 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-odk_settings_settings_mk,v 1.2 2006/08/20 03:36:52 kurt Exp $ ---- odk/settings/settings.mk.orig.port Thu Jul 13 08:03:58 2006 -+++ odk/settings/settings.mk Fri Aug 18 15:47:43 2006 -@@ -502,3 +502,97 @@ URE_MISC=$(OO_SDK_URE_HOME)/share/misc +--- odk/settings/settings.mk.orig.port Wed Jan 17 07:47:27 2007 ++++ odk/settings/settings.mk Tue Feb 6 23:13:34 2007 +@@ -515,3 +515,97 @@ URE_MISC=$(OO_SDK_URE_HOME)/share/misc endif endif Index: patches/patch-psprint_source_printer_printerinfomanager_cxx =================================================================== RCS file: /cvs/ports/editors/openoffice/patches/patch-psprint_source_printer_printerinfomanager_cxx,v retrieving revision 1.3 diff -u -r1.3 patch-psprint_source_printer_printerinfomanager_cxx --- patches/patch-psprint_source_printer_printerinfomanager_cxx 13 Dec 2006 10:25:14 -0000 1.3 +++ patches/patch-psprint_source_printer_printerinfomanager_cxx 21 Feb 2007 11:21:53 -0000 @@ -1,12 +1,20 @@ -$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 +--- psprint/source/printer/printerinfomanager.cxx.orig.port Fri Feb 9 19:50:15 2007 ++++ psprint/source/printer/printerinfomanager.cxx Wed Feb 14 12:08:00 2007 +@@ -1176,7 +1176,7 @@ struct SystemCommandParameters + tokenHandler pHandler; + }; + +-#if ! (defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || defined(MACOSX)) ++#if ! (defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || defined(MACOSX) || defined(OPENBSD)) + static void lpgetSysQueueTokenHandler( + const std::list< rtl::OString >& i_rLines, + std::list< PrinterInfoManager::SystemPrintQueue >& o_rQueues, +@@ -1321,7 +1321,7 @@ static void standardSysQueueTokenHandler static const struct SystemCommandParameters aParms[] = { --#if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || defined(MACOSX) -+#if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || defined(MACOSX) || defined (OPENBSD) - { "/usr/sbin/lpc status", "lpr -P \"(PRINTER)\"", "", ":", 0 }, - { "lpc status", "lpr -P \"(PRINTER)\"", "", ":", 0 }, - { "LANG=C;LC_ALL=C;export LANG LC_ALL;lpstat -s", "lp -d \"(PRINTER)\"", "system for ", ": ", 1 } +- #if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || defined(MACOSX) ++ #if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || defined(MACOSX) || defined(OPENBSD) + { "/usr/sbin/lpc status", "lpr -P \"(PRINTER)\"", "", ":", 0, standardSysQueueTokenHandler }, + { "lpc status", "lpr -P \"(PRINTER)\"", "", ":", 0, standardSysQueueTokenHandler }, + { "LANG=C;LC_ALL=C;export LANG LC_ALL;lpstat -s", "lp -d \"(PRINTER)\"", "system for ", ": ", 1, standardSysQueueTokenHandler } Index: patches/patch-sal_inc_rtl_uuid_h =================================================================== RCS file: /cvs/ports/editors/openoffice/patches/patch-sal_inc_rtl_uuid_h,v retrieving revision 1.2 diff -u -r1.2 patch-sal_inc_rtl_uuid_h --- patches/patch-sal_inc_rtl_uuid_h 20 Aug 2006 03:36:52 -0000 1.2 +++ patches/patch-sal_inc_rtl_uuid_h 21 Feb 2007 11:21:53 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-sal_inc_rtl_uuid_h,v 1.2 2006/08/20 03:36:52 kurt Exp $ ---- sal/inc/rtl/uuid.h.orig.port Thu Sep 8 10:46:10 2005 -+++ sal/inc/rtl/uuid.h Fri Aug 18 15:47:43 2006 -@@ -223,6 +223,8 @@ void SAL_CALL rtl_createNamedUuid( +--- sal/inc/rtl/uuid.h.orig.port Wed Jan 17 09:35:34 2007 ++++ sal/inc/rtl/uuid.h Tue Feb 6 23:13:34 2007 +@@ -208,6 +208,8 @@ void SAL_CALL rtl_createNamedUuid( #define UUID_SYSTEM_TIME_RESOLUTION_100NS_TICKS 100000 #elif IRIX #define UUID_SYSTEM_TIME_RESOLUTION_100NS_TICKS 10 Index: patches/patch-sal_inc_sal_config_h =================================================================== RCS file: /cvs/ports/editors/openoffice/patches/patch-sal_inc_sal_config_h,v retrieving revision 1.2 diff -u -r1.2 patch-sal_inc_sal_config_h --- patches/patch-sal_inc_sal_config_h 20 Aug 2006 03:36:52 -0000 1.2 +++ patches/patch-sal_inc_sal_config_h 21 Feb 2007 11:21:53 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-sal_inc_sal_config_h,v 1.2 2006/08/20 03:36:52 kurt Exp $ ---- sal/inc/sal/config.h.orig.port Tue Jun 20 00:15:28 2006 -+++ sal/inc/sal/config.h Fri Aug 18 15:47:43 2006 -@@ -102,7 +102,7 @@ extern "C" { +--- sal/inc/sal/config.h.orig.port Wed Jan 17 07:48:44 2007 ++++ sal/inc/sal/config.h Tue Feb 6 23:13:34 2007 +@@ -106,7 +106,7 @@ extern "C" { /* don't know what to put in here */ #endif Index: patches/patch-sal_osl_unx_file_cxx =================================================================== RCS file: /cvs/ports/editors/openoffice/patches/patch-sal_osl_unx_file_cxx,v retrieving revision 1.3 diff -u -r1.3 patch-sal_osl_unx_file_cxx --- patches/patch-sal_osl_unx_file_cxx 13 Dec 2006 10:25:14 -0000 1.3 +++ patches/patch-sal_osl_unx_file_cxx 21 Feb 2007 11:21:53 -0000 @@ -1,6 +1,5 @@ -$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 +--- sal/osl/unx/file.cxx.orig.port Mon Jan 22 11:19:27 2007 ++++ sal/osl/unx/file.cxx Tue Feb 6 23:13:34 2007 @@ -118,7 +118,7 @@ static const sal_Char* MOUNTTAB="/etc/mn #include static const sal_Char* MOUNTTAB="/etc/mtab"; @@ -32,15 +31,7 @@ # 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 */ -@@ -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) --# define __OSL_STATFS_ISREMOTE(a) (rtl_str_compare((a).f_basetype, "nfs") == 0) - - /* always return true if queried for the properties of - the file system. If you think this is wrong under any -@@ -1474,7 +1471,6 @@ oslFileError SAL_CALL osl_syncFile(oslFi +@@ -1474,7 +1472,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 +39,7 @@ # define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a) (1) # define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (1) #endif /* HAVE_STATFS_H */ -@@ -1502,10 +1498,6 @@ static oslFileError osl_psz_getVolumeInf +@@ -1502,10 +1499,6 @@ static oslFileError osl_psz_getVolumeInf /* FIXME: how to detect the kind of storage (fixed, cdrom, ...) */ if (uFieldMask & osl_VolumeInfo_Mask_Attributes) { @@ -59,7 +50,7 @@ } if (uFieldMask & osl_VolumeInfo_Mask_FileSystemCaseHandling) -@@ -2224,7 +2216,7 @@ int UnicodeToText( char * buffer, size_t +@@ -2224,7 +2217,7 @@ int UnicodeToText( char * buffer, size_t if( nInfo & RTL_UNICODETOTEXT_INFO_DESTBUFFERTOSMALL ) { @@ -68,7 +59,7 @@ return 0; } -@@ -2276,7 +2268,7 @@ int TextToUnicode( +@@ -2276,7 +2269,7 @@ int TextToUnicode( if (nInfo & RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL) { @@ -77,7 +68,7 @@ return 0; } -@@ -3401,35 +3393,35 @@ static sal_Bool osl_isFloppyMounted(oslV +@@ -3404,35 +3397,35 @@ static sal_Bool osl_isFloppyMounted(oslV * *****************************************************************************/ @@ -105,16 +96,16 @@ } #endif /* MACOSX */ --#if ( defined(MACOSX) || defined(NETBSD) || defined(FREEBSD)) -+#if ( defined(MACOSX) || defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD)) +-#if ( defined(NETBSD) || defined(FREEBSD) ) ++#if ( defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD) ) static sal_Bool osl_getFloppyMountEntry(const sal_Char* pszPath, oslVolumeDeviceHandleImpl* pItem) { return sal_False; } - #endif /* MACOSX */ + #endif /* NETBSD || FREEBSD */ --#if ( defined(MACOSX) || defined(NETBSD) || defined(FREEBSD)) -+#if ( defined(MACOSX) || defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD)) +-#if ( defined(NETBSD) || defined(FREEBSD) ) ++#if ( defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD) ) static sal_Bool osl_isFloppyMounted(oslVolumeDeviceHandleImpl* pDevice) { return sal_False; Index: patches/patch-sal_osl_unx_nlsupport_c =================================================================== RCS file: /cvs/ports/editors/openoffice/patches/patch-sal_osl_unx_nlsupport_c,v retrieving revision 1.2 diff -u -r1.2 patch-sal_osl_unx_nlsupport_c --- patches/patch-sal_osl_unx_nlsupport_c 20 Aug 2006 03:36:52 -0000 1.2 +++ patches/patch-sal_osl_unx_nlsupport_c 21 Feb 2007 11:21:53 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-sal_osl_unx_nlsupport_c,v 1.2 2006/08/20 03:36:52 kurt Exp $ ---- sal/osl/unx/nlsupport.c.orig.port Tue Jul 25 05:40:46 2006 -+++ sal/osl/unx/nlsupport.c Fri Aug 18 15:47:43 2006 +--- sal/osl/unx/nlsupport.c.orig.port Mon Jan 22 11:19:27 2007 ++++ sal/osl/unx/nlsupport.c Tue Feb 6 23:13:34 2007 @@ -38,7 +38,7 @@ #include #include @@ -19,7 +19,7 @@ /* * This implementation of osl_getTextEncodingFromLocale maps -@@ -551,6 +551,35 @@ const _pair _nl_language_list[] = { +@@ -557,6 +557,35 @@ const _pair _nl_language_list[] = { { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */ }; @@ -55,7 +55,7 @@ #endif /* ifdef SOLARIS IRIX LINUX FREEBSD NETBSD */ static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER; -@@ -973,7 +1002,7 @@ int _imp_setProcessLocale( rtl_Locale * +@@ -984,7 +1013,7 @@ int _imp_setProcessLocale( rtl_Locale * snprintf(env_buf, sizeof(env_buf), "LC_ALL=%s", locale_buf); env_buf[sizeof(env_buf)] = '\0'; putenv(env_buf); @@ -64,7 +64,7 @@ setenv( "LC_ALL", locale_buf, 1); #else setenv( "LC_ALL", locale_buf ); -@@ -985,7 +1014,7 @@ int _imp_setProcessLocale( rtl_Locale * +@@ -996,7 +1025,7 @@ int _imp_setProcessLocale( rtl_Locale * snprintf(env_buf, sizeof(env_buf), "LC_CTYPE=%s", locale_buf); env_buf[sizeof(env_buf)] = '\0'; putenv(env_buf); @@ -73,7 +73,7 @@ setenv("LC_CTYPE", locale_buf, 1 ); #else setenv( "LC_CTYPE", locale_buf ); -@@ -997,7 +1026,7 @@ int _imp_setProcessLocale( rtl_Locale * +@@ -1008,7 +1037,7 @@ int _imp_setProcessLocale( rtl_Locale * snprintf(env_buf, sizeof(env_buf), "LANG=%s", locale_buf); env_buf[sizeof(env_buf)] = '\0'; putenv(env_buf); Index: patches/patch-salhelper_source_gcc3_linux_intel_map =================================================================== RCS file: /cvs/ports/editors/openoffice/patches/patch-salhelper_source_gcc3_linux_intel_map,v retrieving revision 1.2 diff -u -r1.2 patch-salhelper_source_gcc3_linux_intel_map --- patches/patch-salhelper_source_gcc3_linux_intel_map 20 Aug 2006 03:36:53 -0000 1.2 +++ patches/patch-salhelper_source_gcc3_linux_intel_map 21 Feb 2007 11:21:53 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-salhelper_source_gcc3_linux_intel_map,v 1.2 2006/08/20 03:36:53 kurt Exp $ ---- salhelper/source/gcc3_linux_intel.map.orig.port Wed Nov 3 04:10:31 2004 -+++ salhelper/source/gcc3_linux_intel.map Fri Aug 18 15:47:44 2006 -@@ -22,7 +22,7 @@ UDK_3_0_0 { # should have been UDK_3.0 +--- salhelper/source/gcc3_linux_intel.map.orig.port Fri Feb 2 19:59:21 2007 ++++ salhelper/source/gcc3_linux_intel.map Tue Feb 6 23:13:34 2007 +@@ -27,7 +27,7 @@ UDK_3_0_0 { # should have been UDK_3.0 # _ZTIN9salhelper21SimpleReferenceObjectE; # _ZTSN9salhelper21SimpleReferenceObjectE; _ZTVN9salhelper21SimpleReferenceObjectE; Index: patches/patch-salhelper_source_makefile_mk =================================================================== RCS file: /cvs/ports/editors/openoffice/patches/patch-salhelper_source_makefile_mk,v retrieving revision 1.2 diff -u -r1.2 patch-salhelper_source_makefile_mk --- patches/patch-salhelper_source_makefile_mk 20 Aug 2006 03:36:53 -0000 1.2 +++ patches/patch-salhelper_source_makefile_mk 21 Feb 2007 11:21:53 -0000 @@ -1,9 +1,9 @@ $OpenBSD: patch-salhelper_source_makefile_mk,v 1.2 2006/08/20 03:36:53 kurt Exp $ ---- salhelper/source/makefile.mk.orig.port Thu Jul 20 12:16:28 2006 -+++ salhelper/source/makefile.mk Fri Aug 18 15:47:44 2006 -@@ -86,6 +86,8 @@ SHL1VERSIONMAP=gcc3_linux_intel.map +--- salhelper/source/makefile.mk.orig.port Fri Feb 2 19:59:21 2007 ++++ salhelper/source/makefile.mk Tue Feb 6 23:13:34 2007 +@@ -88,6 +88,8 @@ SHL1VERSIONMAP=gcc3_linux_intel.map SHL1VERSIONMAP=gcc3_linux_intel.map - .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXSgcc3" + .ELIF "$(OS)$(CPU)$(COMNAME)"=="MACOSXIgcc3" SHL1VERSIONMAP=gcc3_linux_intel.map +.ELIF "$(OS)$(CPU)$(COMNAME)"=="OPENBSDIgcc3" +SHL1VERSIONMAP=gcc3_linux_intel.map Index: patches/patch-scp2_source_ooo_file_library_ooo_scp =================================================================== RCS file: /cvs/ports/editors/openoffice/patches/patch-scp2_source_ooo_file_library_ooo_scp,v retrieving revision 1.5 diff -u -r1.5 patch-scp2_source_ooo_file_library_ooo_scp --- patches/patch-scp2_source_ooo_file_library_ooo_scp 13 Dec 2006 10:25:14 -0000 1.5 +++ patches/patch-scp2_source_ooo_file_library_ooo_scp 21 Feb 2007 11:21:53 -0000 @@ -1,7 +1,7 @@ $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 +--- scp2/source/ooo/file_library_ooo.scp.orig.port Wed Jan 17 07:49:17 2007 ++++ scp2/source/ooo/file_library_ooo.scp Tue Feb 6 23:13:34 2007 +@@ -863,6 +863,8 @@ File gid_File_Lib_Freetype Styles = (PACKED); #if defined (FREEBSD) || defined (NETBSD) Name = "libfreetype.so.9"; @@ -10,7 +10,7 @@ #else Name = "libfreetype.so.6"; #endif -@@ -892,7 +894,7 @@ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Fwl +@@ -904,7 +906,7 @@ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Fwl STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Fwm , fwm) @@ -19,7 +19,7 @@ #if defined( _gcc3 ) File gid_File_Lib_Gcc -@@ -906,7 +908,7 @@ End +@@ -918,7 +920,7 @@ End #endif @@ -28,7 +28,7 @@ #if defined( _gcc3 ) File gid_File_Lib_Stdc -@@ -920,7 +922,7 @@ End +@@ -932,7 +934,7 @@ End #endif @@ -37,7 +37,7 @@ File gid_File_Lib_Gcc2_Uno TXT_FILE_BODY; -@@ -1933,7 +1935,7 @@ File gid_File_Lib_Stlport +@@ -1946,7 +1948,7 @@ File gid_File_Lib_Stlport #ifdef _STLP_DEBUG #ifdef UNX #if defined(_gcc3) || defined(_GCC) @@ -46,7 +46,7 @@ Name = STRING(CONCAT3(libstlport_,gcc_stldebug,.so.4.5)); #else Name = STRING(CONCAT3(libstlport_,gcc_stldebug,UNXSUFFIX)); -@@ -1957,7 +1959,7 @@ File gid_File_Lib_Stlport +@@ -1970,7 +1972,7 @@ File gid_File_Lib_Stlport #else #ifdef UNX #if defined(_gcc3) || defined(_GCC) Index: patches/patch-scp2_source_ure_ure_scp =================================================================== RCS file: /cvs/ports/editors/openoffice/patches/patch-scp2_source_ure_ure_scp,v retrieving revision 1.3 diff -u -r1.3 patch-scp2_source_ure_ure_scp --- patches/patch-scp2_source_ure_ure_scp 13 Dec 2006 10:25:14 -0000 1.3 +++ patches/patch-scp2_source_ure_ure_scp 21 Feb 2007 11:21:53 -0000 @@ -1,7 +1,7 @@ $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 +--- scp2/source/ure/ure.scp.orig.port Thu Jan 25 15:30:49 2007 ++++ scp2/source/ure/ure.scp Tue Feb 6 23:13:34 2007 +@@ -617,7 +617,7 @@ End #if defined _gcc3 && \ !(defined FREEBSD || defined NETBSD || defined MACOSX \ @@ -10,7 +10,7 @@ File gid_File_Dl_GccS TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; -@@ -621,7 +621,7 @@ End +@@ -628,7 +628,7 @@ End #if defined _gcc3 && \ !(defined FREEBSD || defined NETBSD || defined MACOSX \ Index: patches/patch-sd_source_ui_dlg_docprev_cxx =================================================================== RCS file: patches/patch-sd_source_ui_dlg_docprev_cxx diff -N patches/patch-sd_source_ui_dlg_docprev_cxx --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-sd_source_ui_dlg_docprev_cxx 21 Feb 2007 11:21:53 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- sd/source/ui/dlg/docprev.cxx.orig.port Wed Jan 17 07:49:24 2007 ++++ sd/source/ui/dlg/docprev.cxx Fri Feb 16 09:07:27 2007 +@@ -336,7 +336,7 @@ void SdDocPreviewWin::updateViewSettings + + // Use new StandardCheckVisisbilityRedirector + StandardCheckVisisbilityRedirector aRedirector; +- const Rectangle aRedrawRectangle( Point(), aNewSize ); ++ const Rectangle aRedrawRectangle = Rectangle( Point(), aNewSize ); + Region aRedrawRegion(aRedrawRectangle); + pView->SdrPaintView::CompleteRedraw(&aVDev,aRedrawRegion,0,&aRedirector); + Index: patches/patch-sd_source_ui_dlg_sdtreelb_cxx =================================================================== RCS file: patches/patch-sd_source_ui_dlg_sdtreelb_cxx diff -N patches/patch-sd_source_ui_dlg_sdtreelb_cxx --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-sd_source_ui_dlg_sdtreelb_cxx 21 Feb 2007 11:21:53 -0000 @@ -0,0 +1,65 @@ +$OpenBSD$ +--- sd/source/ui/dlg/sdtreelb.cxx.orig.port Wed Feb 14 09:23:21 2007 ++++ sd/source/ui/dlg/sdtreelb.cxx Wed Feb 14 09:27:43 2007 +@@ -350,17 +350,17 @@ void SdPageObjsTLB::Fill( const SdDrawDo + SdPage* pPage = NULL; + SvLBoxEntry* pEntry = NULL; + +- Image aImgPage( BitmapEx( SdResId( BMP_PAGE ) ) ); +- Image aImgPageExcl( BitmapEx( SdResId( BMP_PAGE_EXCLUDED ) ) ); +- Image aImgPageObjsExcl( BitmapEx( SdResId( BMP_PAGEOBJS_EXCLUDED ) ) ); +- Image aImgPageObjs( BitmapEx( SdResId( BMP_PAGEOBJS ) ) ); +- Image aImgObjects( BitmapEx( SdResId( BMP_OBJECTS ) ) ); ++ Image aImgPage = BitmapEx( SdResId( BMP_PAGE ) ); ++ Image aImgPageExcl = BitmapEx( SdResId( BMP_PAGE_EXCLUDED ) ); ++ Image aImgPageObjsExcl = BitmapEx( SdResId( BMP_PAGEOBJS_EXCLUDED ) ); ++ Image aImgPageObjs = BitmapEx( SdResId( BMP_PAGEOBJS ) ); ++ Image aImgObjects = BitmapEx( SdResId( BMP_OBJECTS ) ); + +- Image aImgPageH( BitmapEx( SdResId( BMP_PAGE_H ) ) ); +- Image aImgPageExclH( BitmapEx( SdResId( BMP_PAGE_EXCLUDED_H ) ) ); +- Image aImgPageObjsExclH( BitmapEx( SdResId( BMP_PAGEOBJS_EXCLUDED_H ) ) ); +- Image aImgPageObjsH( BitmapEx( SdResId( BMP_PAGEOBJS_H ) ) ); +- Image aImgObjectsH( BitmapEx( SdResId( BMP_OBJECTS_H ) ) ); ++ Image aImgPageH = BitmapEx( SdResId( BMP_PAGE_H ) ); ++ Image aImgPageExclH = BitmapEx( SdResId( BMP_PAGE_EXCLUDED_H ) ); ++ Image aImgPageObjsExclH = BitmapEx( SdResId( BMP_PAGEOBJS_EXCLUDED_H ) ); ++ Image aImgPageObjsH = BitmapEx( SdResId( BMP_PAGEOBJS_H ) ); ++ Image aImgObjectsH = BitmapEx( SdResId( BMP_OBJECTS_H ) ); + + // first insert all pages including objects + USHORT nPage = 0; +@@ -510,10 +510,10 @@ void SdPageObjsTLB::Fill( const SdDrawDo + mpMedium = pInMedium; + maDocName = rDocName; + +- Image aImgDocOpen( BitmapEx( SdResId( BMP_DOC_OPEN ) ) ); +- Image aImgDocClosed( BitmapEx( SdResId( BMP_DOC_CLOSED ) ) ); +- Image aImgDocOpenH( BitmapEx( SdResId( BMP_DOC_OPEN_H ) ) ); +- Image aImgDocClosedH( BitmapEx( SdResId( BMP_DOC_CLOSED_H ) ) ); ++ Image aImgDocOpen = BitmapEx( SdResId( BMP_DOC_OPEN ) ); ++ Image aImgDocClosed = BitmapEx( SdResId( BMP_DOC_CLOSED ) ); ++ Image aImgDocOpenH = BitmapEx( SdResId( BMP_DOC_OPEN_H ) ); ++ Image aImgDocClosedH = BitmapEx( SdResId( BMP_DOC_CLOSED_H ) ); + + // Dokumentnamen einfuegen + SvLBoxEntry* pFileEntry = InsertEntry( maDocName, +@@ -709,12 +709,12 @@ void SdPageObjsTLB::RequestingChilds( Sv + SdPage* pPage = NULL; + SvLBoxEntry* pPageEntry = NULL; + +- Image aImgPage( BitmapEx( SdResId( BMP_PAGE ) ) ); +- Image aImgPageObjs( BitmapEx( SdResId( BMP_PAGEOBJS ) ) ); +- Image aImgObjects( BitmapEx( SdResId( BMP_OBJECTS ) ) ); +- Image aImgPageH( BitmapEx( SdResId( BMP_PAGE_H ) ) ); +- Image aImgPageObjsH( BitmapEx( SdResId( BMP_PAGEOBJS_H ) ) ); +- Image aImgObjectsH( BitmapEx( SdResId( BMP_OBJECTS_H ) ) ); ++ Image aImgPage = BitmapEx( SdResId( BMP_PAGE ) ); ++ Image aImgPageObjs = BitmapEx( SdResId( BMP_PAGEOBJS ) ); ++ Image aImgObjects = BitmapEx( SdResId( BMP_OBJECTS ) ); ++ Image aImgPageH = BitmapEx( SdResId( BMP_PAGE_H ) ); ++ Image aImgPageObjsH = BitmapEx( SdResId( BMP_PAGEOBJS_H ) ); ++ Image aImgObjectsH = BitmapEx( SdResId( BMP_OBJECTS_H ) ); + + // document name already inserted + Index: patches/patch-sdk_oo_util_makefile_pmk =================================================================== RCS file: /cvs/ports/editors/openoffice/patches/patch-sdk_oo_util_makefile_pmk,v retrieving revision 1.4 diff -u -r1.4 patch-sdk_oo_util_makefile_pmk --- patches/patch-sdk_oo_util_makefile_pmk 19 Oct 2006 15:16:50 -0000 1.4 +++ patches/patch-sdk_oo_util_makefile_pmk 21 Feb 2007 11:21:53 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-sdk_oo_util_makefile_pmk,v 1.4 2006/10/19 15:16:50 kurt Exp $ ---- sdk_oo/util/makefile.pmk.orig.port Fri Nov 11 05:53:22 2005 -+++ sdk_oo/util/makefile.pmk Thu Oct 19 10:47:54 2006 -@@ -57,8 +57,8 @@ ODKZIPPATH=$(SOLARBINDIR) +--- sdk_oo/util/makefile.pmk.orig.port Wed Jan 17 07:49:34 2007 ++++ sdk_oo/util/makefile.pmk Tue Feb 6 23:13:34 2007 +@@ -56,8 +56,8 @@ ODKZIPPATH=$(SOLARBINDIR) BINOUT=$(SOLARBINDIR) IDLOUT=$(SOLARIDLDIR) @@ -12,7 +12,7 @@ CONVERTTAGSCRIPT=$(SOLARENV)$/bin$/converttags.pl -@@ -132,6 +132,11 @@ DESTPLATFROM=irix +@@ -131,6 +131,11 @@ DESTPLATFROM=irix # MACOSX ########### DESTPLATFROM=macosx Index: patches/patch-solenv_bin_modules_installer_globals_pm =================================================================== RCS file: /cvs/ports/editors/openoffice/patches/patch-solenv_bin_modules_installer_globals_pm,v retrieving revision 1.3 diff -u -r1.3 patch-solenv_bin_modules_installer_globals_pm --- patches/patch-solenv_bin_modules_installer_globals_pm 13 Dec 2006 10:25:14 -0000 1.3 +++ patches/patch-solenv_bin_modules_installer_globals_pm 21 Feb 2007 11:21:53 -0000 @@ -1,7 +1,7 @@ $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 +--- solenv/bin/modules/installer/globals.pm.orig.port Thu Jan 25 15:33:03 2007 ++++ solenv/bin/modules/installer/globals.pm Tue Feb 6 23:13:34 2007 +@@ -149,7 +149,7 @@ BEGIN $jdklib = ""; $jrepath = ""; Index: patches/patch-solenv_config_ssolar_cmn =================================================================== RCS file: /cvs/ports/editors/openoffice/patches/patch-solenv_config_ssolar_cmn,v retrieving revision 1.3 diff -u -r1.3 patch-solenv_config_ssolar_cmn --- patches/patch-solenv_config_ssolar_cmn 19 Oct 2006 15:16:50 -0000 1.3 +++ patches/patch-solenv_config_ssolar_cmn 21 Feb 2007 11:21:53 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-solenv_config_ssolar_cmn,v 1.3 2006/10/19 15:16:50 kurt Exp $ ---- solenv/config/ssolar.cmn.orig.port Fri Aug 4 09:31:27 2006 -+++ solenv/config/ssolar.cmn Thu Oct 19 10:47:54 2006 -@@ -517,7 +517,7 @@ unxaixp +--- solenv/config/ssolar.cmn.orig.port Wed Jan 17 07:49:47 2007 ++++ solenv/config/ssolar.cmn Tue Feb 6 23:13:34 2007 +@@ -518,7 +518,7 @@ unxaixp } } Index: patches/patch-solenv_inc_libs_mk =================================================================== RCS file: /cvs/ports/editors/openoffice/patches/patch-solenv_inc_libs_mk,v retrieving revision 1.4 diff -u -r1.4 patch-solenv_inc_libs_mk --- patches/patch-solenv_inc_libs_mk 13 Dec 2006 10:25:14 -0000 1.4 +++ patches/patch-solenv_inc_libs_mk 21 Feb 2007 11:21:53 -0000 @@ -1,7 +1,7 @@ $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 +--- solenv/inc/libs.mk.orig.port Wed Jan 17 07:49:47 2007 ++++ solenv/inc/libs.mk Tue Feb 6 23:13:34 2007 +@@ -173,7 +173,7 @@ ZLIB3RDLIB=-lz ZLIB3RDLIB=-lzlib .ENDIF .IF "$(SYSTEM_JPEG)"=="YES" Index: patches/patch-solenv_inc_settings_mk =================================================================== RCS file: /cvs/ports/editors/openoffice/patches/patch-solenv_inc_settings_mk,v retrieving revision 1.4 diff -u -r1.4 patch-solenv_inc_settings_mk --- patches/patch-solenv_inc_settings_mk 14 Dec 2006 13:12:24 -0000 1.4 +++ patches/patch-solenv_inc_settings_mk 21 Feb 2007 11:21:53 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-solenv_inc_settings_mk,v 1.4 2006/12/14 13:12:24 robert Exp $ ---- solenv/inc/settings.mk.orig.port Wed Dec 13 21:21:20 2006 -+++ solenv/inc/settings.mk Wed Dec 13 21:21:31 2006 -@@ -1113,6 +1113,8 @@ RSCDEFS+=-DOSL_DEBUG_LEVEL=$(DBG_LEVEL) +--- solenv/inc/settings.mk.orig.port Wed Jan 17 09:49:34 2007 ++++ solenv/inc/settings.mk Tue Feb 6 23:13:34 2007 +@@ -1118,6 +1118,8 @@ RSCDEFS+=-DOSL_DEBUG_LEVEL=$(DBG_LEVEL) CDEFS+=-DSVX_LIGHT .ENDIF @@ -10,7 +10,7 @@ .IF "$(optimize)"!="" CDEFS+=$(CDEFSOPT) CFLAGS+=$(CFLAGSOPT) -@@ -1259,7 +1261,7 @@ CFLAGSAPPEND+=$(ENVWARNFLAGS) +@@ -1264,7 +1266,7 @@ CFLAGSAPPEND+=$(ENVWARNFLAGS) CDEFS+= $(ADDCDEFS) CDEFS+= $(ENVCDEFS) Index: patches/patch-store_util_makefile_mk =================================================================== RCS file: /cvs/ports/editors/openoffice/patches/patch-store_util_makefile_mk,v retrieving revision 1.2 diff -u -r1.2 patch-store_util_makefile_mk --- patches/patch-store_util_makefile_mk 20 Aug 2006 03:36:53 -0000 1.2 +++ patches/patch-store_util_makefile_mk 21 Feb 2007 11:21:53 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-store_util_makefile_mk,v 1.2 2006/08/20 03:36:53 kurt Exp $ ---- store/util/makefile.mk.orig.port Thu Jun 29 07:27:36 2006 -+++ store/util/makefile.mk Fri Aug 18 15:47:45 2006 -@@ -79,7 +79,7 @@ SHL1STDLIBS+=$(LIBSTLPORT) +--- store/util/makefile.mk.orig.port Fri Feb 2 20:05:57 2007 ++++ store/util/makefile.mk Tue Feb 6 23:13:34 2007 +@@ -76,7 +76,7 @@ SHL1STDLIBS+=$(LIBSTLPORT) # On gcc3 __Unwind_SetIP is not in supc++ but in libgcc_s.so .IF "$(COMID)"=="gcc3" Index: patches/patch-sw_source_core_view_viewimp_cxx =================================================================== RCS file: patches/patch-sw_source_core_view_viewimp_cxx diff -N patches/patch-sw_source_core_view_viewimp_cxx --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-sw_source_core_view_viewimp_cxx 21 Feb 2007 11:21:53 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- sw/source/core/view/viewimp.cxx.orig.port Mon Feb 12 00:49:31 2007 ++++ sw/source/core/view/viewimp.cxx Mon Feb 12 00:51:51 2007 +@@ -394,7 +394,7 @@ void SwViewImp::MakeDrawView() + if(pWindow) + { + // #i72754# use correct region calculation now +- const Rectangle aRectPixel(Point(), pWindow->GetOutputSizePixel()); ++ const Rectangle aRectPixel = Rectangle(Point(), pWindow->GetOutputSizePixel()); + const Rectangle aRectLogic(pWindow->PixelToLogic(aRectPixel)); + const Region aRegionLogic(aRectLogic); + ViewShell &rSh = *GetShell(); Index: patches/patch-tools_inc_solar_h =================================================================== RCS file: /cvs/ports/editors/openoffice/patches/patch-tools_inc_solar_h,v retrieving revision 1.3 diff -u -r1.3 patch-tools_inc_solar_h --- patches/patch-tools_inc_solar_h 17 Jan 2007 07:29:01 -0000 1.3 +++ patches/patch-tools_inc_solar_h 21 Feb 2007 11:21:53 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-tools_inc_solar_h,v 1.3 2007/01/17 07:29:01 robert Exp $ ---- tools/inc/solar.h.orig.port Fri Dec 1 18:57:51 2006 -+++ tools/inc/solar.h Tue Jan 16 21:57:37 2007 -@@ -341,6 +341,7 @@ template inline T Abs(T a) { +--- tools/inc/solar.h.orig.port Wed Jan 17 07:50:41 2007 ++++ tools/inc/solar.h Tue Feb 6 23:13:34 2007 +@@ -338,6 +338,7 @@ template inline T Abs(T a) { #define SYSTEM_UNXSOGS 31 #define SYSTEM_UNXSOGI 32 #define SYSTEM_UNXMACXI 33 @@ -9,7 +9,7 @@ #if defined WNT #define __DLLEXTENSION "mi" -@@ -412,6 +413,9 @@ template inline T Abs(T a) { +@@ -409,6 +410,9 @@ template inline T Abs(T a) { #elif defined MACOSX && defined X86 #define __DLLEXTENSION "mxi.dylib" #define SYSTEM_ID SYSTEM_UNXMACXI Index: patches/patch-tools_source_fsys_unx_cxx =================================================================== RCS file: /cvs/ports/editors/openoffice/patches/patch-tools_source_fsys_unx_cxx,v retrieving revision 1.3 diff -u -r1.3 patch-tools_source_fsys_unx_cxx --- patches/patch-tools_source_fsys_unx_cxx 13 Dec 2006 10:25:14 -0000 1.3 +++ patches/patch-tools_source_fsys_unx_cxx 21 Feb 2007 11:21:53 -0000 @@ -1,6 +1,5 @@ -$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 +--- tools/source/fsys/unx.cxx.orig.port Sat Jan 13 00:23:55 2007 ++++ tools/source/fsys/unx.cxx Sat Jan 13 00:24:01 2007 @@ -52,7 +52,7 @@ extern "C" int mntctl( int cmd, size_t size, char* buf ); #elif defined(NETBSD) @@ -16,6 +15,6 @@ -#if defined(NETBSD) || defined(FREEBSD) || defined(MACOSX) +#if defined(NETBSD) || defined(FREEBSD) || defined(MACOSX) || defined(OPENBSD) - BOOL GetMountEntry(dev_t dev, struct mymnttab *mytab) + BOOL GetMountEntry(dev_t /* dev */, struct mymnttab * /* mytab */ ) { DBG_WARNING( "Sorry, not implemented: GetMountEntry" ); Index: patches/patch-vcl_unx_source_app_saldisp_cxx =================================================================== RCS file: /cvs/ports/editors/openoffice/patches/patch-vcl_unx_source_app_saldisp_cxx,v retrieving revision 1.4 diff -u -r1.4 patch-vcl_unx_source_app_saldisp_cxx --- patches/patch-vcl_unx_source_app_saldisp_cxx 13 Dec 2006 10:25:14 -0000 1.4 +++ patches/patch-vcl_unx_source_app_saldisp_cxx 21 Feb 2007 11:21:53 -0000 @@ -1,7 +1,7 @@ $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 +--- vcl/unx/source/app/saldisp.cxx.orig.port Wed Jan 17 07:50:56 2007 ++++ vcl/unx/source/app/saldisp.cxx Tue Feb 6 23:13:34 2007 +@@ -972,7 +972,7 @@ bHandleStartupNotification sscanf( pProperties, "%li", &nProperties_ ); else { Index: patches/patch-vcl_unx_source_gdi_gcach_xpeer_cxx =================================================================== RCS file: patches/patch-vcl_unx_source_gdi_gcach_xpeer_cxx diff -N patches/patch-vcl_unx_source_gdi_gcach_xpeer_cxx --- patches/patch-vcl_unx_source_gdi_gcach_xpeer_cxx 13 Dec 2006 10:25:14 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$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 -- OUString xrenderLibraryName( RTL_CONSTASCII_USTRINGPARAM( "libXrender.so.1" )); -+ OUString xrenderLibraryName( RTL_CONSTASCII_USTRINGPARAM( "libXrender.so" )); - #endif - oslModule pRenderLib=osl_loadModule(xrenderLibraryName.pData, SAL_LOADMODULE_DEFAULT); - if( !pRenderLib ) { Index: patches/patch-vcl_util_makefile_mk =================================================================== RCS file: /cvs/ports/editors/openoffice/patches/patch-vcl_util_makefile_mk,v retrieving revision 1.4 diff -u -r1.4 patch-vcl_util_makefile_mk --- patches/patch-vcl_util_makefile_mk 13 Dec 2006 10:25:14 -0000 1.4 +++ patches/patch-vcl_util_makefile_mk 21 Feb 2007 11:21:53 -0000 @@ -1,25 +1,6 @@ -$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 --.ELIF "$(OS)"!="FREEBSD" -+.ELIF "$(OS)"!="FREEBSD" && "$(OS)"!="OPENBSD" - SHL1STDLIBS+=-ldl - .ENDIF - -@@ -227,7 +227,7 @@ LINKFLAGSSHL += /ENTRY:LibMain@12 - - .IF "$(GUI)"=="UNX" - --.IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD" -+.IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD" && "$(OS)"!="OPENBSD" - SHL1STDLIBS+= -ldl - .ENDIF - -@@ -316,7 +316,7 @@ SHL2STDLIBS+=$(LIBSN_LIBS) +--- vcl/util/makefile.mk.orig.port Mon Jan 22 11:26:44 2007 ++++ vcl/util/makefile.mk Tue Feb 6 23:13:34 2007 +@@ -301,7 +301,7 @@ SHL2STDLIBS+=$(LIBSN_LIBS) .ENDIF SHL2STDLIBS += -lXext -lSM -lICE -lX11 @@ -28,21 +9,3 @@ # needed by salprnpsp.cxx SHL2STDLIBS+= -ldl .ENDIF -@@ -372,7 +372,7 @@ SHL4NOCHECK=TRUE - - - SHL4STDLIBS+=-l$(SHL2TARGET) --.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX" -+.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX" || "$(OS)"=="OPENBSD" - SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 - .ELSE - SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl -@@ -390,7 +390,7 @@ SHL5DEPN=$(SHL2TARGETN) - # libs for KDE plugin - SHL5STDLIBS=$(KDE_LIBS) - SHL5STDLIBS+=-l$(SHL2TARGET) --.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX" -+.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX" || "$(OS)"=="OPENBSD" - SHL5STDLIBS+=$(SHL3STDLIBS) -lX11 - .ELSE - SHL5STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl Index: pkg/PFRAG.shared-main =================================================================== RCS file: /cvs/ports/editors/openoffice/pkg/PFRAG.shared-main,v retrieving revision 1.2 diff -u -r1.2 PFRAG.shared-main --- pkg/PFRAG.shared-main 13 Dec 2006 10:25:14 -0000 1.2 +++ pkg/PFRAG.shared-main 21 Feb 2007 11:21:53 -0000 @@ -31,6 +31,7 @@ openoffice/program/libbasctl680.so openoffice/program/libbasegfx680.so openoffice/program/libbf_frm680.so +openoffice/program/libbf_go680.so openoffice/program/libbf_lng680.so openoffice/program/libbf_migratefilter680.so openoffice/program/libbf_ofa680.so @@ -65,6 +66,7 @@ openoffice/program/libdbpool2.so openoffice/program/libdbtools680.so openoffice/program/libdbu680.so +openoffice/program/libdeploymentmisc680.so openoffice/program/libdict_ja.so openoffice/program/libdict_zh.so openoffice/program/libdtransX11680.so @@ -105,13 +107,9 @@ openoffice/program/libi18nutilgcc3.so openoffice/program/libicd680.so openoffice/program/libicg680.so -openoffice/program/libicudata.so @lib openoffice/program/libicudata.so.${LIBicudata_VERSION} -openoffice/program/libicui18n.so @lib openoffice/program/libicui18n.so.${LIBicui18n_VERSION} -openoffice/program/libicule.so @lib openoffice/program/libicule.so.${LIBicule_VERSION} -openoffice/program/libicuuc.so @lib openoffice/program/libicuuc.so.${LIBicuuc_VERSION} openoffice/program/libidx680.so openoffice/program/libime680.so @@ -244,6 +242,7 @@ openoffice/program/simplereg.uno.so openoffice/program/slideshow.uno.so openoffice/program/streams.uno.so +openoffice/program/stringresource680.uno.so openoffice/program/svtmisc.uno.so openoffice/program/sysmgr1.uno.so openoffice/program/syssh.uno.so @@ -253,6 +252,7 @@ openoffice/program/typemgr.uno.so openoffice/program/ucpexpand1.uno.so openoffice/program/ucptdoc1.uno.so +openoffice/program/updatefeed.uno.so openoffice/program/uriproc.uno.so openoffice/program/uuresolver.uno.so openoffice/program/vclcanvas.uno.so Index: pkg/PLIST-java =================================================================== RCS file: /cvs/ports/editors/openoffice/pkg/PLIST-java,v retrieving revision 1.2 diff -u -r1.2 PLIST-java --- pkg/PLIST-java 13 Dec 2006 10:25:14 -0000 1.2 +++ pkg/PLIST-java 21 Feb 2007 11:21:54 -0000 @@ -43,7 +43,6 @@ openoffice/program/classes/xercesImpl.jar openoffice/program/classes/xmerge.jar openoffice/program/classes/xml-apis.jar -openoffice/program/classes/xt.jar openoffice/program/javaldx openoffice/share/Scripts/java/ openoffice/share/Scripts/java/HelloWorld/ Index: pkg/PLIST-main =================================================================== RCS file: /cvs/ports/editors/openoffice/pkg/PLIST-main,v retrieving revision 1.4 diff -u -r1.4 PLIST-main --- pkg/PLIST-main 14 Dec 2006 20:40:28 -0000 1.4 +++ pkg/PLIST-main 21 Feb 2007 11:21:55 -0000 @@ -204,10 +204,10 @@ openoffice/program/legacy_binfilters.rdb openoffice/program/libcppu.so.3 openoffice/program/libcppuhelpergcc3.so.3 -openoffice/program/libicudata.so.26 -openoffice/program/libicui18n.so.26 -openoffice/program/libicule.so.26 -openoffice/program/libicuuc.so.26 +openoffice/program/libicudata.so.36 +openoffice/program/libicui18n.so.36 +openoffice/program/libicule.so.36 +openoffice/program/libicuuc.so.36 openoffice/program/libjvmaccessgcc3.so.3 openoffice/program/libjvmfwk.so.3 openoffice/program/libportaudio.so.0 @@ -525,6 +525,7 @@ openoffice/share/config/soffice.cfg/ openoffice/share/config/soffice.cfg/global/ openoffice/share/config/soffice.cfg/global/accelerator/ +openoffice/share/config/soffice.cfg/global/accelerator/default.xml openoffice/share/config/soffice.cfg/global/accelerator/en-US/ openoffice/share/config/soffice.cfg/global/accelerator/en-US/default.xml openoffice/share/config/soffice.cfg/global/accelerator/es/ @@ -543,6 +544,7 @@ openoffice/share/config/soffice.cfg/modules/BasicIDE/toolbar/insertcontrolsbar.xml openoffice/share/config/soffice.cfg/modules/BasicIDE/toolbar/macrobar.xml openoffice/share/config/soffice.cfg/modules/BasicIDE/toolbar/standardbar.xml +openoffice/share/config/soffice.cfg/modules/BasicIDE/toolbar/translationbar.xml openoffice/share/config/soffice.cfg/modules/StartModule/ openoffice/share/config/soffice.cfg/modules/StartModule/accelerator/ openoffice/share/config/soffice.cfg/modules/StartModule/accelerator/en-US/ @@ -1148,6 +1150,7 @@ openoffice/share/dict/ooo/README_th_TH.txt openoffice/share/dict/ooo/README_th_de_CH_v2.txt openoffice/share/dict/ooo/README_th_de_DE_v2.txt +openoffice/share/dict/ooo/README_th_pl_PL_v2.txt openoffice/share/dict/ooo/WordNet_license.txt openoffice/share/dict/ooo/de_AT.aff openoffice/share/dict/ooo/de_AT.dic @@ -1190,6 +1193,8 @@ openoffice/share/dict/ooo/th_de_DE_v2.idx openoffice/share/dict/ooo/th_en_US_v2.dat openoffice/share/dict/ooo/th_en_US_v2.idx +openoffice/share/dict/ooo/th_pl_PL_v2.dat +openoffice/share/dict/ooo/th_pl_PL_v2.idx openoffice/share/dict/ooo/th_sk_SK_license.txt openoffice/share/dict/ooo/th_sk_SK_v2.dat openoffice/share/dict/ooo/th_sk_SK_v2.idx @@ -1889,6 +1894,7 @@ openoffice/share/registry/data/org/openoffice/Setup.xcu openoffice/share/registry/data/org/openoffice/TypeDetection/ openoffice/share/registry/data/org/openoffice/TypeDetection/UISort.xcu +openoffice/share/registry/data/org/openoffice/UserProfile.xcu openoffice/share/registry/data/org/openoffice/VCL.xcu openoffice/share/registry/data/org/openoffice/ucb/ openoffice/share/registry/data/org/openoffice/ucb/Configuration.xcu @@ -2531,6 +2537,7 @@ openoffice/share/xdg/base.desktop openoffice/share/xdg/calc.desktop openoffice/share/xdg/draw.desktop +openoffice/share/xdg/extension.desktop openoffice/share/xdg/impress.desktop openoffice/share/xdg/math.desktop openoffice/share/xdg/printeradmin.desktop