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

- libxslt is a BUILD_DEPEND not a LIB_DEPEND

Browse Source 
- enable cairo support
- enable portaudio/sendfile - audio not working yet, revisit later
- adjust include and lib search order again. put /usr/local before
/usr/X11R6 so we link to ports expat and not the one that comes with X11R6
- add -pthread to PTHREAD_CFLAGS in odk subproject
- integrate audacity portaudio patches and link to ossaudio
- strip Linux shlib major version numbers from dlopen()'ed lib names
- link stlport with stdc++ to resolve some undefined symbols
- remove getpwuid_r workaround in sal/osl/unx/security.c since a suitable
one already exits in sal/osl/unx/system.c
This commit is contained in:
kurt 2006-10-27 16:02:02 +00:00
parent 9f7f07816a
commit ff1f7ca4a7
16 changed files with 450 additions and 354 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
editors/openoffice/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.15 2006/10/25 22:49:50 kurt Exp $
# $OpenBSD: Makefile,v 1.16 2006/10/27 16:02:02 kurt Exp $
ONLY_FOR_ARCHS= i386
@ -7,7 +7,7 @@ COMMENT= "a multi-platform productivity suite"
VERSION= 2.0.4
DISTNAME= OOo_${VERSION}_src
WRKDIST= ${WRKDIR}/OOD680_m5
PKGNAME= openoffice-${VERSION}p6
PKGNAME= openoffice-${VERSION}p7
CATEGORIES= editors productivity
SHARED_LIBS= icudata 26.0 \
@ -37,19 +37,19 @@ BUILD_DEPENDS= :zip-*:archivers/zip \
:bison-*:devel/bison \
:pkgconfig-*:devel/pkgconfig \
:tcsh-*:shells/tcsh \
:p5-Archive-Zip-*:archivers/p5-Archive-Zip
:p5-Archive-Zip-*:archivers/p5-Archive-Zip \
::textproc/libxslt
LIB_DEPENDS= gdk-x11-2.0.>=400.14,gdk_pixbuf-2.0.>=400.14,gtk-x11-2.0.>=400.14::x11/gtk+2 \
python2.3:python-2.3.*:lang/python/2.3 \
db.>=4::databases/db/v4 \
curl.>=2::net/curl \
neon.>=24::net/neon \
xslt.>=2::textproc/libxslt \
sndfile.>=1::audio/libsndfile
WANTLIB= ICE SM X11 Xext atk-1.0 c cairo expat fontconfig \
WANTLIB= ICE SM X11 Xext Xrender atk-1.0 c cairo expat fontconfig \
freetype glib-2.0 gmodule-2.0 gobject-2.0 \
gthread-2.0 iconv intl jpeg m pango-1.0 \
gthread-2.0 iconv intl ossaudio jpeg m pango-1.0 \
pangocairo-1.0 pangoft2-1.0 pthread stdc++ util xml2 z
USE_X11= Yes
@ -69,8 +69,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
CONFIGURE_ARGS= --disable-gnome-vfs \
--disable-mozilla \
--disable-pasf \
--disable-cups \
--enable-cairo \
--with-system-jpeg \
--with-system-python \
--with-system-libxml \

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

