Modified files: editors/openoffice.org-2.0/Makefile editors/openoffice.org-2.0/distinfo editors/openoffice.org-2.0/files/patch-i64442 editors/openoffice.org-2.0/files/patch-i65511 editors/openoffice.org-2.0/files/patch-i65512 editors/openoffice.org-2.0/files/patch-i65513 Added file: editors/openoffice.org-2.0/files/patch-events_intptr editors/openoffice.org-2.0/files/patch-mozilla editors/openoffice.org-2.0/files/patch-salprnpsp editors/openoffice.org-2.0/files/patch-tools_inc Index: editors/openoffice.org-2.0/Makefile =================================================================== RCS file: /home/ncvs/ports/editors/openoffice.org-2.0/Makefile,v retrieving revision 1.236 diff -u -r1.236 Makefile --- editors/openoffice.org-2.0/Makefile 31 May 2006 03:05:19 -0000 1.236 +++ editors/openoffice.org-2.0/Makefile 2 Jun 2006 06:02:13 -0000 @@ -8,26 +8,30 @@ PORTNAME?= openoffice.org PORTVERSION?= ${OOOVERSION} CATEGORIES+= editors java -MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/${OOOVERSION}/&,} \ +MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/contrib/rc/${OOOVERSION}/&,} \ + http://openoffice.mirrors.pair.com/ftp/contrib/rc/${OOOVERSION}/ \ + http://mirrors.isc.org/pub/openoffice/contrib/rc/${OOOVERSION}/ \ + http://mirrors.ibiblio.org/pub/mirrors/openoffice/contrib/rc/${OOOVERSION}/ \ + ftp://ftp.ussg.iu.edu/pub/openoffice/contrib/rc/${OOOVERSION}/ \ http://openoffice.lunarshells.com/sources/ \ http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \ ${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \ ${MASTER_SITE_MOZILLA:S/$/:mozsrc/} MASTER_SITE_SUBDIR+= mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc -DISTFILES+= OOo_${OOOVERSION}_src.tar.gz +DISTFILES+= OOo_${OOOVERSION}_src_060601.tar.gz .if defined(WITH_GPC) DISTFILES+= gpc231.tar.Z:gpc .endif .if defined(WITH_GNUGCJ) DISTFILES+= ${ANT_DISTFILE}:antbin .endif -EXTRACT_ONLY= OOo_${OOOVERSION}_src.tar.gz +EXTRACT_ONLY= OOo_${OOOVERSION}_src_060601.tar.gz MAINTAINER= openoffice@FreeBSD.org COMMENT?= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser -OOOVERSION= 2.0.3rc3 +OOOVERSION= 2.0.3rc5 NO_LATEST_LINK= yes USE_GNOME= gtk20 gnomevfs2 MOZILLA_VERSION= 1.7.5 @@ -47,10 +51,6 @@ ONLY_FOR_ARCHS= amd64 i386 -.if ${MACHINE_ARCH} == amd64 -BROKEN= "Work in progress" -.endif - .if !defined(WITH_GNUGCJ) USE_JAVA= yes JAVA_VERSION= 1.4+ @@ -79,7 +79,7 @@ CODELINE= 680 RELEASE_NR= 2.0 -OOOTAG?= OOC680_m3 +OOOTAG?= OOC680_m5 INSTALLATION_BASEDIR?= openoffice.org-${OOOVERSION} EXECBASE?= openoffice.org-${OOOVERSION} DIST_SUBDIR= openoffice.org2.0 @@ -102,17 +102,23 @@ .if defined(WITH_GNUGCJ) #this wired part must be rewritten GCCVER=4.1.1 -BUILD_DEPENDS+= ${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt +BUILD_DEPENDS+= ${PREFIX}/lib/gcc/${GCC_TARGET}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt BUILD_DEPENDS+= gjdoc:${PORTSDIR}/java/gjdoc -RUN_DEPENDS+= ${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt +RUN_DEPENDS+= ${PREFIX}/lib/gcc/${GCC_TARGET}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt .else +.if ${ARCH} == amd64 +GCCVER=4.1.1 +BUILD_DEPENDS+= gcc41:${PORTSDIR}/lang/gcc41 +.else +GCCVER=3.4.1 BUILD_DEPENDS+= gcc-ooo:${PORTSDIR}/lang/gcc-ooo .endif +.endif # FIXME (correctly add ccache before gcc and g++) .if defined(WITH_CCACHE) BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache -.if defined(WITH_GNUGCJ) +.if defined(WITH_GNUGCJ) || ${ARCH} == amd64 CC= ccache gcc41 CXX= ccache g++41 .else @@ -121,7 +127,7 @@ .endif #WITH_GNUGCJ .endif #WITH_CCACHE .if !defined(WITH_CCACHE) -.if defined(WITH_GNUGCJ) +.if defined(WITH_GNUGCJ) || ${ARCH} == amd64 CC= gcc41 CXX= g++41 .else @@ -137,15 +143,16 @@ ${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \ bison2:${PORTSDIR}/devel/bison2 \ imake:${X_IMAKE_PORT} -.if !defined(WITH_GNUGCJ) -BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant -.else + +#LIB_DEPENDS+= execinfo.1:${PORTSDIR}/devel/libexecinfo + +.if defined(WITH_GNUGCJ) LIB_DEPENDS+= xslt.2:${PORTSDIR}/textproc/libxslt LIB_DEPENDS+= xml2.5:${PORTSDIR}/textproc/libxml2 -.endif -.if defined(WITH_GNUGCJ) ANT_DISTFILE= apache-ant-${ANT_VERSION}-bin.tar.bz2 ANT_VERSION= 1.6.5 +.else +BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant .endif .if !defined(WITH_GPC) LIB_DEPENDS= art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl @@ -162,9 +169,17 @@ .endif CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --enable-crashdump=yes --enable-symbols=SMALL +.if !defined(WITH_GNUGCJ) +CONFIGURE_ARGS+= --with-jdk-home=${JAVA_HOME} +.endif #workarounds CONFIGURE_ARGS+= --with-system-xrender-headers=yes #i62713# CONFIGURE_ARGS+= --with-system-freetype #link error with internal one +.if (${GCCVER} == 4.1.1) +LIB_DEPENDS= boost_regex:${PORTSDIR}/devel/boost +CONFIGURE_ARGS+= --with-system-boost=yes #i58343# +.endif + .if (${OSVERSION} <= 492000) EXTRA_PATCHES+= ${FILESDIR}/fbsd4-workaroundpatch .endif @@ -221,9 +236,11 @@ @cd ${WRKSRC} ; ./bootstrap # PR:84786 #i53289# .if (${NUMOFPROCESSES}>1) - @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all" +# @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" "EXECINFO_LIBS=-L${PREFIX}/lib -lexecinfo" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all" + @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all" .else - @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; dmake" +# @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" "EXECINFO_LIBS=-L${PREFIX}/lib -lexecinfo" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; dmake" + @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; dmake" .endif do-install: Index: editors/openoffice.org-2.0/distinfo =================================================================== RCS file: /home/ncvs/ports/editors/openoffice.org-2.0/distinfo,v retrieving revision 1.85 diff -u -r1.85 distinfo --- editors/openoffice.org-2.0/distinfo 29 May 2006 00:26:54 -0000 1.85 +++ editors/openoffice.org-2.0/distinfo 2 Jun 2006 06:02:13 -0000 @@ -1,6 +1,6 @@ -MD5 (openoffice.org2.0/OOo_2.0.3rc3_src.tar.gz) = 4262b9d5b3acb91fcd3e7690096235bf -SHA256 (openoffice.org2.0/OOo_2.0.3rc3_src.tar.gz) = 238ff96190f5044723d3d2975ed76d25f9876a766a9387ff80483004f19d4ddf -SIZE (openoffice.org2.0/OOo_2.0.3rc3_src.tar.gz) = 307311849 +MD5 (openoffice.org2.0/OOo_2.0.3rc5_src_060601.tar.gz) = caef8f901a69a990b8747c92581078ac +SHA256 (openoffice.org2.0/OOo_2.0.3rc5_src_060601.tar.gz) = 00bd7716b7abf74001ccfdf94022cb8e87a13bd96e44205ebba967c1fc200b14 +SIZE (openoffice.org2.0/OOo_2.0.3rc5_src_060601.tar.gz) = 307315179 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917 Index: editors/openoffice.org-2.0/files/patch-events_intptr =================================================================== RCS file: editors/openoffice.org-2.0/files/patch-events_intptr diff -N editors/openoffice.org-2.0/files/patch-events_intptr --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ editors/openoffice.org-2.0/files/patch-events_intptr 2 Jun 2006 06:02:13 -0000 @@ -0,0 +1,737 @@ +--- binfilter/bf_forms/source/component/Edit.hxx.orig Wed Sep 7 11:32:04 2005 ++++ binfilter/bf_forms/source/component/Edit.hxx Wed May 31 21:45:01 2006 +@@ -139,7 +139,7 @@ + m_aChangeListeners; + + ::rtl::OUString m_aHtmlChangeValue; +- sal_uInt32 m_nKeyEvent; ++ sal_uIntPtr m_nKeyEvent; + + public: + OEditControl(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory); +--- binfilter/bf_forms/source/component/FormattedField.hxx.orig Fri Apr 7 09:15:02 2006 ++++ binfilter/bf_forms/source/component/FormattedField.hxx Wed May 31 21:45:01 2006 +@@ -185,7 +185,7 @@ + class OFormattedControl : public OBoundControl + ,public OFormattedControl_BASE + { +- sal_uInt32 m_nKeyEvent; ++ sal_uIntPtr m_nKeyEvent; + + public: + OFormattedControl(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory); +--- binfilter/bf_forms/source/component/Grid.hxx.orig Wed Sep 7 11:35:26 2005 ++++ binfilter/bf_forms/source/component/Grid.hxx Wed May 31 21:45:01 2006 +@@ -123,7 +123,7 @@ + + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xSelection; + ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable > m_xParentFormLoadable; +- sal_uInt32 m_nFontEvent; ++ sal_uIntPtr m_nFontEvent; + + // [properties] + ::rtl::OUString m_sHelpURL; // URL +--- binfilter/bf_sfx2/source/dialog/filedlgimpl.hxx.orig Wed Sep 7 22:48:35 2005 ++++ binfilter/bf_sfx2/source/dialog/filedlgimpl.hxx Wed May 31 21:45:01 2006 +@@ -106,7 +106,7 @@ + SfxFilterFlags m_nMustFlags; + SfxFilterFlags m_nDontFlags; + +- ULONG mnPostUserEventId; ++ sal_uIntPtr mnPostUserEventId; + + ErrCode mnError; + +--- binfilter/bf_svx/source/inc/fmctrler.hxx.orig Thu Sep 8 02:00:35 2005 ++++ binfilter/bf_svx/source/inc/fmctrler.hxx Wed May 31 21:45:01 2006 +@@ -322,9 +322,9 @@ + + ::rtl::OUString m_aMode; + +- sal_uInt32 m_nLoadEvent; +- sal_uInt32 m_nUpdateDispatcherEvent; +- sal_uInt32 m_nToggleEvent; ++ sal_uIntPtr m_nLoadEvent; ++ sal_uIntPtr m_nUpdateDispatcherEvent; ++ sal_uIntPtr m_nToggleEvent; + + sal_Int32 m_nCurrentFilterPosition; // current level for filtering (or-criteria) + ::rtl::OUString m_sDispatchPrefix; +--- binfilter/bf_svx/source/inc/fmshimp.hxx.orig Thu Sep 8 02:04:13 2005 ++++ binfilter/bf_svx/source/inc/fmshimp.hxx Wed May 31 21:45:01 2006 +@@ -353,7 +353,7 @@ + SvLongs m_arrRelativeGridColumn; + + ::osl::Mutex m_aMutex; +- sal_uInt32 m_nInvalidationEvent; ++ sal_uIntPtr m_nInvalidationEvent; + ::std::queue< FmLoadAction > + m_aLoadingPages; + +--- binfilter/bf_svx/source/inc/fmvwimp.hxx.orig Thu Sep 8 02:05:53 2005 ++++ binfilter/bf_svx/source/inc/fmvwimp.hxx Wed May 31 21:45:01 2006 +@@ -180,9 +180,9 @@ + + FmFormObj* m_pMarkedGrid; + FmFormView* m_pView; +- sal_uInt32 m_nActivationEvent; +- sal_uInt32 m_nErrorMessageEvent; // event for an asynchronous error message. See also m_aAsyncError +- sal_uInt32 m_nAutoFocusEvent; // event for asynchronously setting the focus to a control ++ sal_uIntPtr m_nActivationEvent; ++ sal_uIntPtr m_nErrorMessageEvent; // event for an asynchronous error message. See also m_aAsyncError ++ sal_uIntPtr m_nAutoFocusEvent; // event for asynchronously setting the focus to a control + + ::com::sun::star::sdb::SQLErrorEvent + m_aAsyncError; // error event which is to be displayed asyn. See m_nErrorMessageEvent. +--- binfilter/inc/bf_svx/gridctrl.hxx.orig Fri Sep 9 09:36:27 2005 ++++ binfilter/inc/bf_svx/gridctrl.hxx Wed May 31 21:45:01 2006 +@@ -272,7 +272,7 @@ + + m_xEmptyRow; // Datensatz zum einfuegen + +- sal_uInt32 m_nAsynAdjustEvent; ++ sal_uIntPtr m_nAsynAdjustEvent; + + // if we modify the row for the new record, we automatically insert a "new new row". + // But if somebody else inserts a new record into the data source, we have to do the same. +@@ -310,7 +310,7 @@ + + BrowserMode m_nMode; + sal_Int32 m_nCurrentPos; // Aktuelle Position; +- sal_uInt32 m_nDeleteEvent; // EventId fuer asychrone Loeschen von Zeilen ++ sal_uIntPtr m_nDeleteEvent; // EventId fuer asychrone Loeschen von Zeilen + sal_uInt16 m_nOptions; // Was kann das Control (Insert, Update, Delete) + // default readonly + sal_uInt16 m_nOptionMask; // the mask of options to be enabled in setDataSource +--- dbaccess/source/ui/inc/AsyncronousLink.hxx.orig Thu Sep 8 11:14:42 2005 ++++ dbaccess/source/ui/inc/AsyncronousLink.hxx Wed May 31 21:45:01 2006 +@@ -60,7 +60,7 @@ + ::vos::OMutex* m_pEventSafety; + ::vos::OMutex* m_pDestructionSafety; + BOOL m_bOwnMutexes; +- ULONG m_nEventId; ++ sal_uIntPtr m_nEventId; + + public: + /** constructs the object +--- dbaccess/source/ui/inc/TableGrantCtrl.hxx.orig Thu Sep 8 11:37:13 2005 ++++ dbaccess/source/ui/inc/TableGrantCtrl.hxx Wed May 31 21:45:01 2006 +@@ -115,7 +115,7 @@ + virtual void CellModified(); + + private: +- ULONG m_nDeActivateEvent; ++ sal_uIntPtr m_nDeActivateEvent; + DECL_LINK( AsynchActivate, void* ); + DECL_LINK( AsynchDeactivate, void* ); + +--- dbaccess/source/ui/inc/TableWindowListBox.hxx.orig Thu Sep 8 11:38:55 2005 ++++ dbaccess/source/ui/inc/TableWindowListBox.hxx Wed May 31 21:45:01 2006 +@@ -77,7 +77,7 @@ + Point m_aMousePos; + + OTableWindow* m_pTabWin; +- sal_Int32 m_nDropEvent; ++ sal_IntPtr m_nDropEvent; + OJoinDropData m_aDropInfo; + + BOOL m_bReallyScrolled : 1; +--- dbaccess/source/ui/inc/sbagrid.hxx.orig Thu Sep 8 12:02:21 2005 ++++ dbaccess/source/ui/inc/sbagrid.hxx Wed May 31 21:45:01 2006 +@@ -262,7 +262,7 @@ + protected: + ::svx::ODataAccessDescriptor m_aDataDescriptor; + SbaGridListener* m_pMasterListener; +- sal_Int32 m_nAsyncDropEvent; ++ sal_IntPtr m_nAsyncDropEvent; + sal_uInt16 m_nLastColId; + sal_uInt16 m_nLastRowId; + +--- forms/source/component/Button.hxx.orig Thu Sep 8 18:34:04 2005 ++++ forms/source/component/Button.hxx Wed May 31 21:45:01 2006 +@@ -113,7 +113,7 @@ + ,public OFormNavigationHelper + { + private: +- sal_uInt32 m_nClickEvent; ++ sal_uIntPtr m_nClickEvent; + sal_Int32 m_nTargetUrlFeatureId; + /// caches the value of the "Enabled" property of our model + sal_Bool m_bEnabledByPropertyValue; +--- forms/source/component/Edit.hxx.orig Thu Sep 8 18:37:36 2005 ++++ forms/source/component/Edit.hxx Wed May 31 21:45:01 2006 +@@ -150,7 +150,7 @@ + m_aChangeListeners; + + ::rtl::OUString m_aHtmlChangeValue; +- sal_uInt32 m_nKeyEvent; ++ sal_uIntPtr m_nKeyEvent; + + public: + OEditControl(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory); +--- forms/source/component/FormattedField.hxx.orig Fri Apr 7 11:23:29 2006 ++++ forms/source/component/FormattedField.hxx Wed May 31 21:45:01 2006 +@@ -189,7 +189,7 @@ + class OFormattedControl : public OBoundControl + ,public OFormattedControl_BASE + { +- sal_uInt32 m_nKeyEvent; ++ sal_uIntPtr m_nKeyEvent; + + public: + OFormattedControl(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory); +--- fpicker/source/office/commonpicker.hxx.orig Thu Sep 8 19:30:41 2005 ++++ fpicker/source/office/commonpicker.hxx Wed May 31 21:45:01 2006 +@@ -113,7 +113,7 @@ + // + + SvtFileDialog* m_pDlg; +- sal_uInt32 m_nCancelEvent; ++ sal_uIntPtr m_nCancelEvent; + sal_Bool m_bExecuting; + + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xDialogParent; +--- sd/source/ui/slideshow/slideshowimpl.hxx.orig Thu Apr 6 09:27:42 2006 ++++ sd/source/ui/slideshow/slideshowimpl.hxx Wed May 31 21:45:01 2006 +@@ -394,7 +394,7 @@ + + ::std::auto_ptr mpPaneHider; + +- ULONG mnEndShowEvent; ++ sal_uIntPtr mnEndShowEvent; + }; + + class SlideShowImplGuard +--- sfx2/inc/tbxctrl.hxx.orig Tue May 2 12:05:25 2006 ++++ sfx2/inc/tbxctrl.hxx Wed May 31 21:45:01 2006 +@@ -153,7 +153,7 @@ + { + friend class SfxToolBox_Impl; + BOOL m_bFloating; +- ULONG m_nEventId; ++ sal_uIntPtr m_nEventId; + BOOL m_bCascading; + Link m_aDeleteLink; + USHORT m_nId; +--- sfx2/source/dialog/filedlgimpl.hxx.orig Wed Sep 7 14:18:47 2005 ++++ sfx2/source/dialog/filedlgimpl.hxx Wed May 31 21:45:01 2006 +@@ -105,7 +105,7 @@ + SfxFilterFlags m_nMustFlags; + SfxFilterFlags m_nDontFlags; + +- ULONG mnPostUserEventId; ++ sal_uIntPtr mnPostUserEventId; + + ErrCode mnError; + +--- svx/inc/gridctrl.hxx.orig Wed Jan 25 10:05:35 2006 ++++ svx/inc/gridctrl.hxx Wed May 31 21:45:02 2006 +@@ -275,7 +275,7 @@ + + m_xEmptyRow; // Datensatz zum einfuegen + +- sal_uInt32 m_nAsynAdjustEvent; ++ sal_uIntPtr m_nAsynAdjustEvent; + + // if we modify the row for the new record, we automatically insert a "new new row". + // But if somebody else inserts a new record into the data source, we have to do the same. +@@ -313,7 +313,7 @@ + + BrowserMode m_nMode; + sal_Int32 m_nCurrentPos; // Aktuelle Position; +- sal_uInt32 m_nDeleteEvent; // EventId fuer asychrone Loeschen von Zeilen ++ sal_uIntPtr m_nDeleteEvent; // EventId fuer asychrone Loeschen von Zeilen + sal_uInt16 m_nOptions; // Was kann das Control (Insert, Update, Delete) + // default readonly + sal_uInt16 m_nOptionMask; // the mask of options to be enabled in setDataSource +--- svx/source/inc/fmctrler.hxx.orig Thu Sep 8 19:15:07 2005 ++++ svx/source/inc/fmctrler.hxx Wed May 31 21:45:02 2006 +@@ -353,9 +353,9 @@ + + ::rtl::OUString m_aMode; + +- sal_uInt32 m_nLoadEvent; +- sal_uInt32 m_nUpdateDispatcherEvent; +- sal_uInt32 m_nToggleEvent; ++ sal_uIntPtr m_nLoadEvent; ++ sal_uIntPtr m_nUpdateDispatcherEvent; ++ sal_uIntPtr m_nToggleEvent; + + sal_Int32 m_nCurrentFilterPosition; // current level for filtering (or-criteria) + +--- svx/source/inc/fmobj.hxx.orig Thu Sep 8 19:17:25 2005 ++++ svx/source/inc/fmobj.hxx Wed May 31 21:45:02 2006 +@@ -68,7 +68,7 @@ + // m_pEnvironmentHistory was created + + FmFormView* m_pControlCreationView; +- sal_uInt32 m_nControlCreationEvent; ++ sal_uIntPtr m_nControlCreationEvent; + + // Informationen fuer die Controlumgebung + // werden nur vorgehalten, wenn ein Object sich nicht in einer Objectliste befindet +--- svx/source/inc/fmshimp.hxx.orig Thu Sep 8 19:18:58 2005 ++++ svx/source/inc/fmshimp.hxx Wed May 31 21:45:02 2006 +@@ -319,8 +319,8 @@ + SvLongs m_arrRelativeGridColumn; + + ::osl::Mutex m_aMutex; +- ULONG m_nInvalidationEvent; +- ULONG m_nActivationEvent; ++ sal_uIntPtr m_nInvalidationEvent; ++ sal_uIntPtr m_nActivationEvent; + ::std::queue< FmLoadAction > + m_aLoadingPages; + +--- vcl/inc/svapp.hxx.orig Fri May 5 06:50:17 2006 ++++ vcl/inc/svapp.hxx Thu Jun 1 17:14:02 2006 +@@ -275,7 +275,7 @@ + + virtual BOOL QueryExit(); + +- virtual void UserEvent( ULONG nEvent, void* pEventData ); ++ virtual void UserEvent( sal_uInt32 nEvent, void* pEventData ); + + virtual void ActivateExtHelp(); + virtual void DeactivateExtHelp(); +@@ -347,19 +347,19 @@ + static void RemoveEventListener( const Link& rEventListener ); + static void AddKeyListener( const Link& rKeyListener ); + static void RemoveKeyListener( const Link& rKeyListener ); +- static void ImplCallEventListeners( ULONG nEvent, Window* pWin, void* pData ); ++ static void ImplCallEventListeners( sal_uInt32 nEvent, Window* pWin, void* pData ); + static void ImplCallEventListeners( VclSimpleEvent* pEvent ); +- static BOOL HandleKey( ULONG nEvent, Window *pWin, KeyEvent* pKeyEvent ); ++ static BOOL HandleKey( sal_uInt32 nEvent, Window *pWin, KeyEvent* pKeyEvent ); + +- static ULONG PostKeyEvent( ULONG nEvent, Window *pWin, KeyEvent* pKeyEvent ); +- static ULONG PostMouseEvent( ULONG nEvent, Window *pWin, MouseEvent* pMouseEvent ); +- static void RemoveMouseAndKeyEvents( Window *pWin ); +- +- static ULONG PostUserEvent( ULONG nEvent, void* pEventData = NULL ); +- static ULONG PostUserEvent( const Link& rLink, void* pCaller = NULL ); +- static BOOL PostUserEvent( ULONG& rEventId, ULONG nEvent, void* pEventData = NULL ); +- static BOOL PostUserEvent( ULONG& rEventId, const Link& rLink, void* pCaller = NULL ); +- static void RemoveUserEvent( ULONG nUserEvent ); ++ static sal_uIntPtr PostKeyEvent( sal_uInt32 nEvent, Window *pWin, KeyEvent* pKeyEvent ); ++ static sal_uIntPtr PostMouseEvent( sal_uInt32 nEvent, Window *pWin, MouseEvent* pMouseEvent ); ++ static void RemoveMouseAndKeyEvents( Window *pWin ); ++ ++ static sal_uIntPtr PostUserEvent( sal_uInt32 nEvent, void* pEventData = NULL ); ++ static sal_uIntPtr PostUserEvent( const Link& rLink, void* pCaller = NULL ); ++ static BOOL PostUserEvent( sal_uIntPtr& rEventId, sal_uInt32 nEvent, void* pEventData = NULL ); ++ static BOOL PostUserEvent( sal_uIntPtr& rEventId, const Link& rLink, void* pCaller = NULL ); ++ static void RemoveUserEvent( sal_uIntPtr nUserEvent ); + + static BOOL InsertIdleHdl( const Link& rLink, USHORT nPriority ); + static void RemoveIdleHdl( const Link& rLink ); +@@ -396,10 +396,10 @@ + static void FlushAccel(); + static BOOL CallAccel( const KeyCode& rKeyCode, USHORT nRepeat = 0 ); + +- static ULONG AddHotKey( const KeyCode& rKeyCode, const Link& rLink, void* pData = NULL ); +- static void RemoveHotKey( ULONG nId ); +- static ULONG AddEventHook( VCLEventHookProc pProc, void* pData = NULL ); +- static void RemoveEventHook( ULONG nId ); ++ static sal_uIntPtr AddHotKey( const KeyCode& rKeyCode, const Link& rLink, void* pData = NULL ); ++ static void RemoveHotKey( sal_uIntPtr nId ); ++ static sal_uIntPtr AddEventHook( VCLEventHookProc pProc, void* pData = NULL ); ++ static void RemoveEventHook( sal_uIntPtr nId ); + static long CallEventHooks( NotifyEvent& rEvt ); + static long CallPreNotify( NotifyEvent& rEvt ); + static long CallEvent( NotifyEvent& rEvt ); +--- vcl/inc/svdata.hxx.orig Thu May 18 02:33:14 2006 ++++ vcl/inc/svdata.hxx Wed May 31 21:45:02 2006 +@@ -423,7 +423,7 @@ + + struct ImplSVEvent + { +- ULONG mnEvent; ++ sal_uInt32 mnEvent; + void* mpData; + Link* mpLink; + Window* mpWindow; +--- vcl/inc/vclevent.hxx.orig Fri Sep 9 07:35:10 2005 ++++ vcl/inc/vclevent.hxx Wed May 31 21:45:02 2006 +@@ -192,13 +192,13 @@ + class VCL_DLLPUBLIC VclSimpleEvent + { + private: +- ULONG nId; ++ sal_uInt32 nId; + + public: +- VclSimpleEvent( ULONG n ) { nId = n; } +- TYPEINFO(); ++ VclSimpleEvent( sal_uInt32 n ) { nId = n; } ++ TYPEINFO(); + +- ULONG GetId() const { return nId; } ++ sal_uInt32 GetId() const { return nId; } + }; + + class VCL_DLLPUBLIC VclWindowEvent : public VclSimpleEvent +@@ -208,7 +208,7 @@ + void* pData; + + public: +- VclWindowEvent( Window* pWin, ULONG n, void* pDat = NULL ) : VclSimpleEvent(n) { pWindow = pWin; pData = pDat; } ++ VclWindowEvent( Window* pWin, sal_uInt32 n, void* pDat = NULL ) : VclSimpleEvent(n) { pWindow = pWin; pData = pDat; } + TYPEINFO(); + + Window* GetWindow() const { return pWindow; } +@@ -222,7 +222,7 @@ + MouseEvent aEvent; + + public: +- VclMouseEvent( Window* pWin, ULONG n, const MouseEvent& rEvent ) : VclWindowEvent( pWin, n ), aEvent(rEvent) { ; } ++ VclMouseEvent( Window* pWin, sal_uInt32 n, const MouseEvent& rEvent ) : VclWindowEvent( pWin, n ), aEvent(rEvent) { ; } + TYPEINFO(); + + const MouseEvent& GetEvent() const { return aEvent; } +@@ -236,7 +236,7 @@ + USHORT mnPos; + + public: +- VclMenuEvent( Menu* pM, ULONG n, USHORT nPos ) : VclSimpleEvent(n) { pMenu = pM; mnPos = nPos; } ++ VclMenuEvent( Menu* pM, sal_uInt32 n, USHORT nPos ) : VclSimpleEvent(n) { pMenu = pM; mnPos = nPos; } + TYPEINFO(); + + Menu* GetMenu() const { return pMenu; } +--- vcl/inc/window.hxx.orig Fri May 5 04:59:16 2006 ++++ vcl/inc/window.hxx Wed May 31 21:45:02 2006 +@@ -611,8 +611,8 @@ + + void SetCompoundControl( BOOL bCompound ); + +- void ImplCallEventListeners( ULONG nEvent, void* pData = NULL ); +- void CallEventListeners( ULONG nEvent, void* pData = NULL ); ++ void ImplCallEventListeners( sal_uInt32 nEvent, void* pData = NULL ); ++ void CallEventListeners( sal_uInt32 nEvent, void* pData = NULL ); + + + public: +@@ -638,7 +638,7 @@ + virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void Command( const CommandEvent& rCEvt ); + virtual void Tracking( const TrackingEvent& rTEvt ); +- virtual void UserEvent( ULONG nEvent, void* pEventData ); ++ virtual void UserEvent( sal_uInt32 nEvent, void* pEventData ); + virtual void StateChanged( StateChangedType nStateChange ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual long PreNotify( NotifyEvent& rNEvt ); +@@ -650,11 +650,11 @@ + /*virtual*/ void AddChildEventListener( const Link& rEventListener ); + /*virtual*/ void RemoveChildEventListener( const Link& rEventListener ); + +- ULONG PostUserEvent( ULONG nEvent, void* pEventData = NULL ); +- ULONG PostUserEvent( const Link& rLink, void* pCaller = NULL ); +- BOOL PostUserEvent( ULONG& rEventId, ULONG nEvent, void* pEventData = NULL ); +- BOOL PostUserEvent( ULONG& rEventId, const Link& rLink, void* pCaller = NULL ); +- void RemoveUserEvent( ULONG nUserEvent ); ++ sal_uIntPtr PostUserEvent( sal_uInt32 nEvent, void* pEventData = NULL ); ++ sal_uIntPtr PostUserEvent( const Link& rLink, void* pCaller = NULL ); ++ BOOL PostUserEvent( sal_uIntPtr& rEventId, sal_uInt32 nEvent, void* pEventData = NULL ); ++ BOOL PostUserEvent( sal_uIntPtr& rEventId, const Link& rLink, void* pCaller = NULL ); ++ void RemoveUserEvent( sal_uIntPtr nUserEvent ); + void PostStateChanged( StateChangedType nState ); + + void IncrementLockCount(); +--- vcl/source/app/svapp.cxx.orig Thu May 18 02:39:54 2006 ++++ vcl/source/app/svapp.cxx Wed May 31 21:54:27 2006 +@@ -243,16 +243,16 @@ + + struct ImplPostEventData + { +- ULONG mnEvent; ++ sal_uInt32 mnEvent; + const Window* mpWin; +- ULONG mnEventId; ++ sal_uIntPtr mnEventId; + KeyEvent maKeyEvent; + MouseEvent maMouseEvent; + + +- ImplPostEventData( ULONG nEvent, const Window* pWin, const KeyEvent& rKeyEvent ) : ++ ImplPostEventData( sal_uInt32 nEvent, const Window* pWin, const KeyEvent& rKeyEvent ) : + mnEvent( nEvent ), mpWin( pWin ), mnEventId( 0 ), maKeyEvent( rKeyEvent ) {} +- ImplPostEventData( ULONG nEvent, const Window* pWin, const MouseEvent& rMouseEvent ) : ++ ImplPostEventData( sal_uInt32 nEvent, const Window* pWin, const MouseEvent& rMouseEvent ) : + mnEvent( nEvent ), mpWin( pWin ), mnEventId( 0 ), maMouseEvent( rMouseEvent ) {} + + ~ImplPostEventData() {} +@@ -314,7 +314,7 @@ + + // ----------------------------------------------------------------------- + +-void Application::UserEvent( ULONG, void* ) ++void Application::UserEvent( sal_uInt32, void* ) + { + } + +@@ -870,7 +870,7 @@ + + // ----------------------------------------------------------------------- + +-void Application::ImplCallEventListeners( ULONG nEvent, Window *pWin, void* pData ) ++void Application::ImplCallEventListeners( sal_uInt32 nEvent, Window *pWin, void* pData ) + { + ImplSVData* pSVData = ImplGetSVData(); + VclWindowEvent aEvent( pWin, nEvent, pData ); +@@ -930,7 +930,7 @@ + + // ----------------------------------------------------------------------- + +-BOOL Application::HandleKey( ULONG nEvent, Window *pWin, KeyEvent* pKeyEvent ) ++BOOL Application::HandleKey( sal_uInt32 nEvent, Window *pWin, KeyEvent* pKeyEvent ) + { + // let listeners process the key event + VclWindowEvent aEvent( pWin, nEvent, (void *) pKeyEvent ); +@@ -947,10 +947,10 @@ + + // ----------------------------------------------------------------------------- + +-ULONG Application::PostKeyEvent( ULONG nEvent, Window *pWin, KeyEvent* pKeyEvent ) ++sal_uIntPtr Application::PostKeyEvent( sal_uInt32 nEvent, Window *pWin, KeyEvent* pKeyEvent ) + { + const ::vos::OGuard aGuard( GetSolarMutex() ); +- ULONG nEventId = 0; ++ sal_uIntPtr nEventId = 0; + + if( pWin && pKeyEvent ) + { +@@ -974,10 +974,10 @@ + + // ----------------------------------------------------------------------------- + +-ULONG Application::PostMouseEvent( ULONG nEvent, Window *pWin, MouseEvent* pMouseEvent ) ++sal_uIntPtr Application::PostMouseEvent( sal_uInt32 nEvent, Window *pWin, MouseEvent* pMouseEvent ) + { + const ::vos::OGuard aGuard( GetSolarMutex() ); +- ULONG nEventId = 0; ++ sal_uIntPtr nEventId = 0; + + if( pWin && pMouseEvent ) + { +@@ -1014,8 +1014,8 @@ + const ::vos::OGuard aGuard( GetSolarMutex() ); + ImplPostEventData* pData = static_cast< ImplPostEventData * >( pCallData ); + const void* pEventData; +- ULONG nEvent; +- const ULONG nEventId = pData->mnEventId; ++ sal_uInt32 nEvent; ++ const sal_uIntPtr nEventId = pData->mnEventId; + + switch( pData->mnEvent ) + { +@@ -1096,25 +1096,25 @@ + + // ----------------------------------------------------------------------- + +-ULONG Application::PostUserEvent( ULONG nEvent, void* pEventData ) ++sal_uIntPtr Application::PostUserEvent( sal_uInt32 nEvent, void* pEventData ) + { +- ULONG nEventId; ++ sal_uIntPtr nEventId; + PostUserEvent( nEventId, nEvent, pEventData ); + return nEventId; + } + + // ----------------------------------------------------------------------- + +-ULONG Application::PostUserEvent( const Link& rLink, void* pCaller ) ++sal_uIntPtr Application::PostUserEvent( const Link& rLink, void* pCaller ) + { +- ULONG nEventId; ++ sal_uIntPtr nEventId; + PostUserEvent( nEventId, rLink, pCaller ); + return nEventId; + } + + // ----------------------------------------------------------------------- + +-BOOL Application::PostUserEvent( ULONG& rEventId, ULONG nEvent, void* pEventData ) ++BOOL Application::PostUserEvent( sal_uIntPtr& rEventId, sal_uInt32 nEvent, void* pEventData ) + { + ImplSVEvent* pSVEvent = new ImplSVEvent; + pSVEvent->mnEvent = nEvent; +@@ -1122,7 +1122,7 @@ + pSVEvent->mpLink = NULL; + pSVEvent->mpWindow = NULL; + pSVEvent->mbCall = TRUE; +- rEventId = (ULONG)pSVEvent; ++ rEventId = (sal_uIntPtr)pSVEvent; + Window* pDefWindow = ImplGetDefaultWindow(); + if ( pDefWindow && pDefWindow->ImplGetFrame()->PostEvent( pSVEvent ) ) + return TRUE; +@@ -1136,7 +1136,7 @@ + + // ----------------------------------------------------------------------- + +-BOOL Application::PostUserEvent( ULONG& rEventId, const Link& rLink, void* pCaller ) ++BOOL Application::PostUserEvent( sal_uIntPtr& rEventId, const Link& rLink, void* pCaller ) + { + ImplSVEvent* pSVEvent = new ImplSVEvent; + pSVEvent->mnEvent = 0; +@@ -1144,7 +1144,7 @@ + pSVEvent->mpLink = new Link( rLink ); + pSVEvent->mpWindow = NULL; + pSVEvent->mbCall = TRUE; +- rEventId = (ULONG)pSVEvent; ++ rEventId = (sal_uIntPtr)pSVEvent; + Window* pDefWindow = ImplGetDefaultWindow(); + if ( pDefWindow && pDefWindow->ImplGetFrame()->PostEvent( pSVEvent ) ) + return TRUE; +@@ -1158,7 +1158,7 @@ + + // ----------------------------------------------------------------------- + +-void Application::RemoveUserEvent( ULONG nUserEvent ) ++void Application::RemoveUserEvent( sal_uIntPtr nUserEvent ) + { + if(nUserEvent) + { +@@ -1698,7 +1698,7 @@ + + // ----------------------------------------------------------------------- + +-ULONG Application::AddHotKey( const KeyCode& rKeyCode, const Link& rLink, void* pData ) ++sal_uIntPtr Application::AddHotKey( const KeyCode& rKeyCode, const Link& rLink, void* pData ) + { + ImplSVData* pSVData = ImplGetSVData(); + ImplHotKey* pHotKeyData = new ImplHotKey; +@@ -1707,12 +1707,12 @@ + pHotKeyData->maLink = rLink; + pHotKeyData->mpNext = pSVData->maAppData.mpFirstHotKey; + pSVData->maAppData.mpFirstHotKey = pHotKeyData; +- return (ULONG)pHotKeyData; ++ return (sal_uIntPtr)pHotKeyData; + } + + // ----------------------------------------------------------------------- + +-void Application::RemoveHotKey( ULONG nId ) ++void Application::RemoveHotKey( sal_uIntPtr nId ) + { + ImplSVData* pSVData = ImplGetSVData(); + ImplHotKey* pFindHotKeyData = (ImplHotKey*)nId; +@@ -1756,7 +1756,7 @@ + + // ----------------------------------------------------------------------- + +-ULONG Application::AddEventHook( VCLEventHookProc pProc, void* pData ) ++sal_uIntPtr Application::AddEventHook( VCLEventHookProc pProc, void* pData ) + { + ImplSVData* pSVData = ImplGetSVData(); + ImplEventHook* pEventHookData = new ImplEventHook; +@@ -1764,12 +1764,12 @@ + pEventHookData->mpProc = pProc; + pEventHookData->mpNext = pSVData->maAppData.mpFirstEventHook; + pSVData->maAppData.mpFirstEventHook = pEventHookData; +- return (ULONG)pEventHookData; ++ return (sal_uIntPtr)pEventHookData; + } + + // ----------------------------------------------------------------------- + +-void Application::RemoveEventHook( ULONG nId ) ++void Application::RemoveEventHook( sal_uIntPtr nId ) + { + ImplSVData* pSVData = ImplGetSVData(); + ImplEventHook* pFindEventHookData = (ImplEventHook*)nId; +--- vcl/source/window/window.cxx.orig Thu May 18 03:03:13 2006 ++++ vcl/source/window/window.cxx Wed May 31 21:45:02 2006 +@@ -4991,7 +4991,7 @@ + + // ----------------------------------------------------------------------- + +-void Window::UserEvent( ULONG, void* ) ++void Window::UserEvent( sal_uInt32, void* ) + { + DBG_CHKTHIS( Window, ImplDbgCheckWindow ); + } +@@ -5334,7 +5334,7 @@ + + // ----------------------------------------------------------------------- + +-void Window::ImplCallEventListeners( ULONG nEvent, void* pData ) ++void Window::ImplCallEventListeners( sal_uInt32 nEvent, void* pData ) + { + // The implementation was moved to CallEventListeners(), + // because derived classes in svtools must be able to +@@ -5347,7 +5347,7 @@ + + // ----------------------------------------------------------------------- + +-void Window::CallEventListeners( ULONG nEvent, void* pData ) ++void Window::CallEventListeners( sal_uInt32 nEvent, void* pData ) + { + VclWindowEvent aEvent( this, nEvent, pData ); + +@@ -5415,25 +5415,25 @@ + + // ----------------------------------------------------------------------- + +-ULONG Window::PostUserEvent( ULONG nEvent, void* pEventData ) ++sal_uIntPtr Window::PostUserEvent( sal_uInt32 nEvent, void* pEventData ) + { +- ULONG nEventId; ++ sal_uIntPtr nEventId; + PostUserEvent( nEventId, nEvent, pEventData ); + return nEventId; + } + + // ----------------------------------------------------------------------- + +-ULONG Window::PostUserEvent( const Link& rLink, void* pCaller ) ++sal_uIntPtr Window::PostUserEvent( const Link& rLink, void* pCaller ) + { +- ULONG nEventId; ++ sal_uIntPtr nEventId; + PostUserEvent( nEventId, rLink, pCaller ); + return nEventId; + } + + // ----------------------------------------------------------------------- + +-BOOL Window::PostUserEvent( ULONG& rEventId, ULONG nEvent, void* pEventData ) ++BOOL Window::PostUserEvent( sal_uIntPtr& rEventId, sal_uInt32 nEvent, void* pEventData ) + { + DBG_CHKTHIS( Window, ImplDbgCheckWindow ); + +@@ -5444,7 +5444,7 @@ + pSVEvent->mpWindow = this; + pSVEvent->mbCall = TRUE; + ImplAddDel( &(pSVEvent->maDelData) ); +- rEventId = (ULONG)pSVEvent; ++ rEventId = (sal_uIntPtr)pSVEvent; + if ( mpWindowImpl->mpFrame->PostEvent( pSVEvent ) ) + return TRUE; + else +@@ -5458,7 +5458,7 @@ + + // ----------------------------------------------------------------------- + +-BOOL Window::PostUserEvent( ULONG& rEventId, const Link& rLink, void* pCaller ) ++BOOL Window::PostUserEvent( sal_uIntPtr& rEventId, const Link& rLink, void* pCaller ) + { + DBG_CHKTHIS( Window, ImplDbgCheckWindow ); + +@@ -5469,7 +5469,7 @@ + pSVEvent->mpWindow = this; + pSVEvent->mbCall = TRUE; + ImplAddDel( &(pSVEvent->maDelData) ); +- rEventId = (ULONG)pSVEvent; ++ rEventId = (sal_uIntPtr)pSVEvent; + if ( mpWindowImpl->mpFrame->PostEvent( pSVEvent ) ) + return TRUE; + else +@@ -5483,7 +5483,7 @@ + + // ----------------------------------------------------------------------- + +-void Window::RemoveUserEvent( ULONG nUserEvent ) ++void Window::RemoveUserEvent( sal_uIntPtr nUserEvent ) + { + DBG_CHKTHIS( Window, ImplDbgCheckWindow ); + Index: editors/openoffice.org-2.0/files/patch-i64442 =================================================================== RCS file: /home/ncvs/ports/editors/openoffice.org-2.0/files/patch-i64442,v retrieving revision 1.2 diff -u -r1.2 patch-i64442 --- editors/openoffice.org-2.0/files/patch-i64442 29 May 2006 00:26:55 -0000 1.2 +++ editors/openoffice.org-2.0/files/patch-i64442 2 Jun 2006 06:02:13 -0000 @@ -1,27 +1,23 @@ -Index: jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx -=================================================================== -RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx,v -retrieving revision 1.7 -diff -u -r1.7 gnujre.cxx ---- jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx 16 Mar 2006 13:13:00 -0000 1.7 -+++ jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx 28 May 2006 03:33:20 -0000 -@@ -63,13 +63,8 @@ +cws maho02 +--- jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx Thu Mar 16 08:13:00 2006 ++++ jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx Thu May 25 17:09:04 2006 +@@ -63,12 +63,12 @@ char const* const* GnuInfo::getRuntimePaths(int * size) { static char const* ar[]= { -#ifdef X86_64 -- "/lib64/libgcj.so.7", -- "/lib64/libgcj.so.6" --#else ++#if defined(X86_64) && !defined(FREEBSD) + "/lib64/libgcj.so.7", + "/lib64/libgcj.so.6" + #else - "/lib/libgcj.so.7", - "/lib/libgcj.so.6" --#endif + "/libgcj.so.7", + "/libgcj.so.6" + #endif }; *size = sizeof(ar) / sizeof (char*); - return ar; -@@ -87,7 +82,7 @@ +@@ -87,7 +87,7 @@ OUString sVersionProperty( RTL_CONSTASCII_USTRINGPARAM("java.version")); OUString sHomeProperty( @@ -30,7 +26,7 @@ OUString sAccessProperty( RTL_CONSTASCII_USTRINGPARAM("javax.accessibility.assistive_technologies")); -@@ -111,19 +106,8 @@ +@@ -111,19 +111,8 @@ } else if (!bHome && sHomeProperty.equals(i->first)) { Index: editors/openoffice.org-2.0/files/patch-i65511 =================================================================== RCS file: /home/ncvs/ports/editors/openoffice.org-2.0/files/patch-i65511,v retrieving revision 1.1 diff -u -r1.1 patch-i65511 --- editors/openoffice.org-2.0/files/patch-i65511 29 May 2006 00:26:55 -0000 1.1 +++ editors/openoffice.org-2.0/files/patch-i65511 2 Jun 2006 06:02:13 -0000 @@ -1,10 +1,5 @@ -Index: jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx -=================================================================== -RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx,v -retrieving revision 1.4 -diff -u -r1.4 sunjre.cxx ---- jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx 7 Sep 2005 19:31:11 -0000 1.4 -+++ jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx 11 May 2006 23:00:16 -0000 +--- jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx.orig Wed Sep 7 15:31:11 2005 ++++ jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx Thu May 25 14:20:37 2006 @@ -76,6 +76,7 @@ "/bin/classic/jvm.dll" #elif UNX @@ -13,3 +8,11 @@ "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so" #endif +@@ -90,6 +91,7 @@ + static char const * ar[] = { + + "/lib/" JFW_PLUGIN_ARCH "/client", ++ "/lib/" JFW_PLUGIN_ARCH "/server", + "/lib/" JFW_PLUGIN_ARCH "/native_threads", + "/lib/" JFW_PLUGIN_ARCH + Index: editors/openoffice.org-2.0/files/patch-i65512 =================================================================== RCS file: /home/ncvs/ports/editors/openoffice.org-2.0/files/patch-i65512,v retrieving revision 1.1 diff -u -r1.1 patch-i65512 --- editors/openoffice.org-2.0/files/patch-i65512 29 May 2006 00:26:55 -0000 1.1 +++ editors/openoffice.org-2.0/files/patch-i65512 2 Jun 2006 06:02:13 -0000 @@ -28,9 +28,9 @@ #if defined(MACOSX) /* ---- sal/osl/unx/system.h.orig Fri Apr 7 04:06:48 2006 -+++ sal/osl/unx/system.h Fri May 5 18:57:50 2006 -@@ -540,8 +540,10 @@ +--- sal/osl/unx/system.h.orig Thu May 4 04:48:25 2006 ++++ sal/osl/unx/system.h Wed May 24 16:06:13 2006 +@@ -543,8 +543,10 @@ struct tm *localtime_r(const time_t *timep, struct tm *buffer); struct tm *gmtime_r(const time_t *timep, struct tm *buffer); #endif /* !defined FREEBSD || (__FreeBSD_version < 500112) */ Index: editors/openoffice.org-2.0/files/patch-i65513 =================================================================== RCS file: /home/ncvs/ports/editors/openoffice.org-2.0/files/patch-i65513,v retrieving revision 1.1 diff -u -r1.1 patch-i65513 --- editors/openoffice.org-2.0/files/patch-i65513 29 May 2006 00:26:55 -0000 1.1 +++ editors/openoffice.org-2.0/files/patch-i65513 2 Jun 2006 06:02:13 -0000 @@ -1,5 +1,5 @@ ---- config_office/set_soenv.in.orig Mon May 8 11:55:43 2006 -+++ config_office/set_soenv.in Mon May 22 17:39:23 2006 +--- config_office/set_soenv.in Mon May 8 11:55:43 2006 ++++ config_office/set_soenv.in Tue May 23 14:31:50 2006 @@ -320,32 +320,60 @@ $XPVERSION = "3"; } @@ -72,7 +72,17 @@ } elsif ( $platform =~ m/linux-gnu/ ) { -@@ -1294,6 +1322,7 @@ +@@ -963,8 +991,7 @@ + $D.$OS. + $D.$CPUNAME; + if ($platform =~ m/freebsd/) +- { $SOLARDEF .= $D."X86". +- $D."OSVERSION=$OSVERSION". ++ { $SOLARDEF .= $D."OSVERSION=$OSVERSION". + " @PTHREAD_CFLAGS@"; + } + $SOLARDEF .= $D."_REENTRANT". +@@ -1294,6 +1321,7 @@ { $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd"; $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd"; Index: editors/openoffice.org-2.0/files/patch-mozilla =================================================================== RCS file: editors/openoffice.org-2.0/files/patch-mozilla diff -N editors/openoffice.org-2.0/files/patch-mozilla --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ editors/openoffice.org-2.0/files/patch-mozilla 2 Jun 2006 06:02:13 -0000 @@ -0,0 +1,21 @@ +--- moz/mozilla-source-1.7.5.patch.orig Wed May 31 11:30:36 2006 ++++ moz/mozilla-source-1.7.5.patch Wed May 31 11:26:26 2006 +@@ -7697,3 +7697,18 @@ + + # Force applications to be built non-statically + # when building the mozcomps meta component ++--- misc/mozilla/nsprpub/pr/include/md/_freebsd.h.orig Sat Apr 22 17:14:55 2006 +++++ misc/build/mozilla/nsprpub/pr/include/md/_freebsd.h Sat Apr 22 17:14:47 2006 ++@@ -106,6 +106,11 @@ ++ #define _PR_IPV6_V6ONLY_PROBE ++ #endif ++ +++#if __FreeBSD_version >= 700016 +++#define _PR_HAVE_GETPROTO_R +++#define _PR_HAVE_5_ARG_GETPROTO_R +++#endif +++ ++ #define USE_SETJMP ++ ++ #ifndef _PR_PTHREADS ++ Index: editors/openoffice.org-2.0/files/patch-salprnpsp =================================================================== RCS file: editors/openoffice.org-2.0/files/patch-salprnpsp diff -N editors/openoffice.org-2.0/files/patch-salprnpsp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ editors/openoffice.org-2.0/files/patch-salprnpsp 2 Jun 2006 06:02:13 -0000 @@ -0,0 +1,16 @@ +Index: unx/source/gdi/salprnpsp.cxx +=================================================================== +RCS file: /cvs/gsl/vcl/unx/source/gdi/salprnpsp.cxx,v +retrieving revision 1.40 +diff -u -r1.40 salprnpsp.cxx +--- vcl/unx/source/gdi/salprnpsp.cxx 22 Mar 2006 09:46:43 -0000 1.40 ++++ vcl/unx/source/gdi/salprnpsp.cxx 27 May 2006 00:31:26 -0000 +@@ -101,6 +101,8 @@ + // NETBSD has no RTLD_GLOBAL + #ifndef RTLD_GLOBAL + #define DLOPEN_MODE (RTLD_LAZY) ++#elif defined(FREEBSD) ++#define DLOPEN_MODE (RTLD_NOW | RTLD_GLOBAL) + #else + #define DLOPEN_MODE (RTLD_GLOBAL | RTLD_LAZY) + #endif Index: editors/openoffice.org-2.0/files/patch-tools_inc =================================================================== RCS file: editors/openoffice.org-2.0/files/patch-tools_inc diff -N editors/openoffice.org-2.0/files/patch-tools_inc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ editors/openoffice.org-2.0/files/patch-tools_inc 2 Jun 2006 06:02:13 -0000 @@ -0,0 +1,29 @@ +--- tools/inc/inetdef.hxx.orig Fri Sep 9 09:42:51 2005 ++++ tools/inc/inetdef.hxx Thu May 25 18:31:02 2006 +@@ -65,7 +65,9 @@ + #elif defined LINUX && defined X86 + #define TOOLS_INETDEF_OS "Linux" + #elif defined FREEBSD && defined X86 +-#define TOOLS_INETDEF_OS "FreeBSD" ++#define TOOLS_INETDEF_OS "FreeBSD/i386" ++#elif defined FREEBSD && defined X86_64 ++#define TOOLS_INETDEF_OS "FreeBSD/amd64" + #elif defined SINIX + #define TOOLS_INETDEF_OS "SINIX" + #elif defined IRIX +--- tools/inc/solar.h.orig Wed Apr 26 16:42:59 2006 ++++ tools/inc/solar.h Thu May 25 18:37:19 2006 +@@ -397,9 +397,12 @@ + #elif defined LINUX && defined __x86_64__ + #define __DLLEXTENSION "lx.so" + #define SYSTEM_ID SYSTEM_UNXLNXX +-#elif defined FREEBSD ++#elif defined FREEBSD && defined X86 + #define __DLLEXTENSION "fi.so" + #define SYSTEM_ID SYSTEM_UNXFBSDI ++#elif defined FREEBSD && defined X86_64 ++ #define __DLLEXTENSION "fx.so" ++ #define SYSTEM_ID SYSTEM_UNXFBSDX + #elif defined IRIX + #define __DLLEXTENSION "im.so" + #define SYSTEM_ID SYSTEM_UNXIRXM