Update to SRC680_m159

author: maho <maho@FreeBSD.org> 2006-03-15 14:25:45 +0800
committer: maho <maho@FreeBSD.org> 2006-03-15 14:25:45 +0800
commit: 7e0fc00d659840676170ce2dd52222b3fe6f7aba (patch)
tree: 52c3bb8bf5c0ee3be9270296978b0afb4fda38f9 /editors/openoffice-3-devel
parent: d42950feda3a637801e1dd20131eb7564e29bcff (diff)
download: freebsd-ports-gnome-7e0fc00d659840676170ce2dd52222b3fe6f7aba.tar.gz
freebsd-ports-gnome-7e0fc00d659840676170ce2dd52222b3fe6f7aba.tar.zst
freebsd-ports-gnome-7e0fc00d659840676170ce2dd52222b3fe6f7aba.zip
10 files changed, 479 insertions, 361 deletions
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 29119ca8c3a7..c8d0bb778792 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -15,14 +15,14 @@ MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680
 		${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_2.0.${MILESTONE}_src${EXTRACT_SUFX}
+DISTFILES+=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
 .if defined(WITH_GNUGCJ)
 DISTFILES+=     ${ANT_DISTFILE}:antbin
 .endif
-EXTRACT_ONLY=	OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
+EXTRACT_ONLY=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
@@ -43,6 +43,7 @@ USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
+USE_BZIP2=	yes
 WITHOUT_CPU_CFLAGS=	true
 
 ONLY_FOR_ARCHS=	i386
@@ -63,9 +64,9 @@ IGNORE=		install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-MILESTONE?=		156
+MILESTONE?=		159
 OOOTAG?=		SRC680_m${MILESTONE}
-SNAPDATE=		20060211
+SNAPDATE=		20060310
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org2.0
@@ -82,8 +83,10 @@ PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
 .if defined(WITH_GNUGCJ)
-#BUILD_DEPENDS+=	${LOCALBASE}/bin/gcc41:${PORTSDIR}/lang/gcc41-wgcj
-BROKEN=	"still work in progress"
+#BUILD_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
+#BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
+#RUN_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
+BROKEN=	"Still work in progress"	
 .else
 BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
 .endif
@@ -92,8 +95,8 @@ BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
 .if defined(WITH_GNUGCJ)
-CC=	ccache ${LOCALBASE}/gcc41/bin/gcc
-CXX=	ccache ${LOCALBASE}/gcc41/bin/g++
+CC=	ccache gcc41
+CXX=	ccache g++41
 .else
 CC=	ccache gcc-ooo
 CXX=	ccache g++-ooo
@@ -101,8 +104,8 @@ CXX=	ccache g++-ooo
 .endif #WITH_CCACHE
 .if !defined(WITH_CCACHE)
 .if defined(WITH_GNUGCJ)
-CC=	${LOCALBASE}/gcc41/bin/gcc
-CXX=	${LOCALBASE}/gcc41/bin/g++
+CC=	gcc41
+CXX=	g++41
 .else
 CC=	gcc-ooo
 CXX=	g++-ooo
@@ -131,20 +134,21 @@ LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2
 .endif
 
 GNU_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}/${OOOTAG}
+WRKSRC?=		${WRKDIR}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
-USE_AUTOTOOLS=	autoconf:259
 
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --with-system-freetype --enable-crashdump=yes --enable-symbols=SMALL
+#workarounds
+CONFIGURE_ARGS+=	--with-system-xrender-headers=yes #i62713#
 
 .if (${OSVERSION} <= 492000)
 EXTRA_PATCHES+=	${FILESDIR}/fbsd4-workaroundpatch
 .endif
 .if defined(WITH_GNUGCJ)
-EXTRA_PATCHES+=	${FILESDIR}/gcj-cws_jaxpapi ${FILESDIR}/gcj-patches
+EXTRA_PATCHES+=	${FILESDIR}/gcj-cws_jaxpapi ${FILESDIR}/gcj-patches ${FILESDIR}/cws-maho1.diff ${FILESDIR}/gcj-fbsdworkaround
 .endif
 #.if defined(WITH_TTF_BYTECODE_ENABLED)
 #EXTRA_PATCHES+=	 ${FILESDIR}/optpatch-freetype
@@ -172,6 +176,8 @@ pre-everything::
 post-extract:
 .if defined(WITH_GNUGCJ)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
+# #iXXXXX# xmerge doesn't support gjdoc
+	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKSRC}/solenv/bin/javadoc
 .endif
 .if defined(WITH_GPC)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index d9e94a17ad36..8a5205ca443c 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_2.0.156_src.tar.gz) = d98f2e47e8ed73986cf2818edefa7ad6
-SHA256 (openoffice.org2.0/OOo_2.0.156_src.tar.gz) = 1a8b274464d7ecf603a7e7dc029167ade940ad09029e327a1703a9e2228444d4
-SIZE (openoffice.org2.0/OOo_2.0.156_src.tar.gz) = 288046106
+MD5 (openoffice.org2.0/OOo_SRC680_m159_source.tar.bz2) = ec5a99d80cd3797dc60c52904db2c036
+SHA256 (openoffice.org2.0/OOo_SRC680_m159_source.tar.bz2) = 1795fdafb214449f316ba0279e8c79d098c1fbf55bdcb7501d5b0f866b8b37e9
+SIZE (openoffice.org2.0/OOo_SRC680_m159_source.tar.bz2) = 240880356
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
diff --git a/editors/openoffice-3-devel/files/Makefile.knobs b/editors/openoffice-3-devel/files/Makefile.knobs
index 1d119fc69a6a..72abc5d6a217 100644
--- a/editors/openoffice-3-devel/files/Makefile.knobs
+++ b/editors/openoffice-3-devel/files/Makefile.knobs
@@ -6,16 +6,12 @@
 CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
 .endif
 .if !defined(WITHOUT_JAVA) && defined(WITH_GNUGCJ)
-CONFIGURE_ARGS+=	--with-jdk-home="${LOCALBASE}/gcc41" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}" --disable-qadevooo
+CONFIGURE_ARGS+=	--with-jdk-home="${LOCALBASE}" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}"
 .endif
 .if defined(WITHOUT_JAVA)
 CONFIGURE_ARGS+=	--without-java
 .endif
 
-.if !defined(WITH_GPC)
-CONFIGURE_ARGS+=	--enable-libart 
-.endif
-
 .if defined(WITH_KDE)
 CONFIGURE_ARGS+=	--enable-kde QTDIR="${QT_PREFIX}"
 .endif
@@ -90,10 +86,11 @@ pre-fetch:
 	@${ECHO} "make LOCALIZED_LANG=xx" 
 	@${ECHO} "while xx can be one of the following"
 	@${ECHO} "af ar be-BY bg br bn bn-BD bn-IN bs ca cs cy da de el"
-	@${ECHO} "en-GB en-US en-ZA eo es et eu fi fr ga gl gu-IN he hi-IN"
-	@${ECHO} "hr hu it ja km kn-IN ko lo lt lv mk ms ne nb nl nn nr"
-	@${ECHO} "ns pa-IN pl pt pt-BR ru rw sk sl sh-YU sr-CS ss st sv"
-	@${ECHO} "sw sw-TZ sx ta-IN th tn tr ts ve vi xh zh-CN zh-TW zu"
+	@${ECHO} "en-GB en-US en-ZA eo es et eu fa fi fr ga gl gu-IN he"
+	@${ECHO} "hi-IN hr hu it ja km kn-IN ko lo lt lv mk ms ne nb nl"
+	@${ECHO} "nn nr ns pa-IN pl pt pt-BR ru rw sk sl sh-YU sr-CS ss"
+	@${ECHO} "st sv sw sw-TZ sx ta-IN th tn tr ts ve vi xh zh-CN"
+	@${ECHO} "zh-TW zu"
 	@${ECHO} "Default: en-US"
 #XXX currently broken
 #.if !defined(WITHOUT_JAVA)