@ -1,7 +1,7 @@
$OpenBSD: patch-config_office_configure_in,v 1.5 2006/10/25 22:49:50 kurt Exp $
$OpenBSD: patch-config_office_configure_in,v 1.6 2006/10/27 16:02:02 kurt Exp $
--- config_office/configure.in.orig.port Mon Aug 28 04:37:20 2006
+++ config_office/configure.in Wed Oct 25 14:53:40 2006
@@ -773,6 +773,15 @@ case "$build_os" in
+++ config_office/configure.in Thu Oct 26 12:49:58 2006
@@ -773,6 +773,16 @@ case "$build_os" in
AC_MSG_RESULT([$PTHREAD_LIBS])
_os=FreeBSD
;;
@ -10,6 +10,7 @@ $OpenBSD: patch-config_office_configure_in,v 1.5 2006/10/25 22:49:50 kurt Exp $
+ test_gtk=yes
+ build_cairo=yes
+ test_kde=yes
+ test_cups=yes
+ PTHREAD_CFLAGS="-pthread -D_THREAD_SAFE"
+ PTHREAD_LIBS="-pthread"
+ _os=OpenBSD
@ -17,7 +18,7 @@ $OpenBSD: patch-config_office_configure_in,v 1.5 2006/10/25 22:49:50 kurt Exp $
osf)
test_x=dontknow
test_cups=no
@@ -2367,11 +2376,11 @@ dnl ====================================
@@ -2367,11 +2377,11 @@ dnl ====================================
dnl Checks for programs.
dnl ===================================================================
dnl Check whether there's a C pre-processor.
@ -31,7 +32,7 @@ $OpenBSD: patch-config_office_configure_in,v 1.5 2006/10/25 22:49:50 kurt Exp $
AC_PROG_CXXCPP
fi
@@ -2501,6 +2510,9 @@ if test "$_os" != "WINNT" -a \( "z$enabl
@@ -2501,6 +2511,9 @@ if test "$_os" != "WINNT" -a \( "z$enabl
AIX)
PKGFORMAT=aix
;;
@ -41,7 +42,7 @@ $OpenBSD: patch-config_office_configure_in,v 1.5 2006/10/25 22:49:50 kurt Exp $
*BSD)
PKGFORMAT=bsd
;;
@@ -2873,12 +2885,13 @@ if test -n "$with_system_python" && test
@@ -2873,12 +2886,13 @@ if test -n "$with_system_python" && test
python_include=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('INCLUDEPY');"`
python_version=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('VERSION');"`
@ -56,7 +57,7 @@ $OpenBSD: patch-config_office_configure_in,v 1.5 2006/10/25 22:49:50 kurt Exp $
fi
dnl check if the headers really work:
@@ -2903,16 +2916,13 @@ if test -n "$with_system_db" -o -n "$wit
@@ -2903,16 +2917,13 @@ if test -n "$with_system_db" -o -n "$wit
test "$with_system_db" != "no"; then
SYSTEM_DB=YES
AC_MSG_RESULT([external])
@ -77,7 +78,7 @@ $OpenBSD: patch-config_office_configure_in,v 1.5 2006/10/25 22:49:50 kurt Exp $
for v in 1 2; do
AC_TRY_RUN([
#include <db.h>
@@ -2923,6 +2933,7 @@ int main(int argc, char **argv) {
@@ -2923,6 +2934,7 @@ int main(int argc, char **argv) {
}
], [DB_VERSION_MINOR=$v], [])
done
@ -85,7 +86,7 @@ $OpenBSD: patch-config_office_configure_in,v 1.5 2006/10/25 22:49:50 kurt Exp $
if test "$DB_VERSION_MINOR" -gt "1"; then
AC_MSG_RESULT([OK])
DB_VERSION=4.$DB_VERSION_MINOR
@@ -3578,7 +3589,7 @@ elif test "$_os" != "WINNT" ; then
@@ -3578,7 +3590,7 @@ elif test "$_os" != "WINNT" ; then
AC_MSG_ERROR([No X includes found]) # Exit
fi
CFLAGS=$X_CFLAGS

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

@ -1,6 +1,6 @@
$OpenBSD: patch-config_office_set_soenv_in,v 1.3 2006/10/19 15:16:50 kurt Exp $
$OpenBSD: patch-config_office_set_soenv_in,v 1.4 2006/10/27 16:02:02 kurt Exp $
--- config_office/set_soenv.in.orig.port Mon Aug 28 04:37:34 2006
+++ config_office/set_soenv.in Thu Oct 19 10:47:52 2006
+++ config_office/set_soenv.in Thu Oct 26 08:51:45 2006
@@ -368,6 +368,34 @@ elsif ( $platform =~ m/freebsd/ )
$INPATH = $OUTPATH.$PROEXT;
$GVERDIR = $INPATH;
@ -72,16 +72,27 @@ $OpenBSD: patch-config_office_set_soenv_in,v 1.3 2006/10/19 15:16:50 kurt Exp $
{ $PATH = $cur_dir.
$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
$ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
@@ -1248,7 +1276,7 @@ if ($platform =~ m/solaris/)
@@ -1260,6 +1288,19 @@ elsif ($platform =~ m/linux-gnu|netbasd|
$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.
@@ -1291,10 +1319,10 @@ $SOLARINC = $I.$cur_dir.
+elsif ($platform =~ m/openbsd/)
+{ $SOLARLIB = $L.$par_dir.$LIB.
+ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
+ $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
+ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
+ $L.'$JAVA_HOME'.$LIB64.
+ $L.$JRELIBDIR.
+ $L.$JRETOOLKITDIR.
+ $L.$JRETHREADDIR.
+ $L_STLPORT_LIB.
+ $L.$USR_LOCAL.$LIB.
+ $L.$XLIB;
+}
elsif ($platform =~ m/cygwin/)
{ $SOLARLIB = $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
$L.$par_dir.$LIB.
@@ -1291,10 +1332,10 @@ $SOLARINC = $I.$cur_dir.
$I.'$SOLARENV'.$INC.
$I.'$SRC_ROOT'.$ds."res";
@ -94,24 +105,25 @@ $OpenBSD: patch-config_office_set_soenv_in,v 1.3 2006/10/19 15:16:50 kurt Exp $
{
# This simply adds an include path, so even cases that break the FHS work
$SOLARINC .= $STLPORT_inc_stlport;
@@ -1334,6 +1362,11 @@ if ($platform =~ m/linux-gnu/)
@@ -1334,6 +1375,10 @@ 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";
}
@@ -1346,7 +1379,7 @@ if ($platform =~ m/linux-gnu/)
$SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include";
}
@@ -1348,6 +1393,10 @@ if ($platform =~ m/linux-gnu/)
#The tail, if needed
- if ($platform =~ m/linux-gnu|freebsd|netbsd/)
+ if ($platform =~ m/linux-gnu|openbsd|freebsd|netbsd/)
if ($platform =~ m/linux-gnu|freebsd|netbsd/)
{ $SOLARINC .= $I.$XINC;
+ }
+ elsif ($platform =~ m/openbsd/)
+ { $SOLARINC .= $I.$USR_LOCAL.$INCLUDE.
+ $I.$XINC;
}
elsif ($platform =~ m/osf1/)
{ $SOLARINC .= $I.$XINC.

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.2 2006/08/20 03:36:52 kurt Exp $
$OpenBSD: patch-odk_setsdkenv_unix_csh_in,v 1.3 2006/10/27 16:02:02 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
+++ odk/setsdkenv_unix.csh.in Thu Oct 26 09:05:03 2006
@@ -176,6 +176,31 @@ switch (`${sdkdir}/config.guess | cut -d
else
setenv PTHREAD_LIBS -pthread
@ -26,7 +26,7 @@ $OpenBSD: patch-odk_setsdkenv_unix_csh_in,v 1.2 2006/08/20 03:36:52 kurt Exp $
+ 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_CFLAGS "-pthread -D_THREAD_SAFE"
+ setenv PTHREAD_LIBS -pthread
+
+ endif

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.2 2006/08/20 03:36:52 kurt Exp $
$OpenBSD: patch-odk_setsdkenv_unix_sh_in,v 1.3 2006/10/27 16:02:02 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
+++ odk/setsdkenv_unix.sh.in Thu Oct 26 09:04:38 2006
@@ -206,6 +206,28 @@ case $sd_platform in
export PTHREAD_LIBS
fi
@ -21,7 +21,7 @@ $OpenBSD: patch-odk_setsdkenv_unix_sh_in,v 1.2 2006/08/20 03:36:52 kurt Exp $
+ 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_CFLAGS="-pthread -D_THREAD_SAFE"
+ PTHREAD_LIBS=-pthread
+ export PTHREAD_CFLAGS
+ export PTHREAD_LIBS

445
editors/openoffice/patches/patch-portaudio_portaudio_v18_1_patch
View File

@ -1,257 +1,256 @@
$OpenBSD: patch-portaudio_portaudio_v18_1_patch,v 1.1 2006/09/20 09:06:19 robert Exp $
--- portaudio/portaudio_v18_1.patch.orig.port Fri Mar 10 10:09:02 2006
+++ portaudio/portaudio_v18_1.patch Tue Aug 22 08:09:41 2006
@@ -1,60 +1,6 @@
-*** misc/portaudio_v18_1/configure 2003-02-12 05:24:56.000000000 +0100
---- misc/build/portaudio_v18_1/configure 2006-01-31 20:10:00.317442000 +0100
+*** misc/portaudio_v18_1/Makefile.in Wed Feb 12 05:24:56 2003
+--- misc/build/portaudio_v18_1/Makefile.in Tue Aug 22 00:07:45 2006
***************
-*** 1883,1892 ****
- case "${host_os}" in
- darwin* )
-
-! OTHER_OBJS="pa_mac_core/pa_mac_core.o";
-! LIBS="-framework CoreAudio -lm";
- PADLL="libportaudio.dylib";
-! SHARED_FLAGS="-framework CoreAudio -dynamiclib";
- ;;
-
- mingw* )
$OpenBSD: patch-portaudio_portaudio_v18_1_patch,v 1.2 2006/10/27 16:02:02 kurt Exp $
--- portaudio/portaudio_v18_1.patch.orig.port Wed Mar 8 09:03:33 2006
+++ portaudio/portaudio_v18_1.patch Thu Oct 26 23:34:46 2006
@@ -12,7 +12,7 @@
;;
mingw* )
---- 1883,1921 ----
- case "${host_os}" in
- darwin* )
-
-! OTHER_OBJS="pa_mac_core/pa_mac_core.o pablio/pablio.o pablio/ringbuffer.o";
-! LIBS="-framework CoreAudio -framework AudioToolbox -lm";
- PADLL="libportaudio.dylib";
-! SHARED_FLAGS="-framework CoreAudio -framework AudioToolbox -dynamiclib -single_module -install_name '@executable_path/libportaudio.dylib.0'";
-! CFLAGS="-malign-natural -O2 -Ipa_common -Ipablio ${ARCH_FLAGS}"
-! ;;
-!
-! linux* )
-!
-! OTHER_OBJS="pa_unix_oss/pa_unix_oss.o pa_unix_oss/pa_unix.o";
-! LIBS="-lm -lpthread";
-! PADLL="libportaudio.so";
-! SHARED_FLAGS="-shared -Wl,-soname=libportaudio.so.0 -Wl,-rpath,'\$\$ORIGIN'";
-! CFLAGS="-O2 -fPIC ${ARCH_FLAGS}"
-! ;;
-!
-! freebsd* )
-! if test "$OSVERSION" -lt "500016"; then
-! PTHREAD_CFLAGS="-D_THREAD_SAFE"
-! PTHREAD_LIBS="-pthread"
-! elif test "$OSVERSION" -lt "502102"; then
-! PTHREAD_CFLAGS="-D_THREAD_SAFE"
-! PTHREAD_LIBS="-lc_r"
-! else
-! PTHREAD_CFLAGS=""
-! PTHREAD_LIBS="-pthread"
-! fi
-!
-! OTHER_OBJS="pa_unix_oss/pa_unix_oss.o pa_unix_oss/pa_unix.o";
-! LIBS="-lm ${PTHREAD_LIBS}";
-! PADLL="libportaudio.so";
-! SHARED_FLAGS="-shared -Wl,-soname=libportaudio.so.0";
-! CFLAGS="-O2 -fPIC ${PTHREAD_CFLAGS} ${ARCH_FLAGS}"
- ;;
-
- mingw* )
-*** misc/portaudio_v18_1/Makefile.in 2003-02-12 05:24:56.000000000 +0100
---- misc/build/portaudio_v18_1/Makefile.in 2006-02-06 16:24:03.977957000 +0100
-***************
*** 52,58 ****
+--- 1883,1931 ----
case "${host_os}" in
darwin* )
OBJS = $(COMMON_OBJS) $(OTHER_OBJS)
@@ -67,52 +13,166 @@
@@ -49,6 +49,16 @@
! PADLL="libportaudio.so";
! SHARED_FLAGS="-shared -Wl,-soname=libportaudio.so.0";
! CFLAGS="-O2 -fPIC ${PTHREAD_CFLAGS} ${ARCH_FLAGS}"
+! ;;
+!
+! openbsd* )
+!
+! OTHER_OBJS="pa_unix_oss/pa_unix_oss.o pa_unix_oss/pa_unix.o";
+! LIBS="-lm -lpthread";
+! PADLL="libportaudio.so";
+! SHARED_FLAGS="-shared -Wl,-soname=libportaudio.so.0";
+! CFLAGS="${CFLAGS} -fPIC -pthread ${ARCH_FLAGS}"
+! DLL_LIBS="-lossaudio";
;;
OBJS = $(COMMON_OBJS) $(OTHER_OBJS)
-! all: lib/$(PADLLV)
+! all: lib/$(PALIB) lib/$(PADLLV)
tests: bin/ $(TESTS)
-*** misc/portaudio_v18_1/Makefile.linux 2002-06-25 23:31:06.000000000 +0200
---- misc/build/portaudio_v18_1/Makefile.linux 2006-01-31 20:10:00.349348000 +0100
+*** misc/portaudio_v18_1/Makefile.linux Tue Jun 25 23:31:06 2002
+--- misc/build/portaudio_v18_1/Makefile.linux Tue Aug 22 00:07:45 2006
***************
-*** 17,23 ****
- LIBS = -lm -lpthread
+*** 14,23 ****
+ # someone tell me the right way, please
+
+! LIBS = -lm -lpthread
+
CDEFINES = -I../pa_common
! CFLAGS = -g
LIBINST = /usr/local/lib
TESTS:= $(wildcard pa_tests/pa*.c pa_tests/debug*.c)
---- 17,23 ----
- LIBS = -lm -lpthread
+--- 14,23 ----
+ # someone tell me the right way, please
+
+! LIBS = -lm -pthread -lossaudio
+
CDEFINES = -I../pa_common
! CFLAGS = -O2 -fPIC $(ARCH_FLAGS)
mingw* )
@@ -90,29 +100,216 @@
LIBINST = /usr/local/lib
TESTS:= $(wildcard pa_tests/pa*.c pa_tests/debug*.c)
-*** misc/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c 2003-06-30 17:05:50.000000000 +0200
---- misc/build/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c 2006-01-31 20:10:00.363708000 +0100
+*** misc/portaudio_v18_1/pa_unix_oss/Makefile Fri Oct 18 16:54:44 2002
+--- misc/build/portaudio_v18_1/pa_unix_oss/Makefile Tue Aug 22 00:07:45 2006
+*** misc/portaudio_v18_1/pa_tests/patest_buffer.c.old 2003-02-11 19:41:32.000000000 +0100
+--- misc/build/portaudio_v18_1/pa_tests/patest_buffer.c 2005-08-15 11:46:53.000000000 +0200
***************
-*** 43,48 ****
---- 43,50 ----
+*** 16,22 ****
+ PAOBJS = pa_lib.o pa_unix_oss.o pa_unix.o
+ PAINC = portaudio.h pa_unix.h
+! PALIBS = -lm -lpthread
+*** 125,130 ****
+--- 125,131 ----
+ if( err < 0 ) return 0;
+
+ all: patest_sine.run
+
+--- 16,22 ----
+
+ PAOBJS = pa_lib.o pa_unix_oss.o pa_unix.o
+ PAINC = portaudio.h pa_unix.h
+! PALIBS = -lm -pthread -lossaudio
+
+ all: patest_sine.run
+
+*** misc/portaudio_v18_1/pa_unix_oss/pa_unix.c Mon Jun 30 17:05:50 2003
+--- misc/build/portaudio_v18_1/pa_unix_oss/pa_unix.c Tue Aug 22 00:07:45 2006
+***************
+*** 411,417 ****
+
+ static PaError PaHost_WatchDogProc( PaHostSoundControl *pahsc )
+ {
+- struct sched_param schp = { 0 };
+ int maxPri;
+
+ #ifdef GNUSTEP
+--- 411,416 ----
+***************
+*** 420,434 ****
+
+ /* Run at a priority level above audio thread so we can still run if it hangs. */
+ /* Rise more than 1 because of rumored off-by-one scheduler bugs. */
+- schp.sched_priority = pahsc->pahsc_AudioPriority + 4;
+- maxPri = sched_get_priority_max(SCHEDULER_POLICY);
+- if( schp.sched_priority > maxPri ) schp.sched_priority = maxPri;
+
+ if (sched_setscheduler(0, SCHEDULER_POLICY, &schp) != 0)
+ {
+ ERR_RPT(("PaHost_WatchDogProc: cannot set watch dog priority!\n"));
+ goto killAudio;
+ }
++ return 0;
+ }
+
+ /* Compare watchdog time with audio and canary thread times. */
+ /* Sleep for a while or until thread cancelled. */
+--- 419,432 ----
+
+ /* Run at a priority level above audio thread so we can still run if it hangs. */
+ /* Rise more than 1 because of rumored off-by-one scheduler bugs. */
+
++ #if 0
+ if (sched_setscheduler(0, SCHEDULER_POLICY, &schp) != 0)
+ {
+ ERR_RPT(("PaHost_WatchDogProc: cannot set watch dog priority!\n"));
+ goto killAudio;
+ }
++ #endif
+
+ /* Compare watchdog time with audio and canary thread times. */
+ /* Sleep for a while or until thread cancelled. */
+*** misc/portaudio_v18_1/pa_unix_oss/pa_unix.c Mon Jun 30 11:05:50 2003
+--- misc/build/portaudio_v18_1/pa_unix_oss/pa_unix.c Thu Oct 26 11:50:21 2006
+***************
+*** 466,471 ****
+--- 464,470 ----
+*** 401,406 ****
+--- 401,407 ----
+ return result;
+ }
+
+ lowerAudio:
+ {
++ #if 0
+ struct sched_param schat = { 0 };
+ if( sched_setscheduler(pahsc->pahsc_AudioThreadPID, SCHED_OTHER, &schat) != 0)
+ {
++ #ifndef __OpenBSD__
+ /*******************************************************************************************
+ * Monitor audio thread and lower its it if it hogs the CPU.
+ * To prevent getting killed, the audio thread must update a
+***************
+*** 477,482 ****
+--- 476,482 ----
+ ERR_RPT(("PaHost_WatchDogProc: lowered audio priority to prevent hogging of CPU.\n"));
+ goto cleanup;
+ }
++ #endif
+ }
+
+ killAudio:
+***************
+*** 574,580 ****
+ {
+ PaHostSoundControl *pahsc;
+ PaError result = paNoError;
+- struct sched_param schp = { 0 };
+
+ pahsc = (PaHostSoundControl *) past->past_DeviceData;
+ if( pahsc == NULL ) return paInternalError;
+--- 574,579 ----
+***************
+*** 582,587 ****
+--- 581,587 ----
+ pahsc->pahsc_AudioThreadPID = getpid();
+ DBUG(("PaHost_BoostPriority: audio PID = %d\n", pahsc->pahsc_AudioThreadPID ));
+
++ #if 0
+ /* Choose a priority in the middle of the range. */
+ pahsc->pahsc_AudioPriority = (sched_get_priority_max(SCHEDULER_POLICY) -
+ sched_get_priority_min(SCHEDULER_POLICY)) / 2;
+***************
+*** 597,602 ****
+--- 597,603 ----
+ /* We are running at high priority so we should have a watchdog in case audio goes wild. */
+ result = PaHost_StartWatchDog( pahsc );
+ }
++ #endif
+*** 600,605 ****
+--- 601,607 ----
+
+ return result;
+ }
+*** misc/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c Mon Jun 30 17:05:50 2003
+--- misc/build/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c Tue Aug 22 00:07:45 2006
+***************
+*** 43,49 ****
++ #endif /* Watchdog */
+
+ /*******************************************************************************************/
+ static PaError Pa_AudioThreadProc( internalPortAudioStream *past )
+***************
+*** 615,622 ****
+--- 617,626 ----
+ GSRegisterCurrentThread(); /* SB20010904 */
+ #endif
+
++ #ifndef __OpenBSD__
+ result = PaHost_BoostPriority( past );
+ if( result < 0 ) goto error;
++ #endif
+
+ past->past_IsActive = 1;
+ DBUG(("entering thread.\n"));
+***************
+*** 682,688 ****
+--- 686,694 ----
+ DBUG(("Pa_AudioThreadProc: left audio loop.\n"));
+
+ past->past_IsActive = 0;
++ #ifndef __OpenBSD__
+ PaHost_StopWatchDog( pahsc );
++ #endif
+
+ error:
+ DBUG(("leaving audio thread.\n"));
+***************
+*** 812,818 ****
+ past->past_NumUserBuffers, past->past_FramesPerUserBuffer,
+ past->past_NumOutputChannels );
+ result = Pa_SetupDeviceFormat( pahsc->pahsc_OutputHandle,
+! past->past_NumOutputChannels, (int)past->past_SampleRate );
+ }
+ }
+ else
+--- 818,824 ----
+ past->past_NumUserBuffers, past->past_FramesPerUserBuffer,
+ past->past_NumOutputChannels );
+ result = Pa_SetupDeviceFormat( pahsc->pahsc_OutputHandle,
+! past->past_NumOutputChannels, (int)past->past_SampleRate, 2 );
+ }
+ }
+ else
+*** misc/portaudio_v18_1/pa_unix_oss/pa_unix.h Thu Apr 10 17:42:34 2003
+--- misc/build/portaudio_v18_1/pa_unix_oss/pa_unix.h Thu Oct 26 11:50:03 2006
+***************
+*** 133,139 ****
+ internalPortAudioDevice *Pa_GetInternalDevice( PaDeviceID id );
+ PaError Pa_QueryDevices( void );
+ PaError Pa_QueryDevice( const char *deviceName, internalPortAudioDevice *pad );
+! PaError Pa_SetupDeviceFormat( int devHandle, int numChannels, int sampleRate );
+ PaError Pa_SetupInputDeviceFormat( int devHandle, int numChannels, int sampleRate );
+ PaError Pa_SetupOutputDeviceFormat( int devHandle, int numChannels, int sampleRate );
+ void Pa_SetLatency( int devHandle, int numBuffers, int framesPerBuffer, int channelsPerFrame );
+--- 133,139 ----
+ internalPortAudioDevice *Pa_GetInternalDevice( PaDeviceID id );
+ PaError Pa_QueryDevices( void );
+ PaError Pa_QueryDevice( const char *deviceName, internalPortAudioDevice *pad );
+! PaError Pa_SetupDeviceFormat( int devHandle, int numChannels, int sampleRate, int input );
+ PaError Pa_SetupInputDeviceFormat( int devHandle, int numChannels, int sampleRate );
+ PaError Pa_SetupOutputDeviceFormat( int devHandle, int numChannels, int sampleRate );
+ void Pa_SetLatency( int devHandle, int numBuffers, int framesPerBuffer, int channelsPerFrame );
+*** misc/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c Mon Jun 30 11:05:50 2003
+--- misc/build/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c Thu Oct 26 11:49:47 2006
+***************
*** 43,48 ****
---- 43,50 ----
+--- 43,53 ----
#ifdef __linux__
#include <linux/soundcard.h>
-+ #elif defined (__FreeBSD__)
-+ #include <sys/soundcard.h>
- #else
+! #else
+ #elif defined (__FreeBSD__)
+ #include <sys/soundcard.h>
++ #elif defined (__OpenBSD__)
++ #include <soundcard.h>
++ #include <sys/audioio.h>
#else
#include <machine/soundcard.h> /* JH20010905 */
#endif
-
-*** misc/portaudio_v18_1/pa_tests/patest_buffer.c.old 2003-02-11 19:41:32.000000000 +0100
---- misc/build/portaudio_v18_1/pa_tests/patest_buffer.c 2005-08-15 11:46:53.000000000 +0200
-***************
***************
-*** 125,130 ****
---- 125,131 ----
- if( err < 0 ) return 0;
+*** 218,228 ****
+ }
- }
+ /*******************************************************************************************/
+! PaError Pa_SetupDeviceFormat( int devHandle, int numChannels, int sampleRate )
+ {
+ PaError result = paNoError;
+ int tmp;
+
+ /* Set format, channels, and rate in this order to keep OSS happy. */
+ /* Set data format. FIXME - handle more native formats. */
+ tmp = AFMT_S16_NE;
+--- 223,237 ----
+ }
+
+ /*******************************************************************************************/
+! PaError Pa_SetupDeviceFormat( int devHandle, int numChannels, int sampleRate, int input )
+ {
+ PaError result = paNoError;
+ int tmp;
+
++ #ifdef __OpenBSD__
++ audio_info_t audio_if;
++ #endif
++
+ /* Set format, channels, and rate in this order to keep OSS happy. */
+ /* Set data format. FIXME - handle more native formats. */
+ tmp = AFMT_S16_NE;
+***************
+*** 272,289 ****
+ return paHostError;
+ }
}
-+ return 0;
- }
+--- 43,51 ----
+!
+ return result;
+ }
+
+ PaError Pa_SetupOutputDeviceFormat( int devHandle, int numChannels, int sampleRate )
+ {
+! return Pa_SetupDeviceFormat(devHandle, numChannels, sampleRate);
+ }
+
+ PaError Pa_SetupInputDeviceFormat( int devHandle, int numChannels, int sampleRate )
+ {
+! return Pa_SetupDeviceFormat(devHandle, numChannels, sampleRate);
+ }
+
+
+--- 281,332 ----
+ return paHostError;
+ }
+ }
+!
+! #ifdef __OpenBSD__
+!
+! AUDIO_INITINFO(&audio_if);
+!
+! switch(input) {
+! case 2:
+! audio_if.record.open = 1;
+! audio_if.record.pause = 0;
+! audio_if.play.open = 1;
+! audio_if.play.pause = 0;
+! break;
+!
+! case 1:
+! audio_if.record.open = 1;
+! audio_if.record.pause = 0;
+! break;
+!
+! case 0:
+! audio_if.play.open = 1;
+! audio_if.play.pause = 0;
+! break;
+!
+! default:
+! break;
+! }
+!
+! if (ioctl(devHandle, AUDIO_SETINFO, &audio_if) == -1)
+! {
+! ERR_RPT(("Pa_SetupDeviceFormat: could not AUDIO_SETINFO for recording on OpenBSD\n" ));
+! return paHostError;
+! }
+!
+! #endif
+!
+ return result;
+ }
+
+ PaError Pa_SetupOutputDeviceFormat( int devHandle, int numChannels, int sampleRate )
+ {
+! return Pa_SetupDeviceFormat(devHandle, numChannels, sampleRate, 0);
+ }
+
+ PaError Pa_SetupInputDeviceFormat( int devHandle, int numChannels, int sampleRate )
+ {
+! return Pa_SetupDeviceFormat(devHandle, numChannels, sampleRate, 1);
}
+ #ifdef __linux__
+ #include <linux/soundcard.h>
+! #elif defined (__OpenBSD__)
+! #include <soundcard.h>
+! #else
+ #include <machine/soundcard.h> /* JH20010905 */
+ #endif

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

@ -0,0 +1,12 @@
$OpenBSD: patch-psprint_source_printer_cupsmgr_cxx,v 1.1 2006/10/27 16:02:02 kurt Exp $
--- psprint/source/printer/cupsmgr.cxx.orig.port Thu Oct 26 10:46:55 2006
+++ psprint/source/printer/cupsmgr.cxx Thu Oct 26 10:47:09 2006
@@ -57,7 +57,7 @@ typedef void cups_option_t;
#ifdef MACOSX
#define CUPS_LIB_NAME "libcups.2.dylib"
#else
-#define CUPS_LIB_NAME "libcups.so.2"
+#define CUPS_LIB_NAME "libcups.so"
#endif
namespace psp

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

@ -1,6 +1,6 @@
$OpenBSD: patch-sal_osl_unx_security_c,v 1.2 2006/08/20 03:36:52 kurt Exp $
$OpenBSD: patch-sal_osl_unx_security_c,v 1.3 2006/10/27 16:02:02 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
+++ sal/osl/unx/security.c Thu Oct 26 09:30:08 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,53 +10,6 @@ $OpenBSD: patch-sal_osl_unx_security_c,v 1.2 2006/08/20 03:36:52 kurt Exp $
/* #i64906#: sysconf(_SC_GETPW_R_SIZE_MAX) returns -1 on Mac OS X and FreeBSD */
size_t n = 1024;
#else
@@ -102,12 +102,46 @@ oslSecurity SAL_CALL osl_getCurrentSecur
oslSecurityImpl * p = newSecurityImpl(&n);
if (p != NULL) {
struct passwd * found;
+#if defined(OPENBSD)
+ static pthread_mutex_t getpwuid_mutex = PTHREAD_MUTEX_INITIALIZER;
+ pthread_mutex_lock(&getpwuid_mutex);
+ 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)
+ {
+ pthread_mutex_unlock(&getpwuid_mutex);
+ 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)
+ {
+ 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)
{
deleteSecurityImpl(p);
p = 0;
}
+#endif
}
return p;
}
@@ -474,7 +508,7 @@ osl_psz_loginUser(const sal_Char* pszUse
oslSecurity* pSecurity)
{

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

@ -1,16 +1,16 @@
$OpenBSD: patch-scp2_source_ooo_file_library_ooo_scp,v 1.3 2006/10/19 15:16:50 kurt Exp $
$OpenBSD: patch-scp2_source_ooo_file_library_ooo_scp,v 1.4 2006/10/27 16:02:02 kurt Exp $
--- scp2/source/ooo/file_library_ooo.scp.orig.port Fri Aug 4 08:39:52 2006
+++ scp2/source/ooo/file_library_ooo.scp Thu Oct 19 10:47:54 2006
@@ -829,7 +829,7 @@ File gid_File_Lib_Freetype
#endif
TXT_FILE_BODY;
+++ scp2/source/ooo/file_library_ooo.scp Thu Oct 26 11:00:11 2006
@@ -831,6 +831,8 @@ File gid_File_Lib_Freetype
Styles = (PACKED);
- #if defined (FREEBSD) || defined (NETBSD)
+ #if defined (FREEBSD) || defined (NETBSD) || defined (OPENBSD)
#if defined (FREEBSD) || defined (NETBSD)
Name = "libfreetype.so.9";
+ #elif defined (OPENBSD)
+ Name = "libfreetype.so";
#else
Name = "libfreetype.so.6";
@@ -872,7 +872,7 @@ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Fwl
#endif
@@ -872,7 +874,7 @@ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Fwl
STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Fwm , fwm)
@ -19,7 +19,7 @@ $OpenBSD: patch-scp2_source_ooo_file_library_ooo_scp,v 1.3 2006/10/19 15:16:50 k
#if defined( _gcc3 )
File gid_File_Lib_Gcc
@@ -886,7 +886,7 @@ End
@@ -886,7 +888,7 @@ End
#endif
@ -28,7 +28,7 @@ $OpenBSD: patch-scp2_source_ooo_file_library_ooo_scp,v 1.3 2006/10/19 15:16:50 k
#if defined( _gcc3 )
File gid_File_Lib_Stdc
@@ -900,7 +900,7 @@ End
@@ -900,7 +902,7 @@ End
#endif
@ -37,7 +37,7 @@ $OpenBSD: patch-scp2_source_ooo_file_library_ooo_scp,v 1.3 2006/10/19 15:16:50 k
File gid_File_Lib_Gcc2_Uno
TXT_FILE_BODY;
@@ -1913,7 +1913,7 @@ File gid_File_Lib_Stlport
@@ -1913,7 +1915,7 @@ File gid_File_Lib_Stlport
#ifdef _STLP_DEBUG
#ifdef UNX
#if defined(_gcc3) || defined(_GCC)
@ -46,7 +46,7 @@ $OpenBSD: patch-scp2_source_ooo_file_library_ooo_scp,v 1.3 2006/10/19 15:16:50 k
Name = STRING(CONCAT3(libstlport_,gcc_stldebug,.so.4.5));
#else
Name = STRING(CONCAT3(libstlport_,gcc_stldebug,UNXSUFFIX));
@@ -1937,7 +1937,7 @@ File gid_File_Lib_Stlport
@@ -1937,7 +1939,7 @@ File gid_File_Lib_Stlport
#else
#ifdef UNX
#if defined(_gcc3) || defined(_GCC)

21
editors/openoffice/patches/patch-shell_source_unix_misc_gnome-open-url_c Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-shell_source_unix_misc_gnome-open-url_c,v 1.1 2006/10/27 16:02:02 kurt Exp $
--- shell/source/unix/misc/gnome-open-url.c.orig.port Thu Oct 26 11:01:40 2006
+++ shell/source/unix/misc/gnome-open-url.c Thu Oct 26 11:02:57 2006
@@ -61,7 +61,7 @@ typedef enum {
gchar* gnome_gconf_get_gnome_libs_settings_relative (const gchar *subkey)
{
- void* handle = dlopen("libglib-2.0.so.0", RTLD_LAZY);
+ void* handle = dlopen("libglib-2.0.so", RTLD_LAZY);
(void)subkey; /* avoid warning due to unused parameter */
@@ -82,7 +82,7 @@ gchar* gnome_gconf_get_gnome_libs_settin
gboolean gnome_url_show (const char *url, GError **error)
{
- void* handle = dlopen("libgnomevfs-2.so.0", RTLD_LAZY);
+ void* handle = dlopen("libgnomevfs-2.so", RTLD_LAZY);
gboolean ret = 0;
(void)error; /* avoid warning due to unused parameter */

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

@ -1,16 +1,16 @@
$OpenBSD: patch-solenv_inc_unxobsdi_mk,v 1.5 2006/10/20 14:59:26 kurt Exp $
--- solenv/inc/unxobsdi.mk.orig.port Thu Oct 19 11:37:15 2006
+++ solenv/inc/unxobsdi.mk Thu Oct 19 14:43:31 2006
@@ -0,0 +1,231 @@
$OpenBSD: patch-solenv_inc_unxobsdi_mk,v 1.6 2006/10/27 16:02:02 kurt Exp $
--- solenv/inc/unxobsdi.mk.orig.port Wed Oct 25 07:34:21 2006
+++ solenv/inc/unxobsdi.mk Thu Oct 26 08:52:12 2006
@@ -0,0 +1,228 @@
+#*************************************************************************
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: patch-solenv_inc_unxobsdi_mk,v $
+#
+# $Revision: 1.5 $
+# $Revision: 1.6 $
+#
+# last change: $Author: kurt $ $Date: 2006/10/20 14:59:26 $
+# last change: $Author: kurt $ $Date: 2006/10/27 16:02:02 $
+#
+# The Contents of this file are made available subject to
+# the terms of GNU Lesser General Public License Version 2.1.
@ -86,8 +86,6 @@ $OpenBSD: patch-solenv_inc_unxobsdi_mk,v 1.5 2006/10/20 14:59:26 kurt Exp $
+
+.ENDIF
+
+INCPOST=$(LOCALBASE)/include
+
+# flags for the C++ Compiler
+CFLAGSCC=$(ARCH_FLAGS)
+# Flags for enabling exception handling
@ -156,7 +154,6 @@ $OpenBSD: patch-solenv_inc_unxobsdi_mk,v 1.5 2006/10/20 14:59:26 kurt Exp $
+#LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
+#LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
+LINKFLAGS=-Wl,-z,combreloc
+SOLARLIB+=-L$(LOCALBASE)/lib
+
+# linker flags for linking applications
+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec

106
editors/openoffice/patches/patch-stlport_STLport-4_5_patch
View File

@ -1,25 +1,89 @@
$OpenBSD: patch-stlport_STLport-4_5_patch,v 1.3 2006/10/25 22:49:50 kurt Exp $
$OpenBSD: patch-stlport_STLport-4_5_patch,v 1.4 2006/10/27 16:02:02 kurt Exp $
--- stlport/STLport-4.5.patch.orig.port Thu Apr 27 03:47:20 2006
+++ stlport/STLport-4.5.patch Tue Oct 24 20:47:05 2006
@@ -141,7 +141,7 @@
! #
! #
! LINK=ar cr
-! DYN_LINK=${CXX} -Wl,-rpath,'$$ORIGIN' ${PTHREAD_LIBS} --fexceptions -shared -o
+! DYN_LINK=${CXX} ${PTHREAD_LIBS} --fexceptions -shared -o
!
! OBJEXT=o
! DYNEXT=so
@@ -281,7 +281,7 @@
! #
! #
! LINK=ar cr
-! DYN_LINK=$(CXX) -Wl,-rpath,'$$ORIGIN' --fexceptions -shared -o
+! DYN_LINK=$(CXX) --fexceptions -shared -o
!
! OBJEXT=o
! DYNEXT=so
@@ -848,3 +848,115 @@
+++ stlport/STLport-4.5.patch Thu Oct 26 15:40:08 2006
@@ -115,6 +115,81 @@
template class _STLP_CLASS_DECLSPEC __node_alloc<false,0>;
template class _STLP_CLASS_DECLSPEC __node_alloc<true,0>;
template class _STLP_CLASS_DECLSPEC __debug_alloc< __node_alloc<true,0> >;
+*** misc/STLport-4.5/src/gcc-3.0-openbsd.mak 2006-02-16 16:21:24.224363000 +0100
+--- misc/build/STLport-4.5/src/gcc-3.0-openbsd.mak 2006-02-16 16:18:28.228881000 +0100
+***************
+*** 1 ****
+! dummy
+--- 1,69 ----
+! #
+! # Note : this makefile is for gcc-3 !
+! #
+!
+! #
+! # compiler
+! # take these from the OOo build environment
+! CC*= gcc
+! CXX*= g++
+!
+! #
+! # Basename for libraries
+! #
+! LIB_BASENAME = libstlport_gcc
+!
+! #
+! # guts for common stuff
+! #
+! #
+! LINK=ar cr
+! DYN_LINK=${CXX} ${PTHREAD_LIBS} -lstdc++ --fexceptions -shared -o
+!
+! OBJEXT=o
+! DYNEXT=so
+! STEXT=a
+! RM=rm -rf
+! PATH_SEP=/
+! MKDIR=mkdir -p
+! COMP=GCC$(ARCH)
+! INSTALL_STEP = install_unix
+!
+! all: all_dynamic all_static symbolic_links
+!
+! include common_macros.mak
+!
+! WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized
+!
+! CXXFLAGS_COMMON = ${PTHREAD_CFLAGS} -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -ftemplate-depth-32 -I${STLPORT_DIR} ${WARNING_FLAGS} ${ARCH_FLAGS}
+! CFLAGS_COMMON = ${PTHREAD_CFLAGS} -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -I${STLPORT_DIR} ${WARNING_FLAGS} ${ARCH_FLAGS}
+!
+! CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2 -fPIC
+! CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
+!
+! CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC
+! CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
+!
+! CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
+! CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
+!
+! CFLAGS_RELEASE_static = $(CFLAGS_COMMON) -O2 -fPIC
+! CFLAGS_RELEASE_dynamic = $(CFLAGS_COMMON) -O2 -fPIC
+!
+! CFLAGS_DEBUG_static = $(CFLAGS_COMMON) -g -fPIC
+! CFLAGS_DEBUG_dynamic = $(CFLAGS_COMMON) -g -fPIC
+!
+! CFLAGS_STLDEBUG_static = $(CFLAGS_DEBUG_static) -D_STLP_DEBUG
+! CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
+!
+! include common_percent_rules.mak
+! include common_rules.mak
+!
+!
+! #install: all
+! # cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
+!
+! #%.s: %.cpp
+! # $(CXX) $(CXXFLAGS) -O4 -S -pto $< -o $@
+!
+!
*** misc/STLport-4.5/src/gcc-3.0-freebsd.mak 2006-02-16 16:21:24.224363000 +0100
--- misc/build/STLport-4.5/src/gcc-3.0-freebsd.mak 2006-02-16 16:18:28.228881000 +0100
***************
@@ -848,3 +923,115 @@
# define _STLP_MUTEX_INITIALIZER
# endif

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

@ -0,0 +1,21 @@
$OpenBSD: patch-stlport_makefile_mk,v 1.1 2006/10/27 16:02:02 kurt Exp $
--- stlport/makefile.mk.orig.port Thu Oct 26 14:53:02 2006
+++ stlport/makefile.mk Thu Oct 26 14:58:56 2006
@@ -111,7 +111,7 @@ PATCH_FILE_NAME=STLport-4.5-0119.patch
TAR_EXCLUDES=*/SC5/*
.ENDIF # "$(USE_SHELL)"=="4nt"
-ADDITIONAL_FILES=src$/gcc-3.0.mak src$/gcc-3.0-macosx.mak src$/gcc-3.0-freebsd.mak src$/sunpro8.mak src$/sunpro11.mak
+ADDITIONAL_FILES=src$/gcc-3.0.mak src$/gcc-3.0-macosx.mak src$/gcc-3.0-freebsd.mak src$/gcc-3.0-openbsd.mak src$/sunpro8.mak src$/sunpro11.mak
CONFIGURE_ACTION=none
@@ -133,6 +133,8 @@ BUILD_FLAGS=-f vc7.mak
# FreeBSD needs a special makefile
.IF "$(OS)"=="FREEBSD"
BUILD_FLAGS=-f gcc-3.0-freebsd.mak
+ .ELIF "$(OS)"=="OPENBSD"
+ BUILD_FLAGS=-f gcc-3.0-openbsd.mak
.ELIF "$(OS)"=="MACOSX"
BUILD_FLAGS=-f gcc-3.0-macosx.mak
.ELSE

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

@ -0,0 +1,12 @@
$OpenBSD: patch-vcl_unx_source_gdi_salogl_cxx,v 1.1 2006/10/27 16:02:02 kurt Exp $
--- vcl/unx/source/gdi/salogl.cxx.orig.port Thu Oct 26 11:04:41 2006
+++ vcl/unx/source/gdi/salogl.cxx Thu Oct 26 11:04:53 2006
@@ -64,7 +64,7 @@ using namespace rtl;
#ifdef MACOSX
#define OGL_LIBNAME "libGL.dylib"
#else
-#define OGL_LIBNAME "libGL.so.1"
+#define OGL_LIBNAME "libGL.so"
#endif
// ----------

4
editors/openoffice/pkg/PFRAG.shared
View File

@ -1,8 +1,9 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2006/09/30 18:47:25 robert Exp $
@comment $OpenBSD: PFRAG.shared,v 1.4 2006/10/27 16:02:02 kurt Exp $
openoffice/program/acceptor.uno.so
openoffice/program/basprov680.uno.so
openoffice/program/behelper.uno.so
openoffice/program/bridgefac.uno.so
openoffice/program/cairocanvas.uno.so
openoffice/program/canvasfactory.uno.so
openoffice/program/cmdmail.uno.so
openoffice/program/configmgr2.uno.so
@ -140,6 +141,7 @@ openoffice/program/libpcr680.so
openoffice/program/libpdffilter680.so
openoffice/program/libpk680.so
openoffice/program/libplaceware.so
openoffice/program/libportaudio.so
openoffice/program/libpreload680.so
openoffice/program/libprotocolhandler680.so
openoffice/program/libpsp680.so

4
editors/openoffice/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2006/09/30 18:47:25 robert Exp $
@comment $OpenBSD: PLIST,v 1.4 2006/10/27 16:02:02 kurt Exp $
%%SHARED%%
bin/scalc
bin/sdraw
@ -76,6 +76,8 @@ openoffice/program/libicule.so.26
openoffice/program/libicuuc.so.26
openoffice/program/libjvmaccessgcc3.so.3
openoffice/program/libjvmfwk.so.3
openoffice/program/libportaudio.so.0
openoffice/program/libportaudio.so.0.0.18
openoffice/program/libreg.so.3
openoffice/program/librmcxt.so.3
openoffice/program/libsal.so.3