This is a patch to build OOo20-m169 on amd64.

Known problem:	It seems to work fine with KDE3 but it doesn't work
		with GNOME for unknown reason.

Build note:	If you build with 'WITH_GNUGCJ' knob on amd64,
		you need the following patch for gcc41:

		http://people.freebsd.org/~jkim/gcj41-amd64.diff

Please note the other patches are already committed to ports CVS.

Added files:	editors/openoffice.org-2.0-devel/files/patch-i65513
		editors/openoffice.org-2.0-devel/files/patch-solenv_config

Modified files:	editors/openoffice.org-2.0-devel/Makefile
		editors/openoffice.org-2.0-devel/files/Makefile.others
		editors/openoffice.org-2.0-devel/files/cws-maho1.diff
		editors/openoffice.org-2.0-devel/files/patch-i65514

Index: editors/openoffice.org-2.0-devel/Makefile
===================================================================
RCS file: /home/ncvs/ports/editors/openoffice.org-2.0-devel/Makefile,v
retrieving revision 1.248
diff -u -r1.248 Makefile
--- editors/openoffice.org-2.0-devel/Makefile	20 May 2006 02:13:28 -0000	1.248
+++ editors/openoffice.org-2.0-devel/Makefile	22 May 2006 21:42:39 -0000
@@ -32,7 +32,7 @@
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_VERSION=	1.7.5
-MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
+MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}${EXTRACT_SUFX}
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
 USE_GNOME+=	libidl
@@ -47,18 +47,36 @@
 #USE_BZIP2=	yes
 WITHOUT_CPU_CFLAGS=	true
 
-ONLY_FOR_ARCHS=	i386
+ONLY_FOR_ARCHS=	amd64 i386
+
+# XXX Cut & paste from bsd.port.mk.
+UNAME?=	/usr/bin/uname
+.if !defined(ARCH)
+ARCH!=  ${UNAME} -p
+.endif
 
 .if !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 JAVA_BUILD=	jdk
+.if ${ARCH} == amd64
+JAVA_VENDOR=	bsdjava
+.else
 JAVA_VENDOR=	freebsd bsdjava
 .endif
+.endif
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
 
+.if ${ARCH} == amd64
+GCC_TARGET=		x86_64-portbld-freebsd${OSREL}
+FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
+.else
+GCC_TARGET=		${ARCH}-portbld-freebsd${OSREL}
+FREEBSD_ENV_SET=	FreeBSDIntelEnv.Set
+.endif
+
 .if ${PERL_LEVEL} < 500600
 IGNORE=		install lang/perl5.8 then try again
 .endif
@@ -72,7 +90,11 @@
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
+.if ${ARCH} == amd64
+PACKAGE_BASENAME=	OOo_${OOOTAG}_${OPSYS}${SIMPLEOSVER}X86_64
+.else
 PACKAGE_BASENAME=	OOo_${OOOTAG}_${OPSYS}${SIMPLEOSVER}Intel
+.endif
 
 LOCALIZED_LANG?=	en-US
 # FIXME (Somehow INDEX build fails)
