cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Import of OpenOffice.Org version 2.0.3m179.

Browse Source 
OpenOffice is an Open Source, community-developed, multi-platform office
productivity suite. It includes the key desktop applications, such as a
word processor, spreadsheet, presentation manager, and drawing program,
with a user interface and feature set similar to other office suites.
 
I would like to thank everyone who helped porting:
Peter Valchev, Kurt Miller, Dale Rahn, Ian Darwin and the OpenOffice.Org team.
 
This import is an explicit request by pvalchev@ and espie@.
This means that the current ports lock is still in effect and this import
is only a planned exception by the release managers.

This port is not yet connected to the builds.
 
okay pvalchev@, espie@
This commit is contained in:
robert 2006-08-17 14:56:21 +00:00
parent 9c997259ba
commit ea9d172be4
127 changed files with 7475 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
editors/openoffice/Makefile Normal file
View File

@ -0,0 +1,132 @@
# $OpenBSD: Makefile,v 1.1.1.1 2006/08/17 14:56:21 robert Exp $
ONLY_FOR_ARCHS= i386
COMMENT= "a multi-platform productivity suite"
M= 179
VERSION= SRC680_m${M}
DISTNAME= OOo_${VERSION}_source
WRKDIST= ${WRKDIR}/ooo_${VERSION}_src
PKGNAME= openoffice-2.0.3m${M}
CATEGORIES= editors productivity
SHARED_LIBS= icudata 26.0 \
icui18n 26.0 \
icule 26.0 \
icuuc 26.0 \
stlport_gcc 4.5
HOMEPAGE= http://www.openoffice.org/
MASTER_SITES= http://humppa.hu/
# See http://www.openoffice.org/about.html#licenses
# and http://www.openoffice.org/license.html
# and http://www.openoffice.org/FAQs/faq-questions.html#licensing
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
BUILD_DEPENDS= :zip-*:archivers/zip \
:unzip-*:archivers/unzip \
:bison-*:devel/bison \
:pkgconfig-*:devel/pkgconfig \
:tcsh-*:shells/tcsh \
:p5-Archive-Zip-*:archivers/p5-Archive-Zip
LIB_DEPENDS= gdk-x11-2.0.0.0,gdk_pixbuf-2.0.0.0,gtk-x11-2.0.0.0::x11/gtk+2 \
python2.3.0.0:python-2.3.*:lang/python/2.3 \
db.>=4::databases/db/v4 \
curl.>=2::net/curl \
neon.>=24::net/neon \
xslt.>=2::textproc/libxslt
WANTLIB= ICE SM X11 Xext atk-1.0.0.0 c cairo expat fontconfig \
freetype glib-2.0.0.0 gmodule-2.0.0.0 gobject-2.0.0.0 \
gthread-2.0.0.0 iconv intl jpeg m pango-1.0.0.0 \
pangocairo-1.0.0.0 pangoft2-1.0.0.0 pthread stdc++ xml2 z
USE_X11= Yes
USE_GMAKE= Yes
NO_REGRESS= Yes
VMEM_WARNING= Yes
WRKCONF= ${WRKSRC}/config_office
CONFIGURE_STYLE=gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
CONFIGURE_ARGS= --disable-gnome-vfs \
--disable-mozilla \
--disable-qadevooo \
--disable-pasf \
--disable-binfilter \
--disable-odk \
--disable-cups \
--with-system-jpeg \
--with-system-python \
--with-system-libxml \
--with-system-stdlibs \
--with-system-freetype \
--with-system-curl \
--with-system-zlib \
--with-system-expat \
--with-system-neon \
--with-system-python \
--with-system-db \
--with-epm=internal \
--with-package-format=portable \
--without-java
FLAVORS= debug
FLAVOR?=
.if ${FLAVOR:L:Mdebug}
CONFIGURE_ARGS+= --enable-debug --enable-crashdump=yes --enable-symbols
.endif
NCPU= `sysctl -n hw.ncpu`
# kludge
OOARCH= OPENBSDGCCI
TCSH= ${LOCALBASE}/bin/tcsh
pre-patch:
@cd ${WRKSRC}/bridges/source/cpp_uno && \
cp -R gcc3_freebsd_intel gcc3_openbsd_intel && \
perl -pi -e "s,FREEBSD,OPENBSD,g" gcc3_openbsd_intel/makefile.mk
pre-configure:
perl -pi -e "s,%%LOCALBASE%%,${LOCALBASE},g; \
s,%%X11BASE%%,${X11BASE},g; \
s,%%TMPDIR%%,${TMPDIR},g" \
${WRKCONF}/set_soenv.in \
${WRKSRC}/solenv/inc/unxobsdi.mk
perl -pi -e "s,/opt/%UNIXPRODUCTNAME%PRODUCTVERSION,openoffice,g" \
${WRKSRC}/instsetoo_native/inc_openoffice/unix/packagelist.txt
do-build:
@cd ${WRKBUILD} && \
./bootstrap && \
${TCSH} -c 'source OpenBSDEnv.Set && cd instsetoo_native && \
build.pl -P${NCPU} --all'
do-install:
cd ${WRKSRC}/instsetoo_native/unxobsd.pro/OpenOffice/portable/install/en-US/openbsd-* && \
for SW in `ls -1 *.sw`; do \
${TAR} xf $$SW -C ${PREFIX}; \
done
${INSTALL_SCRIPT} ${FILESDIR}/soffice.sh ${PREFIX}/bin/soffice
perl -pi -e "s,%%LOCALBASE%%,${LOCALBASE},g; \
s,%%X11BASE%%,${X11BASE},g" \
${PREFIX}/bin/soffice \
cd ${PREFIX}/bin && \
for app in scalc sdraw simpress swriter; do \
ln -sf soffice $$app ; done
.include <bsd.port.mk>

4
editors/openoffice/distinfo Normal file
View File

@ -0,0 +1,4 @@
MD5 (OOo_SRC680_m179_source.tar.gz) = 4d0a5a9738fe21c4ff320220feeb48d9
RMD160 (OOo_SRC680_m179_source.tar.gz) = 6c2fc8adaccd9a91146d39326eef2027c47928ac
SHA1 (OOo_SRC680_m179_source.tar.gz) = e1c8e85c7371923ad35f023f2537cb4cfe9c2bd1
SIZE (OOo_SRC680_m179_source.tar.gz) = 305389861

22
editors/openoffice/files/soffice.sh Normal file
View File

@ -0,0 +1,22 @@
#!/bin/sh
#
# $OpenBSD: soffice.sh,v 1.1.1.1 2006/08/17 14:56:21 robert Exp $
#
case "$0"
in
*swriter)
%%LOCALBASE%%/openoffice/program/soffice -writer
;;
*scalc)
%%LOCALBASE%%/openoffice/program/soffice -calc
;;
*sdraw)
%%LOCALBASE%%/openoffice/program/soffice -draw
;;
*simpress)
%%LOCALBASE%%/openoffice/program/soffice -impress
;;
*)
%%LOCALBASE%%/openoffice/program/soffice
esac

12
editors/openoffice/patches/patch-autodoc_source_mkinc_fullcpp_mk Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-autodoc_source_mkinc_fullcpp_mk,v 1.1.1.1 2006/08/17 14:56:21 robert Exp $
--- autodoc/source/mkinc/fullcpp.mk.orig Wed Sep 7 20:10:59 2005
+++ autodoc/source/mkinc/fullcpp.mk Tue Aug 15 14:03:09 2006
@@ -59,7 +59,7 @@ CFLAGS+= -YX"precomp.h" -Fp$(PRJ)$/$(INP
.ENDIF
-.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD"
+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || "$(OS)"=="OPENBSD"
CFLAGSCXX+= -frtti
.ENDIF

12
editors/openoffice/patches/patch-automation_source_testtool_objtest_cxx Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-automation_source_testtool_objtest_cxx,v 1.1.1.1 2006/08/17 14:56:21 robert Exp $
--- automation/source/testtool/objtest.cxx.orig Thu Jul 6 16:33:04 2006
+++ automation/source/testtool/objtest.cxx Tue Aug 15 14:03:09 2006
@@ -532,6 +532,8 @@ void TestToolObj::LoadIniFile() // La
abGP.Append( "14" );
#elif defined LINUX && defined X86_64
abGP.Append( "15" ); // Linux x86-64
+#elif defined OPENBSD
+ abGP.Append( "16" );
#else
#error ("unknown platform. please request an ID for your platform on qa/dev")
#endif

1340
editors/openoffice/patches/patch-berkeleydb_db-4_2_52_patch Normal file
View File

File diff suppressed because it is too large Load Diff

12
editors/openoffice/patches/patch-binfilter_bf_sc_source_core_data_sc_cell_cxx Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-binfilter_bf_sc_source_core_data_sc_cell_cxx,v 1.1.1.1 2006/08/17 14:56:21 robert Exp $
--- binfilter/bf_sc/source/core/data/sc_cell.cxx.orig Thu Jul 6 11:12:29 2006
+++ binfilter/bf_sc/source/core/data/sc_cell.cxx Tue Aug 15 14:03:09 2006
@@ -49,7 +49,7 @@
#include <mac_end.h>
#endif
-#if defined (SOLARIS) || defined (FREEBSD)
+#if defined (SOLARIS) || defined (FREEBSD) || defined (OPENBSD)
#include <ieeefp.h>
#elif ( defined ( LINUX ) && ( GLIBC < 2 ) )
#include <i386/ieeefp.h>

11
editors/openoffice/patches/patch-bridges_prj_build_lst Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-bridges_prj_build_lst,v 1.1.1.1 2006/08/17 14:56:22 robert Exp $
--- bridges/prj/build.lst.orig Wed Jul 19 11:28:51 2006
+++ bridges/prj/build.lst Tue Aug 15 14:03:09 2006
@@ -19,6 +19,7 @@ br bridges\source\cpp_uno\cc50_solaris_i
br bridges\source\cpp_uno\gcc3_solaris_sparc nmake - u br_gcc3sogs br_cppuno_shared br_unotypes NULL
br bridges\source\cpp_uno\gcc3_solaris_intel nmake - u br_gcc3sogi br_cppuno_shared br_unotypes NULL
br bridges\source\cpp_uno\gcc3_netbsd_intel nmake - u br_gccni br_unotypes NULL
+br bridges\source\cpp_uno\gcc3_openbsd_intel nmake - u br_gcc3oi br_cppuno_shared br_unotypes NULL
br bridges\source\cpp_uno\shared nmake - all br_cppuno_shared br_unotypes NULL
br bridges\source\cli_uno nmake - w,vc7 br_cli_uno br_unotypes NULL
br bridges\source\jni_uno nmake - all br_jni_uno br_unotypes NULL

12
editors/openoffice/patches/patch-bridges_source_cpp_uno_shared_vtablefactory_cxx Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-bridges_source_cpp_uno_shared_vtablefactory_cxx,v 1.1.1.1 2006/08/17 14:56:22 robert Exp $
--- bridges/source/cpp_uno/shared/vtablefactory.cxx.orig Tue Jun 20 01:46:29 2006
+++ bridges/source/cpp_uno/shared/vtablefactory.cxx Tue Aug 15 14:03:09 2006
@@ -69,7 +69,7 @@ namespace {
extern "C" void * SAL_CALL allocExec(rtl_arena_type *, sal_Size * size) {
sal_Size pagesize;
#if defined SAL_UNX
-#if defined FREEBSD || defined NETBSD
+#if defined FREEBSD || defined NETBSD || defined OPENBSD
pagesize = getpagesize();
#else
pagesize = sysconf(_SC_PAGESIZE);

20
editors/openoffice/patches/patch-cli_ure_version_makefile_mk Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-cli_ure_version_makefile_mk,v 1.1.1.1 2006/08/17 14:56:22 robert Exp $
--- cli_ure/version/makefile.mk.orig Tue Jul 25 09:55:26 2006
+++ cli_ure/version/makefile.mk Tue Aug 15 14:03:09 2006
@@ -52,8 +52,6 @@ ECHOQUOTE='
ECHOQUOTE=
.ENDIF
-.IF "$(BUILD_FOR_CLI)" != ""
-
ALLTAR : \
$(BIN)$/cliureversion.mk
@@ -69,7 +67,4 @@ $(BIN)$/cliureversion.mk: version.txt
#INCVERSION .PHONY: version.txt incversions.txt
# +$(PERL) $(PRJ)$/source$/scripts$/increment_version.pl \
# $< $(BIN)$/cliureversion.mk $(SOLARBINDIR)$/unotype_statistics.txt
-
-.END
-

56
editors/openoffice/patches/patch-config_office_configure Normal file
View File

@ -0,0 +1,56 @@
$OpenBSD: patch-config_office_configure,v 1.1.1.1 2006/08/17 14:56:22 robert Exp $
--- config_office/configure.orig Wed Jul 19 11:40:09 2006
+++ config_office/configure Tue Aug 15 14:03:09 2006
@@ -3547,6 +3547,15 @@ echo $ECHO_N "checking which thread libr
echo "${ECHO_T}$PTHREAD_LIBS" >&6; }
_os=FreeBSD
;;
+ openbsd*)
+ test_x=yes
+ test_gtk=yes
+ build_cairo=yes
+ test_kde=yes
+ PTHREAD_CFLAGS="-D_THREAD_SAFE"
+ PTHREAD_LIBS="-pthread"
+ _os=OpenBSD
+ ;;
osf)
test_x=dontknow
test_cups=no
@@ -9890,7 +9899,7 @@ echo "$as_me: error: xsltproc is require
fi
-if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
+if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" -o "$_os" = "OpenBSD" ; then
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -10150,7 +10159,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXX
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
fi
-if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
+if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" -o "$_os" = "OpenBSD" ; then
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -10631,6 +10640,9 @@ echo $ECHO_N "checking which package for
AIX)
PKGFORMAT=aix
;;
+ OpenBSD)
+ PKGFORMAT=portable
+ ;;
*BSD)
PKGFORMAT=bsd
;;
@@ -12378,7 +12390,7 @@ fi
{ echo "$as_me:$LINENO: result: $ac_cv_header_db_h" >&5
echo "${ECHO_T}$ac_cv_header_db_h" >&6; }
if test $ac_cv_header_db_h = yes; then
- DB_INCLUDES=/usr/include
+ DB_INCLUDES=/usr/local/include/db4
else
CFLAGS=-I/usr/include/db4

44
editors/openoffice/patches/patch-config_office_configure_in Normal file
View File

@ -0,0 +1,44 @@
$OpenBSD: patch-config_office_configure_in,v 1.1.1.1 2006/08/17 14:56:22 robert Exp $
--- config_office/configure.in.orig Wed Jul 19 11:52:02 2006
+++ config_office/configure.in Tue Aug 15 14:03:09 2006
@@ -755,6 +755,15 @@ case "$build_os" in
AC_MSG_RESULT([$PTHREAD_LIBS])
_os=FreeBSD
;;
+ openbsd*)
+ test_x=yes
+ test_gtk=yes
+ build_cairo=yes
+ test_kde=yes
+ PTHREAD_CFLAGS="-D_THREAD_SAFE"
+ PTHREAD_LIBS="-pthread"
+ _os=OpenBSD
+ ;;
osf)
test_x=dontknow
test_cups=no
@@ -2327,11 +2336,11 @@ dnl ====================================
dnl Checks for programs.
dnl ===================================================================
dnl Check whether there's a C pre-processor.
-if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
+if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" -o "$_os" = "OpenBSD" ; then
AC_PROG_CPP
fi
dnl Check whether there's a C++ pre-processor.
-if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
+if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" -o "$_os" = "OpenBSD" ; then
AC_PROG_CXXCPP
fi
@@ -2461,8 +2470,8 @@ if test "$_os" != "WINNT" -a \( "z$enabl
AIX)
PKGFORMAT=aix
;;
- *BSD)
- PKGFORMAT=bsd
+ OpenBSD)
+ PKGFORMAT=portable
;;
OSF1)
PKGFORMAT=setld

117
editors/openoffice/patches/patch-config_office_set_soenv_in Normal file
View File

