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

Fix debug FLAVOR so it builds and installs binaries with symbols:

Browse Source 
- add -dontstrip to packaging script to get useful debug binaries
installed
- remove --enable-debug since that makes the debug build too big (>18G)
for me to build. Add back later as a possible verbose_debug flavor.

Use PATCHORIG so that update-patches doesn't pickup internal .orig files.
Idea from espie@

Add a mutex to make the call to getpwuid thread safe.
This commit is contained in:
kurt 2006-08-20 03:36:52 +00:00
parent e79453cff2
commit 94f8549435
121 changed files with 399 additions and 376 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
editors/openoffice/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1.1.1 2006/08/17 14:56:21 robert Exp $
# $OpenBSD: Makefile,v 1.2 2006/08/20 03:36:52 kurt Exp $
ONLY_FOR_ARCHS= i386
@ -8,7 +8,7 @@ M= 179
VERSION= SRC680_m${M}
DISTNAME= OOo_${VERSION}_source
WRKDIST= ${WRKDIR}/ooo_${VERSION}_src
PKGNAME= openoffice-2.0.3m${M}
PKGNAME= openoffice-2.0.3m${M}p0
CATEGORIES= editors productivity
SHARED_LIBS= icudata 26.0 \
@ -52,6 +52,7 @@ USE_GMAKE= Yes
NO_REGRESS= Yes
VMEM_WARNING= Yes
PATCHORIG= .orig.port
WRKCONF= ${WRKSRC}/config_office
CONFIGURE_STYLE=gnu
@ -85,7 +86,7 @@ FLAVORS= debug
FLAVOR?=
.if ${FLAVOR:L:Mdebug}
CONFIGURE_ARGS+= --enable-debug --enable-crashdump=yes --enable-symbols
CONFIGURE_ARGS+= --enable-crashdump --enable-symbols
.endif
NCPU= `sysctl -n hw.ncpu`
@ -111,7 +112,7 @@ pre-configure:
do-build:
@cd ${WRKBUILD} && \
./bootstrap && \
${TCSH} -c 'source OpenBSDEnv.Set && cd instsetoo_native && \
${TCSH} -c 'source OpenBSDEnv.Set && cd instsetoo_native && \
build.pl -P${NCPU} --all'
do-install:

6
editors/openoffice/patches/patch-autodoc_source_mkinc_fullcpp_mk
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-autodoc_source_mkinc_fullcpp_mk,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- autodoc/source/mkinc/fullcpp.mk.orig.port Wed Sep 7 14:10:59 2005
+++ autodoc/source/mkinc/fullcpp.mk Fri Aug 18 15:47:41 2006
@@ -59,7 +59,7 @@ CFLAGS+= -YX"precomp.h" -Fp$(PRJ)$/$(INP
.ENDIF

6
editors/openoffice/patches/patch-automation_source_testtool_objtest_cxx
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-automation_source_testtool_objtest_cxx,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- automation/source/testtool/objtest.cxx.orig.port Thu Jul 6 10:33:04 2006
+++ automation/source/testtool/objtest.cxx Fri Aug 18 15:47:41 2006
@@ -532,6 +532,8 @@ void TestToolObj::LoadIniFile() // La
abGP.Append( "14" );
#elif defined LINUX && defined X86_64

6
editors/openoffice/patches/patch-berkeleydb_db-4_2_52_patch
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-berkeleydb_db-4_2_52_patch,v 1.1.1.1 2006/08/17 14:56:21 robert Exp $
--- berkeleydb/db-4.2.52.patch.orig Tue Jul 25 12:23:22 2006
+++ berkeleydb/db-4.2.52.patch Tue Aug 15 14:03:09 2006
$OpenBSD: patch-berkeleydb_db-4_2_52_patch,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- berkeleydb/db-4.2.52.patch.orig.port Tue Jul 25 06:23:22 2006
+++ berkeleydb/db-4.2.52.patch Fri Aug 18 15:47:42 2006
@@ -521,6 +521,19 @@
*** misc/db-4.2.52.NC/dist/configure Wed Dec 3 22:10:02 2003
--- misc/build/db-4.2.52.NC/dist/configure Tue Jul 25 09:05:20 2006

6
editors/openoffice/patches/patch-binfilter_bf_sc_source_core_data_sc_cell_cxx
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-binfilter_bf_sc_source_core_data_sc_cell_cxx,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- binfilter/bf_sc/source/core/data/sc_cell.cxx.orig.port Thu Jul 6 05:12:29 2006
+++ binfilter/bf_sc/source/core/data/sc_cell.cxx Fri Aug 18 15:47:42 2006
@@ -49,7 +49,7 @@
#include <mac_end.h>
#endif

6
editors/openoffice/patches/patch-bridges_prj_build_lst
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-bridges_prj_build_lst,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- bridges/prj/build.lst.orig.port Wed Jul 19 05:28:51 2006
+++ bridges/prj/build.lst Fri Aug 18 15:47:42 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

6
editors/openoffice/patches/patch-bridges_source_cpp_uno_shared_vtablefactory_cxx
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-bridges_source_cpp_uno_shared_vtablefactory_cxx,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- bridges/source/cpp_uno/shared/vtablefactory.cxx.orig.port Mon Jun 19 19:46:29 2006
+++ bridges/source/cpp_uno/shared/vtablefactory.cxx Fri Aug 18 15:47:42 2006
@@ -69,7 +69,7 @@ namespace {
extern "C" void * SAL_CALL allocExec(rtl_arena_type *, sal_Size * size) {
sal_Size pagesize;

6
editors/openoffice/patches/patch-cli_ure_version_makefile_mk
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-cli_ure_version_makefile_mk,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- cli_ure/version/makefile.mk.orig.port Tue Jul 25 03:55:26 2006
+++ cli_ure/version/makefile.mk Fri Aug 18 15:47:42 2006
@@ -52,8 +52,6 @@ ECHOQUOTE='
ECHOQUOTE=
.ENDIF

6
editors/openoffice/patches/patch-config_office_configure
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-config_office_configure,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- config_office/configure.orig.port Wed Jul 19 05:40:09 2006
+++ config_office/configure Fri Aug 18 15:47:42 2006
@@ -3547,6 +3547,15 @@ echo $ECHO_N "checking which thread libr
echo "${ECHO_T}$PTHREAD_LIBS" >&6; }
_os=FreeBSD

6
editors/openoffice/patches/patch-config_office_configure_in
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-config_office_configure_in,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- config_office/configure.in.orig.port Wed Jul 19 05:52:02 2006
+++ config_office/configure.in Fri Aug 18 15:47:42 2006
@@ -755,6 +755,15 @@ case "$build_os" in
AC_MSG_RESULT([$PTHREAD_LIBS])
_os=FreeBSD

6
editors/openoffice/patches/patch-config_office_set_soenv_in
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-config_office_set_soenv_in,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- config_office/set_soenv.in.orig.port Wed Jul 19 05:52:27 2006
+++ config_office/set_soenv.in Fri Aug 18 15:47:46 2006
@@ -368,6 +368,34 @@ elsif ( $platform =~ m/freebsd/ )
$INPATH = $OUTPATH.$PROEXT;
$GVERDIR = $INPATH;

6
editors/openoffice/patches/patch-cppu_source_typelib_typelib_cxx
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-cppu_source_typelib_typelib_cxx,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- cppu/source/typelib/typelib.cxx.orig.port Mon Jun 19 09:13:24 2006
+++ cppu/source/typelib/typelib.cxx Fri Aug 18 15:47:42 2006
@@ -643,7 +643,7 @@ extern "C" void SAL_CALL typelib_typedes
pRet = (typelib_TypeDescription *)pTmp;
#if OSL_DEBUG_LEVEL > 1

6
editors/openoffice/patches/patch-cppu_source_uno_data_cxx
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-cppu_source_uno_data_cxx,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- cppu/source/uno/data.cxx.orig.port Fri Feb 3 12:32:32 2006
+++ cppu/source/uno/data.cxx Fri Aug 18 15:47:42 2006
@@ -364,7 +364,7 @@ sal_Bool SAL_CALL uno_type_isAssignableF
#endif

6
editors/openoffice/patches/patch-cppu_util_makefile_mk
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-cppu_util_makefile_mk,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- cppu/util/makefile.mk.orig.port Wed Apr 19 09:50:07 2006
+++ cppu/util/makefile.mk Fri Aug 18 15:47:42 2006
@@ -65,7 +65,9 @@ SHL1STDLIBS = $(SALLIB) $(SALHELPERLIB)
SHL1DEPN=
SHL1IMPLIB=i$(TARGET)

6
editors/openoffice/patches/patch-cppuhelper_source_makefile_mk
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-cppuhelper_source_makefile_mk,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- cppuhelper/source/makefile.mk.orig.port Tue Jun 20 07:58:34 2006
+++ cppuhelper/source/makefile.mk Fri Aug 18 15:47:42 2006
@@ -177,6 +177,8 @@ SHL1VERSIONMAP=gcc3_linux_intel.map
SHL1VERSIONMAP=gcc3_linux_intel.map
.ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXSgcc3"

6
editors/openoffice/patches/patch-crashrep_source_unx_main_cxx
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-crashrep_source_unx_main_cxx,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- crashrep/source/unx/main.cxx.orig.port Mon Jun 19 10:31:28 2006
+++ crashrep/source/unx/main.cxx Fri Aug 18 15:47:42 2006
@@ -50,7 +50,7 @@
#include <vector>
#include <string>

6
editors/openoffice/patches/patch-crashrep_source_unx_makefile_mk
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-crashrep_source_unx_makefile_mk,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- crashrep/source/unx/makefile.mk.orig.port Thu Sep 8 05:42:39 2005
+++ crashrep/source/unx/makefile.mk Fri Aug 18 15:47:42 2006
@@ -71,7 +71,7 @@ APP1TARGET=$(TARGET)
APP1OBJS=$(OBJFILES)

6
editors/openoffice/patches/patch-desktop_source_app_main_cxx
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-desktop_source_app_main_cxx,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- desktop/source/app/main.cxx.orig.port Thu Sep 8 13:11:14 2005
+++ desktop/source/app/main.cxx Fri Aug 18 15:47:42 2006
@@ -34,7 +34,7 @@
************************************************************************/

6
editors/openoffice/patches/patch-desktop_source_pkgchk_unopkg_cmdenv_cxx
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-desktop_source_pkgchk_unopkg_cmdenv_cxx,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- desktop/source/pkgchk/unopkg_cmdenv.cxx.orig.port Thu Jul 13 13:08:49 2006
+++ desktop/source/pkgchk/unopkg_cmdenv.cxx Fri Aug 18 15:47:42 2006
@@ -180,18 +180,18 @@ CommandEnvironmentImpl::~CommandEnvironm
void CommandEnvironmentImpl::printLicense(const OUString& sLicense, bool & accept, bool &decline)
{

6
editors/openoffice/patches/patch-desktop_util_makefile_mk
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-desktop_util_makefile_mk,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- desktop/util/makefile.mk.orig.port Tue May 2 13:13:56 2006
+++ desktop/util/makefile.mk Fri Aug 18 15:47:42 2006
@@ -96,7 +96,7 @@ LIB1FILES += $(OBJ)$/copyright_ascii_sun
LINKFLAGSAPPGUI!:= $(LINKFLAGSAPPGUI:s/-bind_at_load//)
.ENDIF # MACOSX

6
editors/openoffice/patches/patch-dmake_configure
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-dmake_configure,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- dmake/configure.orig.port Thu Jun 29 07:22:15 2006
+++ dmake/configure Fri Aug 18 15:47:42 2006
@@ -3475,6 +3475,9 @@ case "$_os" in
"AIX")
OS_VERSION=sysvr4

6
editors/openoffice/patches/patch-dmake_configure_in
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-dmake_configure_in,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- dmake/configure.in.orig.port Thu Jun 29 07:22:28 2006
+++ dmake/configure.in Fri Aug 18 15:47:42 2006
@@ -104,6 +104,9 @@ case "$_os" in
"AIX")
OS_VERSION=sysvr4

6
editors/openoffice/patches/patch-dmake_unix_runargv_c
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-dmake_unix_runargv_c,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- dmake/unix/runargv.c.orig.port Thu Apr 20 08:19:12 2006
+++ dmake/unix/runargv.c Fri Aug 18 15:47:42 2006
@@ -132,7 +132,7 @@ private_strerror (errnum)
#ifdef arm32
extern const char * const sys_errlist[];

6
editors/openoffice/patches/patch-dtrans_source_X11_X11_selection_cxx
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-dtrans_source_X11_X11_selection_cxx,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- dtrans/source/X11/X11_selection.cxx.orig.port Mon Jul 10 12:31:52 2006
+++ dtrans/source/X11/X11_selection.cxx Fri Aug 18 15:47:42 2006
@@ -42,7 +42,7 @@
#include <X11/Xlib.h>
#include <X11/X.h>

6
editors/openoffice/patches/patch-epm_epm-3_7_patch
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-epm_epm-3_7_patch,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- epm/epm-3.7.patch.orig.port Wed Jul 19 05:36:49 2006
+++ epm/epm-3.7.patch Fri Aug 18 15:47:42 2006
@@ -623,6 +623,35 @@
file->dst);
fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst);

6
editors/openoffice/patches/patch-extensions_source_nsplugin_source_makefile_mk
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-extensions_source_nsplugin_source_makefile_mk,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- extensions/source/nsplugin/source/makefile.mk.orig.port Fri Feb 17 11:03:55 2006
+++ extensions/source/nsplugin/source/makefile.mk Fri Aug 18 15:47:42 2006
@@ -57,7 +57,7 @@ dummy:
@echo GTK disabled - nothing to build

