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-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 31 May 2006 14:57:04 -0000 @@ -8,7 +8,7 @@ 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.lunarshells.com/sources/ \ http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \ @@ -27,7 +27,7 @@ MAINTAINER= openoffice@FreeBSD.org COMMENT?= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser -OOOVERSION= 2.0.3rc3 +OOOVERSION= 2.0.3rc4 NO_LATEST_LINK= yes USE_GNOME= gtk20 gnomevfs2 MOZILLA_VERSION= 1.7.5 @@ -47,10 +47,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 +75,7 @@ CODELINE= 680 RELEASE_NR= 2.0 -OOOTAG?= OOC680_m3 +OOOTAG?= OOC680_m4 INSTALLATION_BASEDIR?= openoffice.org-${OOOVERSION} EXECBASE?= openoffice.org-${OOOVERSION} DIST_SUBDIR= openoffice.org2.0 @@ -102,17 +98,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 +123,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 +139,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 +165,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 +232,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 31 May 2006 14:57:04 -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.3rc4_src.tar.gz) = ac7941c3defbba6937ff8d5bb1580898 +SHA256 (openoffice.org2.0/OOo_2.0.3rc4_src.tar.gz) = c0d254b658a77026afb21705c22e79db633d0ed98a07fc030b3af8b1e74714ba +SIZE (openoffice.org2.0/OOo_2.0.3rc4_src.tar.gz) = 307310608 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-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 31 May 2006 14:57:04 -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 31 May 2006 14:57:04 -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 31 May 2006 14:57:04 -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 31 May 2006 14:57:04 -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-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 31 May 2006 14:57:05 -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 31 May 2006 14:57:05 -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