@ -0,0 +1,117 @@
$OpenBSD: patch-config_office_set_soenv_in,v 1.1.1.1 2006/08/17 14:56:22 robert Exp $
--- config_office/set_soenv.in.orig Wed Jul 19 11:52:27 2006
+++ config_office/set_soenv.in Tue Aug 15 14:05:56 2006
@@ -368,6 +368,34 @@ elsif ( $platform =~ m/freebsd/ )
$INPATH = $OUTPATH.$PROEXT;
$GVERDIR = $INPATH;
}
+elsif ( $platform =~ m/openbsd/ )
+{ print "Setting OpenBSD specific values... ";
+ $outfile = "OpenBSDEnv.Set";
+ $BIG_SVX = "TRUE";
+ $COM = "GCC";
+ $COMPATH = '@COMPATH@';
+ $CPU = "I";
+ $CPUNAME = "INTEL";
+ $CVER = "C300";
+ $GUI = "UNX";
+ $GUIBASE = "unx";
+ $GUIENV = "sal";
+ $GVER = "VCL";
+ $OUTPATH = "unxobsd";
+ $INPATH = $OUTPATH.$PROEXT;
+ $GVERDIR = $INPATH;
+ $OS = "OPENBSD";
+ $PATH_SEPERATOR = $ps;
+ $XPVERSION = "3";
+ $OSVERSION = '@OSVERSION@';
+ $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";
+ }
+}
elsif ( $platform =~ m/linux-gnu/ )
{
# General Linux settings:
@@ -935,7 +963,7 @@ if ($platform =~ m/solaris/)
$ps.$JRETHREADDIR.
$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
}
-elsif ($platform =~ m/linux-gnu|netbsd|osf1|freebsd|aix/)
+elsif ($platform =~ m/linux-gnu|netbsd|osf1|openbsd|freebsd|aix/)
{ $LD_LIBRARY_PATH = $cur_dir.
$ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
$ps.$JRELIBDIR.
@@ -984,7 +1012,7 @@ if ($platform =~ m/solaris/)
$D."SUPD=$UPD".
$D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"';
}
-elsif ($platform =~ m/linux-gnu|netbsd|freebsd|osf1|irix|aix/)
+elsif ($platform =~ m/linux-gnu|netbsd|openbsd|freebsd|osf1|irix|aix/)
{ $SOLARDEF = $D."UNX".
$D.$COM.
$D.$CVER.
@@ -1021,7 +1049,7 @@ if ($platform =~ m/solaris/)
$L.$USR_DT.$LIB.
$L.$USR_OPENWIN.$LIB;
}
-elsif ($platform =~ m/linux-gnu|netbsd|osf1|irix|freebsd|aix/)
+elsif ($platform =~ m/linux-gnu|netbsd|osf1|irix|openbsd|freebsd|aix/)
{
$SOLAREXTRALIB = $L.$par_dir.$LIB64;
}
@@ -1062,7 +1090,7 @@ if ($platform =~ m/cygwin/)
}
# The general environment path.
-if ($platform =~ m/linux-gnu|netbsd|odf1|irix|freebsd|aix|solaris/)
+if ($platform =~ m/linux-gnu|netbsd|odf1|irix|openbsd|freebsd|aix|solaris/)
{ $PATH = $cur_dir.
$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
$ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
@@ -1240,7 +1268,7 @@ if ($platform =~ m/solaris/)
$L_STLPORT_LIB.
$L.$XLIB;
}
-elsif ($platform =~ m/linux-gnu|netbasd|osf1|irix|aix|freebsd/)
+elsif ($platform =~ m/linux-gnu|netbasd|osf1|irix|aix|openbsd|freebsd/)
{ $SOLARLIB = $L.$par_dir.$LIB.
$L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
$L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
@@ -1283,10 +1311,10 @@ $SOLARINC = $I.$cur_dir.
$I.'$SOLARENV'.$INC.
$I.'$SRC_ROOT'.$ds."res";
-if ($platform =~ m/solaris|linux-gnu|osf1|freebsd|netbsd|irix/)
+if ($platform =~ m/solaris|linux-gnu|osf1|openbsd|freebsd|netbsd|irix/)
{
$SOLARINC .= $STLPORT_stlport;
-if ($platform =~ m/linux|freebsd|netbsd/)
+if ($platform =~ m/linux|openbsd|freebsd|netbsd/)
{
# This simply adds an include path, so even cases that break the FHS work
$SOLARINC .= $STLPORT_inc_stlport;
@@ -1326,6 +1354,11 @@ if ($platform =~ m/linux-gnu/)
$SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd";
$SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
}
+ elsif ($platform =~ m/openbsd/)
+ {
+ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."openbsd";
+ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd";
+ }
elsif ($platform =~ m/netbsd/)
{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
}
@@ -1338,7 +1371,7 @@ if ($platform =~ m/linux-gnu/)
$SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include";
}
#The tail, if needed
- if ($platform =~ m/linux-gnu|freebsd|netbsd/)
+ if ($platform =~ m/linux-gnu|openbsd|freebsd|netbsd/)
{ $SOLARINC .= $I.$XINC;
}
elsif ($platform =~ m/osf1/)

93
editors/openoffice/patches/patch-cppu_source_typelib_typelib_cxx Normal file
View File

@ -0,0 +1,93 @@
$OpenBSD: patch-cppu_source_typelib_typelib_cxx,v 1.1.1.1 2006/08/17 14:56:22 robert Exp $
--- cppu/source/typelib/typelib.cxx.orig Mon Jun 19 15:13:24 2006
+++ cppu/source/typelib/typelib.cxx Tue Aug 15 14:03:09 2006
@@ -643,7 +643,7 @@ extern "C" void SAL_CALL typelib_typedes
pRet = (typelib_TypeDescription *)pTmp;
#if OSL_DEBUG_LEVEL > 1
osl_incrementInterlockedCount(
- Init::get().nArrayTypeDescriptionCount );
+ &Init::get().nArrayTypeDescriptionCount );
#endif
pIndirect->pType = 0;
pTmp->nDimensions = 0;
@@ -658,7 +658,7 @@ extern "C" void SAL_CALL typelib_typedes
pRet = (typelib_TypeDescription *)pTmp;
#if OSL_DEBUG_LEVEL > 1
osl_incrementInterlockedCount(
- Init::get().nIndirectTypeDescriptionCount );
+ &Init::get().nIndirectTypeDescriptionCount );
#endif
pTmp->pType = 0;
}
@@ -671,7 +671,7 @@ extern "C" void SAL_CALL typelib_typedes
pRet = (typelib_TypeDescription *)pTmp;
#if OSL_DEBUG_LEVEL > 1
osl_incrementInterlockedCount(
- Init::get().nUnionTypeDescriptionCount );
+ &Init::get().nUnionTypeDescriptionCount );
#endif
pTmp->nMembers = 0;
pTmp->pDiscriminantTypeRef = 0;
@@ -690,7 +690,7 @@ extern "C" void SAL_CALL typelib_typedes
pRet = (typelib_TypeDescription *)pTmp;
#if OSL_DEBUG_LEVEL > 1
osl_incrementInterlockedCount(
- Init::get().nCompoundTypeDescriptionCount );
+ &Init::get().nCompoundTypeDescriptionCount );
#endif
pTmp->aBase.pBaseTypeDescription = 0;
pTmp->aBase.nMembers = 0;
@@ -709,7 +709,7 @@ extern "C" void SAL_CALL typelib_typedes
pRet = (typelib_TypeDescription *)pTmp;
#if OSL_DEBUG_LEVEL > 1
osl_incrementInterlockedCount(
- Init::get().nCompoundTypeDescriptionCount );
+ &Init::get().nCompoundTypeDescriptionCount );
#endif
pTmp->pBaseTypeDescription = 0;
pTmp->nMembers = 0;
@@ -725,7 +725,7 @@ extern "C" void SAL_CALL typelib_typedes
pRet = (typelib_TypeDescription *)pTmp;
#if OSL_DEBUG_LEVEL > 1
osl_incrementInterlockedCount(
- Init::get().nEnumTypeDescriptionCount );
+ &Init::get().nEnumTypeDescriptionCount );
#endif
pTmp->nDefaultEnumValue = 0;
pTmp->nEnumValues = 0;
@@ -740,7 +740,7 @@ extern "C" void SAL_CALL typelib_typedes
pRet = (typelib_TypeDescription *)pTmp;
#if OSL_DEBUG_LEVEL > 1
osl_incrementInterlockedCount(
- Init::get().nInterfaceTypeDescriptionCount );
+ &Init::get().nInterfaceTypeDescriptionCount );
#endif
pTmp->pBaseTypeDescription = 0;
pTmp->nMembers = 0;
@@ -761,7 +761,7 @@ extern "C" void SAL_CALL typelib_typedes
pRet = (typelib_TypeDescription *)pTmp;
#if OSL_DEBUG_LEVEL > 1
osl_incrementInterlockedCount(
- Init::get().nInterfaceMethodTypeDescriptionCount );
+ &Init::get().nInterfaceMethodTypeDescriptionCount );
#endif
pTmp->aBase.pMemberName = 0;
pTmp->pReturnTypeRef = 0;
@@ -781,7 +781,7 @@ extern "C" void SAL_CALL typelib_typedes
pRet = (typelib_TypeDescription *)pTmp;
#if OSL_DEBUG_LEVEL > 1
osl_incrementInterlockedCount(
- Init::get().nInterfaceAttributeTypeDescriptionCount );
+ &Init::get().nInterfaceAttributeTypeDescriptionCount );
#endif
pTmp->aBase.pMemberName = 0;
pTmp->pAttributeTypeRef = 0;
@@ -799,7 +799,7 @@ extern "C" void SAL_CALL typelib_typedes
{
pRet = new typelib_TypeDescription();
#if OSL_DEBUG_LEVEL > 1
- osl_incrementInterlockedCount( Init::get().nTypeDescriptionCount );
+ osl_incrementInterlockedCount( &Init::get().nTypeDescriptionCount );
#endif
}
}

12
editors/openoffice/patches/patch-cppu_source_uno_data_cxx Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-cppu_source_uno_data_cxx,v 1.1.1.1 2006/08/17 14:56:22 robert Exp $
--- cppu/source/uno/data.cxx.orig Fri Feb 3 18:32:32 2006
+++ cppu/source/uno/data.cxx Tue Aug 15 14:03:09 2006
@@ -364,7 +364,7 @@ sal_Bool SAL_CALL uno_type_isAssignableF
#endif
#if defined(INTEL) \
- && (defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) || defined(MACOSX) \
+ && (defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) || defined(MACOSX) || defined(OPENBSD) \
|| defined(__SUNPRO_CC) && defined(SOLARIS))
#define MAX_ALIGNMENT_4
#endif

13
editors/openoffice/patches/patch-cppu_util_makefile_mk Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-cppu_util_makefile_mk,v 1.1.1.1 2006/08/17 14:56:22 robert Exp $
--- cppu/util/makefile.mk.orig Wed Apr 19 15:50:07 2006
+++ cppu/util/makefile.mk Tue Aug 15 14:03:09 2006
@@ -65,7 +65,9 @@ SHL1STDLIBS = $(SALLIB) $(SALHELPERLIB)
SHL1DEPN=
SHL1IMPLIB=i$(TARGET)
.IF "$(OS)"!="FREEBSD"
+.IF "$(OS)"!="OPENBSD"
SHL1DEF=$(MISC)$/$(SHL1TARGET).def
+.ENDIF
.ENDIF
SHL1VERSIONMAP=$(TARGET).map

12
editors/openoffice/patches/patch-cppuhelper_source_makefile_mk Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-cppuhelper_source_makefile_mk,v 1.1.1.1 2006/08/17 14:56:22 robert Exp $
--- cppuhelper/source/makefile.mk.orig Tue Jun 20 13:58:34 2006
+++ cppuhelper/source/makefile.mk Tue Aug 15 14:03:09 2006
@@ -177,6 +177,8 @@ SHL1VERSIONMAP=gcc3_linux_intel.map
SHL1VERSIONMAP=gcc3_linux_intel.map
.ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXSgcc3"
SHL1VERSIONMAP=gcc3_linux_intel.map
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="OPENBSDIgcc3"
+SHL1VERSIONMAP=gcc3_linux_intel.map
.ENDIF
# --- Targets ------------------------------------------------------

12
editors/openoffice/patches/patch-crashrep_source_unx_main_cxx Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-crashrep_source_unx_main_cxx,v 1.1.1.1 2006/08/17 14:56:22 robert Exp $
--- crashrep/source/unx/main.cxx.orig Mon Jun 19 16:31:28 2006
+++ crashrep/source/unx/main.cxx Tue Aug 15 14:03:09 2006
@@ -50,7 +50,7 @@
#include <vector>
#include <string>
-#if defined (LINUX) || (FREEBSD)
+#if defined (LINUX) || (FREEBSD) || (OPENBSD)
#include <netinet/in.h>
#endif

12
editors/openoffice/patches/patch-crashrep_source_unx_makefile_mk Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-crashrep_source_unx_makefile_mk,v 1.1.1.1 2006/08/17 14:56:22 robert Exp $
--- crashrep/source/unx/makefile.mk.orig Thu Sep 8 11:42:39 2005
+++ crashrep/source/unx/makefile.mk Tue Aug 15 14:03:09 2006
@@ -71,7 +71,7 @@ APP1TARGET=$(TARGET)
APP1OBJS=$(OBJFILES)
APP1STDLIBS=$(DYNAMIC) -lXext -lX11
-.IF "$(OS)" != "FREEBSD"
+.IF "$(OS)" != "FREEBSD" && "$(OS)" != "OPENBSD"
APP1STDLIBS+=-ldl -lnsl
.ENDIF
.IF "$(OS)" == "SOLARIS"

12
editors/openoffice/patches/patch-desktop_source_app_main_cxx Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-desktop_source_app_main_cxx,v 1.1.1.1 2006/08/17 14:56:22 robert Exp $
--- desktop/source/app/main.cxx.orig Thu Sep 8 19:11:14 2005
+++ desktop/source/app/main.cxx Tue Aug 15 14:03:09 2006
@@ -34,7 +34,7 @@
************************************************************************/
#if defined(UNX)
-#if defined(MACOSX) || defined(FREEBSD)
+#if defined(MACOSX) || defined(FREEBSD) || defined(OPENBSD)
#include <sys/types.h>
#include <sys/time.h>
#endif /* MACOSX || FREEBSD */

30
editors/openoffice/patches/patch-desktop_source_pkgchk_unopkg_cmdenv_cxx Normal file
View File

@ -0,0 +1,30 @@
$OpenBSD: patch-desktop_source_pkgchk_unopkg_cmdenv_cxx,v 1.1.1.1 2006/08/17 14:56:22 robert Exp $
--- desktop/source/pkgchk/unopkg_cmdenv.cxx.orig Thu Jul 13 19:08:49 2006
+++ desktop/source/pkgchk/unopkg_cmdenv.cxx Tue Aug 15 14:03:09 2006
@@ -180,18 +180,18 @@ CommandEnvironmentImpl::~CommandEnvironm
void CommandEnvironmentImpl::printLicense(const OUString& sLicense, bool & accept, bool &decline)
{
ResMgr * pResMgr = DeploymentResMgr::get();
- OUString s1(String(ResId(RID_STR_UNOPKG_ACCEPT_LIC_1, pResMgr)));
+ OUString s1 = String(ResId(RID_STR_UNOPKG_ACCEPT_LIC_1, pResMgr));
::rtl::OString os1 = ::rtl::OUStringToOString(s1, osl_getThreadTextEncoding());
- OUString s2(String(ResId(RID_STR_UNOPKG_ACCEPT_LIC_2, pResMgr)));
+ OUString s2 = String(ResId(RID_STR_UNOPKG_ACCEPT_LIC_2, pResMgr));
::rtl::OString os2 = ::rtl::OUStringToOString(s2, osl_getThreadTextEncoding());
- OUString s3(String(ResId(RID_STR_UNOPKG_ACCEPT_LIC_3, pResMgr)));
+ OUString s3 = String(ResId(RID_STR_UNOPKG_ACCEPT_LIC_3, pResMgr));
::rtl::OString os3 = ::rtl::OUStringToOString(s3, osl_getThreadTextEncoding());
- OUString s4(String(ResId(RID_STR_UNOPKG_ACCEPT_LIC_4, pResMgr)));
+ OUString s4 = String(ResId(RID_STR_UNOPKG_ACCEPT_LIC_4, pResMgr));
::rtl::OString os4 = ::rtl::OUStringToOString(s4, osl_getThreadTextEncoding());
- OUString sYES(String(ResId(RID_STR_UNOPKG_ACCEPT_LIC_YES, pResMgr)));
- OUString sY(String(ResId(RID_STR_UNOPKG_ACCEPT_LIC_Y, pResMgr)));
- OUString sNO(String(ResId(RID_STR_UNOPKG_ACCEPT_LIC_NO, pResMgr)));
- OUString sN(String(ResId(RID_STR_UNOPKG_ACCEPT_LIC_N, pResMgr)));
+ OUString sYES = String(ResId(RID_STR_UNOPKG_ACCEPT_LIC_YES, pResMgr));
+ OUString sY = String(ResId(RID_STR_UNOPKG_ACCEPT_LIC_Y, pResMgr));
+ OUString sNO = String(ResId(RID_STR_UNOPKG_ACCEPT_LIC_NO, pResMgr));
+ OUString sN =String(ResId(RID_STR_UNOPKG_ACCEPT_LIC_N, pResMgr));
fprintf(stdout, "\n\n%s\n\n", os1.getStr());
fprintf(stdout, "%s\n\n", OUStringToOString(sLicense, osl_getThreadTextEncoding()).getStr());

12
editors/openoffice/patches/patch-desktop_util_makefile_mk Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-desktop_util_makefile_mk,v 1.1.1.1 2006/08/17 14:56:22 robert Exp $
--- desktop/util/makefile.mk.orig Tue May 2 19:13:56 2006
+++ desktop/util/makefile.mk Tue Aug 15 14:03:09 2006
@@ -96,7 +96,7 @@ LIB1FILES += $(OBJ)$/copyright_ascii_sun
LINKFLAGSAPPGUI!:= $(LINKFLAGSAPPGUI:s/-bind_at_load//)
.ENDIF # MACOSX
-.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" || "$(OS)" == "NETBSD"
+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" || "$(OS)" == "NETBSD" || "$(OS)" == "OPENBSD"
# #74158# linux needs sal/vos/tools at end of link list, solaris needs it first,
# winXX is handled like solaris for now
APP1_STDPRE=

13
editors/openoffice/patches/patch-dmake_configure Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-dmake_configure,v 1.1.1.1 2006/08/17 14:56:22 robert Exp $
--- dmake/configure.orig Thu Jun 29 13:22:15 2006
+++ dmake/configure Tue Aug 15 14:03:09 2006
@@ -3475,6 +3475,9 @@ case "$_os" in
"AIX")
OS_VERSION=sysvr4
;;
+ "OpenBSD")
+ OS_VERSION=linux
+ ;;
*)
{ { echo "$as_me:$LINENO: error: $_os operating system is not suitable to build dmake!" >&5
echo "$as_me: error: $_os operating system is not suitable to build dmake!" >&2;}

13
editors/openoffice/patches/patch-dmake_configure_in Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-dmake_configure_in,v 1.1.1.1 2006/08/17 14:56:22 robert Exp $
--- dmake/configure.in.orig Thu Jun 29 13:22:28 2006
+++ dmake/configure.in Tue Aug 15 14:03:09 2006
@@ -104,6 +104,9 @@ case "$_os" in
"AIX")
OS_VERSION=sysvr4
;;
+ "OpenBSD")
+ OS_VERSION=linux
+ ;;
*)
AC_MSG_ERROR([$_os operating system is not suitable to build dmake!])
;;