6
editors/openoffice/patches/patch-extensions_source_plugin_unx_makefile_mk
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-extensions_source_plugin_unx_makefile_mk,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- extensions/source/plugin/unx/makefile.mk.orig.port Mon Jun 19 06:45:51 2006
+++ extensions/source/plugin/unx/makefile.mk Fri Aug 18 15:47:42 2006
@@ -73,7 +73,7 @@ APP1STDLIBS=\
.IF "$(OS)"=="SOLARIS" || "$(OS)"=="SCO" || "$(OS)"=="HPUX"
APP1STDLIBS+=-lXm -lXt -lXext -lX11 -ldl

6
editors/openoffice/patches/patch-extensions_source_scanner_makefile_mk
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-extensions_source_scanner_makefile_mk,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- extensions/source/scanner/makefile.mk.orig.port Thu Sep 8 16:36:35 2005
+++ extensions/source/scanner/makefile.mk Fri Aug 18 15:47:42 2006
@@ -89,7 +89,9 @@ SHL1STDLIBS=\
.IF "$(GUI)"=="UNX"
.IF "$(OS)"!="FREEBSD"

6
editors/openoffice/patches/patch-external_gcc3_specific_makefile_mk
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-external_gcc3_specific_makefile_mk,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- external/gcc3_specific/makefile.mk.orig.port Mon Sep 12 10:49:17 2005
+++ external/gcc3_specific/makefile.mk Fri Aug 18 15:47:42 2006
@@ -12,8 +12,8 @@ TARGET=gcc3_specific
.IF "$(OS)"!="MACOSX"
.IF "$(OS)"!="IRIX"

6
editors/openoffice/patches/patch-external_glibc_glibcpatch_sh
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-external_glibc_glibcpatch_sh,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- external/glibc/glibcpatch.sh.orig.port Tue Sep 6 10:21:32 2005
+++ external/glibc/glibcpatch.sh Fri Aug 18 15:47:42 2006
@@ -43,6 +43,7 @@ if test -s "$tarball"; then
_gnutar=`tar --version 2> /dev/null`
gnutar=`echo $_gnutar | awk '/GNU/ { print "true" }'`

6
editors/openoffice/patches/patch-external_glibc_sdfiles_makefile_mk
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-external_glibc_sdfiles_makefile_mk,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- external/glibc/sdfiles/makefile.mk.orig.port Tue Jun 20 07:47:56 2006
+++ external/glibc/sdfiles/makefile.mk Fri Aug 18 15:47:42 2006
@@ -53,14 +53,14 @@ CDEFS+=-DHAVE_STRING_H -DHAVE_CONFIG_H
# --- Files --------------------------------------------------------

6
editors/openoffice/patches/patch-external_prj_d_lst
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-external_prj_d_lst,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- external/prj/d.lst.orig.port Mon May 8 12:10:34 2006
+++ external/prj/d.lst Fri Aug 18 15:47:42 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

6
editors/openoffice/patches/patch-freetype_makefile_mk
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-freetype_makefile_mk,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- freetype/makefile.mk.orig.port Thu Oct 13 12:49:16 2005
+++ freetype/makefile.mk Fri Aug 18 15:47:42 2006
@@ -70,7 +70,7 @@ OUT2LIB= \
objs$/.libs$/libfreetype.a
.IF "$(OS)"=="MACOSX"

6
editors/openoffice/patches/patch-icu_icu-2_6_patch
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-icu_icu-2_6_patch,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- icu/icu-2.6.patch.orig.port Mon Jun 19 20:19:36 2006
+++ icu/icu-2.6.patch Fri Aug 18 15:47:43 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.

6
editors/openoffice/patches/patch-idlc_source_idlccompile_cxx
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-idlc_source_idlccompile_cxx,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- idlc/source/idlccompile.cxx.orig.port Mon Jun 19 23:48:52 2006
+++ idlc/source/idlccompile.cxx Fri Aug 18 15:47:43 2006
@@ -61,7 +61,7 @@
#ifdef SAL_UNX

6
editors/openoffice/patches/patch-instsetoo_native_inc_openoffice_unix_packagelist_txt
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-instsetoo_native_inc_openoffice_unix_packagelist_txt,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- instsetoo_native/inc_openoffice/unix/packagelist.txt.orig.port Wed Jul 5 17:14:13 2006
+++ instsetoo_native/inc_openoffice/unix/packagelist.txt Fri Aug 18 15:47:46 2006
@@ -28,7 +28,7 @@ findrequires = "find-requires-gnome.sh"
copyright = "1999-2006 by OpenOffice.org"
vendor = "OpenOffice.org"

15
editors/openoffice/patches/patch-instsetoo_native_util_makefile_mk
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-instsetoo_native_util_makefile_mk,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- instsetoo_native/util/makefile.mk.orig.port Thu Jul 13 11:15:45 2006
+++ instsetoo_native/util/makefile.mk Sat Aug 19 09:34:50 2006
@@ -108,7 +108,7 @@ ALLTAR : $(LOCALPYFILES)
.IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)"
ALLTAR : openoffice
@ -10,6 +10,15 @@ $OpenBSD: patch-instsetoo_native_util_makefile_mk,v 1.1.1.1 2006/08/17 14:56:23
.ENDIF
.ELSE # "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
ALLTAR : updatepack
@@ -189,7 +189,7 @@ openoffice_%{$(PKGFORMAT:^".")} :
openoffice_% :
.ENDIF # "$(PKGFORMAT)"!=""
.IF "$(OS)"!="MACOSX" || "$(PKGFORMAT)"!="portable"
- +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -packagelist $(PRJ)$/inc_openoffice$/unix$/packagelist.txt -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -addsystemintegration $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH))
+ +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -packagelist $(PRJ)$/inc_openoffice$/unix$/packagelist.txt -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -addsystemintegration $(subst,xxx,$(@:e:s/.//) -dontstrip $(PKGFORMATSWITCH))
.ELSE # "$(OS)"!="MACOSX" || "$(PKGFORMAT)"!=""
+$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -packagelist $(PRJ)$/inc_openoffice$/unix$/packagelist.txt -u $(OUT) -buildid $(BUILD) -destdir $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b))_inprogress$/ -simple staging
+$(RM) $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b))$/gid_*
@@ -394,11 +394,11 @@ hack_msitemplates .PHONY:
+-$(MKDIRHIER) $(MSIURETEMPLATEDIR)
+-$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)

6
editors/openoffice/patches/patch-jvmaccess_util_makefile_mk
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-jvmaccess_util_makefile_mk,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- jvmaccess/util/makefile.mk.orig.port Wed Sep 7 15:23:59 2005
+++ jvmaccess/util/makefile.mk Fri Aug 18 15:47:43 2006
@@ -68,6 +68,8 @@ SHL1VERSIONMAP = gcc3_linux_intel.map
SHL1VERSIONMAP = gcc3_linux_intel.map
.ELIF "$(OS)$(CPU)$(COMNAME)" == "LINUXSgcc3"