diff --git a/editors/openoffice-3-devel/files/Makefile.localized b/editors/openoffice-3-devel/files/Makefile.localized
index d1a0fa4e670b..fc113e2769ef 100644
--- a/editors/openoffice-3-devel/files/Makefile.localized
+++ b/editors/openoffice-3-devel/files/Makefile.localized
@@ -102,6 +102,10 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "fa"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "fi"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
diff --git a/editors/openoffice-3-devel/files/cws-maho1.diff b/editors/openoffice-3-devel/files/cws-maho1.diff
new file mode 100644
index 000000000000..2b427d8ef479
--- /dev/null
+++ b/editors/openoffice-3-devel/files/cws-maho1.diff
@@ -0,0 +1,287 @@
+
+Index: config_office/configure
+===================================================================
+RCS file: /cvs/tools/config_office/configure,v
+retrieving revision 1.142
+retrieving revision 1.142.4.7
+diff -u -p -r1.142 -r1.142.4.7
+--- config_office/configure	28 Feb 2006 16:55:27 -0000	1.142
++++ config_office/configure	7 Mar 2006 02:51:40 -0000	1.142.4.7
+@@ -308,7 +308,7 @@ ac_includes_default="\
+ # include <unistd.h>
+ #endif"
+ 
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK SED LOCAL_SOLENV UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP ENABLE_VCTK VC_STANDARD ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS ENABLE_CUPS ENABLE_FONTCONFIG WITH_BINFILTER ENABLE_DIRECTX NETTOOLKIT ENABLE_RPATH WITH_MYSPELL_DICTS USE_SHELL WITH_MINGWIN TCSH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GCCVER HAVE_GCC_VISIBILITY_FEATURE GNUMAKE _cc MSPDB_PATH COMEX MIDL_PATH CSC_PATH NMAKE_PATH FRAME_HOME CPP EGREP PAM_LINK CRYPT_LINK CXX CXXFLAGS ac_ct_CXX GXX_INCLUDE_PATH EXCEPTIONS CXXCPP STLPORT4 USE_SYSTEM_STL ALLOC BUILD_VER_STRING SOLAR_JAVA LANG JAVAINTERPRETER JAVACOMPILER JAVADOC AWTLIB JAVACACHE JAVA_HOME JDK XSLTPROC PERL DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM PKGFORMAT RPM SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG FREETYPE_CFLAGS FREETYPE_LIBS SYSTEM_FREETYPE LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS SYSTEM_DB DB_VERSION DB_INCLUDES DB_JAR SABLOTCONFIG SYSTEM_SABLOT SABLOT_LIBS CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_OPENLDAP MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS MOZ_NSS_CFLAGS MOZ_NSS_LIBS MOZILLA_VERSION MOZILLA_TOOLKIT MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB SYSTEM_MOZILLA MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB SYSTEM_XRENDER_HEADERS XRENDER_LINK XMKMF SYSTEM_NAS NAS_INCLUDES ENABLE_NAS ENABLE_PASF SYSTEM_PORTAUDIO SYSTEM_SNDFILE BUILD_TYPE NEON_CFLAGS NEON_LIBS SYSTEM_NEON AGG_CFLAGS AGG_LIBS SYSTEM_AGG MYSPELL_CFLAGS MYSPELL_LIBS SYSTEM_MYSPELL SYSTEM_HUNSPELL HUNSPELL_CFLAGS SYSTEM_HYPH SYSTEM_MYTHES PSDK_HOME DIRECTXSDK_HOME DIRECTXSDK_LIB NSIS_PATH EXTRA_DOTNET_FILES BISON FLEX PATCH GNUPATCH GNUCP CYGWIN_PATH ML_EXE ASM_HOME ZIP UNZIP ZIP_HOME LIBART_CFLAGS LIBART_LIBS WITH_LIBART WITH_GPC ENABLE_GTK ENABLE_KDE GNOMEVFS_CFLAGS GNOMEVFS_LIBS GCONF_CFLAGS GCONF_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS GDKPIXBUF_CFLAGS GDKPIXBUF_LIBS CAIRO_CFLAGS CAIRO_LIBS ENABLE_CAIRO SYSTEM_CAIRO MOC KDE_CFLAGS KDE_LIBS LIBSN_CFLAGS LIBSN_LIBS WITH_LIBSN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB WITH_FONTOOO SYSTEM_MSPACK WITH_FONTS SCPDEFS WITHOUT_PPDS WITHOUT_AFMS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB WITH_LANG WITH_DICT ENABLE_STATIC_GTK LOCAL_SOLVER LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK SED LOCAL_SOLENV UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP ENABLE_VCTK VC_STANDARD ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS ENABLE_CUPS ENABLE_FONTCONFIG WITH_BINFILTER ENABLE_DIRECTX NETTOOLKIT ENABLE_RPATH WITH_MYSPELL_DICTS USE_SHELL WITH_MINGWIN TCSH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GCCVER HAVE_GCC_VISIBILITY_FEATURE GNUMAKE _cc MSPDB_PATH COMEX MIDL_PATH CSC_PATH NMAKE_PATH FRAME_HOME CPP EGREP PAM_LINK CRYPT_LINK CXX CXXFLAGS ac_ct_CXX GXX_INCLUDE_PATH EXCEPTIONS CXXCPP STLPORT4 USE_SYSTEM_STL ALLOC BUILD_VER_STRING SOLAR_JAVA LANG JAVAINTERPRETER JAVACOMPILER JAVADOC AWTLIB JAVACACHE JAR JAVACMD JAVA_HOME JDK XSLTPROC PERL DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM PKGFORMAT RPM SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG FREETYPE_CFLAGS FREETYPE_LIBS SYSTEM_FREETYPE LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS SYSTEM_DB DB_VERSION DB_INCLUDES DB_JAR SABLOTCONFIG SYSTEM_SABLOT SABLOT_LIBS CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_OPENLDAP MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS MOZ_NSS_CFLAGS MOZ_NSS_LIBS MOZILLA_VERSION MOZILLA_TOOLKIT MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB SYSTEM_MOZILLA MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB SYSTEM_XRENDER_HEADERS XRENDER_LINK XMKMF SYSTEM_NAS NAS_INCLUDES ENABLE_NAS ENABLE_PASF SYSTEM_PORTAUDIO SYSTEM_SNDFILE BUILD_TYPE NEON_CFLAGS NEON_LIBS SYSTEM_NEON AGG_CFLAGS AGG_LIBS SYSTEM_AGG MYSPELL_CFLAGS MYSPELL_LIBS SYSTEM_MYSPELL SYSTEM_HUNSPELL HUNSPELL_CFLAGS SYSTEM_HYPH SYSTEM_MYTHES PSDK_HOME DIRECTXSDK_HOME DIRECTXSDK_LIB NSIS_PATH EXTRA_DOTNET_FILES BISON FLEX PATCH GNUPATCH GNUCP CYGWIN_PATH ML_EXE ASM_HOME ZIP UNZIP ZIP_HOME LIBART_CFLAGS LIBART_LIBS WITH_LIBART WITH_GPC ENABLE_GTK ENABLE_KDE GNOMEVFS_CFLAGS GNOMEVFS_LIBS GCONF_CFLAGS GCONF_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS GDKPIXBUF_CFLAGS GDKPIXBUF_LIBS CAIRO_CFLAGS CAIRO_LIBS ENABLE_CAIRO SYSTEM_CAIRO MOC KDE_CFLAGS KDE_LIBS LIBSN_CFLAGS LIBSN_LIBS WITH_LIBSN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB WITH_FONTOOO SYSTEM_MSPACK WITH_FONTS SCPDEFS WITHOUT_PPDS WITHOUT_AFMS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB WITH_LANG WITH_DICT ENABLE_STATIC_GTK LOCAL_SOLVER LIBOBJS LTLIBOBJS'
+ ac_subst_files=''
+ 
+ # Initialize some variables set by options.
+@@ -7250,9 +7250,14 @@ echo "$as_me: error: $javacompiler not f
+ fi
+ 
+ if test "$SOLAR_JAVA" != ""; then
++    if test "$JDK" = "gcj"; then
++	javadoc_program=gjdoc
++    else
++	javadoc_program=javadoc
++    fi
+     if test -z "$with_jdk_home"; then
+-        # Extract the first word of "javadoc", so it can be a program name with args.
+-set dummy javadoc; ac_word=$2
++        # Extract the first word of "$javadoc_program", so it can be a program name with args.
++set dummy $javadoc_program; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_JAVADOC+set}" = set; then
+@@ -7291,12 +7296,12 @@ echo "${ECHO_T}no" >&6
+ fi
+ 
+     else
+-        _javadoc_path="$with_jdk_home/bin/javadoc"
++        _javadoc_path="$with_jdk_home/bin/$javadoc_program"
+                 if test -x "$_javadoc_path"; then
+             JAVADOC=$_javadoc_path
+         else
+-            # Extract the first word of "javadoc", so it can be a program name with args.
+-set dummy javadoc; ac_word=$2
++            # Extract the first word of "$javadoc_program", so it can be a program name with args.
++set dummy $javadoc_program; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_JAVADOC+set}" = set; then
+@@ -7717,6 +7722,59 @@ echo "$as_me: WARNING: $javacache not fo
+    fi
+ fi
+ 
++if test "$JDK" = "gcj"; then
++   if test -x "$JAVA_HOME/bin/fastjar"; then
++      JAR="$JAVA_HOME/bin/fastjar";
++   else
++      if test -x "$JAVA_HOME/bin/jar"; then
++         JAR="$JAVA_HOME/bin/jar";
++      else
++         # Extract the first word of "jar", so it can be a program name with args.
++set dummy jar; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_path_JAR+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  case $JAR in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_JAR="$JAR" # Let the user override the test with a path.
++  ;;
++  *)
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_path_JAR="$as_dir/$ac_word$ac_exec_ext"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  ;;
++esac
++fi
++JAR=$ac_cv_path_JAR
++
++if test -n "$JAR"; then
++  echo "$as_me:$LINENO: result: $JAR" >&5
++echo "${ECHO_T}$JAR" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++      fi
++   fi
++JAVACMD=$JAVAINTERPRETER
++
++
++fi
++
+ 
+ 
+ 
+@@ -19533,9 +19591,8 @@ cat > conftest.xml << EOF
+ 	</target>
+     </project>
+ EOF
+-  oldJAVA_HOME=$JAVA_HOME
+   if test "$JDK" = "gcj"; then
+-    JAVA_HOME=; export JAVA_HOME
++    export JAVACMD
+     ant_cmd="$ANT -Dbuild.compiler=gcj -buildfile conftest.xml 1>&2"
+   else
+     ant_cmd="$ANT -buildfile conftest.xml 1>&2"
+@@ -19562,9 +19619,9 @@ echo "$as_me: WARNING: Ant does not work
+     ANT_HOME=""
+     echo "Ant does not work - Some Java projects will not build!" >>warn
+   fi
+-  JAVA_HOME=$oldJAVA_HOME
+   rm -f conftest* core core.* *.core
+ fi
++
+ if test -z "$ANT_HOME"; then
+    ANT_HOME="NO_ANT_HOME"
+ fi
+@@ -20381,6 +20438,8 @@ s,@JAVACOMPILER@,$JAVACOMPILER,;t t
+ s,@JAVADOC@,$JAVADOC,;t t
+ s,@AWTLIB@,$AWTLIB,;t t
+ s,@JAVACACHE@,$JAVACACHE,;t t
++s,@JAR@,$JAR,;t t
++s,@JAVACMD@,$JAVACMD,;t t
+ s,@JAVA_HOME@,$JAVA_HOME,;t t
+ s,@JDK@,$JDK,;t t
+ s,@XSLTPROC@,$XSLTPROC,;t t
+Index: config_office/configure.in
+===================================================================
+RCS file: /cvs/tools/config_office/configure.in,v
+retrieving revision 1.159
+retrieving revision 1.159.4.6
+diff -u -p -r1.159 -r1.159.4.6
+--- config_office/configure.in	28 Feb 2006 16:41:29 -0000	1.159
++++ config_office/configure.in	7 Mar 2006 02:51:41 -0000	1.159.4.6
+@@ -2023,15 +2023,20 @@ dnl ====================================
+ dnl Checks for javadoc
+ dnl ===================================================================
+ if test "$SOLAR_JAVA" != ""; then
++    if test "$JDK" = "gcj"; then
++	javadoc_program=gjdoc
++    else
++	javadoc_program=javadoc
++    fi
+     if test -z "$with_jdk_home"; then
+-        AC_PATH_PROG(JAVADOC, javadoc)
++        AC_PATH_PROG(JAVADOC, $javadoc_program)
+     else
+-        _javadoc_path="$with_jdk_home/bin/javadoc"
++        _javadoc_path="$with_jdk_home/bin/$javadoc_program"
+         dnl Check if there is a javadoc at all.
+         if test -x "$_javadoc_path"; then
+             JAVADOC=$_javadoc_path
+         else
+-            AC_PATH_PROG(JAVADOC, javadoc)
++            AC_PATH_PROG(JAVADOC, $javadoc_program)
+         fi
+     fi
+     if test -z "$JAVADOC"; then
+@@ -2121,6 +2126,24 @@ if test `$JAVACOMPILER --version 2>&1 | 
+    fi
+ fi
+ 
++dnl ===================================================================
++dnl Pass optional environment variable, use if compiler is gcj
++dnl ===================================================================
++if test "$JDK" = "gcj"; then
++   if test -x "$JAVA_HOME/bin/fastjar"; then
++      JAR="$JAVA_HOME/bin/fastjar";
++   else
++      if test -x "$JAVA_HOME/bin/jar"; then
++         JAR="$JAVA_HOME/bin/jar";
++      else
++         AC_PATH_PROG(JAR,jar)
++      fi
++   fi
++JAVACMD=$JAVAINTERPRETER
++AC_SUBST(JAVACMD)
++AC_SUBST(JAR)
++fi
++
+ AC_SUBST(JAVA_HOME)
+ AC_SUBST(JDK)
+ AC_SUBST(JAVAINTERPRETER)
+@@ -4322,9 +4345,8 @@ cat > conftest.xml << EOF
+ 	</target>
+     </project>
+ EOF
+-  oldJAVA_HOME=$JAVA_HOME
+   if test "$JDK" = "gcj"; then
+-    JAVA_HOME=; export JAVA_HOME
++    export JAVACMD
+     ant_cmd="$ANT -Dbuild.compiler=gcj -buildfile conftest.xml 1>&2"
+   else
+     ant_cmd="$ANT -buildfile conftest.xml 1>&2"
+@@ -4345,9 +4367,9 @@ EOF
+     ANT_HOME=""
+     echo "Ant does not work - Some Java projects will not build!" >>warn
+   fi
+-  JAVA_HOME=$oldJAVA_HOME
+   rm -f conftest* core core.* *.core
+ fi
++
+ if test -z "$ANT_HOME"; then
+    ANT_HOME="NO_ANT_HOME"
+ fi
+Index: config_office/set_soenv.in
+===================================================================
+RCS file: /cvs/tools/config_office/set_soenv.in,v
+retrieving revision 1.92
+retrieving revision 1.92.4.3
+diff -u -p -r1.92 -r1.92.4.3
+--- config_office/set_soenv.in	28 Feb 2006 10:41:43 -0000	1.92
++++ config_office/set_soenv.in	4 Mar 2006 08:04:38 -0000	1.92.4.3
+@@ -1696,6 +1696,8 @@ if ( '@JDK@' ne '' )
+    ToFile( "JAVAINTERPRETER", "@JAVAINTERPRETER@","e" );
+    ToFile( "JAVACOMPILER",    "@JAVACOMPILER@",  "e" );
+    ToFile( "JAVADOC",         "@JAVADOC@",       "e" );
++   ToFile( "JAVACMD",         "@JAVACMD@",       "e" );
++   ToFile( "JAR",             "@JAR@",           "e" );
+ }
+ if ( $platform =~ m/darwin/ )
+ {  ToFile( "DYLD_LIBRARY_PATH", $LD_LIBRARY_PATH,   "e" );
+
+Index: berkeleydb/makefile.mk
+===================================================================
+RCS file: /cvs/external/berkeleydb/makefile.mk,v
+retrieving revision 1.30
+retrieving revision 1.30.6.2
+diff -u -p -r1.30 -r1.30.6.2
+--- berkeleydb/makefile.mk	13 Jan 2006 16:23:55 -0000	1.30
++++ berkeleydb/makefile.mk	4 Mar 2006 10:56:19 -0000	1.30.6.2
+@@ -86,6 +86,10 @@ CONFIGURE_ACTION= \
+ CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185
+ .IF "$(SOLAR_JAVA)"!=""
+ CONFIGURE_FLAGS+=--enable-java
++.IF "$(JDK)"=="gcj"
++JAVA:=$(JAVAINTERPRETER)
++.EXPORT : JAVA
++.ENDIF
+ .ENDIF
+ 
+ BUILD_DIR=$(CONFIGURE_DIR)
+Index: qadevOOo/runner/makefile.mk
+===================================================================
+RCS file: /cvs/qa/qadevOOo/runner/makefile.mk,v
+retrieving revision 1.11
+retrieving revision 1.11.12.1
+diff -u -p -r1.11 -r1.11.12.1
+--- qadevOOo/runner/makefile.mk	2 Nov 2005 17:40:11 -0000	1.11
++++ qadevOOo/runner/makefile.mk	4 Mar 2006 04:49:22 -0000	1.11.12.1
+@@ -54,13 +54,17 @@ OWNJAR: ALLTAR
+ 
+ .INCLUDE :  target.mk
+ 
++.IF "$(JAR)"==""
++JAR=jar
++.ENDIF
++
+ # LLA: parameter v is only verbose, need too long!
+ OWNJAR: LIGHT
+-    +jar cfm $(CLASSDIR)$/$(TARGET).jar manifest -C $(PRJ) objdsc $(JARCOMMANDS_TESTS) $(JARCOMMANDS_RUNNER)
++    +$(JAR) cfm $(CLASSDIR)$/$(TARGET).jar manifest -C $(PRJ) objdsc $(JARCOMMANDS_TESTS) $(JARCOMMANDS_RUNNER)
+ 
+ # LLA: parameter v is only verbose, need too long!
+ LIGHT:
+-    +jar cfm $(CLASSDIR)$/$(TARGET)Light.jar manifest $(JARCOMMANDS_RUNNER)
++    +$(JAR) cfm $(CLASSDIR)$/$(TARGET)Light.jar manifest $(JARCOMMANDS_RUNNER)
+ 
+ .ELSE
+ all:
+
diff --git a/editors/openoffice-3-devel/files/gcj-cws_jaxpapi b/editors/openoffice-3-devel/files/gcj-cws_jaxpapi
index b7473b8dc748..353cd34bda7a 100644
--- a/editors/openoffice-3-devel/files/gcj-cws_jaxpapi
+++ b/editors/openoffice-3-devel/files/gcj-cws_jaxpapi
@@ -23,18 +23,6 @@ retrieving revision 1.16.16.1
 diff -u -r1.16 -r1.16.16.1
 --- filter/source/config/fragments/makefile.mk	14 Dec 2005 14:48:16 -0000	1.16
 +++ filter/source/config/fragments/makefile.mk	17 Jan 2006 11:03:31 -0000	1.16.16.1
-@@ -4,9 +4,9 @@
- #
- #   $RCSfile: makefile.mk,v $
- #
--#   $Revision: 1.16 $
-+#   $Revision: 1.16.16.1 $
- #
--#   last change: $Author: rt $ $Date: 2005/12/14 14:48:16 $
-+#   last change: $Author: cmc $ $Date: 2006/01/17 11:03:31 $
- #
- #   The Contents of this file are made available subject to
- #   the terms of GNU Lesser General Public License Version 2.1.
 @@ -156,11 +156,7 @@
  MERGE:=python ../tools/merge/pyAltFCFGMerge
  .ELSE
@@ -56,18 +44,6 @@ retrieving revision 1.5.92.1
 diff -u -r1.5 -r1.5.92.1
 --- filter/source/config/tools/utils/makefile.mk	8 Sep 2005 21:39:14 -0000	1.5
 +++ filter/source/config/tools/utils/makefile.mk	17 Jan 2006 11:03:44 -0000	1.5.92.1
-@@ -4,9 +4,9 @@
- #
- #   $RCSfile: makefile.mk,v $
- #
--#   $Revision: 1.5 $
-+#   $Revision: 1.5.92.1 $
- #
--#   last change: $Author: rt $ $Date: 2005/09/08 21:39:14 $
-+#   last change: $Author: cmc $ $Date: 2006/01/17 11:03:44 $
- #
- #   The Contents of this file are made available subject to
- #   the terms of GNU Lesser General Public License Version 2.1.
 @@ -51,8 +51,8 @@
                      juh.jar         \
                      jut.jar         \
@@ -102,18 +78,6 @@ retrieving revision 1.2.88.1
 diff -u -r1.2 -r1.2.88.1
 --- officecfg/org/openoffice/configuration/FileHelper.java	8 Sep 2005 14:42:51 -0000	1.2
 +++ officecfg/org/openoffice/configuration/FileHelper.java	17 Jan 2006 11:28:49 -0000	1.2.88.1
-@@ -4,9 +4,9 @@
-  *
-  *  $RCSfile: FileHelper.java,v $
-  *
-- *  $Revision: 1.2 $
-+ *  $Revision: 1.2.88.1 $
-  *
-- *  last change: $Author: rt $ $Date: 2005/09/08 14:42:51 $
-+ *  last change: $Author: cmc $ $Date: 2006/01/17 11:28:49 $
-  *
-  *  The Contents of this file are made available subject to
-  *  the terms of GNU Lesser General Public License Version 2.1.
 @@ -62,7 +62,7 @@
  		File aFile = new File(sSource);
  		
@@ -148,18 +112,6 @@ retrieving revision 1.4.88.1
 diff -u -r1.4 -r1.4.88.1
 --- officecfg/org/openoffice/configuration/XMLDefaultGenerator.java	8 Sep 2005 14:43:34 -0000	1.4
 +++ officecfg/org/openoffice/configuration/XMLDefaultGenerator.java	17 Jan 2006 11:28:50 -0000	1.4.88.1
-@@ -4,9 +4,9 @@
-  *
-  *  $RCSfile: XMLDefaultGenerator.java,v $
-  *
-- *  $Revision: 1.4 $
-+ *  $Revision: 1.4.88.1 $
-  *
-- *  last change: $Author: rt $ $Date: 2005/09/08 14:43:34 $
-+ *  last change: $Author: cmc $ $Date: 2006/01/17 11:28:50 $
-  *
-  *  The Contents of this file are made available subject to
-  *  the terms of GNU Lesser General Public License Version 2.1.
 @@ -36,12 +36,10 @@
  
  import org.xml.sax.*;
@@ -190,18 +142,6 @@ retrieving revision 1.10.12.1
 diff -u -r1.10 -r1.10.12.1
 --- readlicense_oo/util/makefile.pmk	25 Oct 2005 10:43:44 -0000	1.10
 +++ readlicense_oo/util/makefile.pmk	17 Jan 2006 11:15:07 -0000	1.10.12.1
-@@ -4,9 +4,9 @@
- #
- #   $RCSfile: makefile.pmk,v $
- #
--#   $Revision: 1.10 $
-+#   $Revision: 1.10.12.1 $
- #
--#   last change: $Author: hr $ $Date: 2005/10/25 10:43:44 $
-+#   last change: $Author: cmc $ $Date: 2006/01/17 11:15:07 $
- #
- #   The Contents of this file are made available subject to
- #   the terms of GNU Lesser General Public License Version 2.1.
 @@ -70,7 +70,7 @@
  $(MISC)$/readme%.html :
      @+-$(MKDIR) $(@:d)
@@ -228,18 +168,6 @@ retrieving revision 1.32.18.1
 diff -u -r1.32 -r1.32.18.1
 --- scripting/java/build.xml	9 Sep 2005 01:54:21 -0000	1.32
 +++ scripting/java/build.xml	17 Jan 2006 11:15:56 -0000	1.32.18.1
-@@ -4,9 +4,9 @@
-  
-     $RCSfile: build.xml,v $
-  
--    $Revision: 1.32 $
-+    $Revision: 1.32.18.1 $
-  
--    last change: $Author: rt $ $Date: 2005/09/09 01:54:21 $
-+    last change: $Author: cmc $ $Date: 2006/01/17 11:15:56 $
-  
-     The Contents of this file are made available subject to
-     the terms of GNU Lesser General Public License Version 2.1.
 @@ -65,15 +65,11 @@
  
    <path id="idesupport.class.path">
@@ -264,18 +192,6 @@ retrieving revision 1.21.184.2
 diff -u -r1.22 -r1.21.184.2
 --- solenv/bin/modules/installer/javainstaller.pm	13 Jan 2006 15:01:29 -0000	1.22
 +++ solenv/bin/modules/installer/javainstaller.pm	18 Jan 2006 12:05:44 -0000	1.21.184.2
-@@ -4,9 +4,9 @@
- #
- #   $RCSfile: javainstaller.pm,v $
- #
--#   $Revision: 1.22 $
-+#   $Revision: 1.21.184.2 $
- #
--#   last change: $Author: rt $ $Date: 2006/01/13 15:01:29 $
-+#   last change: $Author: cmc $ $Date: 2006/01/18 12:05:44 $
- #
- #   The Contents of this file are made available subject to
- #   the terms of GNU Lesser General Public License Version 2.1.
 @@ -494,14 +494,14 @@
  
  	# The variable CLASSPATH has to contain:
@@ -302,22 +218,6 @@ retrieving revision 1.6.184.1
 diff -u -r1.6 -r1.6.184.1
 --- solenv/inc/tg_config.mk	8 Sep 2005 09:42:41 -0000	1.6
 +++ solenv/inc/tg_config.mk	17 Jan 2006 11:10:09 -0000	1.6.184.1
-@@ -1,12 +1,12 @@
--#*************************************************************************
-+#************************************************************************
- #
- #   OpenOffice.org - a multi-platform office productivity suite
- #
- #   $RCSfile: tg_config.mk,v $
- #
--#   $Revision: 1.6 $
-+#   $Revision: 1.6.184.1 $
- #
--#   last change: $Author: rt $ $Date: 2005/09/08 09:42:41 $
-+#   last change: $Author: cmc $ $Date: 2006/01/17 11:10:09 $
- #
- #   The Contents of this file are made available subject to
- #   the terms of GNU Lesser General Public License Version 2.1.
 @@ -62,12 +62,12 @@
  	-$(MKDIRHIER) $(@:d)
  .IF "$(XSLTPROC)"=="NO_XSLTPROC"
@@ -459,18 +359,6 @@ retrieving revision 1.9.4.1
 diff -u -r1.9 -r1.9.4.1
 --- xmerge/util/build.xml	24 Oct 2005 18:23:52 -0000	1.9
 +++ xmerge/util/build.xml	17 Jan 2006 10:55:05 -0000	1.9.4.1
-@@ -4,9 +4,9 @@
-  
-     $RCSfile: build.xml,v $
-  
--    $Revision: 1.9 $
-+    $Revision: 1.9.4.1 $
-  
--    last change: $Author: hr $ $Date: 2005/10/24 18:23:52 $
-+    last change: $Author: cmc $ $Date: 2006/01/17 10:55:05 $
-  
-     The Contents of this file are made available subject to
-     the terms of GNU Lesser General Public License Version 2.1.
 @@ -39,9 +39,8 @@
      <property name="javadoc.dir" location="${build.dir}/javadoc"/>
      
@@ -507,18 +395,6 @@ retrieving revision 1.3.8.1
 diff -u -r1.3 -r1.3.8.1
 --- xmerge/workben/build.xml	9 Sep 2005 11:50:54 -0000	1.3
 +++ xmerge/workben/build.xml	17 Jan 2006 10:55:13 -0000	1.3.8.1
-@@ -5,9 +5,9 @@
-  
-     $RCSfile: build.xml,v $
-  
--    $Revision: 1.3 $
-+    $Revision: 1.3.8.1 $
-  
--    last change: $Author: rt $ $Date: 2005/09/09 11:50:54 $
-+    last change: $Author: cmc $ $Date: 2006/01/17 10:55:13 $
-  
-     The Contents of this file are made available subject to
-     the terms of GNU Lesser General Public License Version 2.1.
 @@ -60,9 +60,8 @@
      <!-- classpath settings for javac tasks -->
      <path id="classpath">
@@ -539,18 +415,6 @@ retrieving revision 1.2.2.1
 diff -u -r1.2 -r1.2.2.1
 --- xmlhelp/source/com/sun/star/help/GCJFileURLStreamHandler.java	16 Jan 2006 12:35:17 -0000	1.2
 +++ xmlhelp/source/com/sun/star/help/GCJFileURLStreamHandler.java	19 Jan 2006 09:43:59 -0000	1.2.2.1
-@@ -4,9 +4,9 @@
-  *
-  *  $RCSfile: GCJFileURLStreamHandler.java,v $
-  *
-- *  $Revision: 1.2 $
-+ *  $Revision: 1.2.2.1 $
-  *
-- *  last change: $Author: obo $ $Date: 2006/01/16 12:35:17 $
-+ *  last change: $Author: cmc $ $Date: 2006/01/19 09:43:59 $
-  *
-  *  The Contents of this file are made available subject to
-  *  the terms of GNU Lesser General Public License Version 2.1.
 @@ -43,12 +43,12 @@
  import java.net.URLConnection;
  import java.util.HashMap;
@@ -574,18 +438,6 @@ retrieving revision 1.11.4.2
 diff -u -r1.12 -r1.11.4.2
 --- xmlhelp/source/com/sun/star/help/HelpCompiler.java	16 Jan 2006 12:35:49 -0000	1.12
 +++ xmlhelp/source/com/sun/star/help/HelpCompiler.java	18 Jan 2006 12:08:35 -0000	1.11.4.2
-@@ -4,9 +4,9 @@
-  *
-  *  $RCSfile: HelpCompiler.java,v $
-  *
-- *  $Revision: 1.12 $
-+ *  $Revision: 1.11.4.2 $
-  *
-- *  last change: $Author: obo $ $Date: 2006/01/16 12:35:49 $
-+ *  last change: $Author: cmc $ $Date: 2006/01/18 12:08:35 $
-  *
-  *  The Contents of this file are made available subject to
-  *  the terms of GNU Lesser General Public License Version 2.1.
 @@ -38,6 +38,7 @@
  import java.io.ByteArrayInputStream;
  import java.io.File;
@@ -989,18 +841,6 @@ retrieving revision 1.16.20.1
 diff -u -r1.16 -r1.16.20.1
 --- xmlhelp/source/com/sun/star/help/HelpIndexer.java	25 Oct 2005 11:24:55 -0000	1.16
 +++ xmlhelp/source/com/sun/star/help/HelpIndexer.java	17 Jan 2006 11:20:47 -0000	1.16.20.1
-@@ -4,9 +4,9 @@
-  *
-  *  $RCSfile: HelpIndexer.java,v $
-  *
-- *  $Revision: 1.16 $
-+ *  $Revision: 1.16.20.1 $
-  *
-- *  last change: $Author: hr $ $Date: 2005/10/25 11:24:55 $
-+ *  last change: $Author: cmc $ $Date: 2006/01/17 11:20:47 $
-  *
-  *  The Contents of this file are made available subject to
-  *  the terms of GNU Lesser General Public License Version 2.1.
 @@ -46,7 +46,6 @@
  import java.util.*;
  
@@ -1029,18 +869,6 @@ retrieving revision 1.21.2.1
 diff -u -r1.21 -r1.21.2.1
 --- xmlhelp/source/com/sun/star/help/makefile.mk	16 Jan 2006 12:42:15 -0000	1.21
 +++ xmlhelp/source/com/sun/star/help/makefile.mk	19 Jan 2006 14:48:36 -0000	1.21.2.1
-@@ -4,9 +4,9 @@
- #
- #   $RCSfile: makefile.mk,v $
- #
--#   $Revision: 1.21 $
-+#   $Revision: 1.21.2.1 $
- #
--#   last change: $Author: obo $ $Date: 2006/01/16 12:42:15 $
-+#   last change: $Author: cmc $ $Date: 2006/01/19 14:48:36 $
- #
- #   The Contents of this file are made available subject to
- #   the terms of GNU Lesser General Public License Version 2.1.
 @@ -42,7 +42,7 @@
  
  .INCLUDE : settings.mk
@@ -1088,18 +916,6 @@ retrieving revision 1.2.12.1
 diff -u -r1.2 -r1.2.12.1
 --- XmlSearch/src/com/sun/xmlsearch/tree/TreeBuilder.java	9 Sep 2005 16:41:49 -0000	1.2
 +++ XmlSearch/src/com/sun/xmlsearch/tree/TreeBuilder.java	17 Jan 2006 10:54:04 -0000	1.2.12.1
-@@ -4,9 +4,9 @@
-  *
-  *  $RCSfile: TreeBuilder.java,v $
-  *
-- *  $Revision: 1.2 $
-+ *  $Revision: 1.2.12.1 $
-  *
-- *  last change: $Author: rt $ $Date: 2005/09/09 16:41:49 $
-+ *  last change: $Author: cmc $ $Date: 2006/01/17 10:54:04 $
-  *
-  *  The Contents of this file are made available subject to
-  *  the terms of GNU Lesser General Public License Version 2.1.
 @@ -46,7 +46,8 @@
  import org.xml.sax.HandlerBase;
  import org.xml.sax.AttributeList;
@@ -1163,18 +979,6 @@ retrieving revision 1.2.12.1
 diff -u -r1.2 -r1.2.12.1
 --- XmlSearch/src/com/sun/xmlsearch/util/Configuration.java	9 Sep 2005 16:45:09 -0000	1.2
 +++ XmlSearch/src/com/sun/xmlsearch/util/Configuration.java	17 Jan 2006 10:54:05 -0000	1.2.12.1
-@@ -4,9 +4,9 @@
-  *
-  *  $RCSfile: Configuration.java,v $
-  *
-- *  $Revision: 1.2 $
-+ *  $Revision: 1.2.12.1 $
-  *
-- *  last change: $Author: rt $ $Date: 2005/09/09 16:45:09 $
-+ *  last change: $Author: cmc $ $Date: 2006/01/17 10:54:05 $
-  *
-  *  The Contents of this file are made available subject to
-  *  the terms of GNU Lesser General Public License Version 2.1.
 @@ -40,8 +40,8 @@
  import java.util.Vector;
  import java.net.URL;
@@ -1217,18 +1021,6 @@ retrieving revision 1.7.12.1
 diff -u -r1.7 -r1.7.12.1
 --- XmlSearch/src/com/sun/xmlsearch/xml/indexer/XmlIndexBuilder.java	9 Sep 2005 16:52:56 -0000	1.7
 +++ XmlSearch/src/com/sun/xmlsearch/xml/indexer/XmlIndexBuilder.java	17 Jan 2006 10:54:06 -0000	1.7.12.1
-@@ -4,9 +4,9 @@
-  *
-  *  $RCSfile: XmlIndexBuilder.java,v $
-  *
-- *  $Revision: 1.7 $
-+ *  $Revision: 1.7.12.1 $
-  *
-- *  last change: $Author: rt $ $Date: 2005/09/09 16:52:56 $
-+ *  last change: $Author: cmc $ $Date: 2006/01/17 10:54:06 $
-  *
-  *  The Contents of this file are made available subject to
-  *  the terms of GNU Lesser General Public License Version 2.1.
 @@ -42,15 +42,17 @@
  import java.net.URL;
  import org.xml.sax.InputSource;
@@ -1285,18 +1077,6 @@ retrieving revision 1.2.12.1
 diff -u -r1.2 -r1.2.12.1
 --- XmlSearch/src/com/sun/xmlsearch/xml/indexer/XmlIndexer.java	9 Sep 2005 16:53:09 -0000	1.2
 +++ XmlSearch/src/com/sun/xmlsearch/xml/indexer/XmlIndexer.java	17 Jan 2006 10:54:07 -0000	1.2.12.1
-@@ -4,9 +4,9 @@
-  *
-  *  $RCSfile: XmlIndexer.java,v $
-  *
-- *  $Revision: 1.2 $
-+ *  $Revision: 1.2.12.1 $
-  *
-- *  last change: $Author: rt $ $Date: 2005/09/09 16:53:09 $
-+ *  last change: $Author: cmc $ $Date: 2006/01/17 10:54:07 $
-  *
-  *  The Contents of this file are made available subject to
-  *  the terms of GNU Lesser General Public License Version 2.1.
 @@ -39,8 +39,6 @@
  import java.io.*;
  import java.util.*;
diff --git a/editors/openoffice-3-devel/files/gcj-fbsdworkaround b/editors/openoffice-3-devel/files/gcj-fbsdworkaround
new file mode 100644
index 000000000000..471f004db546
--- /dev/null
+++ b/editors/openoffice-3-devel/files/gcj-fbsdworkaround
@@ -0,0 +1,30 @@
+--- config_office/configure~	Sat Mar  4 16:12:31 2006
++++ config_office/configure	Sat Mar  4 16:12:45 2006
+@@ -7544,7 +7544,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lgcjawt  $LIBS"
++LIBS="-lgcjawt  -pthread $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h.  */
+
+http://qa.openoffice.org/issues/show_bug.cgi?id=63095
+Index: stoc/source/javaloader/makefile.mk
+===================================================================
+RCS file: /cvs/udk/stoc/source/javaloader/makefile.mk,v
+retrieving revision 1.16
+diff -u -r1.16 makefile.mk
+--- stoc/source/javaloader/makefile.mk	8 Sep 2005 07:57:58 -0000	1.16
++++ stoc/source/javaloader/makefile.mk	13 Mar 2006 00:54:46 -0000
+@@ -59,7 +59,8 @@
+ 		$(CPPUHELPERLIB) 	\
+ 		$(CPPULIB)			\
+ 		$(SALLIB) \
+-        $(JVMACCESSLIB)
++        $(JVMACCESSLIB) \
++        -L/usr/local/lib -liconv
+ 
+ SHL1VERSIONMAP = javaloader.map
+ SHL1DEPN=		
diff --git a/editors/openoffice-3-devel/files/gcj-patches b/editors/openoffice-3-devel/files/gcj-patches
index aeb80007018b..c23155233d31 100644
--- a/editors/openoffice-3-devel/files/gcj-patches
+++ b/editors/openoffice-3-devel/files/gcj-patches
@@ -1,3 +1,5 @@
+fixed (http://qa.openoffice.org/issues/show_bug.cgi?id=60091) 
+http://qa.openoffice.org/issues/show_bug.cgi?id=63070
 Index: wizards/com/sun/star/wizards/ui/FilterComponent.java
 ===================================================================
 RCS file: /cvs/installation/wizards/com/sun/star/wizards/ui/FilterComponent.java,v
@@ -18,120 +20,4 @@ diff -u -r1.8 FilterComponent.java
  								default:
  									curValue = String.valueOf(curValue);
 
-Index: solenv/inc/settings.mk
-===================================================================
-RCS file: /cvs/tools/solenv/inc/settings.mk,v
-retrieving revision 1.185
-diff -u -r1.185 settings.mk
---- solenv/inc/settings.mk	20 Jan 2006 12:09:20 -0000	1.185
-+++ solenv/inc/settings.mk	27 Jan 2006 23:11:31 -0000
-@@ -187,7 +187,8 @@
- 
- #required arguments
- .IF "$(JAVACACHE)" != ""
--JAVAC=$(JAVACOMPILER) --encoding=ISO-8859-15 -O2 -fno-assert -Wno-deprecated -C
-+#JAVAC=$(JAVACOMPILER) --encoding=ISO-8859-15 -O2 -fno-assert -Wno-deprecated -C
-+JAVAC=$(JAVACOMPILER) --encoding=UTF-8 -O2 -fno-assert -Wno-deprecated -C
- JAVAI=$(JAVAINTERPRETER) -Dgnu.gcj.precompiled.db.path=$(GCJ_DATABASE)
- .ELSE
- JAVAC=$(JAVACOMPILER)
-
-Index: source/ui/slidesorter/cache/SlsQueueProcessor.hxx
-===================================================================
-RCS file: /cvs/graphics/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx,v
-retrieving revision 1.10
-diff -u -p -u -r1.10 SlsQueueProcessor.hxx
---- sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx	19 Jan 2006 12:52:20 -0000	1.10
-+++ sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx	26 Jan 2006 08:29:38 -0000
-@@ -164,7 +164,7 @@ template <class Queue, class RequestData
-     while ( ! mrQueue.IsEmpty())
-     {
-         // Determine whether the system is idle.
--        sal_Int32 nIdleState (tools::IdleDetection::GetIdleState(mrView.GetWindow()));
-+        sal_Int32 nIdleState (tools::IdleDetection::GetIdleState(static_cast< ::Window* >(mrView.GetWindow())));
-         if (nIdleState != tools::IdleDetection::IDET_IDLE)
-         {
-             if ((nIdleState&tools::IdleDetection::IDET_FULL_SCREEN_SHOW_ACTIVE) != 0)
-
-Index: config_office/configure.in
-===================================================================
-RCS file: /cvs/tools/config_office/configure.in,v
-retrieving revision 1.150
-diff -u -r1.150 configure.in
---- config_office/configure.in	20 Jan 2006 13:28:25 -0000	1.150
-+++ config_office/configure.in	2 Feb 2006 05:13:30 -0000
-@@ -1975,6 +1975,7 @@
- dnl Checks for javadoc
- dnl ===================================================================
- if test "$SOLAR_JAVA" != ""; then
-+  if test "$JDK" != "gcj"; then 
-     if test -z "$with_jdk_home"; then
-         AC_PATH_PROG(JAVADOC, javadoc)
-     else
-@@ -1996,6 +1997,9 @@
-         JAVADOC=`cygpath -d "$JAVADOC"`
-         JAVADOC=`cygpath -u "$JAVADOC"`
-     fi
-+  else
-+        AC_PATH_PROG(JAVADOC, gjdoc)
-+  fi 
- fi
- 
- if test "$SOLAR_JAVA" != ""; then
-@@ -2032,8 +2036,14 @@
- if test "$JDK" = "gcj"; then 
-    save_CFLAGS=$CFLAGS
-    save_LDFLAGS=$LDFLAGS
--   CFLAGS="$CFLAGS -I$JAVA_HOME/include"
--   LDFLAGS="$LDFLAGS -L$JAVA_HOME/lib -lgcj"
-+   CFLAGS="$CFLAGS -I$JAVA_HOME/include -pthread"
-+   LDFLAGS="$LDFLAGS -L$JAVA_HOME/lib -lgcj -pthread"
-+   JAR="$JAVA_HOME/bin/fastjar"
-+   JAVACMD="$JAVA_HOME/bin/gij"
-+   JAVA="$JAVA_HOME/bin/gij"
-+   AC_SUBST(JAVA)
-+   AC_SUBST(JAVACMD)
-+   AC_SUBST(JAR)
-    AC_CHECK_HEADER(jni.h, [],
-                     [AC_MSG_ERROR([jni.h could not be found. Mismatch between gcc and libgcj or libgcj-devel missing?])], [])
- 
-@@ -4214,7 +4224,7 @@
- EOF
-   oldJAVA_HOME=$JAVA_HOME
-   if test "$JDK" = "gcj"; then
--    JAVA_HOME=; export JAVA_HOME
-+    JAVACMD="$JAVA_HOME/bin/gij"; export JAVACMD
-     ant_cmd="$ANT -Dbuild.compiler=gcj -buildfile conftest.xml 1>&2"
-   else
-     ant_cmd="$ANT -buildfile conftest.xml 1>&2"
-Index: config_office/set_soenv.in
-===================================================================
-RCS file: /cvs/tools/config_office/set_soenv.in,v
-retrieving revision 1.86
-diff -u -r1.86 set_soenv.in
---- config_office/set_soenv.in	13 Jan 2006 16:37:16 -0000	1.86
-+++ config_office/set_soenv.in	2 Feb 2006 05:13:31 -0000
-@@ -68,7 +68,7 @@
- #
- # Help variables.
- my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV, $SOLVER, $CONFIG, 
--     $USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_BIN, $JAVA_LIB, $JAVA_INCLUDE,
-+     $USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_BIN, $JAVA_LIB, $JAVA_INCLUDE, $JAVACMD, $JAVA, $JAR,
-      $SOLARENVINC, $USR_DT, $USR_OPENWIN, $TCSH_PATH, $XLIB, $XINC,
-      $CYGWIN_PATH, $language, $dict, $ASM_PATH, $ps_STLPORT_LIB, $L_STLPORT_LIB,
-      $STLPORT_stlport, $STLPORT_inc_stlport, $PERL_PATH );
-@@ -1679,6 +1679,9 @@
-    ToFile( "JAVAINTERPRETER", "@JAVAINTERPRETER@","e" );
-    ToFile( "JAVACOMPILER",    "@JAVACOMPILER@",  "e" );
-    ToFile( "JAVADOC",         "@JAVADOC@",       "e" );
-+   ToFile( "JAVA",            "@JAVA@",          "e" );
-+   ToFile( "JAVACMD",         "@JAVACMD@",       "e" );
-+   ToFile( "JAR",             "@JAR@",          "e" );
- }
- if ( $platform =~ m/darwin/ )
- {  ToFile( "DYLD_LIBRARY_PATH", $LD_LIBRARY_PATH,   "e" );
 
-Javadoc@xmerge http://qa.openoffice.org/issues/show_bug.cgi?id=57286
-JAVA@berkeleydb http://qa.openoffice.org/issues/show_bug.cgi?id=54657
-JAVACMD@ant
-JAR@berkeleydb
diff --git a/editors/openoffice-3-devel/files/patch-i63007 b/editors/openoffice-3-devel/files/patch-i63007
new file mode 100644
index 000000000000..dec090c8b8c8
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-i63007
@@ -0,0 +1,48 @@
+--- animations/source/animcore/targetpropertiescreator.cxx	2006-03-10 14:03:10.000000000 +0100
++++ animations/source/animcore/targetpropertiescreator.cxx	2006-03-10 14:03:40.000000000 +0100
+@@ -518,7 +518,7 @@
+                         aCurr->first.mnParagraphIndex ) );
+             }
+                 
+-            rCurrProps.Properties = ::comphelper::containerToSequence< beans::NamedValue >( aCurr->second );
++            rCurrProps.Properties = ::comphelper::containerToSequence( aCurr->second );
+ 
+             ++aCurr;
+         }
+
+--- framework/source/uielement/toolbarmanager.cxx	2006-01-07 09:14:50.000000000 +0100
++++ framework/source/uielement/toolbarmanager.cxx	2006-03-10 16:01:04.000000000 +0100
+@@ -1002,7 +1002,7 @@
+                     aPropertyVector.push_back( makeAny( aPropValue ));
+                 }
+ 
+-                Sequence< Any > aArgs( comphelper::containerToSequence< Any >( aPropertyVector ));
++                Sequence< Any > aArgs( comphelper::containerToSequence( aPropertyVector ));
+                 xController = Reference< XStatusListener >( xToolbarControllerFactory->createInstanceWithArgumentsAndContext(
+                                                                 aCommandURL, aArgs, xComponentContext ),
+                                                             UNO_QUERY );
+@@ -1075,7 +1075,7 @@
+                     aPropertyVector.push_back( makeAny( aPropValue ));
+                 }
+ 
+-                Sequence< Any > aArgs( comphelper::containerToSequence< Any >( aPropertyVector ));
++                Sequence< Any > aArgs( comphelper::containerToSequence( aPropertyVector ));
+                 xInit->initialize( aArgs );
+             }
+ 
+
+--- framework/source/uielement/uicommanddescription.cxx	2005-12-16 09:11:31.000000000 +0100
++++ framework/source/uielement/uicommanddescription.cxx	2006-03-10 16:01:13.000000000 +0100
+@@ -537,9 +537,9 @@
+     }
+ 
+     // Create cached sequences for fast retrieving
+-    m_aCommandImageList       = comphelper::containerToSequence< rtl::OUString >( aImageCommandVector );
+-    m_aCommandRotateImageList = comphelper::containerToSequence< rtl::OUString >( aImageRotateVector );
+-    m_aCommandMirrorImageList = comphelper::containerToSequence< rtl::OUString >( aImageMirrorVector );
++    m_aCommandImageList       = comphelper::containerToSequence( aImageCommandVector );
++    m_aCommandRotateImageList = comphelper::containerToSequence( aImageRotateVector );
++    m_aCommandMirrorImageList = comphelper::containerToSequence( aImageMirrorVector );
+ 
+     m_bCacheFilled = sal_True;
+ 
diff --git a/editors/openoffice-3-devel/files/patch-i63069 b/editors/openoffice-3-devel/files/patch-i63069
new file mode 100644
index 000000000000..b20da21305fe
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-i63069
@@ -0,0 +1,80 @@
+Index: stlport/STLport-4.5.patch
+===================================================================
+RCS file: /cvs/external/stlport/STLport-4.5.patch,v
+retrieving revision 1.26
+diff -u -r1.26 STLport-4.5.patch
+--- stlport/STLport-4.5.patch	7 Mar 2006 17:11:51 -0000	1.26
++++ stlport/STLport-4.5.patch	11 Mar 2006 05:16:19 -0000
+@@ -120,16 +120,16 @@
+ ***************
+ *** 1 ****
+ ! dummy
+---- 1,59 ----
++--- 1,69 ----
+ ! #
+ ! # Note : this makefile is for gcc-3 !
+ ! #
+ ! 
+ ! #
+ ! # compiler
+-! #
+-! CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+-! CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
++! # take these from the OOo build environment
++! CC*= gcc 
++! CXX*= g++
+ ! 
+ ! #
+ ! # Basename for libraries
+@@ -141,7 +141,7 @@
+ ! #
+ ! #
+ ! LINK=ar cr
+-! DYN_LINK=${CXX} ${PTHREAD_LIBS} --fexceptions -shared -o
++! DYN_LINK=${CXX} -Wl,-rpath,'$$ORIGIN' ${PTHREAD_LIBS} --fexceptions -shared -o
+ ! 
+ ! OBJEXT=o
+ ! DYNEXT=so
+@@ -149,26 +149,36 @@
+ ! RM=rm -rf
+ ! PATH_SEP=/
+ ! MKDIR=mkdir -p
+-! COMP=GCC-FREEBSD
++! COMP=GCC$(ARCH)
+ ! INSTALL_STEP = install_unix 
+ ! 
+ ! all:  all_dynamic all_static symbolic_links 
+ ! 
+ ! include common_macros.mak
+ ! 
+-! WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
++! WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized
+ ! 
+-! CXXFLAGS_COMMON = -I${STLPORT_DIR} -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} ${WARNING_FLAGS} ${ARCH_FLAGS}
++! CXXFLAGS_COMMON =  -D_REENTRANT -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -ftemplate-depth-32 -I${STLPORT_DIR} ${WARNING_FLAGS} ${ARCH_FLAGS}
++! CFLAGS_COMMON =  -D_REENTRANT -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -I${STLPORT_DIR} ${WARNING_FLAGS} ${ARCH_FLAGS}
+ ! 
+-! CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
+-! CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
++! CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2 -fPIC
++! CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
+ ! 
+-! CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
++! CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC
+ ! CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
+ ! 
+ ! CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
+ ! CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
+ ! 
++! CFLAGS_RELEASE_static = $(CFLAGS_COMMON) -O2 -fPIC
++! CFLAGS_RELEASE_dynamic = $(CFLAGS_COMMON) -O2 -fPIC
++! 
++! CFLAGS_DEBUG_static = $(CFLAGS_COMMON) -g -fPIC
++! CFLAGS_DEBUG_dynamic = $(CFLAGS_COMMON) -g -fPIC
++! 
++! CFLAGS_STLDEBUG_static = $(CFLAGS_DEBUG_static) -D_STLP_DEBUG
++! CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
++! 
+ ! include common_percent_rules.mak
+ ! include common_rules.mak
+ !
author	maho <maho@FreeBSD.org>	2006-03-15 14:25:45 +0800
committer	maho <maho@FreeBSD.org>	2006-03-15 14:25:45 +0800
commit	7e0fc00d659840676170ce2dd52222b3fe6f7aba (patch)
tree	52c3bb8bf5c0ee3be9270296978b0afb4fda38f9 /editors/openoffice-3-devel
parent	d42950feda3a637801e1dd20131eb7564e29bcff (diff)
download	freebsd-ports-gnome-7e0fc00d659840676170ce2dd52222b3fe6f7aba.tar.gz freebsd-ports-gnome-7e0fc00d659840676170ce2dd52222b3fe6f7aba.tar.zst freebsd-ports-gnome-7e0fc00d659840676170ce2dd52222b3fe6f7aba.zip