12
editors/openoffice/patches/patch-dmake_unix_runargv_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-dmake_unix_runargv_c,v 1.1.1.1 2006/08/17 14:56:22 robert Exp $
--- dmake/unix/runargv.c.orig Thu Apr 20 14:19:12 2006
+++ dmake/unix/runargv.c Tue Aug 15 14:03:09 2006
@@ -132,7 +132,7 @@ private_strerror (errnum)
#ifdef arm32
extern const char * const sys_errlist[];
#else
-#if defined(linux) || defined(__FreeBSD__)
+#if defined(linux) || defined(__FreeBSD__) || defined(__OpenBSD__)
extern const char * const sys_errlist[];
#else
extern char *sys_errlist[];

12
editors/openoffice/patches/patch-dtrans_source_X11_X11_selection_cxx Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-dtrans_source_X11_X11_selection_cxx,v 1.1.1.1 2006/08/17 14:56:22 robert Exp $
--- dtrans/source/X11/X11_selection.cxx.orig Mon Jul 10 18:31:52 2006
+++ dtrans/source/X11/X11_selection.cxx Tue Aug 15 14:03:10 2006
@@ -42,7 +42,7 @@
#include <X11/Xlib.h>
#include <X11/X.h>
#include <X11/Xutil.h>
-#if defined(LINUX) || defined(NETBSD) || defined (FREEBSD)
+#if defined(LINUX) || defined(NETBSD) || defined (FREEBSD) || defined (OPENBSD)
#include <sys/poll.h>
#else
#include <poll.h>

39
editors/openoffice/patches/patch-epm_epm-3_7_patch Normal file
View File

@ -0,0 +1,39 @@
$OpenBSD: patch-epm_epm-3_7_patch,v 1.1.1.1 2006/08/17 14:56:22 robert Exp $
--- epm/epm-3.7.patch.orig Wed Jul 19 11:36:49 2006
+++ epm/epm-3.7.patch Tue Aug 15 14:03:10 2006
@@ -623,6 +623,35 @@
file->dst);
fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst);
}
+*** misc/epm-3.7/portable.c Wed Jul 23 17:41:08 2003
+--- misc/build/epm-3.7/portable.c Thu Aug 10 09:54:13 2006
+***************
+*** 1515,1525 ****
+ fputs("# Determine correct extract options for the tar command...\n", fp);
+ fputs("if test `uname` = Darwin; then\n", fp);
+ fputs(" ac_tar=\"tar -xpPf\"\n", fp);
+ fputs("else if test \"`tar --help 2>&1 | grep GNU`\" = \"\"; then\n", fp);
+ fputs(" ac_tar=\"tar -xpf\"\n", fp);
+ fputs("else\n", fp);
+ fputs(" ac_tar=\"tar -xpPf\"\n", fp);
+! fputs("fi fi\n", fp);
+
+ return (0);
+ }
+--- 1515,1527 ----
+ fputs("# Determine correct extract options for the tar command...\n", fp);
+ fputs("if test `uname` = Darwin; then\n", fp);
+ fputs(" ac_tar=\"tar -xpPf\"\n", fp);
++ fputs("else if test `uname` = OpenBSD; then\n", fp);
++ fputs(" ac_tar=\"tar -xpPf\"\n", fp);
+ fputs("else if test \"`tar --help 2>&1 | grep GNU`\" = \"\"; then\n", fp);
+ fputs(" ac_tar=\"tar -xpf\"\n", fp);
+ fputs("else\n", fp);
+ fputs(" ac_tar=\"tar -xpPf\"\n", fp);
+! fputs("fi fi fi\n", fp);
+
+ return (0);
+ }
*** misc/epm-3.7/qprintf.c Tue Jan 28 06:48:03 2003
--- misc/build/epm-3.7/qprintf.c Thu Jan 19 17:04:22 2006
***************

30
editors/openoffice/patches/patch-extensions_source_nsplugin_source_makefile_mk Normal file
View File

@ -0,0 +1,30 @@
$OpenBSD: patch-extensions_source_nsplugin_source_makefile_mk,v 1.1.1.1 2006/08/17 14:56:22 robert Exp $
--- extensions/source/nsplugin/source/makefile.mk.orig Fri Feb 17 17:03:55 2006
+++ extensions/source/nsplugin/source/makefile.mk Tue Aug 15 14:03:10 2006
@@ -57,7 +57,7 @@ dummy:
@echo GTK disabled - nothing to build
.ELSE # "$(ENABLE_GTK)"==""
-.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" || "$(OS)"=="OPENBSD"
INC+= -DNP_LINUX
.ENDIF
PKGCONFIG_MODULES=gtk+-2.0
@@ -80,7 +80,7 @@ SHL1OBJS= $(SLO)$/npshell.obj \
.IF "$(GUI)"=="UNX"
STDLIBS+=$(SOLARLIBDIR)$/npunix.o
SHL1STDLIBS+=$(SOLARLIBDIR)$/npunix.o
-#.IF "$(OS)"!="FREEBSD"
+#.IF "$(OS)"!="FREEBSD" || "$(OS)"!="OPENBSD"
#SHL1STDLIBS+= -ldl -lnsl
#.ENDIF #FREEBSD
.ENDIF #UNX
@@ -115,7 +115,7 @@ APP1STDLIBS=\
$(TOOLSLIB)
.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX"
+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX" || "$(OS)"=="OPENBSD"
.ELSE
APP1STDLIBS+= -ldl -lnsl -lnls -lsocket
.ENDIF

12
editors/openoffice/patches/patch-extensions_source_plugin_unx_makefile_mk Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-extensions_source_plugin_unx_makefile_mk,v 1.1.1.1 2006/08/17 14:56:22 robert Exp $
--- extensions/source/plugin/unx/makefile.mk.orig Mon Jun 19 12:45:51 2006
+++ extensions/source/plugin/unx/makefile.mk Tue Aug 15 14:03:10 2006
@@ -73,7 +73,7 @@ APP1STDLIBS=\
.IF "$(OS)"=="SOLARIS" || "$(OS)"=="SCO" || "$(OS)"=="HPUX"
APP1STDLIBS+=-lXm -lXt -lXext -lX11 -ldl
.ELSE
-.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD"
+.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || "$(OS)"=="OPENBSD"
APP1STDLIBS+=-lXaw -lXt -lXext -lX11
.ELSE
APP1STDLIBS+=-lXaw -lXt -lXext -lX11 -ldl

13
editors/openoffice/patches/patch-extensions_source_scanner_makefile_mk Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-extensions_source_scanner_makefile_mk,v 1.1.1.1 2006/08/17 14:56:22 robert Exp $
--- extensions/source/scanner/makefile.mk.orig Thu Sep 8 22:36:35 2005
+++ extensions/source/scanner/makefile.mk Tue Aug 15 14:03:10 2006
@@ -89,7 +89,9 @@ SHL1STDLIBS=\
.IF "$(GUI)"=="UNX"
.IF "$(OS)"!="FREEBSD"
.IF "$(OS)"!="NETBSD"
+.IF "$(OS)"!="OPENBSD"
SHL1STDLIBS+=$(SVTOOLLIB) -ldl
+.ENDIF
.ENDIF
.ENDIF
.ENDIF

21
editors/openoffice/patches/patch-external_gcc3_specific_makefile_mk Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-external_gcc3_specific_makefile_mk,v 1.1.1.1 2006/08/17 14:56:22 robert Exp $
--- external/gcc3_specific/makefile.mk.orig Mon Sep 12 16:49:17 2005
+++ external/gcc3_specific/makefile.mk Tue Aug 15 14:03:10 2006
@@ -12,8 +12,8 @@ TARGET=gcc3_specific
.IF "$(OS)"!="MACOSX"
.IF "$(OS)"!="IRIX"
.IF "$(OS)"!="FREEBSD"
+.IF "$(OS)"!="OPENBSD"
-
all .SEQUENTIAL : $(SOLARLIBDIR)$/libstdc++.so.$(SHORTSTDCPP3) $(SOLARLIBDIR)$/libgcc_s.so.1 $(SOLARLIBDIR)$/libgcc_s.so
@@ -27,6 +27,7 @@ $(SOLARLIBDIR)$/libgcc_s.so : $(SOLARLIB
-rm -f $@
+ln -s libgcc_s.so.1 $@
+.ENDIF
.ENDIF
.ENDIF
.ENDIF

21
editors/openoffice/patches/patch-external_glibc_glibcpatch_sh Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-external_glibc_glibcpatch_sh,v 1.1.1.1 2006/08/17 14:56:22 robert Exp $
--- external/glibc/glibcpatch.sh.orig Tue Sep 6 16:21:32 2005
+++ external/glibc/glibcpatch.sh Tue Aug 15 14:03:10 2006
@@ -43,6 +43,7 @@ if test -s "$tarball"; then
_gnutar=`tar --version 2> /dev/null`
gnutar=`echo $_gnutar | awk '/GNU/ { print "true" }'`
if test "$gnutar" = "true"; then
+
tar -T flist.cp -x -z -f $tarball
chmod -R +w glibc-2.1.3
else
@@ -53,6 +54,9 @@ if test -s "$tarball"; then
fi
elif test "$OS" = "MACOSX"; then
#Only MACOSX
+ tar -x -z -f $tarball `cat flist.cp`
+ elif test "$OS" = "OPENBSD"; then
+#Only OPENBSD
tar -x -z -f $tarball `cat flist.cp`
else
#LINUX and others

21
editors/openoffice/patches/patch-external_glibc_sdfiles_makefile_mk Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-external_glibc_sdfiles_makefile_mk,v 1.1.1.1 2006/08/17 14:56:22 robert Exp $
--- external/glibc/sdfiles/makefile.mk.orig Tue Jun 20 13:47:56 2006
+++ external/glibc/sdfiles/makefile.mk Tue Aug 15 14:03:10 2006
@@ -53,14 +53,14 @@ CDEFS+=-DHAVE_STRING_H -DHAVE_CONFIG_H
# --- Files --------------------------------------------------------
-OBJFILES= $(OBJ)$/getopt.obj \
- $(OBJ)$/getopt1.obj
+OBJFILES= $(OBJ)$/getopt.obj \
+ $(OBJ)$/getopt1.obj
LIB1TARGET=$(SLB)$/$(TARGET).lib
LIB1ARCHIV=$(LB)$/lib$(TARGET).a
LIB1OBJFILES=$(OBJFILES)
-.IF "$(OS)"=="NETBSD"
+.IF "$(OS)"=="NETBSD" || "$(OS)"=="OPENBSD"
TARGET2=gnu_readdir_r
OBJFILES+= $(OBJ)$/readdir_r.obj
LIB2TARGET=$(SLB)$/$(TARGET2).lib

11
editors/openoffice/patches/patch-external_prj_d_lst Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-external_prj_d_lst,v 1.1.1.1 2006/08/17 14:56:22 robert Exp $
--- external/prj/d.lst.orig Mon May 8 18:10:34 2006
+++ external/prj/d.lst Tue Aug 15 14:03:10 2006
@@ -46,6 +46,7 @@ mkdir: %_DEST%\pck%_EXT%
..\%__SRC%\slo\PluginNew.* %_DEST%\lib%_EXT%\*
..\%__SRC%\slb\gnu_getopt.lib %_DEST%\lib%_EXT%\gnu_getopt.lib
..\%__SRC%\lib\libgnu_getopt.a %_DEST%\lib%_EXT%\libgnu_getopt.a
+..\%__SRC%\lib\libgnu_readdir_r.a %_DEST%\lib%_EXT%\libgnu_readdir_r.a
..\%__SRC%\slb\zlib.lib %_DEST%\lib%_EXT%\zlib.lib
..\%__SRC%\lib\libzlib.a %_DEST%\lib%_EXT%\libzlib.a
..\%__SRC%\lib\libfreetype.a %_DEST%\lib%_EXT%\libfreetype.a

12
editors/openoffice/patches/patch-freetype_makefile_mk Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-freetype_makefile_mk,v 1.1.1.1 2006/08/17 14:56:22 robert Exp $
--- freetype/makefile.mk.orig Thu Oct 13 18:49:16 2005
+++ freetype/makefile.mk Tue Aug 15 14:03:10 2006
@@ -70,7 +70,7 @@ OUT2LIB= \
objs$/.libs$/libfreetype.a
.IF "$(OS)"=="MACOSX"
OUT2LIB+=objs$/.libs$/libfreetype.*.dylib
-.ELIF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD"
+.ELIF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || "$(OS)"=="OPENBSD"
OUT2LIB+=objs$/.libs$/libfreetype.so.9*
.ELSE
OUT2LIB+=objs$/.libs$/libfreetype.so.6*

93
editors/openoffice/patches/patch-icu_icu-2_6_patch Normal file
View File

@ -0,0 +1,93 @@
$OpenBSD: patch-icu_icu-2_6_patch,v 1.1.1.1 2006/08/17 14:56:22 robert Exp $
--- icu/icu-2.6.patch.orig Tue Jun 20 02:19:36 2006
+++ icu/icu-2.6.patch Tue Aug 15 14:03:10 2006
@@ -74,32 +74,6 @@
/** Default constructor. Creates an empty shell of an iterator, with no
* rules or text to iterate over. Object can subsequently be assigned to.
* @draft ICU 2.2
-*** misc/icu/source/config/mh-bsd-gcc 2002-05-02 01:48:10.000000000 +0200
---- misc/build/icu/source/config/mh-bsd-gcc 2006-03-09 16:00:48.000000000 +0100
-***************
-*** 10,21 ****
---- 10,30 ----
- GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS)
-
- ## Flags for position independent code
-+ STATICCFLAGS = -fPIC
-+ STATICCXXFLAGS = -fPIC
-+ STATICCPPFLAGS = -DPIC
- SHAREDLIBCFLAGS = -fPIC
- SHAREDLIBCXXFLAGS = -fPIC
- SHAREDLIBCPPFLAGS = -DPIC
-
- ## Compiler switch to embed a runtime search path
- LD_RPATH=
-+ ## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH
-+ ENABLE_RPATH=YES
-+ RPATHLDFLAGS=${LD_RPATH_PRE}'$$ORIGIN'
-+
-+ #SH# ENABLE_RPATH=YES
-+ #SH# RPATHLDFLAGS="${LD_RPATH_PRE}'$$ORIGIN'"
- LD_RPATH_PRE= -Wl,-rpath,
-
- ## Compiler switch to embed a library name
*** misc/icu/source/config/mh-darwin 2003-06-03 22:52:56.000000000 +0200
--- misc/build/icu/source/config/mh-darwin 2006-03-09 16:00:46.000000000 +0100
***************
@@ -2929,4 +2903,56 @@
! return doCaseCompare(start, destLength, srcText.fArray, srcStart, srcLength, options);
}
}
+
+*** misc/icu/source/stubdata/stubdata.c Tue Nov 20 21:28:14 2001
+--- misc/build/icu/source/stubdata/stubdata.c Sat Jul 29 10:20:42 2006
+***************
+*** 28,41 ****
+ UDataInfo info;
+ char padding[8];
+ uint32_t count, reserved;
+- /*
+ const struct {
+ const char *const name;
+ const void *const data;
+! } toc[1];
+! */
+! int fakeNameAndData[4]; /* TODO: Change this header type from */
+! /* pointerTOC to OffsetTOC. */
+ } ICU_Data_Header;
+
+ U_EXPORT const ICU_Data_Header U_ICUDATA_ENTRY_POINT = {
+--- 28,37 ----
+ UDataInfo info;
+ char padding[8];
+ uint32_t count, reserved;
+ const struct {
+ const char *const name;
+ const void *const data;
+! } toc[295]; /* set to real toc size to avoid symbol size mismatch runtime link errors */
+ } ICU_Data_Header;
+
+ U_EXPORT const ICU_Data_Header U_ICUDATA_ENTRY_POINT = {
+***************
+*** 64,73 ****
+ 0, /* count */
+ 0, /* Reserved */
+ { /* TOC structure */
+! /* { */
+! 0 , 0 , 0, 0 /* name and data entries. Count says there are none, */
+ /* but put one in just in case. */
+! /* } */
+ }
+ };
+
+--- 60,69 ----
+ 0, /* count */
+ 0, /* Reserved */
+ { /* TOC structure */
+! {
+! {0 , 0} /* name and data entries. Count says there are none, */
+ /* but put one in just in case. */
+! }
+ }
+ };