6
editors/openoffice/patches/patch-jvmfwk_distributions_OpenOfficeorg_makefile_mk
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-jvmfwk_distributions_OpenOfficeorg_makefile_mk,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- jvmfwk/distributions/OpenOfficeorg/makefile.mk.orig.port Tue Jan 31 13:28:42 2006
+++ jvmfwk/distributions/OpenOfficeorg/makefile.mk Fri Aug 18 15:47:43 2006
@@ -49,7 +49,7 @@ $(BIN)$/javavendors_ooo.xml: javavendors
.IF "$(GUI)"=="UNX"
.IF "$(OS)"=="MACOSX"

6
editors/openoffice/patches/patch-jvmfwk_plugins_sunmajor_pluginlib_sunversion_cxx
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-jvmfwk_plugins_sunmajor_pluginlib_sunversion_cxx,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx.orig.port Mon Jun 19 20:09:54 2006
+++ jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx Fri Aug 18 15:47:43 2006
@@ -205,7 +205,7 @@ bool SunVersion::init(const char *szVers
m_preRelease = getPreRelease(pCur);
if (m_preRelease == Rel_NONE)

6
editors/openoffice/patches/patch-jvmfwk_plugins_sunmajor_pluginlib_sunversion_hxx
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-jvmfwk_plugins_sunmajor_pluginlib_sunversion_hxx,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx.orig.port Wed Sep 7 15:31:59 2005
+++ jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx Fri Aug 18 15:47:43 2006
@@ -84,7 +84,7 @@ protected:
Rel_RC1,
Rel_RC2,

6
editors/openoffice/patches/patch-lingucomponent_source_spellcheck_hunspell_affixmgr_cxx
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-lingucomponent_source_spellcheck_hunspell_affixmgr_cxx,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- lingucomponent/source/spellcheck/hunspell/affixmgr.cxx.orig.port Wed Jul 19 12:15:53 2006
+++ lingucomponent/source/spellcheck/hunspell/affixmgr.cxx Fri Aug 18 15:47:43 2006
@@ -2439,12 +2439,11 @@ char * AffixMgr::suffix_check_twosfx_mor
result3[0] = '\0';
#ifdef DEBUG

6
editors/openoffice/patches/patch-lingucomponent_source_spellcheck_myspell_Makefile
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-lingucomponent_source_spellcheck_myspell_Makefile,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- lingucomponent/source/spellcheck/myspell/Makefile.orig.port Tue Mar 9 07:40:54 2004
+++ lingucomponent/source/spellcheck/myspell/Makefile Fri Aug 18 15:47:43 2006
@@ -60,6 +60,23 @@ ifeq "$(PLATFORM)" "FreeBSD"
RANLIB=ranlib
endif

6
editors/openoffice/patches/patch-nas_nas-1_6_patch
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-nas_nas-1_6_patch,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- nas/nas-1.6.patch.orig.port Fri Mar 10 10:59:50 2006
+++ nas/nas-1.6.patch Fri Aug 18 15:47:43 2006
@@ -763,3 +763,15 @@
XtAppAddActions(appContext, actions, XtNumber(actions));

6
editors/openoffice/patches/patch-odk_configure_pl
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-odk_configure_pl,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- odk/configure.pl.orig.port Wed Nov 9 04:28:37 2005
+++ odk/configure.pl Fri Aug 18 15:47:43 2006
@@ -28,6 +28,10 @@ if ( $main::operatingSystem =~ /freebsd/
{
$main::makeName = "gmake";

6
editors/openoffice/patches/patch-odk_setsdkenv_unix_csh_in
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-odk_setsdkenv_unix_csh_in,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- odk/setsdkenv_unix.csh.in.orig.port Wed Nov 9 04:29:11 2005
+++ odk/setsdkenv_unix.csh.in Fri Aug 18 15:47:43 2006
@@ -176,6 +176,31 @@ switch (`${sdkdir}/config.guess | cut -d
else
setenv PTHREAD_LIBS -pthread

6
editors/openoffice/patches/patch-odk_setsdkenv_unix_sh_in
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-odk_setsdkenv_unix_sh_in,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- odk/setsdkenv_unix.sh.in.orig.port Wed Nov 9 04:29:22 2005
+++ odk/setsdkenv_unix.sh.in Fri Aug 18 15:47:43 2006
@@ -206,6 +206,28 @@ case $sd_platform in
export PTHREAD_LIBS
fi

6
editors/openoffice/patches/patch-odk_settings_settings_mk
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-odk_settings_settings_mk,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- odk/settings/settings.mk.orig.port Thu Jul 13 08:03:58 2006
+++ odk/settings/settings.mk Fri Aug 18 15:47:43 2006
@@ -502,3 +502,97 @@ URE_MISC=$(OO_SDK_URE_HOME)/share/misc
endif

6
editors/openoffice/patches/patch-psprint_source_fontmanager_fontmanager_cxx
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-psprint_source_fontmanager_fontmanager_cxx,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- psprint/source/fontmanager/fontmanager.cxx.orig.port Mon Jun 19 06:24:03 2006
+++ psprint/source/fontmanager/fontmanager.cxx Fri Aug 18 15:47:43 2006
@@ -427,7 +427,11 @@ bool PrintFontManager::BuiltinFont::quer
// -------------------------------------------------------------------------

6
editors/openoffice/patches/patch-psprint_source_printer_printerinfomanager_cxx
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-psprint_source_printer_printerinfomanager_cxx,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- psprint/source/printer/printerinfomanager.cxx.orig.port Mon Jul 10 12:30:50 2006
+++ psprint/source/printer/printerinfomanager.cxx Fri Aug 18 15:47:43 2006
@@ -1172,7 +1172,7 @@ struct SystemCommandParameters
static const struct SystemCommandParameters aParms[] =

6
editors/openoffice/patches/patch-psprint_source_printergfx_printerjob_cxx
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-psprint_source_printergfx_printerjob_cxx,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- psprint/source/printergfx/printerjob.cxx.orig.port Tue Jul 25 05:36:11 2006
+++ psprint/source/printergfx/printerjob.cxx Fri Aug 18 15:47:43 2006
@@ -262,7 +262,7 @@ getUserName (char* pName, int nSize)
sal_Bool bSuccess = sal_False;

6
editors/openoffice/patches/patch-pyuno_source_module_makefile_mk
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-pyuno_source_module_makefile_mk,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- pyuno/source/module/makefile.mk.orig.port Tue Jan 31 13:18:25 2006
+++ pyuno/source/module/makefile.mk Fri Aug 18 15:47:43 2006
@@ -130,6 +130,8 @@ $(PYUNO_MODULE) : $(SLO)$/pyuno_dlopenwr
@+ echo $(LINK) $(LINKFLAGSSHLCUI) -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
.ELIF "$(OS)" == "MACOSX"

6
editors/openoffice/patches/patch-sablot_Sablot-0_52_patch
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-sablot_Sablot-0_52_patch,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- sablot/Sablot-0.52.patch.orig.port Mon Jun 19 13:27:11 2006
+++ sablot/Sablot-0.52.patch Fri Aug 18 15:47:43 2006
@@ -119,7 +119,7 @@
! .ENDIF
! .ENDIF

6
editors/openoffice/patches/patch-sal_inc_osl_endian_h
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-sal_inc_osl_endian_h,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- sal/inc/osl/endian.h.orig.port Fri Jan 20 09:27:49 2006
+++ sal/inc/osl/endian.h Fri Aug 18 15:47:43 2006
@@ -187,7 +187,7 @@ extern "C" {
!defined(LINUX) && !defined(NETBSD) && !defined(SCO) && \
!defined(AIX) && !defined(HPUX) && \

6
editors/openoffice/patches/patch-sal_inc_rtl_uuid_h
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-sal_inc_rtl_uuid_h,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- sal/inc/rtl/uuid.h.orig.port Thu Sep 8 10:46:10 2005
+++ sal/inc/rtl/uuid.h Fri Aug 18 15:47:43 2006
@@ -223,6 +223,8 @@ void SAL_CALL rtl_createNamedUuid(
#define UUID_SYSTEM_TIME_RESOLUTION_100NS_TICKS 100000
#elif IRIX

6
editors/openoffice/patches/patch-sal_inc_sal_alloca_h
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-sal_inc_sal_alloca_h,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- sal/inc/sal/alloca.h.orig.port Thu Sep 8 10:46:27 2005
+++ sal/inc/sal/alloca.h Fri Aug 18 15:47:43 2006
@@ -43,7 +43,7 @@
#define INCLUDED_ALLOCA_H
#endif

6
editors/openoffice/patches/patch-sal_inc_sal_config_h
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-sal_inc_sal_config_h,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- sal/inc/sal/config.h.orig.port Tue Jun 20 00:15:28 2006
+++ sal/inc/sal/config.h Fri Aug 18 15:47:43 2006
@@ -102,7 +102,7 @@ extern "C" {
/* don't know what to put in here */
#endif

6
editors/openoffice/patches/patch-sal_inc_sal_types_h
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-sal_inc_sal_types_h,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- sal/inc/sal/types.h.orig.port Tue Jun 20 00:15:50 2006
+++ sal/inc/sal/types.h Fri Aug 18 15:47:43 2006
@@ -282,7 +282,7 @@ typedef struct _sal_Sequence
lack RTTI support, dynamic_cast is not included here).
*/

6
editors/openoffice/patches/patch-sal_osl_unx_backtrace_c
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-sal_osl_unx_backtrace_c,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- sal/osl/unx/backtrace.c.orig.port Tue Jun 20 00:16:46 2006
+++ sal/osl/unx/backtrace.c Fri Aug 18 15:47:43 2006
@@ -124,7 +124,7 @@ void backtrace_symbols_fd( void **buffer
#endif /* defined SOLARIS */

6
editors/openoffice/patches/patch-sal_osl_unx_backtrace_h
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-sal_osl_unx_backtrace_h,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- sal/osl/unx/backtrace.h.orig.port Thu Feb 9 12:05:59 2006
+++ sal/osl/unx/backtrace.h Fri Aug 18 15:47:43 2006
@@ -34,7 +34,7 @@
************************************************************************/

6
editors/openoffice/patches/patch-sal_osl_unx_file_cxx
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-sal_osl_unx_file_cxx,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- sal/osl/unx/file.cxx.orig.port Tue Jun 20 00:17:10 2006
+++ sal/osl/unx/file.cxx Fri Aug 18 15:47:43 2006
@@ -115,7 +115,7 @@ static const sal_Char* MOUNTTAB="/etc/mn
#include <ctype.h>
static const sal_Char* MOUNTTAB="/etc/mtab";

6
editors/openoffice/patches/patch-sal_osl_unx_file_error_transl_cxx
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-sal_osl_unx_file_error_transl_cxx,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- sal/osl/unx/file_error_transl.cxx.orig.port Thu Sep 8 10:54:25 2005
+++ sal/osl/unx/file_error_transl.cxx Fri Aug 18 15:47:43 2006
@@ -219,19 +219,19 @@ oslFileError oslTranslateFileError(sal_B
osl_error = osl_File_E_LOOP;
break;

6
editors/openoffice/patches/patch-sal_osl_unx_makefile_mk
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-sal_osl_unx_makefile_mk,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- sal/osl/unx/makefile.mk.orig.port Wed Jul 19 05:55:27 2006
+++ sal/osl/unx/makefile.mk Fri Aug 18 15:47:43 2006
@@ -110,7 +110,7 @@ OBJFILES= $(OBJ)$/conditn.obj \
$(OBJ)$/file_stat.obj
#.ENDIF

6
editors/openoffice/patches/patch-sal_osl_unx_nlsupport_c
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-sal_osl_unx_nlsupport_c,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- sal/osl/unx/nlsupport.c.orig.port Tue Jul 25 05:40:46 2006
+++ sal/osl/unx/nlsupport.c Fri Aug 18 15:47:43 2006
@@ -38,7 +38,7 @@
#include <osl/process.h>
#include <rtl/memory.h>

6
editors/openoffice/patches/patch-sal_osl_unx_process_c
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-sal_osl_unx_process_c,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- sal/osl/unx/process.c.orig.port Tue Jun 20 00:18:45 2006
+++ sal/osl/unx/process.c Fri Aug 18 15:47:44 2006
@@ -491,7 +491,7 @@ static void ChildStatusProc(void *pData)
if (! INIT_GROUPS(data.m_name, data.m_gid) || (setuid(data.m_uid) != 0))

27
editors/openoffice/patches/patch-sal_osl_unx_security_c
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-sal_osl_unx_security_c,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- sal/osl/unx/security.c.orig.port Wed Jul 19 05:55:41 2006
+++ sal/osl/unx/security.c Fri Aug 18 15:47:44 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);
@ -10,12 +10,13 @@ $OpenBSD: patch-sal_osl_unx_security_c,v 1.1.1.1 2006/08/17 14:56:23 robert Exp
/* #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
@@ -102,12 +102,46 @@ oslSecurity SAL_CALL osl_getCurrentSecur
oslSecurityImpl * p = newSecurityImpl(&n);
if (p != NULL) {
struct passwd * found;
+#if defined(OPENBSD)
+ /* TODO: not thread safe - protect this */
+ static pthread_mutex_t getpwuid_mutex = PTHREAD_MUTEX_INITIALIZER;
+ pthread_mutex_lock(&getpwuid_mutex);
+ if ((found = getpwuid(getuid())) != 0)
+ {
+ size_t bufsize = n;
@ -24,6 +25,7 @@ $OpenBSD: patch-sal_osl_unx_security_c,v 1.1.1.1 2006/08/17 14:56:23 robert Exp
+ p->m_pPasswd.pw_gid = found->pw_gid;
+ if ((len = strlcpy(p->m_buffer, found->pw_name, bufsize)) >= bufsize)
+ {
+ pthread_mutex_unlock(&getpwuid_mutex);
+ deleteSecurityImpl(p);
+ return 0;
+ }
@ -31,20 +33,31 @@ $OpenBSD: patch-sal_osl_unx_security_c,v 1.1.1.1 2006/08/17 14:56:23 robert Exp
+ bufsize -= len+1;
+ if (strlcpy(&p->m_buffer[len+1], found->pw_dir, bufsize) >= bufsize)
+ {
+ pthread_mutex_unlock(&getpwuid_mutex);
+ deleteSecurityImpl(p);
+ return 0;
+ }
+ p->m_pPasswd.pw_dir = &p->m_buffer[len+1];
+ pthread_mutex_unlock(&getpwuid_mutex);
+ }
+ else
+ {
+ pthread_mutex_unlock(&getpwuid_mutex);
+ deleteSecurityImpl(p);
+ p = 0;
+ }
+#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
}
+#endif
}
return p;
}
@@ -474,7 +508,7 @@ osl_psz_loginUser(const sal_Char* pszUse
oslSecurity* pSecurity)
{
#if defined NETBSD || defined SCO || defined AIX || defined FREEBSD || \

6
editors/openoffice/patches/patch-sal_osl_unx_socket_c
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-sal_osl_unx_socket_c,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- sal/osl/unx/socket.c.orig.port Wed Jul 19 05:39:22 2006
+++ sal/osl/unx/socket.c Fri Aug 18 15:47:44 2006
@@ -56,7 +56,7 @@
#undef HAVE_POLL_H
#endif

6
editors/openoffice/patches/patch-sal_osl_unx_system_c
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-sal_osl_unx_system_c,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- sal/osl/unx/system.c.orig.port Wed Jul 19 05:39:37 2006
+++ sal/osl/unx/system.c Fri Aug 18 15:47:44 2006
@@ -48,7 +48,7 @@
static pthread_mutex_t getrtl_mutex = PTHREAD_MUTEX_INITIALIZER;

6
editors/openoffice/patches/patch-sal_osl_unx_system_h
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-sal_osl_unx_system_h,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- sal/osl/unx/system.h.orig.port Wed Jul 19 05:39:50 2006
+++ sal/osl/unx/system.h Fri Aug 18 15:47:44 2006
@@ -198,6 +198,28 @@
# define NO_PTHREAD_RTL
#endif

6
editors/openoffice/patches/patch-sal_osl_unx_tempfile_c
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-sal_osl_unx_tempfile_c,v 1.2 2006/08/20 03:36:53 kurt Exp $
--- sal/osl/unx/tempfile.c.orig.port Thu May 4 04:48:55 2006
+++ sal/osl/unx/tempfile.c Fri Aug 18 15:47:44 2006
@@ -88,7 +88,7 @@ oslFileError SAL_CALL osl_getTempDirURL(
if ( !pValue )
{

6
editors/openoffice/patches/patch-sal_osl_unx_thread_c
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-sal_osl_unx_thread_c,v 1.2 2006/08/20 03:36:53 kurt Exp $
--- sal/osl/unx/thread.c.orig.port Thu Jul 6 10:42:32 2006
+++ sal/osl/unx/thread.c Fri Aug 18 15:47:44 2006
@@ -35,6 +35,7 @@
#include "system.h"

6
editors/openoffice/patches/patch-sal_osl_unx_time_c
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-sal_osl_unx_time_c,v 1.2 2006/08/20 03:36:53 kurt Exp $
--- sal/osl/unx/time.c.orig.port Thu Sep 8 11:02:55 2005
+++ sal/osl/unx/time.c Fri Aug 18 15:47:44 2006
@@ -40,7 +40,7 @@
#include <osl/time.h>

6
editors/openoffice/patches/patch-sal_rtl_source_alloc_arena_c
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-sal_rtl_source_alloc_arena_c,v 1.2 2006/08/20 03:36:53 kurt Exp $
--- sal/rtl/source/alloc_arena.c.orig.port Tue Jun 20 00:28:24 2006
+++ sal/rtl/source/alloc_arena.c Fri Aug 18 15:47:44 2006
@@ -1239,7 +1239,7 @@ static sal_Size
rtl_machdep_pagesize (void)
{

6
editors/openoffice/patches/patch-sal_rtl_source_alloc_c
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-sal_rtl_source_alloc_c,v 1.2 2006/08/20 03:36:53 kurt Exp $
--- sal/rtl/source/alloc.c.orig.port Tue Jun 20 00:28:13 2006
+++ sal/rtl/source/alloc.c Fri Aug 18 15:47:44 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))

6
editors/openoffice/patches/patch-sal_rtl_source_macro_hxx
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-sal_rtl_source_macro_hxx,v 1.2 2006/08/20 03:36:53 kurt Exp $
--- sal/rtl/source/macro.hxx.orig.port Wed Oct 5 07:40:14 2005
+++ sal/rtl/source/macro.hxx Fri Aug 18 15:47:44 2006
@@ -53,6 +53,8 @@
#define THIS_OS "FreeBSD"
#elif defined IRIX

6
editors/openoffice/patches/patch-sal_workben_makefile_mk
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-sal_workben_makefile_mk,v 1.2 2006/08/20 03:36:53 kurt Exp $
--- sal/workben/makefile.mk.orig.port Thu Sep 8 12:50:39 2005
+++ sal/workben/makefile.mk Fri Aug 18 15:47:44 2006
@@ -352,7 +352,7 @@ APP4DEPN= $(SLB)$/sal.lib
# tgetpwnam
#

6
editors/openoffice/patches/patch-salhelper_source_gcc3_linux_intel_map
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-salhelper_source_gcc3_linux_intel_map,v 1.2 2006/08/20 03:36:53 kurt Exp $
--- salhelper/source/gcc3_linux_intel.map.orig.port Wed Nov 3 04:10:31 2004
+++ salhelper/source/gcc3_linux_intel.map Fri Aug 18 15:47:44 2006
@@ -22,7 +22,7 @@ UDK_3_0_0 { # should have been UDK_3.0
# _ZTIN9salhelper21SimpleReferenceObjectE;
# _ZTSN9salhelper21SimpleReferenceObjectE;

6
editors/openoffice/patches/patch-salhelper_source_makefile_mk
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-salhelper_source_makefile_mk,v 1.2 2006/08/20 03:36:53 kurt Exp $
--- salhelper/source/makefile.mk.orig.port Thu Jul 20 12:16:28 2006
+++ salhelper/source/makefile.mk Fri Aug 18 15:47:44 2006
@@ -86,6 +86,8 @@ SHL1VERSIONMAP=gcc3_linux_intel.map
SHL1VERSIONMAP=gcc3_linux_intel.map
.ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXSgcc3"

6
editors/openoffice/patches/patch-salhelper_test_rtti_makefile_mk
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-salhelper_test_rtti_makefile_mk,v 1.2 2006/08/20 03:36:53 kurt Exp $
--- salhelper/test/rtti/makefile.mk.orig.port Thu Sep 8 13:02:46 2005
+++ salhelper/test/rtti/makefile.mk Fri Aug 18 15:47:44 2006
@@ -93,6 +93,8 @@ SHL1VERSIONMAP= lngi.map
SHL1VERSIONMAP= gcc2_freebsd_intel.map
.ELIF "$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3"

6
editors/openoffice/patches/patch-scp2_source_ooo_file_library_ooo_scp
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-scp2_source_ooo_file_library_ooo_scp,v 1.2 2006/08/20 03:36:53 kurt Exp $
--- scp2/source/ooo/file_library_ooo.scp.orig.port Thu Jul 13 06:26:22 2006
+++ scp2/source/ooo/file_library_ooo.scp Fri Aug 18 15:47:45 2006
@@ -819,7 +819,7 @@ File gid_File_Lib_Freetype
#endif
TXT_FILE_BODY;

6
editors/openoffice/patches/patch-scp2_source_ure_ure_scp
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-scp2_source_ure_ure_scp,v 1.2 2006/08/20 03:36:53 kurt Exp $
--- scp2/source/ure/ure.scp.orig.port Thu Sep 8 21:46:59 2005
+++ scp2/source/ure/ure.scp Fri Aug 18 15:47:45 2006
@@ -606,7 +606,7 @@ End
#if defined _gcc3 && \

6
editors/openoffice/patches/patch-scp2_source_writer_file_writer_scp
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-scp2_source_writer_file_writer_scp,v 1.2 2006/08/20 03:36:53 kurt Exp $
--- scp2/source/writer/file_writer.scp.orig.port Thu Jul 13 09:31:34 2006
+++ scp2/source/writer/file_writer.scp Fri Aug 18 15:47:45 2006
@@ -56,12 +56,16 @@ File gid_File_Exe_Swriter
Styles = (PACKED);
End

6
editors/openoffice/patches/patch-sdk_oo_util_makefile_pmk
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-sdk_oo_util_makefile_pmk,v 1.2 2006/08/20 03:36:53 kurt Exp $
--- sdk_oo/util/makefile.pmk.orig.port Fri Nov 11 05:53:22 2005
+++ sdk_oo/util/makefile.pmk Fri Aug 18 15:47:45 2006
@@ -132,6 +132,11 @@ DESTPLATFROM=irix
# MACOSX
###########

6
editors/openoffice/patches/patch-shell_source_backends_localebe_localebackend_cxx
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-shell_source_backends_localebe_localebackend_cxx,v 1.2 2006/08/20 03:36:53 kurt Exp $
--- shell/source/backends/localebe/localebackend.cxx.orig.port Mon Jun 19 10:16:34 2006
+++ shell/source/backends/localebe/localebackend.cxx Fri Aug 18 15:47:45 2006
@@ -50,7 +50,7 @@
#include <stdio.h>

6
editors/openoffice/patches/patch-shell_source_unix_misc_makefile_mk
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-shell_source_unix_misc_makefile_mk,v 1.2 2006/08/20 03:36:53 kurt Exp $
--- shell/source/unix/misc/makefile.mk.orig.port Wed Sep 7 15:55:11 2005
+++ shell/source/unix/misc/makefile.mk Fri Aug 18 15:47:45 2006
@@ -65,7 +65,7 @@ APP1TARGET = gnome-open-url.bin
APP1OBJS = \
$(OBJ)$/gnome-open-url.obj

6
editors/openoffice/patches/patch-slideshow_source_engine_activities_continuouskeytimeactivitybase_cxx
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-slideshow_source_engine_activities_continuouskeytimeactivitybase_cxx,v 1.2 2006/08/20 03:36:53 kurt Exp $
--- slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx.orig.port Wed Jul 26 03:28:09 2006
+++ slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx Fri Aug 18 15:47:45 2006
@@ -98,7 +98,7 @@ namespace presentation
mnLastIndex = ::std::min< ::std::ptrdiff_t >(
maKeyTimes.size()-2,

6
editors/openoffice/patches/patch-solenv_bin_mapgen_pl
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-solenv_bin_mapgen_pl,v 1.2 2006/08/20 03:36:53 kurt Exp $
--- solenv/bin/mapgen.pl.orig.port Wed Sep 7 18:10:44 2005
+++ solenv/bin/mapgen.pl Fri Aug 18 15:47:45 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'));

6
editors/openoffice/patches/patch-solenv_bin_modules_installer_globals_pm
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-solenv_bin_modules_installer_globals_pm,v 1.2 2006/08/20 03:36:53 kurt Exp $
--- solenv/bin/modules/installer/globals.pm.orig.port Mon Jul 10 14:49:40 2006
+++ solenv/bin/modules/installer/globals.pm Fri Aug 18 15:47:45 2006
@@ -144,7 +144,7 @@ BEGIN
$jdklib = "";
$jrepath = "";

6
editors/openoffice/patches/patch-solenv_bin_modules_installer_regmerge_pm
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-solenv_bin_modules_installer_regmerge_pm,v 1.2 2006/08/20 03:36:53 kurt Exp $
--- solenv/bin/modules/installer/regmerge.pm.orig.port Thu Sep 8 05:09:09 2005
+++ solenv/bin/modules/installer/regmerge.pm Fri Aug 18 15:47:45 2006
@@ -219,7 +219,13 @@ sub merge_files
my $databasename = $databasefile->{'Name'};
my $databasedest = $databasedir . $installer::globals::separator . $databasename;

6
editors/openoffice/patches/patch-solenv_bin_modules_installer_worker_pm
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-solenv_bin_modules_installer_worker_pm,v 1.2 2006/08/20 03:36:53 kurt Exp $
--- solenv/bin/modules/installer/worker.pm.orig.port Mon Jul 10 07:00:31 2006
+++ solenv/bin/modules/installer/worker.pm Fri Aug 18 15:47:45 2006
@@ -511,7 +511,7 @@ sub clean_output_tree
if ( -d $installer::globals::removedirs[$i] )
{

6
editors/openoffice/patches/patch-solenv_bin_modules_osarch_pm
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-solenv_bin_modules_osarch_pm,v 1.2 2006/08/20 03:36:53 kurt Exp $
--- solenv/bin/modules/osarch.pm.orig.port Thu Mar 27 06:47:56 2003
+++ solenv/bin/modules/osarch.pm Fri Aug 18 15:47:45 2006
@@ -22,6 +22,7 @@ chop( $m_str, $s_str );
"Linux", "linux",
"FreeBSD", "freebsd",

6
editors/openoffice/patches/patch-solenv_config_ssolar_cmn
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-solenv_config_ssolar_cmn,v 1.2 2006/08/20 03:36:53 kurt Exp $
--- solenv/config/ssolar.cmn.orig.port Fri Jun 2 08:31:52 2006
+++ solenv/config/ssolar.cmn Fri Aug 18 15:47:45 2006
@@ -516,7 +516,7 @@ unxaixp
}
}

6
editors/openoffice/patches/patch-solenv_config_ssrc680_ini
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-solenv_config_ssrc680_ini,v 1.2 2006/08/20 03:36:53 kurt Exp $
--- solenv/config/ssrc680.ini.orig.port Wed Jul 19 05:38:15 2006
+++ solenv/config/ssrc680.ini Fri Aug 18 15:47:45 2006
@@ -2454,7 +2454,7 @@ unxmacxp
}
}

6
editors/openoffice/patches/patch-solenv_config_stand_lst
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-solenv_config_stand_lst,v 1.2 2006/08/20 03:36:53 kurt Exp $
--- solenv/config/stand.lst.orig.port Fri May 19 05:36:56 2006
+++ solenv/config/stand.lst Fri Aug 18 15:47:45 2006
@@ -37,10 +37,10 @@ SRC680
}
Environments

6
editors/openoffice/patches/patch-solenv_inc_libs_mk
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-solenv_inc_libs_mk,v 1.2 2006/08/20 03:36:53 kurt Exp $
--- solenv/inc/libs.mk.orig.port Wed Jul 19 05:38:31 2006
+++ solenv/inc/libs.mk Fri Aug 18 15:47:45 2006
@@ -175,7 +175,7 @@ ZLIB3RDLIB=-lz
ZLIB3RDLIB=-lzlib
.ENDIF

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

@ -1,6 +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
$OpenBSD: patch-solenv_inc_startup_OPENBSD_macros_mk,v 1.2 2006/08/20 03:36:53 kurt Exp $
--- solenv/inc/startup/OPENBSD/macros.mk.orig.port Fri Aug 18 15:47:45 2006
+++ solenv/inc/startup/OPENBSD/macros.mk Fri Aug 18 15:47:45 2006
@@ -0,0 +1,2 @@
+
+.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d:d:d)UNIX$/macros.mk

6
editors/openoffice/patches/patch-solenv_inc_tg_ext_mk
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-solenv_inc_tg_ext_mk,v 1.2 2006/08/20 03:36:53 kurt Exp $
--- solenv/inc/tg_ext.mk.orig.port Wed Jul 5 17:58:11 2006
+++ solenv/inc/tg_ext.mk Fri Aug 18 15:47:45 2006
@@ -48,7 +48,9 @@ INCLUDE!:=$(INCLUDE:s/ -I/;/)
.IF "$(OS)"!="NETBSD"

6
editors/openoffice/patches/patch-solenv_inc_unx_mk
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-solenv_inc_unx_mk,v 1.2 2006/08/20 03:36:53 kurt Exp $
--- solenv/inc/unx.mk.orig.port Wed Jul 19 05:26:37 2006
+++ solenv/inc/unx.mk Fri Aug 18 15:47:45 2006
@@ -36,6 +36,9 @@
# --- Unix-Environment ---------------------------------------
# Used if "$(GUI)" == "UNX"

18
editors/openoffice/patches/patch-solenv_inc_unxobsdi_mk
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-solenv_inc_unxobsdi_mk,v 1.1.1.1 2006/08/17 14:56:24 robert Exp $
--- solenv/inc/unxobsdi.mk.orig Wed Aug 16 10:26:08 2006
+++ solenv/inc/unxobsdi.mk Tue Aug 15 14:08:10 2006
$OpenBSD: patch-solenv_inc_unxobsdi_mk,v 1.2 2006/08/20 03:36:53 kurt Exp $
--- solenv/inc/unxobsdi.mk.orig.port Fri Aug 18 15:47:45 2006
+++ solenv/inc/unxobsdi.mk Fri Aug 18 15:47:46 2006
@@ -0,0 +1,231 @@
+#*************************************************************************
+#
@ -8,9 +8,9 @@ $OpenBSD: patch-solenv_inc_unxobsdi_mk,v 1.1.1.1 2006/08/17 14:56:24 robert Exp
+#
+# $RCSfile: patch-solenv_inc_unxobsdi_mk,v $
+#
+# $Revision: 1.1.1.1 $
+# $Revision: 1.2 $
+#
+# last change: $Author: robert $ $Date: 2006/08/17 14:56:24 $
+# last change: $Author: kurt $ $Date: 2006/08/20 03:36:53 $
+#
+# The Contents of this file are made available subject to
+# the terms of GNU Lesser General Public License Version 2.1.
@ -77,7 +77,7 @@ $OpenBSD: patch-solenv_inc_unxobsdi_mk,v 1.1.1.1 2006/08/17 14:56:24 robert Exp
+CC+:=$(CFLAGS_SYSBASE)
+.ENDIF # "$(SYSBASE)"!=""
+CFLAGS+=-fmessage-length=0 -c
+CLFAGS+=-I%%LOCALBASE%%/include -I%%X11BASE%%/include
+CLFAGS+=-I/usr/local/include -I/usr/X11R6/include
+
+# flags to enable build with symbols; required for crashdump feature
+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
@ -89,7 +89,7 @@ $OpenBSD: patch-solenv_inc_unxobsdi_mk,v 1.1.1.1 2006/08/17 14:56:24 robert Exp
+
+# flags for the C++ Compiler
+CFLAGSCC= -pipe $(ARCH_FLAGS)
+CFLAGSCC+=-I%%LOCALBASE%%/include -I%%X11BASE%%/include
+CFLAGSCC+=-I/usr/local/include -I/usr/X11R6/include
+# Flags for enabling exception handling
+CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
+# Flags for disabling exception handling
@ -101,7 +101,7 @@ $OpenBSD: patch-solenv_inc_unxobsdi_mk,v 1.1.1.1 2006/08/17 14:56:24 robert Exp
+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+CFLAGSCXX += -fvisibility-inlines-hidden
+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+CFLAGSCXX += -I%%LOCALBASE%%/include -I%%X11BASE%%/include
+CFLAGSCXX += -I/usr/local/include -I/usr/X11R6/include
+
+# Compiler flags for compiling static object in single threaded environment with graphical user interface
+CFLAGSOBJGUIST=
@ -156,7 +156,7 @@ $OpenBSD: patch-solenv_inc_unxobsdi_mk,v 1.1.1.1 2006/08/17 14:56:24 robert Exp
+#LINKFLAGSDEFS*=#-Wl,-z,defs
+#LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
+#LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
+LINKFLAGS=-Wl,-z,combreloc -L%%LOCALBASE%%/lib -L%%X11BASE%%/lib
+LINKFLAGS=-Wl,-z,combreloc -L/usr/local/lib -L/usr/X11R6/lib
+
+# linker flags for linking applications
+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec

6
editors/openoffice/patches/patch-soltools_checkdll_makefile_mk
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-soltools_checkdll_makefile_mk,v 1.1.1.1 2006/08/17 14:56:24 robert Exp $
--- soltools/checkdll/makefile.mk.orig Thu Sep 8 09:23:19 2005
+++ soltools/checkdll/makefile.mk Tue Aug 15 14:03:11 2006
$OpenBSD: patch-soltools_checkdll_makefile_mk,v 1.2 2006/08/20 03:36:53 kurt Exp $
--- soltools/checkdll/makefile.mk.orig.port Thu Sep 8 03:23:19 2005
+++ soltools/checkdll/makefile.mk Fri Aug 18 15:47:45 2006
@@ -53,7 +53,7 @@ LIBSALCPPRT=$(0)
APP1TARGET = checkdll
APP1OBJS = $(OBJ)$/checkdll.obj

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