@@ -86,17 +108,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
@@ -105,7 +133,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
@@ -121,15 +149,14 @@
 		${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
+
+.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_lgpl2
@@ -146,8 +173,15 @@
 .endif
 
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --enable-crashdump=yes --enable-symbols=SMALL --with-system-freetype 
+.if !defined(WITH_GNUGCJ)
+CONFIGURE_ARGS+=	--with-jdk-home=${JAVA_HOME}
+.endif
 #workarounds
 CONFIGURE_ARGS+=	--with-system-xrender-headers=yes #i62713#
+.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
@@ -204,17 +238,17 @@
 	@cd ${WRKSRC} ; ./bootstrap
 # PR:84786 #i53289#
 .if (${NUMOFPROCESSES}>1)
-	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.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 FreeBSDEnv.Set ; dmake"
+	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; dmake"
 .endif
 
 do-install:
-	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES
+	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
 	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
-		${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
+		${CP} ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
 		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKDIR}/tmp/$$i ; \
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
Index: editors/openoffice.org-2.0-devel/files/Makefile.others
===================================================================
RCS file: /home/ncvs/ports/editors/openoffice.org-2.0-devel/files/Makefile.others,v
retrieving revision 1.6
diff -u -r1.6 Makefile.others
--- editors/openoffice.org-2.0-devel/files/Makefile.others	11 Dec 2005 01:02:18 -0000	1.6
+++ editors/openoffice.org-2.0-devel/files/Makefile.others	22 May 2006 21:42:39 -0000
@@ -24,7 +24,7 @@
 	@${RM} -fr ${WRKDIR}/sdk_tmp
 	@${MKDIR} ${WRKDIR}/sdk_tmp
 	@cd ${WRKDIR}/sdk_tmp ; \
-		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_SDK/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
+		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_SDK/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.t?z
 	@cd ${WRKDIR}/sdk_tmp/opt/openoffice* ; \
 		${MKDIR} ../${INSTALLATION_BASEDIR}_sdk ; \
 		${MV} * ../${INSTALLATION_BASEDIR}_sdk ; cd .. ; \
@@ -35,7 +35,7 @@
 	@${RM} -fr ${WRKDIR}/ure_tmp
 	@${MKDIR} ${WRKDIR}/ure_tmp
 	@cd ${WRKDIR}/ure_tmp ; \
-		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/URE/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
+		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/URE/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.t?z
 	@cd ${WRKDIR}/ure_tmp/opt/openoffice* ; \
 		${MKDIR} ../${INSTALLATION_BASEDIR} ; \
 		${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \
@@ -48,9 +48,9 @@
 languagepack:
 	@${ECHO_MSG} "===>   Make languagepack of OpenOffice.org"
 .if defined (ALL_LOCALIZED_LANGS)
-	@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack'
+	@cd ${WRKSRC} ; ${TCSH} -c 'source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; dmake ooolanguagepack'
 .else
-	@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack_${LOCALIZED_LANG}'
+	@cd ${WRKSRC} ; ${TCSH} -c 'source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; dmake ooolanguagepack_${LOCALIZED_LANG}'
 .endif
 
 .if !defined (ALL_LOCALIZED_LANGS)
@@ -58,7 +58,7 @@
 	@${MKDIR} ${WRKDIR}/langpack_tmp
 .if defined (LOCALIZED_LANG)
 	@cd ${WRKDIR}/langpack_tmp ; \
-		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
+		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.t?z
 	@cd ${WRKDIR}/langpack_tmp/opt/openoffice* ; \
 		${MKDIR} ../${INSTALLATION_BASEDIR} ; \
 		${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \
Index: editors/openoffice.org-2.0-devel/files/cws-maho1.diff
===================================================================
RCS file: /home/ncvs/ports/editors/openoffice.org-2.0-devel/files/cws-maho1.diff,v
retrieving revision 1.3
diff -u -r1.3 cws-maho1.diff
--- editors/openoffice.org-2.0-devel/files/cws-maho1.diff	27 Apr 2006 00:01:26 -0000	1.3
+++ editors/openoffice.org-2.0-devel/files/cws-maho1.diff	22 May 2006 21:42:39 -0000
@@ -143,30 +143,23 @@
  .ELSE
  all:
 
-Index: configure
+Index: config_office/configure
 ===================================================================
 RCS file: /cvs/tools/config_office/configure,v
-retrieving revision 1.147
-diff -u -r1.147 configure
---- config_office/configure	20 Apr 2006 13:37:25 -0000	1.147
-+++ config_office/configure	25 Apr 2006 13:11:27 -0000
-@@ -1,5 +1,5 @@
- #! /bin/sh
--# From configure.in Revision .
-+# From configure.in Revision: 1.163  .
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.59.
- #
+retrieving revision 1.149
+diff -u -r1.149 configure
+--- config_office/configure	5 May 2006 11:32:59 -0000	1.149
++++ config_office/configure	9 May 2006 22:08:51 -0000
 @@ -309,7 +309,7 @@
  # 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 SYSTEM_HSQLDB HSQLDB_JAR SYSTEM_BSH BSH_JAR SYSTEM_XML_APIS XML_APIS_JAR SYSTEM_XERCES XERCES_JAR SYSTEM_XALAN XALAN_JAR SABLOTCONFIG SYSTEM_SABLOT SABLOT_LIBS CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_LDAP 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 DISABLE_NEON 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 ENABLE_LOCKDOWN 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 SYSTEM_HSQLDB HSQLDB_JAR SYSTEM_BSH BSH_JAR SYSTEM_XML_APIS XML_APIS_JAR SYSTEM_XERCES XERCES_JAR SYSTEM_XALAN XALAN_JAR SABLOTCONFIG SYSTEM_SABLOT SABLOT_LIBS CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_LDAP 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 DISABLE_NEON 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 ENABLE_LOCKDOWN 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 PERL 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 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 SYSTEM_HSQLDB HSQLDB_JAR SYSTEM_BSH BSH_JAR SYSTEM_XML_APIS XML_APIS_JAR SYSTEM_XERCES XERCES_JAR SYSTEM_XALAN XALAN_JAR SABLOTCONFIG SYSTEM_SABLOT SABLOT_LIBS CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_LDAP 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 DISABLE_NEON 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 ENABLE_LOCKDOWN 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 PERL 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 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 SYSTEM_HSQLDB HSQLDB_JAR SYSTEM_BSH BSH_JAR SYSTEM_XML_APIS XML_APIS_JAR SYSTEM_XERCES XERCES_JAR SYSTEM_XALAN XALAN_JAR SABLOTCONFIG SYSTEM_SABLOT SABLOT_LIBS CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_LDAP 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 DISABLE_NEON 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 ENABLE_LOCKDOWN 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.
-@@ -7584,9 +7584,14 @@
+@@ -7705,9 +7705,14 @@
  fi
  
  if test "$SOLAR_JAVA" != ""; then
@@ -183,7 +176,7 @@
  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
-@@ -7625,12 +7630,12 @@
+@@ -7746,12 +7751,12 @@
  fi
  
      else
@@ -199,7 +192,7 @@
  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
-@@ -8079,6 +8084,59 @@
+@@ -8200,6 +8205,59 @@
     fi
  fi
  
@@ -259,7 +252,7 @@
  
  
  
-@@ -21061,9 +21119,8 @@
+@@ -21115,9 +21173,8 @@
  	</target>
      </project>
  EOF
@@ -270,7 +263,7 @@
      ant_cmd="$ANT -Dbuild.compiler=gcj -buildfile conftest.xml 1>&2"
    else
      ant_cmd="$ANT -buildfile conftest.xml 1>&2"
-@@ -21090,9 +21147,9 @@
+@@ -21144,9 +21201,9 @@
      ANT_HOME=""
      echo "Ant does not work - Some Java projects will not build!" >>warn
    fi
@@ -281,7 +274,7 @@
  if test -z "$ANT_HOME"; then
     ANT_HOME="NO_ANT_HOME"
  fi
-@@ -21908,6 +21965,8 @@
+@@ -21963,6 +22020,8 @@
  s,@JAVADOC@,$JAVADOC,;t t
  s,@AWTLIB@,$AWTLIB,;t t
  s,@JAVACACHE@,$JAVACACHE,;t t
Index: editors/openoffice.org-2.0-devel/files/patch-i65513
===================================================================
RCS file: editors/openoffice.org-2.0-devel/files/patch-i65513
diff -N editors/openoffice.org-2.0-devel/files/patch-i65513
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ editors/openoffice.org-2.0-devel/files/patch-i65513	22 May 2006 21:42:39 -0000
@@ -0,0 +1,581 @@
+--- 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
+@@ -320,32 +320,60 @@
+       $XPVERSION      = "3"; 
+ }
+ elsif ( $platform =~ m/freebsd/ ) 
+-{     print "Setting FreeBSD specific values... ";
+-      $outfile        = "FreeBSDEnv.Set"; 
+-      $BIG_SVX        = "TRUE";
++{     $BIG_SVX        = "TRUE";
+       $COM            = "GCC";
+       $COMPATH        = '@COMPATH@'; 
+-      $CPU            = "I";
+-      $CPUNAME        = "INTEL";
+       $CVER           = "C300";
+       $GUI            = "UNX";
+       $GUIBASE        = "unx";
+       $GUIENV         = "sal";
+       $GVER           = "VCL";
+-      $OUTPATH        = "unxfbsd";
+-      $INPATH         = $OUTPATH.$PROEXT;
+-      $GVERDIR        = $INPATH;
+       $OS             = "FREEBSD";
+       $PATH_SEPERATOR = $ps;
+       $XPVERSION      = "3";
+       $OSVERSION      = '@OSVERSION@';
++   if ($platform =~ m/^amd64/)
++   {  my ( $JAVA_OS );
++      print "Setting FreeBSD AMD64 specific values... ";
++      $outfile        = "FreeBSDAMDEnv.Set";
++      $CPU            = "X";
++      $CPUNAME        = "X86_64";
++      $OUTPATH        = "unxfbsdx";
++      $JAVA_OS        = '@JAVA_HOME@';
++      $JAVA_OS        =~ s/.*\///;
++      if ($JAVA_OS =~ m/^linux/)
++      {  $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
++         $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
++         $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
++         $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
++      }
++      else
++      {  $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64";
++         $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
++         $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
++         $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."xawt";
++      }
++   }
++   elsif ($platform =~ m/^i386/)
++   {  print "Setting FreeBSD Intel specific values... ";
++      $outfile        = "FreeBSDIntelEnv.Set";
++      $CPU            = "I";
++      $CPUNAME        = "INTEL";
++      $OUTPATH        = "unxfbsdi";
+       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
+       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
+       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
+       $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
+-      if( @GCCVER@ >= 30401 ) {
+-      	 $CVER        = "C341";
+-      }
++   }
++   else
++   {  print "Unsupported FreeBSD architecture: $platform \n";
++         exit 1;
++   }
++   if( @GCCVER@ >= 30401 ) {
++      $CVER        = "C341";
++   }
++      $INPATH         = $OUTPATH.$PROEXT;
++      $GVERDIR        = $INPATH;
+ } 
+ elsif ( $platform =~ m/linux-gnu/ ) 
+ {
+@@ -1294,6 +1322,7 @@
+    		{
+       		$SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
+       		$SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd";
++      		$SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
+    		}
+    		elsif ($platform =~ m/netbsd/)
+    		{  $SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
+--- solenv/inc/unx.mk	Fri May 19 13:55:04 2006
++++ solenv/inc/unx.mk	Fri May 19 13:38:42 2006
+@@ -155,10 +155,9 @@
+ .INCLUDE : unxbsds.mk
+ .ENDIF
+ 
+-.IF "$(COM)$(OS)$(CPU)" == "GCCFREEBSDI"
+-.INCLUDE : unxfbsdi.mk
++.IF "$(COM)$(OS)" == "GCCFREEBSD"
++.INCLUDE : unxfbsd.mk
+ .ENDIF
+-
+ 
+ .IF "$(COM)$(OS)$(CPU)" == "C730IRIXM"
+ .INCLUDE : unxirxm3.mk
+--- solenv/inc/unxfbsd.mk	Fri May 19 13:13:25 2006
++++ solenv/inc/unxfbsd.mk	Fri May 19 13:52:02 2006
+@@ -0,0 +1,220 @@
++#*************************************************************************
++#
++#   OpenOffice.org - a multi-platform office productivity suite
++#
++#   $RCSfile$
++#
++#   $Revision$
++#
++#   last change: $Author$ $Date$
++#
++#   The Contents of this file are made available subject to
++#   the terms of GNU Lesser General Public License Version 2.1.
++#
++#
++#     GNU Lesser General Public License Version 2.1
++#     =============================================
++#     Copyright 2005 by Sun Microsystems, Inc.
++#     901 San Antonio Road, Palo Alto, CA 94303, USA
++#
++#     This library is free software; you can redistribute it and/or
++#     modify it under the terms of the GNU Lesser General Public
++#     License version 2.1, as published by the Free Software Foundation.
++#
++#     This library is distributed in the hope that it will be useful,
++#     but WITHOUT ANY WARRANTY; without even the implied warranty of
++#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++#     Lesser General Public License for more details.
++#
++#     You should have received a copy of the GNU Lesser General Public
++#     License along with this library; if not, write to the Free Software
++#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++#     MA  02111-1307  USA
++#
++#*************************************************************************
++
++# Makefile for FreeBSD.
++
++ASM=
++AFLAGS=
++
++SOLAR_JAVA*=TRUE
++JAVAFLAGSDEBUG=-g
++
++# Include arch specific makefile.
++.IF "$(CPUNAME)" == "INTEL"
++.INCLUDE : unxfbsdi.mk
++.ENDIF
++.IF "$(CPUNAME)" == "X86_64"
++.INCLUDE : unxfbsdx.mk
++.ENDIF
++
++# filter for supressing verbose messages from linker
++#not needed at the moment
++#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
++
++# _PTHREADS is needed for the stl
++CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
++
++# enable visibility define in "sal/types.h"
++.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
++.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++
++# this is a platform with JAVA support
++.IF "$(SOLAR_JAVA)"!=""
++JAVADEF=-DSOLAR_JAVA
++.IF "$(debug)"==""
++JAVA_RUNTIME=-ljava
++.ELSE
++JAVA_RUNTIME=-ljava_g
++.ENDIF
++.ENDIF
++
++# name of C++ Compiler
++CXX*=g++
++# name of C Compiler
++CC*=gcc
++.IF "$(SYSBASE)"!=""
++CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
++CXX+:=$(CFLAGS_SYSBASE)
++CC+:=$(CFLAGS_SYSBASE)
++.ENDIF          # "$(SYSBASE)"!=""
++CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
++
++# flags to enable build with symbols; required for crashdump feature
++.IF "$(ENABLE_SYMBOLS)"=="SMALL"
++CFLAGSENABLESYMBOLS=-g1
++.ELSE
++CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
++
++.ENDIF
++
++# flags for the C++ Compiler
++CFLAGSCC= -pipe $(ARCH_FLAGS)
++# Flags for enabling exception handling
++CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
++# Flags for disabling exception handling
++CFLAGS_NO_EXCEPTIONS=-fno-exceptions
++
++# -fpermissive should be removed as soon as possible
++CFLAGSCXX= -pipe $(ARCH_FLAGS)
++CFLAGSCXX+= -Wno-ctor-dtor-privacy
++PICSWITCH:=-fpic
++.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++CFLAGSCXX += -fvisibility-inlines-hidden
++.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++
++# Compiler flags for compiling static object in single threaded environment with graphical user interface
++CFLAGSOBJGUIST=
++# Compiler flags for compiling static object in single threaded environment with character user interface
++CFLAGSOBJCUIST=
++# Compiler flags for compiling static object in multi threaded environment with graphical user interface
++CFLAGSOBJGUIMT=
++# Compiler flags for compiling static object in multi threaded environment with character user interface
++CFLAGSOBJCUIMT=
++# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
++CFLAGSSLOGUIMT=$(PICSWITCH)
++# Compiler flags for compiling shared object in multi threaded environment with character user interface
++CFLAGSSLOCUIMT=$(PICSWITCH)
++# Compiler flags for profiling
++CFLAGSPROF=
++# Compiler flags for debugging
++CFLAGSDEBUG=-g
++CFLAGSDBGUTIL=
++# Compiler flags for disabling optimizations
++CFLAGSNOOPT=-O0
++# Compiler flags for describing the output path
++CFLAGSOUTOBJ=-o
++# Enable all warnings
++CFLAGSWALL=-Wall
++# Set default warn level
++CFLAGSDFLTWARN=
++
++# switches for dynamic and static linking
++STATIC		= -Wl,-Bstatic
++DYNAMIC		= -Wl,-Bdynamic
++
++# name of linker
++LINK*=$(CXX)
++LINKC*=$(CC)
++
++# default linker flags
++LINKFLAGSDEFS*=#-Wl,-z,defs
++LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
++LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
++
++# linker flags for linking applications
++LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++
++# linker flags for linking shared libraries
++LINKFLAGSSHLGUI= -shared
++LINKFLAGSSHLCUI= -shared
++
++LINKFLAGSTACK=
++LINKFLAGSPROF=
++LINKFLAGSDEBUG=-g
++LINKFLAGSOPT=
++
++# linker flags for optimization (symbol hashtable)
++# for now, applied to symbol scoped libraries, only
++LINKFLAGSOPTIMIZE*=-Wl,-O1
++LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
++
++SONAME_SWITCH=-Wl,-h
++
++# Sequence of libs does matter !
++
++STDLIBCPP=-lstdc++
++
++# default objectfilenames to link
++STDOBJVCL=$(L)$/salmain.o
++STDOBJGUI=
++STDSLOGUI=
++STDOBJCUI=
++STDSLOCUI=
++
++# libraries for linking applications
++STDLIBCUIST=-lm
++STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
++STDLIBCUIMT=$(PTHREAD_LIBS) -lm
++STDLIBGUIST=-lX11 -lm
++# libraries for linking shared libraries
++STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
++STDSHLCUIMT=$(PTHREAD_LIBS) -lm
++STDSHLGUIST=-lX11 -lXext -lm
++STDSHLCUIST=-lm
++
++LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
++
++.IF "$(USE_STLP_DEBUG)" != ""
++LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
++LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
++.ELSE # "$(USE_STLP_DEBUG)" != ""
++LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
++LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
++.ENDIF # "$(USE_STLP_DEBUG)" != ""
++
++#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
++
++# name of library manager
++LIBMGR=ar
++LIBFLAGS=-r
++
++# tool for generating import libraries
++IMPLIB=
++IMPLIBFLAGS=
++
++MAPSYM=
++MAPSYMFLAGS=
++
++RC=irc
++RCFLAGS=-fo$@ $(RCFILES)
++RCLINK=
++RCLINKFLAGS=
++RCSETVERSION=
++
++# platform specific identifier for shared libs
++DLLPRE=lib
++DLLPOST=.so
+--- solenv/inc/unxfbsdi.mk	Tue Jan 31 13:24:38 2006
++++ solenv/inc/unxfbsdi.mk	Fri May 19 13:52:19 2006
+@@ -33,192 +33,23 @@
+ #
+ #*************************************************************************
+ 
+-# mk file for unxfbsdi
+-ASM=
+-AFLAGS=
++#
++# FreBSD/i386 specific defines
++#
+ 
+-SOLAR_JAVA*=TRUE
+-JAVAFLAGSDEBUG=-g
+-
+-# filter for supressing verbose messages from linker
+-#not needed at the moment
+-#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+-
+-# _PTHREADS is needed for the stl
+-CDEFS+=$(PTHREAD_CFLAGS) -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
+-
+-# enable visibility define in "sal/types.h"
+-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+-CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
+-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+-
+-# this is a platform with JAVA support
+-.IF "$(SOLAR_JAVA)"!=""
+-JAVADEF=-DSOLAR_JAVA
+-.IF "$(debug)"==""
+-JAVA_RUNTIME=-ljava
+-.ELSE
+-JAVA_RUNTIME=-ljava_g
+-.ENDIF
+-.ENDIF
++CDEFS+=-DX86
+ 
+ # architecture dependent flags for the C and C++ compiler that can be changed by
+ # exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
+ ARCH_FLAGS*=-mtune=pentiumpro
+ 
+-# name of C++ Compiler
+-CXX*=g++
+-# name of C Compiler
+-CC*=gcc
+-.IF "$(SYSBASE)"!=""
+-CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
+-CXX+:=$(CFLAGS_SYSBASE)
+-CC+:=$(CFLAGS_SYSBASE)
+-.ENDIF          # "$(SYSBASE)"!=""
+-CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
+-
+-# flags to enable build with symbols; required for crashdump feature
+-.IF "$(ENABLE_SYMBOLS)"=="SMALL"
+-CFLAGSENABLESYMBOLS=-g1
+-.ELSE
+-CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
+-
+-.ENDIF
+-
+-# flags for the C++ Compiler
+-CFLAGSCC= -pipe $(ARCH_FLAGS)
+-# Flags for enabling exception handling
+-CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
+-# Flags for disabling exception handling
+-CFLAGS_NO_EXCEPTIONS=-fno-exceptions
+-
+-# -fpermissive should be removed as soon as possible
+-CFLAGSCXX= -pipe $(ARCH_FLAGS)
+-CFLAGSCXX+= -Wno-ctor-dtor-privacy
+-PICSWITCH:=-fpic
+-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+-CFLAGSCXX += -fvisibility-inlines-hidden
+-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+-
+-# Compiler flags for compiling static object in single threaded environment with graphical user interface
+-CFLAGSOBJGUIST=
+-# Compiler flags for compiling static object in single threaded environment with character user interface
+-CFLAGSOBJCUIST=
+-# Compiler flags for compiling static object in multi threaded environment with graphical user interface
+-CFLAGSOBJGUIMT=
+-# Compiler flags for compiling static object in multi threaded environment with character user interface
+-CFLAGSOBJCUIMT=
+-# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
+-CFLAGSSLOGUIMT=$(PICSWITCH)
+-# Compiler flags for compiling shared object in multi threaded environment with character user interface
+-CFLAGSSLOCUIMT=$(PICSWITCH)
+-# Compiler flags for profiling
+-CFLAGSPROF=
+-# Compiler flags for debugging
+-CFLAGSDEBUG=-g
+-CFLAGSDBGUTIL=
+ # Compiler flags for enabling optimizations
+ .IF "$(PRODUCT)"!=""
+ CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
+-CFLAGSOPT+=-Wuninitialized				# not supported without optimization
++CFLAGSOPT+=-Wuninitialized			# not supported without optimization
+ .ELSE 	# "$(PRODUCT)"!=""
+-CFLAGSOPT=   							# no optimizing for non products
++CFLAGSOPT=   					# no optimizing for non products
+ .ENDIF	# "$(PRODUCT)"!=""
+-# Compiler flags for disabling optimizations
+-CFLAGSNOOPT=-O0
+-# Compiler flags for describing the output path
+-CFLAGSOUTOBJ=-o
+-# Enable all warnings
+-CFLAGSWALL=-Wall
+-# Set default warn level
+-CFLAGSDFLTWARN=
+-
+-# switches for dynamic and static linking
+-STATIC		= -Wl,-Bstatic
+-DYNAMIC		= -Wl,-Bdynamic
+-
+-# name of linker
+-LINK*=$(CXX)
+-LINKC*=$(CC)
+-
+-# default linker flags
+-LINKFLAGSDEFS*=#-Wl,-z,defs
+-LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
+-LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
+-
+-# linker flags for linking applications
+-LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+-LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+-
+-# linker flags for linking shared libraries
+-LINKFLAGSSHLGUI= -shared
+-LINKFLAGSSHLCUI= -shared
+-
+-LINKFLAGSTACK=
+-LINKFLAGSPROF=
+-LINKFLAGSDEBUG=-g
+-LINKFLAGSOPT=
+-
+-# linker flags for optimization (symbol hashtable)
+-# for now, applied to symbol scoped libraries, only
+-LINKFLAGSOPTIMIZE*=-Wl,-O1
+-LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
+-
+-SONAME_SWITCH=-Wl,-h
+-
+-# Sequence of libs does matter !
+-
+-STDLIBCPP=-lstdc++
+-
+-# default objectfilenames to link
+-STDOBJVCL=$(L)$/salmain.o
+-STDOBJGUI=
+-STDSLOGUI=
+-STDOBJCUI=
+-STDSLOCUI=
+-
+-# libraries for linking applications
+-STDLIBCUIST=-lm
+-STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
+-STDLIBCUIMT=$(PTHREAD_LIBS) -lm
+-STDLIBGUIST=-lX11 -lm
+-# libraries for linking shared libraries
+-STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
+-STDSHLCUIMT=$(PTHREAD_LIBS) -lm
+-STDSHLGUIST=-lX11 -lXext -lm
+-STDSHLCUIST=-lm
+-
+-LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
+-
+-.IF "$(USE_STLP_DEBUG)" != ""
+-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
+-LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
+-.ELSE # "$(USE_STLP_DEBUG)" != ""
+-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
+-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
+-.ENDIF # "$(USE_STLP_DEBUG)" != ""
+-
+-#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
+-
+-# name of library manager
+-LIBMGR=ar
+-LIBFLAGS=-r
+-
+-# tool for generating import libraries
+-IMPLIB=
+-IMPLIBFLAGS=
+-
+-MAPSYM=
+-MAPSYMFLAGS=
+-
+-RC=irc
+-RCFLAGS=-fo$@ $(RCFILES)
+-RCLINK=
+-RCLINKFLAGS=
+-RCSETVERSION=
+ 
+ # platform specific identifier for shared libs
+ DLLPOSTFIX=fi
+-DLLPRE=lib
+-DLLPOST=.so
+-
+--- solenv/inc/unxfbsdx.mk	Fri May 19 13:13:25 2006
++++ solenv/inc/unxfbsdx.mk	Fri May 19 13:52:38 2006
+@@ -0,0 +1,57 @@
++#*************************************************************************
++#
++#   OpenOffice.org - a multi-platform office productivity suite
++#
++#   $RCSfile$
++#
++#   $Revision$
++#
++#   last change: $Author$ $Date$
++#
++#   The Contents of this file are made available subject to
++#   the terms of GNU Lesser General Public License Version 2.1.
++#
++#
++#     GNU Lesser General Public License Version 2.1
++#     =============================================
++#     Copyright 2005 by Sun Microsystems, Inc.
++#     901 San Antonio Road, Palo Alto, CA 94303, USA
++#
++#     This library is free software; you can redistribute it and/or
++#     modify it under the terms of the GNU Lesser General Public
++#     License version 2.1, as published by the Free Software Foundation.
++#
++#     This library is distributed in the hope that it will be useful,
++#     but WITHOUT ANY WARRANTY; without even the implied warranty of
++#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++#     Lesser General Public License for more details.
++#
++#     You should have received a copy of the GNU Lesser General Public
++#     License along with this library; if not, write to the Free Software
++#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++#     MA  02111-1307  USA
++#
++#*************************************************************************
++
++#
++# FreBSD/amd64 specific defines
++#
++
++CDEFS+=-DX86_64
++
++# architecture dependent flags for the C and C++ compiler that can be changed by
++# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
++.IF "$(CPUNAME)" == "X86_64"
++ARCH_FLAGS*=
++.ENDIF
++
++# Compiler flags for enabling optimizations
++.IF "$(PRODUCT)"!=""
++CFLAGSOPT=-O2 -fno-strict-aliasing		# optimizing for products
++CFLAGSOPT+=-Wuninitialized			# not supported without optimization
++.ELSE 	# "$(PRODUCT)"!=""
++CFLAGSOPT=   					# no optimizing for non products
++.ENDIF	# "$(PRODUCT)"!=""
++
++# platform specific identifier for shared libs
++DLLPOSTFIX=fx
Index: editors/openoffice.org-2.0-devel/files/patch-i65514
===================================================================
RCS file: /home/ncvs/ports/editors/openoffice.org-2.0-devel/files/patch-i65514,v
retrieving revision 1.1
diff -u -r1.1 patch-i65514
--- editors/openoffice.org-2.0-devel/files/patch-i65514	18 May 2006 16:10:50 -0000	1.1
+++ editors/openoffice.org-2.0-devel/files/patch-i65514	22 May 2006 21:42:39 -0000
@@ -1,12 +1,140 @@
---- berkeleydb/makefile.mk	8 Mar 2006 14:13:53 -0000	1.31
-+++ berkeleydb/makefile.mk	12 May 2006 00:26:22 -0000
-@@ -88,6 +88,9 @@
- .IF "$(SOLAR_JAVA)"!=""
- CONFIGURE_FLAGS+=--enable-java
- .ENDIF
-+.IF "$(COM)$(CPU)"=="GCCX"
-+CONFIGURE_FLAGS+=--with-mutex=x86/gcc-assembly
-+.ENDIF
- 
- BUILD_DIR=$(CONFIGURE_DIR)
- BUILD_DIR_OUT=$(CONFIGURE_DIR)
+--- berkeleydb/db-4.2.52.patch.orig	Fri Dec 23 09:22:46 2005
++++ berkeleydb/db-4.2.52.patch	Fri May 19 17:44:11 2006
+@@ -205,6 +205,20 @@
+ !         $(SLO)$/dbreg_util.obj
+ ! 
+ ! .INCLUDE :  target.mk
++*** misc/db-4.2.52.NC/dist/config.hin	Wed Dec  3 16:10:00 2003
++--- misc/build/db-4.2.52.NC/dist/config.hin	Fri May 19 17:37:41 2006
++***************
++*** 193,198 ****
++--- 193,201 ----
++  /* Define to 1 to use the GCC compiler and x86 assembly language mutexes. */
++  #undef HAVE_MUTEX_X86_GCC_ASSEMBLY
++  
+++ /* Define to 1 to use the GCC compiler and x86-64 assembly language mutexes. */
+++ #undef HAVE_MUTEX_X86_64_GCC_ASSEMBLY
+++ 
++  /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
++  #undef HAVE_NDIR_H
++  
+ *** misc/db-4.2.52.NC/dist/configure	2003-12-03 22:10:02.000000000 +0100
+ --- misc/build/db-4.2.52.NC/dist/configure	2005-12-22 18:36:14.647415000 +0100
+ ***************
+@@ -241,6 +255,76 @@
+     fi
+   
+     # Commands to make compiler produce verbose output that lists
++***************
++*** 28556,28561 ****
++--- 28556,28606 ----
++  rm -f conftest.$ac_objext conftest.$ac_ext
++  fi
++  
+++ # x86_64/gcc: FreeBSD, NetBSD, BSD/OS, Linux
+++ if test "$db_cv_mutex" = no; then
+++ cat >conftest.$ac_ext <<_ACEOF
+++ #line $LINENO "configure"
+++ /* confdefs.h.  */
+++ _ACEOF
+++ cat confdefs.h >>conftest.$ac_ext
+++ cat >>conftest.$ac_ext <<_ACEOF
+++ /* end confdefs.h.  */
+++ 
+++ int
+++ main ()
+++ {
+++ 
+++ #if (defined(__amd64__) || defined(__x86_64__)) && defined(__GNUC__)
+++ 	exit(0);
+++ #else
+++ 	FAIL TO COMPILE/LINK
+++ #endif
+++ 
+++   ;
+++   return 0;
+++ }
+++ _ACEOF
+++ rm -f conftest.$ac_objext
+++ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+++   (eval $ac_compile) 2>&5
+++   ac_status=$?
+++   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+++   (exit $ac_status); } &&
+++          { ac_try='test -s conftest.$ac_objext'
+++   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+++   (eval $ac_try) 2>&5
+++   ac_status=$?
+++   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+++   (exit $ac_status); }; }; then
+++   db_cv_mutex="x86_64/gcc-assembly"
+++ else
+++   echo "$as_me: failed program was:" >&5
+++ sed 's/^/| /' conftest.$ac_ext >&5
+++ 
+++ fi
+++ rm -f conftest.$ac_objext conftest.$ac_ext
+++ fi
+++ 
++  # S390/cc: IBM OS/390 Unix
++  if test "$db_cv_mutex" = no; then
++  cat >conftest.$ac_ext <<_ACEOF
++***************
++*** 28971,28976 ****
++--- 29016,29028 ----
++  x86/gcc-assembly)	ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS"
++  			cat >>confdefs.h <<\_ACEOF
++  #define HAVE_MUTEX_X86_GCC_ASSEMBLY 1
+++ _ACEOF
+++ 
+++ 
+++ ;;
+++ x86_64/gcc-assembly)	ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS"
+++ 			cat >>confdefs.h <<\_ACEOF
+++ #define HAVE_MUTEX_X86_64_GCC_ASSEMBLY 1
++  _ACEOF
++  
++  
+ *** misc/db-4.2.52.NC/dist/ltmain.sh	2003-04-26 19:45:37.000000000 +0200
+ --- misc/build/db-4.2.52.NC/dist/ltmain.sh	2005-12-22 18:36:14.447413000 +0100
+ ***************
+@@ -943,3 +1027,39 @@
+ ! 			$(SLO)$/xa_map.obj
+ ! 
+ ! .INCLUDE :  target.mk
++*** misc/db-4.2.52.NC/dbinc/mutex.h	Sat Sep 20 17:40:49 2003
++--- misc/build/db-4.2.52.NC/dbinc/mutex.h	Fri May 19 12:43:58 2006
++***************
++*** 781,786 ****
++--- 781,811 ----
++  #endif
++  #endif
++  
+++ /*********************************************************************
+++  * x86_64/gcc assembly.
+++  *********************************************************************/
+++ #ifdef HAVE_MUTEX_X86_64_GCC_ASSEMBLY
+++ typedef unsigned char tsl_t;
+++ 
+++ #ifdef LOAD_ACTUAL_MUTEX_CODE
+++ /*
+++  * For gcc/x86-64, 0 is clear, 1 is set.
+++  */
+++ #define	MUTEX_SET(tsl) ({						\
+++ 	register tsl_t *__l = (tsl);					\
+++ 	int __r;							\
+++ 	asm volatile("movq $1,%%rax; lock; xchgb %1,%%al; xorq $1,%%rax"\
+++ 	    : "=&a" (__r), "=m" (*__l)					\
+++ 	    : "1" (*__l)						\
+++ 	    );								\
+++ 	__r & 1;							\
+++ })
+++ 
+++ #define	MUTEX_UNSET(tsl)	(*(tsl) = 0)
+++ #define	MUTEX_INIT(tsl)		MUTEX_UNSET(tsl)
+++ #endif
+++ #endif
+++ 
++  /*
++   * Mutex alignment defaults to one byte.
++   *
Index: editors/openoffice.org-2.0-devel/files/patch-solenv_config
===================================================================
RCS file: editors/openoffice.org-2.0-devel/files/patch-solenv_config
diff -N editors/openoffice.org-2.0-devel/files/patch-solenv_config
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ editors/openoffice.org-2.0-devel/files/patch-solenv_config	22 May 2006 21:42:39 -0000
@@ -0,0 +1,677 @@
+--- solenv/config/ssolar.cmn	7 Apr 2006 08:00:46 -0000	1.54
++++ solenv/config/ssolar.cmn	9 May 2006 01:43:52 -0000
+@@ -540,6 +540,22 @@
+ 	}
+ }
+ 
++unxfbsdx
++{
++	standlst
++	{
++		DRIVE_O %WORK_STAMP%/drives/o:/UnixVolume
++	}
++	order common
++	environment
++	{
++		common
++		{
++			SOLARSRC %DRIVE_O%/%UPD%
++		}
++	}
++}
++
+ unxbsda
+ {
+ 	standlst
+--- solenv/config/ssrc680.ini	19 Apr 2006 15:09:10 -0000	1.96
++++ solenv/config/ssrc680.ini	9 May 2006 01:43:53 -0000
+@@ -3799,6 +3799,307 @@
+ 		}
+     }
+ }
++
++unxfbsdx
++{
++	extern
++	{
++		USER
++		HOME
++		SOL_TMP
++		ENV_ROOT
++		SOURCE_ROOT
++		DIST_ROOT
++		LOCALINI
++		SYSBASE_ROOT
++		JDK_PATH
++		STL_ROOT
++	}
++	reset
++	{
++		OLD_CHAOS
++		TFDEF
++		CLASSPATH
++		COPYALL
++	}
++	restore
++	{
++		INCLUDE
++	}
++    switches
++    {
++        nojava
++		localini
++		jdk13
++		jdk14
++		envroot
++		sourceroot
++		distroot
++		stl
++		pro
++		pre PRE
++		reset
++		bsclient
++		debug
++		ca
++        cap
++		cax
++		compath STAR_COMPATH
++		tmp SOL_TMP_DIR
++		jdk13path
++		jdk14path
++		nativecvs STAR_NATIVECVS
++		package
++		sysbaseroot
++		l10n L10N_framework
++        bs_sourceroot SOURCE_ROOT
++    }
++	script
++	{
++		post
++		{
++			300: if ( "$PCLEAN_PATH" == "xxx" ) setenv PCLEAN_PATH $COMMON_ENV_TOOLS
++			400: if ( ${?COPYALL} ) $PCLEAN_PATH/lucopy.pl all $ZIPSOURCE $BTARGET
++			500: source $PCLEAN_PATH/pcleaner
++            600: umask 002
++			800: rehash
++			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
++			851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
++			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
++			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
++		}
++	}
++    order nojava common0 bs_sourceroot tmp envroot:0 sourceroot:0 sysbaseroot common1 jdk13path:0 jdk14path:0 distroot:0 nativecvs package ca cap cax compath common2 pro stl:0 stl:1 common product jdk13 jdk14 debug pre reset localini
++    environment
++    {
++        bs_sourceroot
++        {
++            SOLAR_SOURCE_ROOT %SOURCE_ROOT%
++            SOURCE_ROOT_USED TRUE
++        }
++        nojava
++        {
++            DISABLE_JAVA TRUE
++        }
++		common0
++		{
++			SOLAR_ENV_ROOT	/so/env
++			SOLAR_SOURCE_ROOT	/so/ws
++		}
++        pro
++        {
++            PROEXT .pro
++			PROSWITCH -DPRODUCT
++        }
++		envroot:0 IF X%ENV_ROOT%X != XX
++		{
++			SOLAR_ENV_ROOT	%ENV_ROOT%
++		}
++		sourceroot:0 IF X%SOURCE_ROOT%X != XX
++		{
++			SOLAR_SOURCE_ROOT	%SOURCE_ROOT%
++            SOURCE_ROOT_USED TRUE
++		}
++		distroot:0 if X%DIST_ROOT%X != XX
++		{
++			SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
++			SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
++			SOLARVER %DIST_ROOT%/%WORK_STAMP%
++		}
++		jdk13path:0 IF X%JDK_PATH%X != XX
++		{
++			SOLAR_JDK13PATH	%JDK_PATH%
++		}
++		jdk14path:0 IF X%JDK_PATH%X != XX
++		{
++			SOLAR_JDK14PATH	%JDK_PATH%
++		}
++		stl:1 IF X%STL_ROOT%X == XX
++		{
++			SOLAR_STLPATH  %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
++		}
++		stl:0 IF X%STL_ROOT%X != XX
++		{
++			SOLAR_STLPATH  %STL_ROOT%
++			SOLAR_STLLIBPATH  %STL_ROOT%$/..$/lib
++		}
++		sysbaseroot
++		{
++			SOLAR_SYSBASE_ROOT	%SYSBASE_ROOT%
++		}
++		tmp
++		{
++			SOL_TMP %SOL_TMP_DIR%
++		}
++		common1
++		{
++			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%
++			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
++			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
++			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
++			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv
++			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv
++			SOLARROOT %SOLAR_ENV_ROOT%
++			DEVROOT %SOLAR_ENV_ROOT%
++			SOLAR_JDK13PATH	%SOLAR_ENV_ROOT%/Linux_JDK_1.3.1
++			SOLAR_JDK14PATH	%SOLAR_ENV_ROOT%/Linux_JDK_1.4.1_03
++			COMPATH %SOLAR_ENV_ROOT%$/gcc_3.0.1_linux_libc2.11_turbolinux
++			PKGFORMAT some_dummy
++            SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
++		}
++		compath
++		{
++			COMPATH %STAR_COMPATH%
++		}
++	product
++	{
++			*dmake dmake %PROFULLSWITCH% genpid=$$ \!* && source $TMP/gen$$
++			*build perl $SOLARENV/bin/build.pl -file ~/.solar.env.$$.tmp \!*; source ~/.solar.env.$$.tmp;  rm ~/.solar.env.$$.tmp
++	}
++		nativecvs
++		{
++			*cvs %STAR_NATIVECVS%
++		}
++		package
++		{
++			STAR_PACKMISC %DEVROOT%/packmisc
++			STAR_SOLARENVPATH %DEVROOT%/solenv/inst
++		}
++		common2
++		{
++			OS FREEBSD
++			GLIBC GLIBC
++			GUI UNX
++			GUIBASE unx
++			GUIENV sal
++			COM GCC
++			CPU X
++			CPUNAME X86_64
++			INPATH unxfbsdx%PROEXT%
++			GVERDIR unxfbsdx%PROEXT%
++			OUTPATH unxfbsdx
++			CVER C300
++			GVER VCL
++			XPVERSION 3
++			SOLARUPD %UPD%
++			TEMP /tmp
++			TMP /tmp
++			USE_NAMESPACE TRUE
++			BUILD_TOOLS %SOLARROOT%/bt_unxfbsdx/bin
++			ENV_TOOLS %SOLARROOT%/et_unxfbsdx/bin
++			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
++			COMMON_ENV_TOOLS %SOLARROOT%$/etools
++			SYSBASE	%SOLAR_SYSBASE_ROOT%
++			SOLAR_STLPATH  %SOLARVERSION%$/unxfbsdx%PROEXT%$/inc%UPDMINOREXT%$/stl
++			SOLAR_STLLIBPATH  %SOLARVERSION%$/unxfbsdx%PROEXT%$/lib%UPDMINOREXT%
++			JDK13PATH %SOLAR_JDK13PATH%
++			JDK14PATH %SOLAR_JDK14PATH%
++            NO_BSYMBOLIC True
++		}
++		localini IF X%LOCALINI%X != XX
++		{
++			LOCALINI %LOCALINI%
++		}
++        common
++        {
++			DMAKEROOT %SOLARENV%/inc/startup
++			PATHEXTRA  %combin%:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11
++			LD_LIBRARY_PATH .:/usr/local/lib:%HOME%/%WORK_STAMP%/%INPATH%/lib:../lib:%SOLARVERSION%/%INPATH%/lib%UPDMINOREXT%:%COMPATH%/libexec
++			SOLAREXTRALIB -L../lib -L%SYSBASE%/usr/X11R6/lib -L%SYSBASE%/usr/lib -L/usr/X11R6/lib  -L%SOLAR_STLLIBPATH%
++			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/include/X11
++			SOLARDEF -DUNX -DGCC -DC301 -D_PTHREADS -DFREEBSD -DBSD -DAMD -DX86_64 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DGLIBC=%GLIBC% -DSUPD=%UPD% %PROSWITCH% -DUPDVER=""'"'"SV%UPD%"'"'""
++			*build perl %SOLARENV%/bin/build.pl %PROFULLSWITCH%
++			*copyprj perl %COMMON_ENV_TOOLS%/copyprj.pl
++			COPYPRJ perl %COMMON_ENV_TOOLS%/copyprj.pl
++			*deliver perl %SOLARENV%/bin/deliver.pl
++			*z_ooo perl %SOLARENV%/bin/z_ooo.pl
++			DELIVER perl %SOLARENV%/bin/deliver.pl
++			*zipdep perl %SOLARENV%/bin/zipdep.pl
++			ZIPDEP perl %SOLARENV%/bin/zipdep.pl
++			*mkout perl %SOLARENV%/bin/mkout.pl
++			MKOUT perl %SOLARENV%/bin/mkout.pl
++			SOLAR_JAVA TRUE
++            *o: cd %SOLARENV%/..
++            *s: cd %SOLARVERSION%
++            *r: cd %SOLARROOT%
++        }
++		jdk13
++		{
++			JDK_VERSION 131
++			JAVA_HOME %JDK13PATH%
++			JDKPATH %JDK13PATH%/bin
++			JDKINC %JDK13PATH%/include:%JDK13PATH%/include/linux
++			JDKINCS -I%JDK13PATH%/include -I%JDK13PATH%/include/linux
++			JDKLIB %JDK13PATH%/jre/lib:%JDK13PATH%/jre/lib/amd64:%JDK13PATH%/jre/lib/amd64/server
++			JDKLIBS -L%JDK13PATH%/jre/lib -L%JDK13PATH%/jre/lib/amd64 -L%JDK13PATH%/jre/lib/amd64/server
++			XCLASSPATH .:%JDK13PATH%/jre/lib/rt.jar:%JDK13PATH%/lib/tools.jar
++		}
++		jdk14
++		{
++			JDK_VERSION 140
++			JAVA_HOME %JDK14PATH%
++			JDKPATH %JDK14PATH%/bin
++			JDKINC %JDK14PATH%/include:%JDK14PATH%/include/linux
++			JDKINCS -I%JDK14PATH%/include -I%JDK14PATH%/include/linux
++			JDKLIB %JDK14PATH%/jre/lib:%JDK14PATH%/jre/lib/amd64:%JDK14PATH%/jre/lib/amd64/server
++			JDKLIBS -L%JDK14PATH%/jre/lib -L%JDK14PATH%/jre/lib/amd64 -L%JDK14PATH%/jre/lib/amd64/server
++			XCLASSPATH .:%JDK14PATH%/jre/lib/rt.jar
++		}
++		debug
++		{
++			LD_LIBRARY_PATH %SOLARROOT%/solenv/unxlngi4/lib/debug:%LD_LIBRARY_PATH%
++		}
++		pre
++		{
++			INCLUDE %PRE%/inc:%INCLUDE%
++			LIB %PRE%/lib:%LIB%
++			IENV %PRE%/inc:%IENV%
++			ILIB %PRE%/lib:%ILIB%
++			SOLARINC -I. -I%PRE%/inc %SOLARINC%
++			SOLARLIB -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib
++			LD_LIBRARY_PATH %PRE%/lib:%LD_LIBRARY_PATH%
++		}
++		reset
++		{
++			RESETPATH /usr/bin/X11:/bin:/usr/openwin/bin:/usr/dt/bin:%HOME%/%WORK_STAMP%/unxlngi4%PROEXT%/bin:%SOLARVERSION%/unxlngi4%PROEXT%/bin%UPDMINOREXT%:/usr/bin
++			*make
++		}
++		ca
++		{
++			PCLEAN_PATH %SOLARROOT%/etools
++			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
++			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
++			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
++			DEVROOT %SOL_TMP%$/n
++			SOLARROOT %SOL_TMP%$/r
++			COPYALL TRUE
++		}
++		cap
++		{
++			PCLEAN_PATH %SOLARROOT%/etools
++			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
++			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
++			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
++			DEVROOT %SOL_TMP%$/n
++			SOLARROOT %SOL_TMP%$/r
++			COPYALL TRUE
++            COPY_PACKED TRUE
++            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
++		}
++		cax
++		{
++			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
++			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
++			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
++			DEVROOT %SOL_TMP%$/n
++			SOLARROOT %SOL_TMP%$/r
++			COPYALL FALSE
++			PCLEAN_PATH %SOL_TMP%$/r/etools
++            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
++		}
++    }
++}
++
+ wntmscix
+ {
+ 	switches
+--- solenv/config/ssrx645.ini	7 Apr 2006 08:01:29 -0000	1.23
++++ solenv/config/ssrx645.ini	9 May 2006 01:43:54 -0000
+@@ -4852,6 +4852,7 @@
+ 		}
+ 	}
+ }
++
+ unxfbsdi
+ {
+ 	extern
+@@ -5153,3 +5154,305 @@
+ 		}
+     }
+ }
++
++unxfbsdx
++{
++	extern
++	{
++		USER
++		HOME
++		SOL_TMP
++		ENV_ROOT
++		SOURCE_ROOT
++		DIST_ROOT
++		LOCALINI
++		SYSBASE_ROOT
++		JDK_PATH
++		STL_ROOT
++	}
++	reset
++	{
++		OLD_CHAOS
++		TFDEF
++		CLASSPATH
++		COPYALL
++	}
++	restore
++	{
++		INCLUDE
++	}
++    switches
++    {
++        nojava
++		localini
++		jdk13
++		jdk14
++		envroot
++		sourceroot
++		distroot
++		stl
++		pro
++		pre PRE
++		reset
++		bsclient
++		debug
++		ca
++        cap
++		cax
++		compath STAR_COMPATH
++		tmp SOL_TMP_DIR
++		jdk13path
++		jdk14path
++		nativecvs STAR_NATIVECVS
++		package
++		sysbaseroot
++		l10n L10N_framework
++		bs_sourceroot SOURCE_ROOT_TMP
++    }
++	script
++	{
++		post
++		{
++			300: if ( "$PCLEAN_PATH" == "xxx" ) setenv PCLEAN_PATH $COMMON_ENV_TOOLS
++			400: if ( ${?COPYALL} ) $PCLEAN_PATH/lucopy.pl all $ZIPSOURCE $BTARGET
++			500: source $PCLEAN_PATH/pcleaner
++            600: umask 002
++			800: rehash
++			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
++			851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
++			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
++			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
++		}
++	}
++    order nojava common0 bs_sourceroot tmp envroot:0 sourceroot:0 jdk13path:0 jdk14path:0 sysbaseroot common1 distroot:0 nativecvs package ca cap cax compath common2 pro stl:0 stl:1 common product jdk13 jdk14 debug pre reset localini
++    environment
++    {
++        bs_sourceroot
++        {
++            SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
++            SOURCE_ROOT %SOURCE_ROOT_TMP%
++            SOURCE_ROOT_USED TRUE
++        }
++        nojava
++        {
++            DISABLE_JAVA TRUE
++        }
++		common0
++		{
++			SOLAR_ENV_ROOT	/so/env
++			SOLAR_SOURCE_ROOT	/so/ws
++		}
++        pro
++        {
++            PROEXT .pro
++			PROSWITCH -DPRODUCT
++        }
++		envroot:0 IF X%ENV_ROOT%X != XX
++		{
++			SOLAR_ENV_ROOT	%ENV_ROOT%
++		}
++		sourceroot:0 IF X%SOURCE_ROOT%X != XX
++		{
++			SOLAR_SOURCE_ROOT	%SOURCE_ROOT%
++            SOURCE_ROOT_USED TRUE
++		}
++		distroot:0 if X%DIST_ROOT%X != XX
++		{
++			SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
++			SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
++			SOLARVER %DIST_ROOT%/%WORK_STAMP%
++		}
++		jdk13path:0 IF X%JDK_PATH%X != XX
++		{
++			SOLAR_JDK13PATH	%JDK_PATH%
++		}
++		jdk14path:0 IF X%JDK_PATH%X != XX
++		{
++			SOLAR_JDK14PATH	%JDK_PATH%
++		}
++		stl:1 IF X%STL_ROOT%X == XX
++		{
++			SOLAR_STLPATH  %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
++		}
++		stl:0 IF X%STL_ROOT%X != XX
++		{
++			SOLAR_STLPATH  %STL_ROOT%
++			SOLAR_STLLIBPATH  %STL_ROOT%$/..$/lib
++		}
++		sysbaseroot
++		{
++			SOLAR_SYSBASE_ROOT	%SYSBASE_ROOT%
++		}
++		tmp
++		{
++			SOL_TMP %SOL_TMP_DIR%
++		}
++		common1
++		{
++			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%
++			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
++			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
++			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
++			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv
++			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv
++			SOLARROOT %SOLAR_ENV_ROOT%
++			DEVROOT %SOLAR_ENV_ROOT%
++			SOLAR_JDK13PATH	%SOLAR_ENV_ROOT%/Linux_JDK_1.3.1
++			SOLAR_JDK14PATH	%SOLAR_ENV_ROOT%/Linux_JDK_1.4.1_03
++			COMPATH %SOLAR_ENV_ROOT%$/gcc_3.0.1_linux_libc2.11_turbolinux
++		}
++		compath
++		{
++			COMPATH %STAR_COMPATH%
++		}
++	product
++	{
++			*dmake dmake %PROFULLSWITCH% genpid=$$ \!* && source $TMP/gen$$
++			*build perl $SOLARENV/bin/build.pl -file ~/.solar.env.$$.tmp \!*; source ~/.solar.env.$$.tmp;  rm ~/.solar.env.$$.tmp
++	}
++		nativecvs
++		{
++			*cvs %STAR_NATIVECVS%
++		}
++		package
++		{
++			STAR_PACKMISC %DEVROOT%/packmisc
++			STAR_SOLARENVPATH %DEVROOT%/solenv/inst
++		}
++		common2
++		{
++			OS FREEBSD
++			GLIBC GLIBC
++			GUI UNX
++			GUIBASE unx
++			GUIENV sal
++			COM GCC
++			CPU X
++			CPUNAME X86_64
++			DLLSUFFIX fx
++			INPATH unxfbsdx%PROEXT%
++			GVERDIR unxfbsdx%PROEXT%
++			OUTPATH unxfbsdx
++			CVER C300
++			GVER VCL
++			XPVERSION 3
++			SOLARUPD %UPD%
++			TEMP /tmp
++			TMP /tmp
++			USE_NAMESPACE TRUE
++			BUILD_TOOLS %SOLARROOT%/bt_unxfbsdx/bin
++			ENV_TOOLS %SOLARROOT%/et_unxfbsdx/bin
++			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
++			COMMON_ENV_TOOLS %SOLARROOT%$/etools
++			SYSBASE	%SOLAR_SYSBASE_ROOT%
++			SOLAR_STLPATH  %SOLARVERSION%$/unxfbsdx%PROEXT%$/inc%UPDMINOREXT%$/stl
++			SOLAR_STLLIBPATH  %SOLARVERSION%$/unxfbsdx%PROEXT%$/lib%UPDMINOREXT%
++			JDK13PATH %SOLAR_JDK13PATH%
++			JDK14PATH %SOLAR_JDK14PATH%
++            NO_BSYMBOLIC True
++		}
++		localini IF X%LOCALINI%X != XX
++		{
++			LOCALINI %LOCALINI%
++		}
++        common
++        {
++			DMAKEROOT %SOLARENV%/inc/startup
++			PATHEXTRA  %combin%:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11
++			LD_LIBRARY_PATH .:/usr/local/lib:%HOME%/%WORK_STAMP%/%INPATH%/lib:../lib:%SOLARVERSION%/%INPATH%/lib%UPDMINOREXT%:%COMPATH%/libexec
++			SOLAREXTRALIB -L../lib -L%SYSBASE%/usr/X11R6/lib -L%SYSBASE%/usr/lib -L/usr/X11R6/lib  -L%SOLAR_STLLIBPATH%
++			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/include/X11
++			SOLARDEF -DUNX -DGCC -DC301 -D_PTHREADS -DFREEBSD -DBSD -DAMD -DX86_64 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DGLIBC=%GLIBC% -DSUPD=%UPD% %PROSWITCH% -DUPDVER=""'"'"SV%UPD%"'"'""
++			*build perl %SOLARENV%/bin/build.pl %PROFULLSWITCH%
++			*copyprj perl %COMMON_ENV_TOOLS%/copyprj.pl
++			COPYPRJ perl %COMMON_ENV_TOOLS%/copyprj.pl
++			*deliver perl %SOLARENV%/bin/deliver.pl
++			*z_ooo perl %SOLARENV%/bin/z_ooo.pl
++			DELIVER perl %SOLARENV%/bin/deliver.pl
++			*zipdep perl %SOLARENV%/bin/zipdep.pl
++			ZIPDEP perl %SOLARENV%/bin/zipdep.pl
++			*mkout perl %SOLARENV%/bin/mkout.pl
++			MKOUT perl %SOLARENV%/bin/mkout.pl
++			*dmake dmake %PROFULLSWITCH%
++			SOLAR_JAVA TRUE
++            *o: cd %SOLARENV%/..
++            *s: cd %SOLARVERSION%
++            *r: cd %SOLARROOT%
++        }
++		jdk13
++		{
++			JDK_VERSION 131
++			JAVA_HOME %JDK13PATH%
++			JDKPATH %JDK13PATH%/bin
++			JDKINC %JDK13PATH%/include:%JDK13PATH%/include/linux
++			JDKINCS -I%JDK13PATH%/include -I%JDK13PATH%/include/linux
++			JDKLIB %JDK13PATH%/jre/lib:%JDK13PATH%/jre/lib/amd64:%JDK13PATH%/jre/lib/amd64/server
++			JDKLIBS -L%JDK13PATH%/jre/lib -L%JDK13PATH%/jre/lib/amd64 -L%JDK13PATH%/jre/lib/amd64/server
++			XCLASSPATH .:%JDK13PATH%/jre/lib/rt.jar:%JDK13PATH%/lib/tools.jar
++		}
++		jdk14
++		{
++			JDK_VERSION 140
++			JAVA_HOME %JDK14PATH%
++			JDKPATH %JDK14PATH%/bin
++			JDKINC %JDK14PATH%/include:%JDK14PATH%/include/linux
++			JDKINCS -I%JDK14PATH%/include -I%JDK14PATH%/include/linux
++			JDKLIB %JDK14PATH%/jre/lib:%JDK14PATH%/jre/lib/amd64:%JDK14PATH%/jre/lib/amd64/server
++			JDKLIBS -L%JDK14PATH%/jre/lib -L%JDK14PATH%/jre/lib/amd64 -L%JDK14PATH%/jre/lib/amd64/server
++			XCLASSPATH .:%JDK14PATH%/jre/lib/rt.jar
++		}
++		debug
++		{
++			LD_LIBRARY_PATH %SOLARROOT%/solenv/unxlngi4/lib/debug:%LD_LIBRARY_PATH%
++		}
++		pre
++		{
++			INCLUDE %PRE%/inc:%INCLUDE%
++			LIB %PRE%/lib:%LIB%
++			IENV %PRE%/inc:%IENV%
++			ILIB %PRE%/lib:%ILIB%
++			SOLARINC -I. -I%PRE%/inc %SOLARINC%
++			SOLARLIB -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib
++			LD_LIBRARY_PATH %PRE%/lib:%LD_LIBRARY_PATH%
++		}
++		reset
++		{
++			RESETPATH /usr/bin/X11:/bin:/usr/openwin/bin:/usr/dt/bin:%HOME%/%WORK_STAMP%/unxlngi4%PROEXT%/bin:%SOLARVERSION%/unxlngi4%PROEXT%/bin%UPDMINOREXT%:/usr/bin
++			*make
++		}
++		ca
++		{
++			PCLEAN_PATH %SOLARROOT%/etools
++			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
++			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
++			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
++			DEVROOT %SOL_TMP%$/n
++			SOLARROOT %SOL_TMP%$/r
++			COPYALL TRUE
++			RSCRES %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/res
++		}
++		cap
++		{
++			PCLEAN_PATH %SOLARROOT%/etools
++			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
++			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
++			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
++			DEVROOT %SOL_TMP%$/n
++			SOLARROOT %SOL_TMP%$/r
++			COPYALL TRUE
++			RSCRES %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/res
++            COPY_PACKED TRUE
++		}
++		cax
++		{
++			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
++			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
++			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
++			DEVROOT %SOL_TMP%$/n
++			SOLARROOT %SOL_TMP%$/r
++			COPYALL FALSE
++			RSCRES %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/res
++			PCLEAN_PATH %SOL_TMP%$/r/etools
++		}
++    }
++}
+--- solenv/config/stand.lst	9 Feb 2006 08:57:55 -0000	1.98
++++ solenv/config/stand.lst	Mon May 15 13:08:07 2006
+@@ -45,6 +45,11 @@
+ 			prio 12
+ 			setsolar -SRC680 -pro -bsclient unxfbsdi
+ 		}
++		unxfbsdx.pro
++		{
++			prio 12
++			setsolar -SRC680 -pro -bsclient unxfbsdx
++		}
+ 		unxlngi5.pro
+ 		{
+ 			prio 12
+@@ -104,6 +109,11 @@
+ 		{
+ 			prio 15
+ 			setsolar -SRC680 -bsclient unxfbsdi
++		}
++		unxfbsdx
++		{
++			prio 15
++			setsolar -SRC680 -bsclient unxfbsdx
+ 		}
+ 		unxlngi5
+ 		{