12
editors/openoffice/patches/patch-idlc_source_idlccompile_cxx Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-idlc_source_idlccompile_cxx,v 1.1.1.1 2006/08/17 14:56:22 robert Exp $
--- idlc/source/idlccompile.cxx.orig Tue Jun 20 05:48:52 2006
+++ idlc/source/idlccompile.cxx Tue Aug 15 14:03:10 2006
@@ -61,7 +61,7 @@
#ifdef SAL_UNX
#include <unistd.h>
-#if defined(MACOSX) || defined(FREEBSD) || defined(NETBSD)
+#if defined(MACOSX) || defined(FREEBSD) || defined(NETBSD) || defined (OPENBSD)
#include <sys/wait.h>
#else
#include <wait.h>

321
editors/openoffice/patches/patch-instsetoo_native_inc_openoffice_unix_packagelist_txt Normal file
View File

@ -0,0 +1,321 @@
$OpenBSD: patch-instsetoo_native_inc_openoffice_unix_packagelist_txt,v 1.1.1.1 2006/08/17 14:56:23 robert Exp $
--- instsetoo_native/inc_openoffice/unix/packagelist.txt.orig Wed Jul 5 23:14:13 2006
+++ instsetoo_native/inc_openoffice/unix/packagelist.txt Tue Aug 15 14:05:56 2006
@@ -28,7 +28,7 @@ findrequires = "find-requires-gnome.sh"
copyright = "1999-2006 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Gnome integration module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -42,7 +42,7 @@ requires = "%UNIXPRODUCTNAME-core01"
copyright = "1999-2006 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "KDE integration module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -56,7 +56,7 @@ freebsdrequires = "%UNIXPRODUCTNAME-core
copyright = "1999-2006 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Core module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -71,7 +71,7 @@ requires = "%UNIXPRODUCTNAME-core01"
copyright = "1999-2006 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Writer module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -86,7 +86,7 @@ requires = "%UNIXPRODUCTNAME-core01"
copyright = "1999-2006 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Calc module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -101,7 +101,7 @@ requires = "%UNIXPRODUCTNAME-core01"
copyright = "1999-2006 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Draw module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -116,7 +116,7 @@ requires = "%UNIXPRODUCTNAME-core01"
copyright = "1999-2006 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Impress module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -131,7 +131,7 @@ requires = "%UNIXPRODUCTNAME-core01"
copyright = "1999-2006 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Base module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -146,7 +146,7 @@ requires = "%UNIXPRODUCTNAME-core01"
copyright = "1999-2006 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Math module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -160,7 +160,7 @@ requires = "%UNIXPRODUCTNAME-core01"
copyright = "1999-2006 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Graphic filter module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -174,7 +174,7 @@ requires = "%UNIXPRODUCTNAME-core01"
copyright = "1999-2006 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Testtool module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -188,7 +188,7 @@ requires = "%UNIXPRODUCTNAME-core01"
copyright = "1999-2006 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "English spellchecker module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -202,7 +202,7 @@ requires = "%UNIXPRODUCTNAME-core01"
copyright = "1999-2006 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "XSLT filter samples module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -216,7 +216,7 @@ requires = "%UNIXPRODUCTNAME-core01"
copyright = "1999-2006 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Java filter module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -230,7 +230,7 @@ requires = "%UNIXPRODUCTNAME-core01"
copyright = "1999-2006 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Optional gallery for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -244,7 +244,7 @@ requires = "%UNIXPRODUCTNAME-core01"
copyright = "1999-2006 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Language utilities for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -258,7 +258,7 @@ requires = "%UNIXPRODUCTNAME-core01"
copyright = "1999-2006 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "ActiveX control for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -272,7 +272,7 @@ requires = "%UNIXPRODUCTNAME-core01"
copyright = "1999-2006 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Pyuno module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -282,11 +282,12 @@ solarisrequires = "%WITHOUTDOTUNIXPRODUC
packagename = "%UNIXPRODUCTNAME-emailmerge"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-emailmerge"
freebsdrequires = "%UNIXPRODUCTNAME-core01"
+openbsdrequires = "%UNIXPRODUCTNAME-core01"
requires = "%UNIXPRODUCTNAME-pyuno"
copyright = "1999-2006 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Email mailmerge module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -300,7 +301,7 @@ requires = "%UNIXPRODUCTNAME-core01"
copyright = "1999-2006 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Mailcap module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -310,12 +311,12 @@ solarispackagename = "%WITHOUTDOTUNIXPRO
solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01"
packagename = "%UNIXPRODUCTNAME-core02"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core02"
-requires = "%UNIXPRODUCTNAME-core01"
+requires = ""
freebsdrequires = ""
copyright = "1999-2006 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -324,12 +325,12 @@ solarispackagename = "%WITHOUTDOTUNIXPRO
solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01"
packagename = "%UNIXPRODUCTNAME-core03"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core03"
-requires = "%UNIXPRODUCTNAME-core01"
+requires = ""
freebsdrequires = ""
copyright = "1999-2006 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -338,12 +339,12 @@ solarispackagename = "%WITHOUTDOTUNIXPRO
solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01"
packagename = "%UNIXPRODUCTNAME-core04"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core04,%UNIXPRODUCTNAME-spellcheck"
-requires = "%UNIXPRODUCTNAME-core01"
+requires = ""
freebsdrequires = ""
copyright = "1999-2006 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -352,12 +353,12 @@ solarispackagename = "%WITHOUTDOTUNIXPRO
solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01"
packagename = "%UNIXPRODUCTNAME-core05"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core05"
-requires = "%UNIXPRODUCTNAME-core01"
+requires = ""
freebsdrequires = ""
copyright = "1999-2006 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -366,12 +367,12 @@ solarispackagename = "%WITHOUTDOTUNIXPRO
solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01"
packagename = "%UNIXPRODUCTNAME-core06"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core06"
-requires = "%UNIXPRODUCTNAME-core01"
+requires = ""
freebsdrequires = ""
copyright = "1999-2006 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -380,12 +381,12 @@ solarispackagename = "%WITHOUTDOTUNIXPRO
solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01"
packagename = "%UNIXPRODUCTNAME-core07"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core07"
-requires = "%UNIXPRODUCTNAME-core01"
+requires = ""
freebsdrequires = ""
copyright = "1999-2006 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -394,12 +395,12 @@ solarispackagename = "%WITHOUTDOTUNIXPRO
solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01"
packagename = "%UNIXPRODUCTNAME-core08"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core08"
-requires = "%UNIXPRODUCTNAME-core01"
+requires = ""
freebsdrequires = ""
copyright = "1999-2006 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -408,12 +409,12 @@ solarispackagename = "%WITHOUTDOTUNIXPRO
solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01"
packagename = "%UNIXPRODUCTNAME-core09"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core09"
-requires = "%UNIXPRODUCTNAME-core01"
+requires = ""
freebsdrequires = ""
copyright = "1999-2006 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -423,10 +424,10 @@ solarispackagename = "%WITHOUTDOTUNIXPRO
solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01"
packagename = "%UNIXPRODUCTNAME-core10"
linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core10"
-requires = "%UNIXPRODUCTNAME-core01"
+requires = ""
freebsdrequires = ""
copyright = "1999-2006 by OpenOffice.org"
vendor = "OpenOffice.org"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End

29
editors/openoffice/patches/patch-instsetoo_native_util_makefile_mk Normal file
View File

@ -0,0 +1,29 @@
$OpenBSD: patch-instsetoo_native_util_makefile_mk,v 1.1.1.1 2006/08/17 14:56:23 robert Exp $
--- instsetoo_native/util/makefile.mk.orig Thu Jul 13 17:15:45 2006
+++ instsetoo_native/util/makefile.mk Tue Aug 15 14:03:10 2006
@@ -108,7 +108,7 @@ ALLTAR : $(LOCALPYFILES)
.IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)"
ALLTAR : openoffice
.ELSE
-ALLTAR : openoffice sdkoo_en-US ure_en-US
+ALLTAR : openoffice
.ENDIF
.ELSE # "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
ALLTAR : updatepack
@@ -394,11 +394,11 @@ hack_msitemplates .PHONY:
+-$(MKDIRHIER) $(MSIURETEMPLATEDIR)
+-$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)
+-$(MKDIRHIER) $(MSIURETEMPLATEDIR)
- $(GNUCOPY) -ua $(MSIOFFICETEMPLATESOURCE) $(MSIOFFICETEMPLATEDIR:d:d)
- $(GNUCOPY) -ua $(MSILANGPACKTEMPLATESOURCE) $(MSILANGPACKTEMPLATEDIR:d:d)
- $(GNUCOPY) -ua $(MSIURETEMPLATESOURCE) $(MSIURETEMPLATEDIR:d:d)
- $(GNUCOPY) -ua $(MSISDKOOTEMPLATESOURCE) $(MSISDKOOTEMPLATEDIR:d:d)
- $(GNUCOPY) -ua $(MSIURETEMPLATESOURCE) $(MSIURETEMPLATEDIR:d:d)
+ $(GNUCOPY) -R $(MSIOFFICETEMPLATESOURCE) $(MSIOFFICETEMPLATEDIR:d:d)
+ $(GNUCOPY) -R $(MSILANGPACKTEMPLATESOURCE) $(MSILANGPACKTEMPLATEDIR:d:d)
+ $(GNUCOPY) -R $(MSIURETEMPLATESOURCE) $(MSIURETEMPLATEDIR:d:d)
+ $(GNUCOPY) -R $(MSISDKOOTEMPLATESOURCE) $(MSISDKOOTEMPLATEDIR:d:d)
+ $(GNUCOPY) -R $(MSIURETEMPLATESOURCE) $(MSIURETEMPLATEDIR:d:d)
+$(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
+$(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
+$(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp

12
editors/openoffice/patches/patch-jvmaccess_util_makefile_mk Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-jvmaccess_util_makefile_mk,v 1.1.1.1 2006/08/17 14:56:23 robert Exp $
--- jvmaccess/util/makefile.mk.orig Wed Sep 7 21:23:59 2005
+++ jvmaccess/util/makefile.mk Tue Aug 15 14:03:10 2006
@@ -68,6 +68,8 @@ SHL1VERSIONMAP = gcc3_linux_intel.map
SHL1VERSIONMAP = gcc3_linux_intel.map
.ELIF "$(OS)$(CPU)$(COMNAME)" == "LINUXSgcc3"
SHL1VERSIONMAP = gcc3_linux_intel.map
+.ELIF "$(OS)$(CPU)$(COMNAME)" == "OPENBSDIgcc3"
+SHL1VERSIONMAP = gcc3_linux_intel.map
.ENDIF
DEF1NAME = $(SHL1TARGET)

12
editors/openoffice/patches/patch-jvmfwk_distributions_OpenOfficeorg_makefile_mk Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-jvmfwk_distributions_OpenOfficeorg_makefile_mk,v 1.1.1.1 2006/08/17 14:56:23 robert Exp $
--- jvmfwk/distributions/OpenOfficeorg/makefile.mk.orig Tue Jan 31 19:28:42 2006
+++ jvmfwk/distributions/OpenOfficeorg/makefile.mk Tue Aug 15 14:03:10 2006
@@ -49,7 +49,7 @@ $(BIN)$/javavendors_ooo.xml: javavendors
.IF "$(GUI)"=="UNX"
.IF "$(OS)"=="MACOSX"
+-$(COPY) javavendors_macosx.xml $(BIN)$/javavendors_ooo.xml
-.ELIF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
+.ELIF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" || "$(OS)"=="OPENBSD"
+-$(COPY) javavendors_linux.xml $(BIN)$/javavendors_ooo.xml
.ELSE
+-$(COPY) javavendors_unx.xml $(BIN)$/javavendors_ooo.xml

21
editors/openoffice/patches/patch-jvmfwk_plugins_sunmajor_pluginlib_sunversion_cxx Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-jvmfwk_plugins_sunmajor_pluginlib_sunversion_cxx,v 1.1.1.1 2006/08/17 14:56:23 robert Exp $
--- jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx.orig Tue Jun 20 02:09:54 2006
+++ jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx Tue Aug 15 14:03:10 2006
@@ -205,7 +205,7 @@ bool SunVersion::init(const char *szVers
m_preRelease = getPreRelease(pCur);
if (m_preRelease == Rel_NONE)
return false;
-#if defined(FREEBSD)
+#if defined(FREEBSD) || defined(OPENBSD)
if (m_preRelease == Rel_FreeBSD)
{
pCur++; //elemnate `p'
@@ -256,7 +256,7 @@ SunVersion::PreRelease SunVersion::getPr
return Rel_RC2;
else if (! strcmp(szRelease, "rc3"))
return Rel_RC3;
-#if defined (FREEBSD)
+#if defined (FREEBSD) || defined (OPENBSD)
else if (! strncmp(szRelease, "p", 1))
return Rel_FreeBSD;
#endif

12
editors/openoffice/patches/patch-jvmfwk_plugins_sunmajor_pluginlib_sunversion_hxx Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-jvmfwk_plugins_sunmajor_pluginlib_sunversion_hxx,v 1.1.1.1 2006/08/17 14:56:23 robert Exp $
--- jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx.orig Wed Sep 7 21:31:59 2005
+++ jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx Tue Aug 15 14:03:10 2006
@@ -84,7 +84,7 @@ protected:
Rel_RC1,
Rel_RC2,
Rel_RC3
-#if defined(FREEBSD)
+#if defined(FREEBSD) || defined(OPENBSD)
,
Rel_FreeBSD
#endif

66
editors/openoffice/patches/patch-lingucomponent_source_spellcheck_hunspell_affixmgr_cxx Normal file
View File

@ -0,0 +1,66 @@
$OpenBSD: patch-lingucomponent_source_spellcheck_hunspell_affixmgr_cxx,v 1.1.1.1 2006/08/17 14:56:23 robert Exp $
--- lingucomponent/source/spellcheck/hunspell/affixmgr.cxx.orig Wed Jul 19 18:15:53 2006
+++ lingucomponent/source/spellcheck/hunspell/affixmgr.cxx Tue Aug 15 14:03:10 2006
@@ -2439,12 +2439,11 @@ char * AffixMgr::suffix_check_twosfx_mor
result3[0] = '\0';
#ifdef DEBUG
unsigned short flag = sptr->getFlag();
- char flagch[2] = &flag;
if (flag_mode == FLAG_NUM) {
- sprintf(result3, "%d", sptr->getKey());
+ sprintf(result3, "%p", sptr->getKey());
} else if (flag_mode == FLAG_LONG) {
- sprintf(result3, "%c%c", flagch[0], flagch[1]);
- } else sprintf(result3, "%c", flagch[1]);
+ sprintf(result3, "%c%c", (char)(flag>>8), (char)(flag & 0x00ff));
+ } else sprintf(result3, "%c", (char)(flag & 0x00ff));
strcat(result3, ":");
#endif
if (sptr->getMorph()) strcat(result3, sptr->getMorph());
@@ -2466,10 +2465,16 @@ char * AffixMgr::suffix_check_morph(cons
int sfxopts, AffEntry * ppfx, const FLAG cclass, const FLAG needflag, char in_compound)
{
char result[MAXLNLEN];
-
+#ifdef DEBUG
+ char result2[MAXLNLEN];
+#endif
+
struct hentry * rv = NULL;
result[0] = '\0';
+#ifdef DEBUG
+ result2[0] = '\0';
+#endif
PfxEntry* ep = (PfxEntry *) ppfx;
@@ -2555,13 +2560,12 @@ char * AffixMgr::suffix_check_morph(cons
!TESTAFF(rv->astr, lemma_present, rv->alen))) strcat(result, rv->word);
if (!complexprefixes && rv->description) strcat(result, rv->description);
#ifdef DEBUG
- unsigned short flag = sptr->getKey();
- char flagch[2] = &flag;
+ unsigned short flag = sptr->getFlag();
if (flag_mode == FLAG_NUM) {
- sprintf(result2, "%d", sptr->getKey());
+ sprintf(result2, "%p", sptr->getKey());
} else if (flag_mode == FLAG_LONG) {
- sprintf(result2, "%c%c", flagch[0], flagch[1]);
- } else sprintf(result2, "%c", flagch[1]);
+ sprintf(result2, "%c%c", (char)(flag>>8), (char)(flag & 0x00FF));
+ } else sprintf(result2, "%c", (char)(flag & 0x00FF));
strcat(result2, ":");
strcat(result, result2);
#endif
@@ -3684,7 +3688,9 @@ int AffixMgr::parse_affix(char * line,
int i = 0;
// checking lines with bad syntax
-// int basefieldnum = 0;
+#if DEBUG
+ int basefieldnum = 0;
+#endif
// split affix header line into pieces

27
editors/openoffice/patches/patch-lingucomponent_source_spellcheck_myspell_Makefile Normal file
View File

@ -0,0 +1,27 @@
$OpenBSD: patch-lingucomponent_source_spellcheck_myspell_Makefile,v 1.1.1.1 2006/08/17 14:56:23 robert Exp $
--- lingucomponent/source/spellcheck/myspell/Makefile.orig Tue Mar 9 13:40:54 2004
+++ lingucomponent/source/spellcheck/myspell/Makefile Tue Aug 15 14:03:10 2006
@@ -60,6 +60,23 @@ ifeq "$(PLATFORM)" "FreeBSD"
RANLIB=ranlib
endif
+ifeq "$(PLATFORM)" "OpenBSD"
+ CXX ?= g++
+ CXXFLAGS ?= -O2 -Wall -ansi -pedantic -I.
+ CC ?= gcc
+ CFLAGS ?= -O2 -Wall -ansi -pedantic -I.
+ PICFLAGS = -fPIC
+ SHARED = -shared -fPIC
+ SOSUFFIX = so
+ SOPREFIX = lib
+ UNIXVERSIONING=YES
+ SONAME = -Wl,-h
+ LIBPATH = LD_LIBRARY_PATH
+ STATICLIB=libmyspell-$(VERSION)_pic.a
+ AR=ar rc
+ RANLIB=ranlib
+endif
+
ifeq "$(PLATFORM)" "Darwin"
CXX ?= g++
CXXFLAGS ?= -O2 -Wall -ansi -pedantic -I.

19
editors/openoffice/patches/patch-nas_nas-1_6_patch Normal file
View File

@ -0,0 +1,19 @@
$OpenBSD: patch-nas_nas-1_6_patch,v 1.1.1.1 2006/08/17 14:56:23 robert Exp $
--- nas/nas-1.6.patch.orig Fri Mar 10 16:59:50 2006
+++ nas/nas-1.6.patch Tue Aug 15 14:03:10 2006
@@ -763,3 +763,15 @@
XtAppAddActions(appContext, actions, XtNumber(actions));
if (argc == 3)
+*** misc/nas-1.6/doc/Imakefile Sat May 8 20:47:19 1999
+--- misc/build/nas-1.6/doc/Imakefile Sat Apr 15 14:51:40 2006
+***************
+*** 27,33 ****
+ #define IHaveSubdirs
+ #define PassCDebugFlags AuPassCDebugFlags
+
+- SUBDIRS = man
+-
+ MakeSubdirs($(SUBDIRS))
+ DependSubdirs($(SUBDIRS))
+--- 27,31 ----

14
editors/openoffice/patches/patch-odk_configure_pl Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-odk_configure_pl,v 1.1.1.1 2006/08/17 14:56:23 robert Exp $
--- odk/configure.pl.orig Wed Nov 9 10:28:37 2005
+++ odk/configure.pl Tue Aug 15 14:03:10 2006
@@ -28,6 +28,10 @@ if ( $main::operatingSystem =~ /freebsd/
{
$main::makeName = "gmake";
}
+if ( $main::operatingSystem =~ /openbsd/ )
+{
+ $main::makeName = "gmake";
+}
$main::OO_SDK_MAKE_HOME_SUGGESTION = searchprog($main::makeName);
$main::makeVersion = "3.79.1";
$main::correctVersion = 0;

35
editors/openoffice/patches/patch-odk_setsdkenv_unix_csh_in Normal file
View File

@ -0,0 +1,35 @@
$OpenBSD: patch-odk_setsdkenv_unix_csh_in,v 1.1.1.1 2006/08/17 14:56:23 robert Exp $
--- odk/setsdkenv_unix.csh.in.orig Wed Nov 9 10:29:11 2005
+++ odk/setsdkenv_unix.csh.in Tue Aug 15 14:03:10 2006
@@ -176,6 +176,31 @@ switch (`${sdkdir}/config.guess | cut -d
else
setenv PTHREAD_LIBS -pthread
endif
+
+ case "openbsd*":
+ if ( $?OO_SDK_CPP_HOME == 0) then
+ set sdk_gxx_include_path=`echo "#include <cstring>" | ${OO_SDK_CPP_HOME}/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
+ setenv SDK_GXX_INCLUDE_PATH ${sdk_gxx_include_path}
+ endif
+
+ set directoryname=openbsd
+ set comid=gcc3
+ set pltfrm=gcc
+ set soext=so
+ set exampleout=OPENBSDexample.out
+ set platform=OpenBSD
+
+ # set LD_LIBRARY_PATH
+ if ( $?LD_LIBARY_PATH == 0) then
+ setenv LD_LIBRARY_PATH ${OO_SDK_HOME}/${directoryname}/lib:${OO_EXAMPLE_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.
+ else
+ setenv LD_LIBRARY_PATH ${OO_SDK_HOME}/${directoryname}/lib:${OO_EXAMPLE_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${LD_LIBRARY_PATH}
+ endif
+
+ setenv PTHREAD_CFLAGS -D_THREAD_SAFE
+ setenv PTHREAD_LIBS -pthread
+
+ endif
breaksw
endsw

32
editors/openoffice/patches/patch-odk_setsdkenv_unix_sh_in Normal file
View File

@ -0,0 +1,32 @@
$OpenBSD: patch-odk_setsdkenv_unix_sh_in,v 1.1.1.1 2006/08/17 14:56:23 robert Exp $
--- odk/setsdkenv_unix.sh.in.orig Wed Nov 9 10:29:22 2005
+++ odk/setsdkenv_unix.sh.in Tue Aug 15 14:03:10 2006
@@ -206,6 +206,28 @@ case $sd_platform in
export PTHREAD_LIBS
fi
;;
+ openbsd*)
+ if [ -n "$OO_SDK_CPP_HOME" ]
+ then
+ SDK_GXX_INCLUDE_PATH=`echo "#include <cstring>" | $OO_SDK_CPP_HOME/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
+ export SDK_GXX_INCLUDE_PATH
+ fi
+
+ directoryname=openbsd
+ comid=gcc3
+ pltfrm=gcc
+ soext=so
+ exampleout=OPENBSDexample.out
+ platform=OpenBSD
+ LD_LIBRARY_PATH=$OO_SDK_HOME/$directoryname/lib:$OO_EXAMPLE_OUT/$exampleout/lib:${OO_SDK_URE_LIB_DIR}:.:$LD_LIBRARY_PATH
+ export LD_LIBRARY_PATH
+
+ PTHREAD_CFLAGS=-D_THREAD_SAFE
+ PTHREAD_LIBS=-pthread
+ export PTHREAD_CFLAGS
+ export PTHREAD_LIBS
+ fi
+ ;;
esac
# Add directory of the SDK tools to the path.

101
editors/openoffice/patches/patch-odk_settings_settings_mk Normal file
View File

@ -0,0 +1,101 @@
$OpenBSD: patch-odk_settings_settings_mk,v 1.1.1.1 2006/08/17 14:56:23 robert Exp $
--- odk/settings/settings.mk.orig Thu Jul 13 14:03:58 2006
+++ odk/settings/settings.mk Tue Aug 15 14:03:10 2006
@@ -502,3 +502,97 @@ URE_MISC=$(OO_SDK_URE_HOME)/share/misc
endif
endif
+
+###########################################################################
+#
+# OpenBSD specific settings
+#
+###########################################################################
+ifneq (,$(findstring openbsd,$(PLATFORM)))
+# Settings for OpenBSD using gcc compiler
+
+PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1)
+
+# Default is openbsd on a intel machine
+PLATFORM=openbsd
+PACKAGE_LIB_DIR=openbsd_x86.plt
+UNOPKG_PLATFORM=OpenBSD_x86
+JAVA_PROC_TYPE=i386
+
+OS=OPENBSD
+PS=/
+CC=gcc
+LINK=g++
+LIB=g++
+ECHO=@echo
+MKDIR=mkdir -p
+CAT=cat
+OBJ_EXT=o
+SHAREDLIB_EXT=so
+SHAREDLIB_PRE=lib
+SHAREDLIB_OUT=$(OUT_LIB)
+
+GCC_VERSION=$(shell $(CC) -dumpversion)
+
+ifeq "$(shell echo $(GCC_VERSION) | cut -c 1)" "3"
+COMID=gcc3
+CPPU_ENV=gcc3
+else
+COMID=GCC
+CPPU_ENV=gcc2
+endif
+
+OSEP=\<
+CSEP=\>
+QUOTE=$(subst S,\,S)
+QM=\"
+SQM='
+ECHOLINE=@echo
+P2BG=&
+
+DEL=rm -f
+DELRECURSIVE=rm -rf
+COPY=cp
+URLPREFIX=file://
+
+# Include UDK version numbers
+include $(PRJ)/include/udkversion.mk
+
+SALLIB=-luno_sal
+CPPULIB=-luno_cppu
+CPPUHELPERLIB=-luno_cppuhelper$(COMID)
+SALHELPERLIB=-luno_salhelper$(COMID)
+REGLIB=-lreg
+STORELIB=-lstore
+STLPORTLIB=-lstlport_gcc
+
+EMPTYSTRING=
+PATH_SEPARATOR=:
+
+# -O is necessary for inlining (see gcc documentation)
+ifeq "$(DEBUG)" "yes"
+CC_FLAGS=-c -g -fPIC -DPIC $(PTHREAD_CFLAGS)
+else
+CC_FLAGS=-c -O -fPIC -DPIC $(PTHREAD_CFLAGS)
+endif
+
+SDK_JAVA_INCLUDES = -I"$(OO_SDK_JAVA_HOME)/include" -I"$(OO_SDK_JAVA_HOME)/include/openbsd"
+CC_INCLUDES=-I. -I$(OUT)/inc/examples -I$(PRJ)/include
+STL_INCLUDES=-I"$(OO_SDK_HOME)/include/stl"
+CC_DEFINES=-DUNX -DGCC -DOPENBSD -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH)
+
+CC_OUTPUT_SWITCH=-o
+
+LIBRARY_LINK_FLAGS=-shared '-Wl,-rpath,$$ORIGIN'
+COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) -Wl,--version-script,$(PRJ)/settings/component.uno.map
+
+EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined
+#EXE_LINK_FLAGS+=-Wl,-export-dynamic -Wl,-z,defs
+LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/lib -L"$(OFFICE_PROGRAM_PATH)" $(PTHREAD_LIBS)
+LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)"
+
+ifneq "$(OO_SDK_URE_HOME)" ""
+URE_MISC=$(OO_SDK_URE_HOME)/share/misc
+endif
+
+endif

15
editors/openoffice/patches/patch-psprint_source_fontmanager_fontmanager_cxx Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-psprint_source_fontmanager_fontmanager_cxx,v 1.1.1.1 2006/08/17 14:56:23 robert Exp $
--- psprint/source/fontmanager/fontmanager.cxx.orig Mon Jun 19 12:24:03 2006
+++ psprint/source/fontmanager/fontmanager.cxx Tue Aug 15 14:03:10 2006
@@ -427,7 +427,11 @@ bool PrintFontManager::BuiltinFont::quer
// -------------------------------------------------------------------------
+#if OSL_DEBUG_LEVEL > 1
+bool PrintFontManager::TrueTypeFontFile::queryMetricPage( int nPage, MultiAtomProvider* pProvider )
+#else
bool PrintFontManager::TrueTypeFontFile::queryMetricPage( int nPage, MultiAtomProvider* /*pProvider*/ )
+#endif
{
bool bSuccess = false;

12
editors/openoffice/patches/patch-psprint_source_printer_printerinfomanager_cxx Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-psprint_source_printer_printerinfomanager_cxx,v 1.1.1.1 2006/08/17 14:56:23 robert Exp $
--- psprint/source/printer/printerinfomanager.cxx.orig Mon Jul 10 18:30:50 2006
+++ psprint/source/printer/printerinfomanager.cxx Tue Aug 15 14:03:10 2006
@@ -1172,7 +1172,7 @@ struct SystemCommandParameters
static const struct SystemCommandParameters aParms[] =
{
-#if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || defined(MACOSX)
+#if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || defined(MACOSX) || defined (OPENBSD)
{ "/usr/sbin/lpc status", "lpr -P \"(PRINTER)\"", "", ":", 0 },
{ "lpc status", "lpr -P \"(PRINTER)\"", "", ":", 0 },
{ "LANG=C;LC_ALL=C;export LANG LC_ALL;lpstat -s", "lp -d \"(PRINTER)\"", "system for ", ": ", 1 }

12
editors/openoffice/patches/patch-psprint_source_printergfx_printerjob_cxx Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-psprint_source_printergfx_printerjob_cxx,v 1.1.1.1 2006/08/17 14:56:23 robert Exp $
--- psprint/source/printergfx/printerjob.cxx.orig Tue Jul 25 11:36:11 2006
+++ psprint/source/printergfx/printerjob.cxx Tue Aug 15 14:03:10 2006
@@ -262,7 +262,7 @@ getUserName (char* pName, int nSize)
sal_Bool bSuccess = sal_False;
-#ifdef FREEBSD
+#if defined (FREEBSD) || defined (OPENBSD)
pPWEntry = getpwuid( getuid());
#else
if (getpwuid_r(getuid(), &aPWEntry, pPWBuffer, sizeof(pPWBuffer), &pPWEntry) != 0)

12
editors/openoffice/patches/patch-pyuno_source_module_makefile_mk Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-pyuno_source_module_makefile_mk,v 1.1.1.1 2006/08/17 14:56:23 robert Exp $
--- pyuno/source/module/makefile.mk.orig Tue Jan 31 19:18:25 2006
+++ pyuno/source/module/makefile.mk Tue Aug 15 14:03:10 2006
@@ -130,6 +130,8 @@ $(PYUNO_MODULE) : $(SLO)$/pyuno_dlopenwr
@+ echo $(LINK) $(LINKFLAGSSHLCUI) -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
.ELIF "$(OS)" == "MACOSX"
@+ echo $(CC) -bundle -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
+.ELIF "$(OS)" == "OPEBBSD"
+ @+ echo ld -shared -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
.ELSE
@+ echo $(LINK) $(LINKFLAGSSHLCUI) -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
.ENDIF

21
editors/openoffice/patches/patch-sablot_Sablot-0_52_patch Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-sablot_Sablot-0_52_patch,v 1.1.1.1 2006/08/17 14:56:23 robert Exp $
--- sablot/Sablot-0.52.patch.orig Mon Jun 19 19:27:11 2006
+++ sablot/Sablot-0.52.patch Tue Aug 15 14:03:10 2006
@@ -119,7 +119,7 @@
! .ENDIF
! .ENDIF
!
-! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD" || "$(OS)"=="IRIX" || "$(OS)"=="NETBSD"
+! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD" || "$(OS)"=="IRIX" || "$(OS)"=="OPENBSD" || "$(OS)"=="NETBSD"
! CFLAGS+= -DHAVE_UNISTD_H
! .ENDIF
!
@@ -131,7 +131,7 @@
! .IF "$(OS)"=="NETBSD"
! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE
! .ELSE
-! .IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
+! .IF "$(OS)"=="MACOSX" || "$(OS)"=="OPENBSD" || "$(OS)"=="FREEBSD"
! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_SYS_TIME_H -DHAVE_ISNAN -DHAVE_FINITE
! .ELSE
! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE

12
editors/openoffice/patches/patch-sal_inc_osl_endian_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-sal_inc_osl_endian_h,v 1.1.1.1 2006/08/17 14:56:23 robert Exp $
--- sal/inc/osl/endian.h.orig Fri Jan 20 15:27:49 2006
+++ sal/inc/osl/endian.h Tue Aug 15 14:03:10 2006
@@ -187,7 +187,7 @@ extern "C" {
!defined(LINUX) && !defined(NETBSD) && !defined(SCO) && \
!defined(AIX) && !defined(HPUX) && \
!defined(SOLARIS) && !defined(IRIX) && !defined(MACOS) && \
- !defined(MACOSX) && !defined(FREEBSD)
+ !defined(MACOSX) && !defined(FREEBSD) && !defined(OPENBSD)
# error "Target plattform not specified !"
#endif

12
editors/openoffice/patches/patch-sal_inc_rtl_uuid_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-sal_inc_rtl_uuid_h,v 1.1.1.1 2006/08/17 14:56:23 robert Exp $
--- sal/inc/rtl/uuid.h.orig Thu Sep 8 16:46:10 2005
+++ sal/inc/rtl/uuid.h Tue Aug 15 14:03:10 2006
@@ -223,6 +223,8 @@ void SAL_CALL rtl_createNamedUuid(
#define UUID_SYSTEM_TIME_RESOLUTION_100NS_TICKS 100000
#elif IRIX
#define UUID_SYSTEM_TIME_RESOLUTION_100NS_TICKS 10
+#elif OPENBSD
+#define UUID_SYSTEM_TIME_RESOLUTION_100NS_TICKS 10
#else
#error "System time resolution must be calculated!"
#endif

12
editors/openoffice/patches/patch-sal_inc_sal_alloca_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-sal_inc_sal_alloca_h,v 1.1.1.1 2006/08/17 14:56:23 robert Exp $
--- sal/inc/sal/alloca.h.orig Thu Sep 8 16:46:27 2005
+++ sal/inc/sal/alloca.h Tue Aug 15 14:03:10 2006
@@ -43,7 +43,7 @@
#define INCLUDED_ALLOCA_H
#endif
-#elif defined (FREEBSD) || defined(NETBSD)
+#elif defined (FREEBSD) || defined(NETBSD) || defined (OPENBSD)
#ifndef INCLUDED_STDLIB_H
#include <stdlib.h>

12
editors/openoffice/patches/patch-sal_inc_sal_config_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-sal_inc_sal_config_h,v 1.1.1.1 2006/08/17 14:56:23 robert Exp $
--- sal/inc/sal/config.h.orig Tue Jun 20 06:15:28 2006
+++ sal/inc/sal/config.h Tue Aug 15 14:03:10 2006
@@ -102,7 +102,7 @@ extern "C" {
/* don't know what to put in here */
#endif
-#if defined(SOLARIS) || defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || defined(SCO) || defined(IRIX)
+#if defined(SOLARIS) || defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || defined(SCO) || defined(IRIX) || defined(OPENBSD)
#define SAL_UNX
#define SAL_DLLEXTENSION ".so"
#define SAL_DLLPREFIX "lib"

12
editors/openoffice/patches/patch-sal_inc_sal_types_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-sal_inc_sal_types_h,v 1.1.1.1 2006/08/17 14:56:23 robert Exp $
--- sal/inc/sal/types.h.orig Tue Jun 20 06:15:50 2006
+++ sal/inc/sal/types.h Tue Aug 15 14:03:10 2006
@@ -282,7 +282,7 @@ typedef struct _sal_Sequence
lack RTTI support, dynamic_cast is not included here).
*/
#ifdef __cplusplus
-#if defined SAL_W32 || defined SOLARIS || defined LINUX || defined MACOSX || defined FREEBSD || defined NETBSD || defined AIX
+#if defined SAL_W32 || defined SOLARIS || defined LINUX || defined MACOSX || defined FREEBSD || defined NETBSD || defined AIX || defined OPENBSD
#define SAL_CONST_CAST(type, expr) (const_cast< type >(expr))
#define SAL_REINTERPRET_CAST(type, expr) (reinterpret_cast< type >(expr))
#define SAL_STATIC_CAST(type, expr) (static_cast< type >(expr))

12
editors/openoffice/patches/patch-sal_osl_unx_backtrace_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-sal_osl_unx_backtrace_c,v 1.1.1.1 2006/08/17 14:56:23 robert Exp $
--- sal/osl/unx/backtrace.c.orig Tue Jun 20 06:16:46 2006
+++ sal/osl/unx/backtrace.c Tue Aug 15 14:03:10 2006
@@ -124,7 +124,7 @@ void backtrace_symbols_fd( void **buffer
#endif /* defined SOLARIS */
-#if defined FREEBSD || defined NETBSD
+#if defined FREEBSD || defined NETBSD || defined OPENBSD
#include <dlfcn.h>
#include <pthread.h>
#include <setjmp.h>

21
editors/openoffice/patches/patch-sal_osl_unx_backtrace_h Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-sal_osl_unx_backtrace_h,v 1.1.1.1 2006/08/17 14:56:23 robert Exp $
--- sal/osl/unx/backtrace.h.orig Thu Feb 9 18:05:59 2006
+++ sal/osl/unx/backtrace.h Tue Aug 15 14:03:10 2006
@@ -34,7 +34,7 @@
************************************************************************/
-#if defined (SOLARIS) || (FREEBSD)
+#if defined (SOLARIS) || (FREEBSD) || (OPENBSD)
#ifdef __cplusplus
extern "C" {
@@ -47,7 +47,7 @@ int backtrace( void **buffer, int max_fr
void backtrace_symbols_fd( void **buffer, int size, int fd );
/* no frame.h on FreeBSD */
-#if defined FREEBSD
+#if defined FREEBSD || defined OPENBSD
struct frame {
long arg0[8];
long arg1[6];

120
editors/openoffice/patches/patch-sal_osl_unx_file_cxx Normal file
View File

@ -0,0 +1,120 @@
$OpenBSD: patch-sal_osl_unx_file_cxx,v 1.1.1.1 2006/08/17 14:56:23 robert Exp $
--- sal/osl/unx/file.cxx.orig Tue Jun 20 06:17:10 2006
+++ sal/osl/unx/file.cxx Tue Aug 15 14:03:10 2006
@@ -115,7 +115,7 @@ static const sal_Char* MOUNTTAB="/etc/mn
#include <ctype.h>
static const sal_Char* MOUNTTAB="/etc/mtab";
-#elif defined(NETBSD) || defined(FREEBSD)
+#elif defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD)
#include <sys/param.h>
#include <sys/ucred.h>
#include <sys/mount.h>
@@ -1383,12 +1383,11 @@ oslFileError SAL_CALL osl_syncFile(oslFi
#ifdef HAVE_STATFS_H
-#if defined(FREEBSD) || defined(NETBSD) || defined(MACOSX)
+#if defined(FREEBSD) || defined(NETBSD) || defined(MACOSX) || defined(OPENBSD)
# define __OSL_STATFS_STRUCT struct statfs
# define __OSL_STATFS(dir, sfs) statfs((dir), (sfs))
# define __OSL_STATFS_BLKSIZ(a) ((sal_uInt64)((a).f_bsize))
# define __OSL_STATFS_TYPENAME(a) ((a).f_fstypename)
-# define __OSL_STATFS_ISREMOTE(a) (((a).f_type & MNT_LOCAL) == 0)
/* always return true if queried for the properties of
the file system. If you think this is wrong under any
@@ -1407,7 +1406,6 @@ oslFileError SAL_CALL osl_syncFile(oslFi
# define __OSL_STATFS_BLKSIZ(a) ((sal_uInt64)((a).f_bsize))
# define __OSL_STATFS_IS_NFS(a) (__OSL_NFS_SUPER_MAGIC == (a).f_type)
# define __OSL_STATFS_IS_SMB(a) (__OSL_SMB_SUPER_MAGIC == (a).f_type)
-# define __OSL_STATFS_ISREMOTE(a) (__OSL_STATFS_IS_NFS((a)) || __OSL_STATFS_IS_SMB((a)))
# define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a) ((__OSL_MSDOS_SUPER_MAGIC != (a).f_type) && (__OSL_NTFS_SUPER_MAGIC != (a).f_type))
# define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) ((__OSL_MSDOS_SUPER_MAGIC != (a).f_type))
#endif /* LINUX */
@@ -1417,7 +1415,6 @@ oslFileError SAL_CALL osl_syncFile(oslFi
# define __OSL_STATFS(dir, sfs) statvfs((dir), (sfs))
# define __OSL_STATFS_BLKSIZ(a) ((sal_uInt64)((a).f_frsize))
# define __OSL_STATFS_TYPENAME(a) ((a).f_basetype)
-# define __OSL_STATFS_ISREMOTE(a) (rtl_str_compare((a).f_basetype, "nfs") == 0)
/* always return true if queried for the properties of
the file system. If you think this is wrong under any
@@ -1433,7 +1430,6 @@ oslFileError SAL_CALL osl_syncFile(oslFi
# define __OSL_STATFS_STRUCT struct dummy {int i;}
# define __OSL_STATFS_INIT(a) ((void)0)
# define __OSL_STATFS(dir, sfs) (1)
-# define __OSL_STATFS_ISREMOTE(sfs) (0)
# define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a) (1)
# define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (1)
#endif /* HAVE_STATFS_H */
@@ -1461,10 +1457,6 @@ static oslFileError osl_psz_getVolumeInf
/* FIXME: how to detect the kind of storage (fixed, cdrom, ...) */
if (uFieldMask & osl_VolumeInfo_Mask_Attributes)
{
- if (__OSL_STATFS_ISREMOTE(sfs))
- pInfo->uAttributes |= osl_Volume_Attribute_Remote;
-
- pInfo->uValidFields |= osl_VolumeInfo_Mask_Attributes;
}
if (uFieldMask & osl_VolumeInfo_Mask_FileSystemCaseHandling)
@@ -2183,7 +2175,7 @@ int UnicodeToText( char * buffer, size_t
if( nInfo & RTL_UNICODETOTEXT_INFO_DESTBUFFERTOSMALL )
{
- errno = EOVERFLOW;
+ errno = ENOMEM;
return 0;
}
@@ -2235,7 +2227,7 @@ int TextToUnicode(
if (nInfo & RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL)
{
- errno = EOVERFLOW;
+ errno = ENOMEM;
return 0;
}
@@ -3360,35 +3352,35 @@ static sal_Bool osl_isFloppyMounted(oslV
*
*****************************************************************************/
-#if (defined(MACOSX) || defined(NETBSD) || defined(FREEBSD))
+#if (defined(MACOSX) || defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD))
static oslVolumeDeviceHandle osl_isFloppyDrive(const sal_Char* pszPath)
{
return NULL;
}
#endif /* MACOSX */
-#if ( defined(MACOSX) || defined(NETBSD) || defined(FREEBSD))
+#if ( defined(MACOSX) || defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD))
static oslFileError osl_mountFloppy(oslVolumeDeviceHandle hFloppy)
{
return osl_File_E_BUSY;
}
#endif /* MACOSX */
-#if ( defined(MACOSX) || defined(NETBSD) || defined(FREEBSD))
+#if ( defined(MACOSX) || defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD))
static oslFileError osl_unmountFloppy(oslVolumeDeviceHandle hFloppy)
{
return osl_File_E_BUSY;
}
#endif /* MACOSX */
-#if ( defined(MACOSX) || defined(NETBSD) || defined(FREEBSD))
+#if ( defined(MACOSX) || defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD))
static sal_Bool osl_getFloppyMountEntry(const sal_Char* pszPath, oslVolumeDeviceHandleImpl* pItem)
{
return sal_False;
}
#endif /* MACOSX */
-#if ( defined(MACOSX) || defined(NETBSD) || defined(FREEBSD))
+#if ( defined(MACOSX) || defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD))
static sal_Bool osl_isFloppyMounted(oslVolumeDeviceHandleImpl* pDevice)
{
return sal_False;

38
editors/openoffice/patches/patch-sal_osl_unx_file_error_transl_cxx Normal file
View File

@ -0,0 +1,38 @@
$OpenBSD: patch-sal_osl_unx_file_error_transl_cxx,v 1.1.1.1 2006/08/17 14:56:23 robert Exp $
--- sal/osl/unx/file_error_transl.cxx.orig Thu Sep 8 16:54:25 2005
+++ sal/osl/unx/file_error_transl.cxx Tue Aug 15 14:03:10 2006
@@ -219,19 +219,19 @@ oslFileError oslTranslateFileError(sal_B
osl_error = osl_File_E_LOOP;
break;
-#if !(defined(MACOSX) || defined(NETBSD) || defined(FREEBSD))
+#if !(defined(MACOSX) || defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD))
case EILSEQ:
osl_error = osl_File_E_ILSEQ;
break;
#endif /* MACOSX */
-#if !(defined(MACOSX) || defined(NETBSD) || defined(FREEBSD))
+#if !(defined(MACOSX) || defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD))
case ENOLINK:
osl_error = osl_File_E_NOLINK;
break;
#endif /* MACOSX */
-#if !(defined(MACOSX) || defined(NETBSD) || defined(FREEBSD))
+#if !(defined(MACOSX) || defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD))
case EMULTIHOP:
osl_error = osl_File_E_MULTIHOP;
break;
@@ -241,9 +241,11 @@ oslFileError oslTranslateFileError(sal_B
osl_error = osl_File_E_USERS;
break;
+#if !defined (OPENBSD)
case EOVERFLOW:
osl_error = osl_File_E_OVERFLOW;
break;
+#endif
case ETIMEDOUT:
osl_error = osl_File_E_TIMEDOUT;

12
editors/openoffice/patches/patch-sal_osl_unx_makefile_mk Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-sal_osl_unx_makefile_mk,v 1.1.1.1 2006/08/17 14:56:23 robert Exp $
--- sal/osl/unx/makefile.mk.orig Wed Jul 19 11:55:27 2006
+++ sal/osl/unx/makefile.mk Tue Aug 15 14:03:10 2006
@@ -110,7 +110,7 @@ OBJFILES= $(OBJ)$/conditn.obj \
$(OBJ)$/file_stat.obj
#.ENDIF
-.IF "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || "$(OS)$(CPU)"=="LINUXS"
+.IF "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || "$(OS)$(CPU)"=="LINUXS" || "$(OS)"=="OPENBSD"
SLOFILES += $(SLO)$/backtrace.obj
OBJFILES += $(OBJ)$/backtrace.obj
.ENDIF

84
editors/openoffice/patches/patch-sal_osl_unx_nlsupport_c Normal file
View File

@ -0,0 +1,84 @@
$OpenBSD: patch-sal_osl_unx_nlsupport_c,v 1.1.1.1 2006/08/17 14:56:23 robert Exp $
--- sal/osl/unx/nlsupport.c.orig Tue Jul 25 11:40:46 2006
+++ sal/osl/unx/nlsupport.c Tue Aug 15 14:03:10 2006
@@ -38,7 +38,7 @@
#include <osl/process.h>
#include <rtl/memory.h>
-#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD) || defined(MACOSX)
+#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD) || defined(MACOSX) || defined(OPENBSD)
#include <pthread.h>
#ifndef MACOSX
#include <locale.h>
@@ -234,7 +234,7 @@ static rtl_Locale * _parse_locale( const
return NULL;
}
-#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD)
+#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD)
/*
* This implementation of osl_getTextEncodingFromLocale maps
@@ -551,6 +551,35 @@ const _pair _nl_language_list[] = {
{ "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */
};
+#elif defined(OPENBSD)
+
+const _pair _nl_language_list[] = {
+ { "646", RTL_TEXTENCODING_ASCII_US }, /* fake: ASCII_US */
+ { "ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */
+ { "BIG5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
+ { "CP1251", RTL_TEXTENCODING_MS_1251 }, /* MS-CYRL */
+ { "CP866", RTL_TEXTENCODING_IBM_866 }, /* CP866 866 */
+ { "CTEXT", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */
+ { "EUCCN", RTL_TEXTENCODING_EUC_CN }, /* China - Simplified Chinese */
+ { "EUCJP", RTL_TEXTENCODING_EUC_JP }, /* Japan */
+ { "EUCKR", RTL_TEXTENCODING_EUC_KR }, /* Korea */
+ { "EUCTW", RTL_TEXTENCODING_EUC_TW }, /* China - Traditional Chinese */
+ { "ISO-2022-JP", RTL_TEXTENCODING_DONTKNOW }, /* */
+ { "ISO-2022-JP-2", RTL_TEXTENCODING_DONTKNOW }, /* */
+ { "ISO8859-1", RTL_TEXTENCODING_ISO_8859_1 }, /* Western */
+ { "ISO8859-15", RTL_TEXTENCODING_ISO_8859_15 }, /* Western Updated (w/Euro sign) */
+ { "ISO8859-2", RTL_TEXTENCODING_ISO_8859_2 }, /* Central European */
+ { "ISO8859-4", RTL_TEXTENCODING_ISO_8859_4 }, /* LATIN4 L4 */
+ { "ISO8859-5", RTL_TEXTENCODING_ISO_8859_5 }, /* Cyrillic */
+ { "ISO8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */
+ { "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */
+ { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8-R */
+ { "KOI8-U", RTL_TEXTENCODING_KOI8_U }, /* KOI8-U */
+ { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */
+ { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */
+ { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */
+};
+
#endif /* ifdef SOLARIS IRIX LINUX FREEBSD NETBSD */
static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
@@ -973,7 +1002,7 @@ int _imp_setProcessLocale( rtl_Locale *
snprintf(env_buf, sizeof(env_buf), "LC_ALL=%s", locale_buf);
env_buf[sizeof(env_buf)] = '\0';
putenv(env_buf);
-#elif defined( FREEBSD ) || defined( NETBSD ) || defined( MACOSX )
+#elif defined( FREEBSD ) || defined( NETBSD ) || defined( MACOSX ) || defined( OPENBSD )
setenv( "LC_ALL", locale_buf, 1);
#else
setenv( "LC_ALL", locale_buf );
@@ -985,7 +1014,7 @@ int _imp_setProcessLocale( rtl_Locale *
snprintf(env_buf, sizeof(env_buf), "LC_CTYPE=%s", locale_buf);
env_buf[sizeof(env_buf)] = '\0';
putenv(env_buf);
-#elif defined( FREEBSD ) || defined( NETBSD ) || defined( MACOSX )
+#elif defined( FREEBSD ) || defined( NETBSD ) || defined( MACOSX || defined( OPENBSD )
setenv("LC_CTYPE", locale_buf, 1 );
#else
setenv( "LC_CTYPE", locale_buf );
@@ -997,7 +1026,7 @@ int _imp_setProcessLocale( rtl_Locale *
snprintf(env_buf, sizeof(env_buf), "LANG=%s", locale_buf);
env_buf[sizeof(env_buf)] = '\0';
putenv(env_buf);
-#elif defined( FREEBSD ) || defined( NETBSD ) || defined( MACOSX )
+#elif defined( FREEBSD ) || defined( NETBSD ) || defined( MACOSX ) || defined( OPENBSD )
setenv("LC_CTYPE", locale_buf, 1 );
#else
setenv( "LANG", locale_buf );

12
editors/openoffice/patches/patch-sal_osl_unx_process_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-sal_osl_unx_process_c,v 1.1.1.1 2006/08/17 14:56:23 robert Exp $
--- sal/osl/unx/process.c.orig Tue Jun 20 06:18:45 2006
+++ sal/osl/unx/process.c Tue Aug 15 14:03:10 2006
@@ -491,7 +491,7 @@ static void ChildStatusProc(void *pData)
if (! INIT_GROUPS(data.m_name, data.m_gid) || (setuid(data.m_uid) != 0))
OSL_TRACE("Failed to change uid and guid, errno=%d (%s)\n", errno, strerror(errno));
-#if defined(LINUX) || defined (FREEBSD)
+#if defined(LINUX) || defined (FREEBSD) || defined (OPENBSD)
unsetenv("HOME");
#else
putenv("HOME=");

55
editors/openoffice/patches/patch-sal_osl_unx_security_c Normal file
View File

@ -0,0 +1,55 @@
$OpenBSD: patch-sal_osl_unx_security_c,v 1.1.1.1 2006/08/17 14:56:23 robert Exp $
--- sal/osl/unx/security.c.orig Wed Jul 19 11:55:41 2006
+++ sal/osl/unx/security.c Tue Aug 15 14:03:10 2006
@@ -76,7 +76,7 @@ static sal_Bool SAL_CALL osl_psz_getHome
static sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax);
static oslSecurityImpl * newSecurityImpl(size_t * bufSize) {
-#if defined (MACOSX) || defined (FREEBSD)
+#if defined (MACOSX) || defined (FREEBSD) || defined(OPENBSD)
/* #i64906#: sysconf(_SC_GETPW_R_SIZE_MAX) returns -1 on Mac OS X and FreeBSD */
size_t n = 1024;
#else
@@ -102,8 +102,33 @@ oslSecurity SAL_CALL osl_getCurrentSecur
oslSecurityImpl * p = newSecurityImpl(&n);
if (p != NULL) {
struct passwd * found;
+#if defined(OPENBSD)
+ /* TODO: not thread safe - protect this */
+ if ((found = getpwuid(getuid())) != 0)
+ {
+ size_t bufsize = n;
+ size_t len;
+ p->m_pPasswd.pw_uid = found->pw_uid;
+ p->m_pPasswd.pw_gid = found->pw_gid;
+ if ((len = strlcpy(p->m_buffer, found->pw_name, bufsize)) >= bufsize)
+ {
+ deleteSecurityImpl(p);
+ return 0;
+ }
+ p->m_pPasswd.pw_name = p->m_buffer;
+ bufsize -= len+1;
+ if (strlcpy(&p->m_buffer[len+1], found->pw_dir, bufsize) >= bufsize)
+ {
+ deleteSecurityImpl(p);
+ return 0;
+ }
+ p->m_pPasswd.pw_dir = &p->m_buffer[len+1];
+ }
+ else
+#else
if (getpwuid_r(getuid(), &p->m_pPasswd, p->m_buffer, n, &found) != 0 ||
found == NULL)
+#endif
{
deleteSecurityImpl(p);
p = 0;
@@ -474,7 +499,7 @@ osl_psz_loginUser(const sal_Char* pszUse
oslSecurity* pSecurity)
{
#if defined NETBSD || defined SCO || defined AIX || defined FREEBSD || \
- defined MACOSX
+ defined MACOSX || defined OPENBSD
return osl_Security_E_None;

12
editors/openoffice/patches/patch-sal_osl_unx_socket_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-sal_osl_unx_socket_c,v 1.1.1.1 2006/08/17 14:56:23 robert Exp $
--- sal/osl/unx/socket.c.orig Wed Jul 19 11:39:22 2006
+++ sal/osl/unx/socket.c Tue Aug 15 14:03:10 2006
@@ -56,7 +56,7 @@
#undef HAVE_POLL_H
#endif
-#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined ( FREEBSD )
+#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined ( FREEBSD ) || defined ( OPENBSD )
#include <sys/poll.h>
#define HAVE_POLL_H
#endif /* HAVE_POLL_H */

21
editors/openoffice/patches/patch-sal_osl_unx_system_c Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-sal_osl_unx_system_c,v 1.1.1.1 2006/08/17 14:56:23 robert Exp $
--- sal/osl/unx/system.c.orig Wed Jul 19 11:39:37 2006
+++ sal/osl/unx/system.c Tue Aug 15 14:03:10 2006
@@ -48,7 +48,7 @@
static pthread_mutex_t getrtl_mutex = PTHREAD_MUTEX_INITIALIZER;
/* struct passwd differs on some platforms */
-#if defined NETBSD || defined MACOSX
+#if defined NETBSD || defined MACOSX || defined OPENBSD
#include <pwd.h>
#include <sys/types.h>
@@ -139,7 +139,7 @@ struct passwd *getpwnam_r(const char* na
#endif /* MACOSX */
}
-#if defined(NETBSD) || defined(MACOSX)
+#if defined(NETBSD) || defined(MACOSX) || defined (OPENBSD)
int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer,
size_t buflen, struct passwd **result)
{

41
editors/openoffice/patches/patch-sal_osl_unx_system_h Normal file
View File

@ -0,0 +1,41 @@
$OpenBSD: patch-sal_osl_unx_system_h,v 1.1.1.1 2006/08/17 14:56:23 robert Exp $
--- sal/osl/unx/system.h.orig Wed Jul 19 11:39:50 2006
+++ sal/osl/unx/system.h Tue Aug 15 14:03:10 2006
@@ -198,6 +198,28 @@
# define NO_PTHREAD_RTL
#endif
+#ifdef OPENBSD
+# define ETIME ETIMEDOUT
+# define _POSIX_THREAD_SYSCALL_SOFT 1
+# include <pthread.h>
+# include <sys/sem.h>
+# include <semaphore.h>
+# include <dlfcn.h>
+# include <sys/filio.h>
+# include <sys/ioctl.h>
+# include <sys/param.h>
+# include <sys/time.h>
+# include <sys/uio.h>
+# include <sys/exec.h>
+# include <sys/un.h>
+# include <netinet/tcp.h>
+# define IORESOURCE_TRANSFER_BSD
+# include <machine/endian.h>
+# define PTR_SIZE_T(s) ((size_t *)&(s))
+# define NO_PTHREAD_RTL
+# define NO_PTHREAD_PRIORITY
+#endif
+
#ifdef SCO
# define AF_IPX -1
# include <strings.h>
@@ -386,7 +408,7 @@ int macxp_resolveAlias(char *path, int b
!defined(LINUX) && !defined(NETBSD) && !defined(FREEBSD) && !defined(SCO) && \
!defined(AIX) && !defined(HPUX) && \
!defined(SOLARIS) && !defined(IRIX) && !defined(MAC) && \
- !defined(MACOSX)
+ !defined(MACOSX) && !defined(OPENBSD)
# error "Target platform not specified!"
#endif

12
editors/openoffice/patches/patch-sal_osl_unx_tempfile_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-sal_osl_unx_tempfile_c,v 1.1.1.1 2006/08/17 14:56:23 robert Exp $
--- sal/osl/unx/tempfile.c.orig Thu May 4 10:48:55 2006
+++ sal/osl/unx/tempfile.c Tue Aug 15 14:03:10 2006
@@ -88,7 +88,7 @@ oslFileError SAL_CALL osl_getTempDirURL(
if ( !pValue )
{
pValue = getenv( "TMP" );
-#if defined(SOLARIS) || defined (LINUX) || defined (FREEBSD)
+#if defined(SOLARIS) || defined (LINUX) || defined (FREEBSD) || defined (OPENBSD)
if ( !pValue )
pValue = P_tmpdir;
#endif

11
editors/openoffice/patches/patch-sal_osl_unx_thread_c Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-sal_osl_unx_thread_c,v 1.1.1.1 2006/08/17 14:56:23 robert Exp $
--- sal/osl/unx/thread.c.orig Thu Jul 6 16:42:32 2006
+++ sal/osl/unx/thread.c Tue Aug 15 14:03:10 2006
@@ -35,6 +35,7 @@
#include "system.h"
#include <string.h>
+#include <sched.h>
#ifndef _OSL_DIAGNOSE_H_
#include <osl/diagnose.h>

12
editors/openoffice/patches/patch-sal_osl_unx_time_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-sal_osl_unx_time_c,v 1.1.1.1 2006/08/17 14:56:23 robert Exp $
--- sal/osl/unx/time.c.orig Thu Sep 8 17:02:55 2005
+++ sal/osl/unx/time.c Tue Aug 15 14:03:10 2006
@@ -40,7 +40,7 @@
#include <osl/time.h>
/* FIXME: detection should be done in configure script */
-#if defined(MACOSX) || defined(FREEBSD) || defined(NETBSD) || defined(LINUX)
+#if defined(MACOSX) || defined(FREEBSD) || defined(NETBSD) || defined(LINUX) || defined(OPENBSD)
#define STRUCT_TM_HAS_GMTOFF 1
#elif defined(SOLARIS)

12
editors/openoffice/patches/patch-sal_rtl_source_alloc_arena_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-sal_rtl_source_alloc_arena_c,v 1.1.1.1 2006/08/17 14:56:24 robert Exp $
--- sal/rtl/source/alloc_arena.c.orig Tue Jun 20 06:28:24 2006
+++ sal/rtl/source/alloc_arena.c Tue Aug 15 14:03:10 2006
@@ -1239,7 +1239,7 @@ static sal_Size
rtl_machdep_pagesize (void)
{
#if defined(SAL_UNX)
-#if defined(FREEBSD) || defined(NETBSD)
+#if defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD)
return ((sal_Size)getpagesize());
#else /* POSIX */
return ((sal_Size)sysconf(_SC_PAGESIZE));

12
editors/openoffice/patches/patch-sal_rtl_source_alloc_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-sal_rtl_source_alloc_c,v 1.1.1.1 2006/08/17 14:56:24 robert Exp $
--- sal/rtl/source/alloc.c.orig Tue Jun 20 06:28:13 2006
+++ sal/rtl/source/alloc.c Tue Aug 15 14:03:10 2006
@@ -85,7 +85,7 @@ typedef pthread_mutex_t mutex_type;
#define RTL_MUTEX_ACQUIRE(a) pthread_mutex_lock((a))
#define RTL_MUTEX_RELEASE(a) pthread_mutex_unlock((a))
-#if defined(FREEBSD) || defined(NETBSD) || defined(MACOSX)
+#if defined(FREEBSD) || defined(NETBSD) || defined(MACOSX) || defined (OPENBSD)
static sal_Size __rtl_memory_vmpagesize (void)
{
/* xBSD */

12
editors/openoffice/patches/patch-sal_rtl_source_macro_hxx Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-sal_rtl_source_macro_hxx,v 1.1.1.1 2006/08/17 14:56:24 robert Exp $
--- sal/rtl/source/macro.hxx.orig Wed Oct 5 13:40:14 2005
+++ sal/rtl/source/macro.hxx Tue Aug 15 14:03:10 2006
@@ -53,6 +53,8 @@
#define THIS_OS "FreeBSD"
#elif defined IRIX
#define THIS_OS "Irix"
+#elif defined OPENBSD
+#define THIS_OS "OpenBSD"
#endif
#if ! defined THIS_OS

12
editors/openoffice/patches/patch-sal_workben_makefile_mk Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-sal_workben_makefile_mk,v 1.1.1.1 2006/08/17 14:56:24 robert Exp $
--- sal/workben/makefile.mk.orig Thu Sep 8 18:50:39 2005
+++ sal/workben/makefile.mk Tue Aug 15 14:03:10 2006
@@ -352,7 +352,7 @@ APP4DEPN= $(SLB)$/sal.lib
# tgetpwnam
#
.IF "$(TESTAPP)" == "tgetpwnam"
-.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" || "$(OS)"=="OPENBSD"
CXXFILES= tgetpwnam.cxx
OBJFILES= $(OBJ)$/tgetpwnam.obj

12
editors/openoffice/patches/patch-salhelper_source_gcc3_linux_intel_map Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-salhelper_source_gcc3_linux_intel_map,v 1.1.1.1 2006/08/17 14:56:24 robert Exp $
--- salhelper/source/gcc3_linux_intel.map.orig Wed Nov 3 10:10:31 2004
+++ salhelper/source/gcc3_linux_intel.map Tue Aug 15 14:03:10 2006
@@ -22,7 +22,7 @@ UDK_3_0_0 { # should have been UDK_3.0
# _ZTIN9salhelper21SimpleReferenceObjectE;
# _ZTSN9salhelper21SimpleReferenceObjectE;
_ZTVN9salhelper21SimpleReferenceObjectE;
-
+ _ZN9salhelper21SimpleReferenceObjectnwEm;
local:
*;
};

12
editors/openoffice/patches/patch-salhelper_source_makefile_mk Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-salhelper_source_makefile_mk,v 1.1.1.1 2006/08/17 14:56:24 robert Exp $
--- salhelper/source/makefile.mk.orig Thu Jul 20 18:16:28 2006
+++ salhelper/source/makefile.mk Tue Aug 15 14:03:10 2006
@@ -86,6 +86,8 @@ SHL1VERSIONMAP=gcc3_linux_intel.map
SHL1VERSIONMAP=gcc3_linux_intel.map
.ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXSgcc3"
SHL1VERSIONMAP=gcc3_linux_intel.map
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="OPENBSDIgcc3"
+SHL1VERSIONMAP=gcc3_linux_intel.map
.ENDIF
# --- Targets ------------------------------------------------------

12
editors/openoffice/patches/patch-salhelper_test_rtti_makefile_mk Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-salhelper_test_rtti_makefile_mk,v 1.1.1.1 2006/08/17 14:56:24 robert Exp $
--- salhelper/test/rtti/makefile.mk.orig Thu Sep 8 19:02:46 2005
+++ salhelper/test/rtti/makefile.mk Tue Aug 15 14:03:10 2006
@@ -93,6 +93,8 @@ SHL1VERSIONMAP= lngi.map
SHL1VERSIONMAP= gcc2_freebsd_intel.map
.ELIF "$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3"
SHL1VERSIONMAP= gcc3_freebsd_intel.map
+.ELIF "$(OS)$(CPU)$(COMNAME)" == "GCCOPENBSDIgcc3"
+SHL1VERSIONMAP= gcc3_linux_intel.map
.ENDIF

57
editors/openoffice/patches/patch-scp2_source_ooo_file_library_ooo_scp Normal file
View File

@ -0,0 +1,57 @@
$OpenBSD: patch-scp2_source_ooo_file_library_ooo_scp,v 1.1.1.1 2006/08/17 14:56:24 robert Exp $
--- scp2/source/ooo/file_library_ooo.scp.orig Thu Jul 13 12:26:22 2006
+++ scp2/source/ooo/file_library_ooo.scp Tue Aug 15 14:03:11 2006
@@ -819,7 +819,7 @@ File gid_File_Lib_Freetype
#endif
TXT_FILE_BODY;
Styles = (PACKED);
- #if defined (FREEBSD) || defined (NETBSD)
+ #if defined (FREEBSD) || defined (NETBSD) || defined (OPENBSD)
Name = "libfreetype.so.9";
#else
Name = "libfreetype.so.6";
@@ -862,7 +862,7 @@ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Fwl
STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Fwm , fwm)
-#if ! (defined (FREEBSD) || defined (NETBSD) || defined(MACOSX) || defined(SYSTEM_STDLIBS))
+#if ! (defined (FREEBSD) || defined (NETBSD) || defined(MACOSX) || defined(SYSTEM_STDLIBS) || defined (OPENBSD))
#if defined( _gcc3 )
File gid_File_Lib_Gcc
@@ -876,7 +876,7 @@ End
#endif
-#if ! (defined (FREEBSD) || defined (NETBSD) || defined(MACOSX) || defined(SYSTEM_STDLIBS))
+#if ! (defined (FREEBSD) || defined (NETBSD) || defined(MACOSX) || defined(SYSTEM_STDLIBS) || defined (OPENBSD))
#if defined( _gcc3 )
File gid_File_Lib_Stdc
@@ -890,7 +890,7 @@ End
#endif
-#if defined(LINUX) || defined(FREEBSD) || defined(NETBSD) || defined(IRIX) || defined(MACOSX)
+#if defined(LINUX) || defined(FREEBSD) || defined(NETBSD) || defined(IRIX) || defined(MACOSX) || defined(OPENBSD)
File gid_File_Lib_Gcc2_Uno
TXT_FILE_BODY;
@@ -1903,7 +1903,7 @@ File gid_File_Lib_Stlport
#ifdef _STLP_DEBUG
#ifdef UNX
#if defined(_gcc3) || defined(_GCC)
- #ifdef IRIX
+ #if defined(IRIX) || defined(OPENBSD)
Name = STRING(CONCAT3(libstlport_,gcc_stldebug,.so.4.5));
#else
Name = STRING(CONCAT3(libstlport_,gcc_stldebug,UNXSUFFIX));
@@ -1927,7 +1927,7 @@ File gid_File_Lib_Stlport
#else
#ifdef UNX
#if defined(_gcc3) || defined(_GCC)
- #ifdef IRIX
+ #if defined(IRIX) || defined(OPENBSD)
Name = STRING(CONCAT3(libstlport_,gcc,.so.4.5));
#else
Name = STRING(CONCAT3(libstlport_,gcc,UNXSUFFIX));

21
editors/openoffice/patches/patch-scp2_source_ure_ure_scp Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-scp2_source_ure_ure_scp,v 1.1.1.1 2006/08/17 14:56:22 robert Exp $
--- scp2/source/ure/ure.scp.orig Fri Sep 9 03:46:59 2005
+++ scp2/source/ure/ure.scp Tue Aug 15 14:03:11 2006
@@ -606,7 +606,7 @@ End
#if defined _gcc3 && \
!(defined FREEBSD || defined NETBSD || defined MACOSX \
- || defined SYSTEM_STDLIBS)
+ || defined SYSTEM_STDLIBS || defined OPENBSD)
File gid_File_Dl_GccS
TXT_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
@@ -617,7 +617,7 @@ End
#if defined _gcc3 && \
!(defined FREEBSD || defined NETBSD || defined MACOSX \
- || defined SYSTEM_STDLIBS)
+ || defined SYSTEM_STDLIBS || defined OPENBSD)
File gid_File_Dl_Stdcpp
TXT_FILE_BODY;
Dir = SCP2_URE_DL_DIR;

20
editors/openoffice/patches/patch-scp2_source_writer_file_writer_scp Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-scp2_source_writer_file_writer_scp,v 1.1.1.1 2006/08/17 14:56:24 robert Exp $
--- scp2/source/writer/file_writer.scp.orig Wed Aug 16 08:07:50 2006
+++ scp2/source/writer/file_writer.scp Wed Aug 16 08:08:18 2006
@@ -56,12 +56,16 @@ File gid_File_Exe_Swriter
Styles = (PACKED);
End
+#ifdef SOLAR_JAVA
+
File gid_File_Jar_Writer2latex
TXT_FILE_BODY;
Name = "writer2latex.jar";
Dir = gid_Dir_Classes;
Styles = (PACKED,PATCH);
End
+
+#endif
#if defined UNX && ! defined MACOSX

15
editors/openoffice/patches/patch-sdk_oo_util_makefile_pmk Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-sdk_oo_util_makefile_pmk,v 1.1.1.1 2006/08/17 14:56:24 robert Exp $
--- sdk_oo/util/makefile.pmk.orig Fri Nov 11 11:53:22 2005
+++ sdk_oo/util/makefile.pmk Tue Aug 15 14:03:11 2006
@@ -132,6 +132,11 @@ DESTPLATFROM=irix
# MACOSX
###########
DESTPLATFROM=macosx
+.ELIF "$(OS)"=="OPENBSD"
+###################
+# OPENBSD
+###################
+DESTPLATFROM=openbsd
.ENDIF
DESTDIRBIN=$(DESTDIR)$/$(DESTPLATFROM)$/bin

30
editors/openoffice/patches/patch-shell_source_backends_localebe_localebackend_cxx Normal file
View File

@ -0,0 +1,30 @@
$OpenBSD: patch-shell_source_backends_localebe_localebackend_cxx,v 1.1.1.1 2006/08/17 14:56:24 robert Exp $
--- shell/source/backends/localebe/localebackend.cxx.orig Mon Jun 19 16:16:34 2006
+++ shell/source/backends/localebe/localebackend.cxx Tue Aug 15 14:03:11 2006
@@ -50,7 +50,7 @@
#include <stdio.h>
-#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD)
+#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD)
#include <rtl/ustrbuf.hxx>
#include <locale.h>
@@ -267,7 +267,7 @@ LocaleBackend* LocaleBackend::createInst
rtl::OUString LocaleBackend::getLocale(void)
{
-#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD)
+#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD)
return ImplGetLocale(LC_CTYPE);
#elif defined (MACOSX)
return ImplGetLocale("AppleLocale");
@@ -280,7 +280,7 @@ rtl::OUString LocaleBackend::getLocale(v
rtl::OUString LocaleBackend::getUILocale(void)
{
-#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD)
+#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD)
return ImplGetLocale(LC_MESSAGES);
#elif defined(MACOSX)
return ImplGetLocale("AppleLanguages");

12
editors/openoffice/patches/patch-shell_source_unix_misc_makefile_mk Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-shell_source_unix_misc_makefile_mk,v 1.1.1.1 2006/08/17 14:56:24 robert Exp $
--- shell/source/unix/misc/makefile.mk.orig Wed Sep 7 21:55:11 2005
+++ shell/source/unix/misc/makefile.mk Tue Aug 15 14:03:11 2006
@@ -65,7 +65,7 @@ APP1TARGET = gnome-open-url.bin
APP1OBJS = \
$(OBJ)$/gnome-open-url.obj
APP1LIBS =
-.IF "$(OS)"!="FREEBSD"
+.IF "$(OS)"!="OPENBSD"
APP1STDLIBS=-ldl
.ENDIF

12
editors/openoffice/patches/patch-slideshow_source_engine_activities_continuouskeytimeactivitybase_cxx Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-slideshow_source_engine_activities_continuouskeytimeactivitybase_cxx,v 1.1.1.1 2006/08/17 14:56:24 robert Exp $
--- slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx.orig Wed Jul 26 09:28:09 2006
+++ slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx Tue Aug 15 14:03:11 2006
@@ -98,7 +98,7 @@ namespace presentation
mnLastIndex = ::std::min< ::std::ptrdiff_t >(
maKeyTimes.size()-2,
// range is ensured by max below
- ::std::max( 0,
+ ::std::max( (long int)0,
::std::distance( maKeyTimes.begin(),
::std::lower_bound( maKeyTimes.begin(),
maKeyTimes.end(),

13
editors/openoffice/patches/patch-solenv_bin_mapgen_pl Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-solenv_bin_mapgen_pl,v 1.1.1.1 2006/08/17 14:56:24 robert Exp $
--- solenv/bin/mapgen.pl.orig Thu Sep 8 00:10:44 2005
+++ solenv/bin/mapgen.pl Tue Aug 15 14:03:11 2006
@@ -143,7 +143,8 @@ sub filter_symbols {
$env_section = '1' and next if ((/^# SOLARIS #$/) && ($ENV{OS} eq 'SOLARIS'));
$env_section = '1' and next if ((/^# LINUX #$/) && ($ENV{OS} eq 'LINUX'));
$env_section = '1' and next if ((/^# FREEBSD #$/) && ($ENV{OS} eq 'FREEBSD'));
- last if ($env_section && ((/^# SOLARIS #$/) || (/^# FREEBSD #$/) || (/^# LINUX #$/)));
+ $env_section = '1' and next if ((/^# OPENBSD #$/) && ($ENV{OS} eq 'OPENBSD'));
+ last if ($env_section && ((/^# SOLARIS #$/) || (/^# FREEBSD #$/) || (/^# OPENBSD #$/) || (/^# LINUX #$/)));
next if (!$_ || /^#/);
push(@filters, $_);
};

12
editors/openoffice/patches/patch-solenv_bin_modules_installer_globals_pm Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-solenv_bin_modules_installer_globals_pm,v 1.1.1.1 2006/08/17 14:56:24 robert Exp $
--- solenv/bin/modules/installer/globals.pm.orig Mon Jul 10 20:49:40 2006
+++ solenv/bin/modules/installer/globals.pm Tue Aug 15 14:03:11 2006
@@ -144,7 +144,7 @@ BEGIN
$jdklib = "";
$jrepath = "";
- $globallogging = 0;
+ $globallogging = 1;
$logfilename = "logfile.log"; # the default logfile name for global errors
@logfileinfo = ();
@errorlogfileinfo = ();

17
editors/openoffice/patches/patch-solenv_bin_modules_installer_regmerge_pm Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-solenv_bin_modules_installer_regmerge_pm,v 1.1.1.1 2006/08/17 14:56:24 robert Exp $
--- solenv/bin/modules/installer/regmerge.pm.orig Thu Sep 8 11:09:09 2005
+++ solenv/bin/modules/installer/regmerge.pm Tue Aug 15 14:03:11 2006
@@ -219,7 +219,13 @@ sub merge_files
my $databasename = $databasefile->{'Name'};
my $databasedest = $databasedir . $installer::globals::separator . $databasename;
+ my $logline = "copy_one_file $databasesource $databasedest\n";
+ push( @installer::globals::logfileinfo, $logline);
+
installer::systemactions::copy_one_file($databasesource, $databasedest);
+ $logline = "copy_one_file done\n";
+ push( @installer::globals::logfileinfo, $logline);
+
$databasefile->{'sourcepath'} = $databasedest; # new sourcepath for the StarRegistry file
# One call for every merge particle. This is only possible, if there are only a few merge particles.

12
editors/openoffice/patches/patch-solenv_bin_modules_installer_worker_pm Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-solenv_bin_modules_installer_worker_pm,v 1.1.1.1 2006/08/17 14:56:24 robert Exp $
--- solenv/bin/modules/installer/worker.pm.orig Mon Jul 10 13:00:31 2006
+++ solenv/bin/modules/installer/worker.pm Tue Aug 15 14:03:11 2006
@@ -511,7 +511,7 @@ sub clean_output_tree
if ( -d $installer::globals::removedirs[$i] )
{
installer::logger::print_message( "... removing directory $installer::globals::removedirs[$i] ...\n" );
- installer::systemactions::remove_complete_directory($installer::globals::removedirs[$i], 1);
+# installer::systemactions::remove_complete_directory($installer::globals::removedirs[$i], 1);
}
}

27
editors/openoffice/patches/patch-solenv_bin_modules_osarch_pm Normal file
View File

@ -0,0 +1,27 @@
$OpenBSD: patch-solenv_bin_modules_osarch_pm,v 1.1.1.1 2006/08/17 14:56:24 robert Exp $
--- solenv/bin/modules/osarch.pm.orig Thu Mar 27 12:47:56 2003
+++ solenv/bin/modules/osarch.pm Tue Aug 15 14:03:11 2006
@@ -22,6 +22,7 @@ chop( $m_str, $s_str );
"Linux", "linux",
"FreeBSD", "freebsd",
"NetBSD", "netbsd",
+ "OpenBSD", "openbsd",
"OSF1", "decunix",
"SCO_SV", "scoosr5",
# "SCO_SV", "scouw21",
@@ -37,6 +38,7 @@ chop( $m_str, $s_str );
"Linux", "-DLINUX",
"FreeBSD", "-DFREEBSD",
"NetBSD", "-DNETBSD",
+ "OpenBSD", "-DOPENBSD",
"OSF1", "-DSYSV -DDECUNIX",
"SCO_SV", "-DSYSV -DSCO -DSCO_OSR5",
# "SCO_SV", "-DSYSV -DSCO -DSCO_UW21",
@@ -53,6 +55,7 @@ chop( $m_str, $s_str );
"Linux", "lng",
"FreeBSD", "fbsd",
"NetBSD", "bsd",
+ "OpenBSD", "obsd",
"SCO_SV", "sco",
"Darwin", "macx",
"Mac OS", "macx",

12
editors/openoffice/patches/patch-solenv_config_ssolar_cmn Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-solenv_config_ssolar_cmn,v 1.1.1.1 2006/08/17 14:56:24 robert Exp $
--- solenv/config/ssolar.cmn.orig Fri Jun 2 14:31:52 2006
+++ solenv/config/ssolar.cmn Tue Aug 15 14:03:11 2006
@@ -516,7 +516,7 @@ unxaixp
}
}
-unxfbsdi
+unxobsdi
{
standlst
{

60
editors/openoffice/patches/patch-solenv_config_ssrc680_ini Normal file
View File

@ -0,0 +1,60 @@
$OpenBSD: patch-solenv_config_ssrc680_ini,v 1.1.1.1 2006/08/17 14:56:24 robert Exp $
--- solenv/config/ssrc680.ini.orig Wed Jul 19 11:38:15 2006
+++ solenv/config/ssrc680.ini Tue Aug 15 14:03:11 2006
@@ -2454,7 +2454,7 @@ unxmacxp
}
}
-unxfbsdi
+unxobsdi
{
extern
{
@@ -2628,7 +2628,7 @@ unxfbsdi
}
common2
{
- OS FREEBSD
+ OS OPENBSD
GLIBC GLIBC
GUI UNX
GUIBASE unx
@@ -2636,22 +2636,22 @@ unxfbsdi
COM GCC
CPU I
CPUNAME INTEL
- INPATH unxfbsdi%PROEXT%
- GVERDIR unxfbsdi%PROEXT%
- OUTPATH unxfbsdi
+ INPATH unxobsdi%PROEXT%
+ GVERDIR unxobsdi%PROEXT%
+ OUTPATH unxobsdi
CVER C300
GVER VCL
XPVERSION 3
SOLARUPD %UPD%
TEMP /tmp
TMP /tmp
- BUILD_TOOLS %SOLARROOT%/bt_unxfbsdi/bin
- ENV_TOOLS %SOLARROOT%/et_unxfbsdi/bin
+ BUILD_TOOLS %SOLARROOT%/bt_unxobsdi/bin
+ ENV_TOOLS %SOLARROOT%/et_unxobsdi/bin
COMMON_BUILD_TOOLS %SOLARROOT%$/btools
COMMON_ENV_TOOLS %SOLARROOT%$/etools
SYSBASE %SOLAR_SYSBASE_ROOT%
- SOLAR_STLPATH %SOLARVERSION%$/unxfbsdi%PROEXT%$/inc%UPDMINOREXT%$/stl
- SOLAR_STLLIBPATH %SOLARVERSION%$/unxfbsdi%PROEXT%$/lib%UPDMINOREXT%
+ SOLAR_STLPATH %SOLARVERSION%$/unxobsdi%PROEXT%$/inc%UPDMINOREXT%$/stl
+ SOLAR_STLLIBPATH %SOLARVERSION%$/unxobsdi%PROEXT%$/lib%UPDMINOREXT%
JDK13PATH %SOLAR_JDK13PATH%
JDK14PATH %SOLAR_JDK14PATH%
JDK15PATH %SOLAR_JDK15PATH%
@@ -2668,7 +2668,7 @@ unxfbsdi
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 -DINTEL -DX86 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DGLIBC=%GLIBC% -DSUPD=%UPD% %PROSWITCH% -DUPDVER=""'"'"SV%UPD%"'"'""
+ SOLARDEF -DUNX -DGCC -DC301 -D_PTHREADS -DOPENBSD -DBSD -DINTEL -DX86 -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

55
editors/openoffice/patches/patch-solenv_config_stand_lst Normal file
View File

@ -0,0 +1,55 @@
$OpenBSD: patch-solenv_config_stand_lst,v 1.1.1.1 2006/08/17 14:56:24 robert Exp $
--- solenv/config/stand.lst.orig Fri May 19 11:36:56 2006
+++ solenv/config/stand.lst Tue Aug 15 14:03:11 2006
@@ -37,10 +37,10 @@ SRC680
}
Environments
{
- unxfbsdi.pro
+ unxobsdi.pro
{
prio 12
- setsolar -SRC680 -pro -bsclient unxfbsdi
+ setsolar -SRC680 -pro -bsclient unxobsdi
}
unxlngi5.pro
{
@@ -97,10 +97,10 @@ SRC680
prio 15
setsolar -SRC680 -pro -bsclient unxsols64b1
}
- unxfbsdi
+ unxobsdi
{
prio 15
- setsolar -SRC680 -bsclient unxfbsdi
+ setsolar -SRC680 -bsclient unxobsdi
}
unxlngi5
{
@@ -996,10 +996,10 @@ OOB680
}
Environments
{
- unxfbsdi.pro
+ unxobsdi.pro
{
prio 12
- setsolar -OOB680 -pro -bsclient unxfbsdi
+ setsolar -OOB680 -pro -bsclient unxobsdi
}
unxlngi5.pro
{
@@ -1056,10 +1056,10 @@ OOB680
prio 15
setsolar -OOB680 -pro -bsclient unxsols64b1
}
- unxfbsdi
+ unxobsdi
{
prio 15
- setsolar -OOB680 -bsclient unxfbsdi
+ setsolar -OOB680 -bsclient unxobsdi
}
unxlngi5
{

12
editors/openoffice/patches/patch-solenv_inc_libs_mk Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-solenv_inc_libs_mk,v 1.1.1.1 2006/08/17 14:56:24 robert Exp $
--- solenv/inc/libs.mk.orig Wed Jul 19 11:38:31 2006
+++ solenv/inc/libs.mk Tue Aug 15 14:03:11 2006
@@ -175,7 +175,7 @@ ZLIB3RDLIB=-lz
ZLIB3RDLIB=-lzlib
.ENDIF
.IF "$(SYSTEM_JPEG)"=="YES"
-.IF "$(SOLAR_JAVA)" != "" && "$(JDK)" != "gcj" && "$(OS)" != "MACOSX"
+.IF "$(SOLAR_JAVA)" != "" && "$(JDK)" != "gcj" && "$(OS)" != "MACOSX" && "$(OS)" != "OPENBSD"
#i34482# Blackdown/Sun jdk is in the libsearch patch and has a libjpeg :-(
.IF "$(OS)" == "FREEBSD"
JPEG3RDLIB=/usr/local/lib/libjpeg.so

6
editors/openoffice/patches/patch-solenv_inc_startup_OPENBSD_macros_mk Normal file
View File

@ -0,0 +1,6 @@
$OpenBSD: patch-solenv_inc_startup_OPENBSD_macros_mk,v 1.1.1.1 2006/08/17 14:56:24 robert Exp $
--- solenv/inc/startup/OPENBSD/macros.mk.orig Wed Aug 16 10:28:21 2006
+++ solenv/inc/startup/OPENBSD/macros.mk Tue Aug 15 14:06:56 2006
@@ -0,0 +1,2 @@
+
+.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d:d:d)UNIX$/macros.mk

13
editors/openoffice/patches/patch-solenv_inc_tg_ext_mk Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-solenv_inc_tg_ext_mk,v 1.1.1.1 2006/08/17 14:56:24 robert Exp $
--- solenv/inc/tg_ext.mk.orig Wed Jul 5 23:58:11 2006
+++ solenv/inc/tg_ext.mk Tue Aug 15 14:03:11 2006
@@ -48,7 +48,9 @@ INCLUDE!:=$(INCLUDE:s/ -I/;/)
.IF "$(OS)"!="NETBSD"
.IF "$(OS)"!="FREEBSD"
+.IF "$(OS)"!="OPENBSD"
PATCHFLAGS=-b
+.ENDIF
.ENDIF # "$(OS)"=="FREEBSD"
.ENDIF # "$(OS)"=="NETBSD"

13
editors/openoffice/patches/patch-solenv_inc_unx_mk Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-solenv_inc_unx_mk,v 1.1.1.1 2006/08/17 14:56:24 robert Exp $
--- solenv/inc/unx.mk.orig Wed Jul 19 11:26:37 2006
+++ solenv/inc/unx.mk Tue Aug 15 14:03:11 2006
@@ -36,6 +36,9 @@
# --- Unix-Environment ---------------------------------------
# Used if "$(GUI)" == "UNX"
+.IF "$(COM)$(OS)$(CPU)" == "GCCOPENBSDI"
+.INCLUDE : unxobsdi.mk
+.ENDIF
# Dieses Define gilt fuer alle WNT- Plattformen
# fuer Compiler, wo kein Java unterstuetzt wird, muss dies ge'undeft werden

Some files were not shown because too many files have changed in this diff Show More