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

update to version 2.0.4m4;

Browse Source 
- more optimizations;
- use autoconf;
- remove hardcoded paths from unxobsdi.mk;
- zap .0.0 from WANTLIB;
- add a new MASTER_SITE;
- enable sndfile support;
This commit is contained in:
robert 2006-09-20 09:06:19 +00:00
parent acf77071fc
commit bcbe5eb725
15 changed files with 339 additions and 252 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
editors/openoffice/Makefile
View File

@ -1,14 +1,14 @@
# $OpenBSD: Makefile,v 1.2 2006/08/20 03:36:52 kurt Exp $
# $OpenBSD: Makefile,v 1.3 2006/09/20 09:06:19 robert Exp $
ONLY_FOR_ARCHS= i386
COMMENT= "a multi-platform productivity suite"
M= 179
VERSION= SRC680_m${M}
M= m4
VERSION= OOD680_${M}
DISTNAME= OOo_${VERSION}_source
WRKDIST= ${WRKDIR}/ooo_${VERSION}_src
PKGNAME= openoffice-2.0.3m${M}p0
PKGNAME= openoffice-2.0.4${M}
CATEGORIES= editors productivity
SHARED_LIBS= icudata 26.0 \
@ -18,7 +18,8 @@ SHARED_LIBS= icudata 26.0 \
stlport_gcc 4.5
HOMEPAGE= http://www.openoffice.org/
MASTER_SITES= http://humppa.hu/
MASTER_SITES= http://humppa.hu/ \
http://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/Sources/
# See http://www.openoffice.org/about.html#licenses
# and http://www.openoffice.org/license.html
@ -35,17 +36,18 @@ BUILD_DEPENDS= :zip-*:archivers/zip \
:tcsh-*:shells/tcsh \
:p5-Archive-Zip-*:archivers/p5-Archive-Zip
LIB_DEPENDS= gdk-x11-2.0.0.0,gdk_pixbuf-2.0.0.0,gtk-x11-2.0.0.0::x11/gtk+2 \
python2.3.0.0:python-2.3.*:lang/python/2.3 \
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
xslt.>=2::textproc/libxslt \
sndfile.>=1::audio/libsndfile
WANTLIB= ICE SM X11 Xext atk-1.0.0.0 c cairo expat fontconfig \
freetype glib-2.0.0.0 gmodule-2.0.0.0 gobject-2.0.0.0 \
gthread-2.0.0.0 iconv intl jpeg m pango-1.0.0.0 \
pangocairo-1.0.0.0 pangoft2-1.0.0.0 pthread stdc++ xml2 z
WANTLIB= ICE SM X11 Xext 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 \
pangocairo-1.0 pangoft2-1.0 pthread stdc++ xml2 z
USE_X11= Yes
USE_GMAKE= Yes
@ -55,7 +57,10 @@ VMEM_WARNING= Yes
PATCHORIG= .orig.port
WRKCONF= ${WRKSRC}/config_office
CONFIGURE_STYLE=gnu
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.59
AUTOCONF_DIR= ${WRKCONF}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
@ -78,6 +83,7 @@ CONFIGURE_ARGS= --disable-gnome-vfs \
--with-system-neon \
--with-system-python \
--with-system-db \
--with-system-sndfile \
--with-epm=internal \
--with-package-format=portable \
--without-java

8
editors/openoffice/distinfo
View File

@ -1,4 +1,4 @@
MD5 (OOo_SRC680_m179_source.tar.gz) = 4d0a5a9738fe21c4ff320220feeb48d9
RMD160 (OOo_SRC680_m179_source.tar.gz) = 6c2fc8adaccd9a91146d39326eef2027c47928ac
SHA1 (OOo_SRC680_m179_source.tar.gz) = e1c8e85c7371923ad35f023f2537cb4cfe9c2bd1
SIZE (OOo_SRC680_m179_source.tar.gz) = 305389861
MD5 (OOo_OOD680_m4_source.tar.gz) = 34c6abbee2e59222a1c9753002ae476c
RMD160 (OOo_OOD680_m4_source.tar.gz) = d6f99422076ec696151004fd2df62a0759d8cd89
SHA1 (OOo_OOD680_m4_source.tar.gz) = dcadfbcc9be88c454280a94ffd1303a0ae05aedc
SIZE (OOo_OOD680_m4_source.tar.gz) = 323081592

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

@ -1,20 +0,0 @@
$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
-.IF "$(BUILD_FOR_CLI)" != ""
-
ALLTAR : \
$(BIN)$/cliureversion.mk
@@ -69,7 +67,4 @@ $(BIN)$/cliureversion.mk: version.txt
#INCVERSION .PHONY: version.txt incversions.txt
# +$(PERL) $(PRJ)$/source$/scripts$/increment_version.pl \
# $< $(BIN)$/cliureversion.mk $(SOLARBINDIR)$/unotype_statistics.txt
-
-.END
-

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

@ -1,56 +0,0 @@
$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
;;
+ openbsd*)
+ test_x=yes
+ test_gtk=yes
+ build_cairo=yes
+ test_kde=yes
+ PTHREAD_CFLAGS="-D_THREAD_SAFE"
+ PTHREAD_LIBS="-pthread"
+ _os=OpenBSD
+ ;;
osf)
test_x=dontknow
test_cups=no
@@ -9890,7 +9899,7 @@ echo "$as_me: error: xsltproc is require
fi
-if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
+if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" -o "$_os" = "OpenBSD" ; then
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -10150,7 +10159,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXX
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
fi
-if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
+if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" -o "$_os" = "OpenBSD" ; then
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -10631,6 +10640,9 @@ echo $ECHO_N "checking which package for
AIX)
PKGFORMAT=aix
;;
+ OpenBSD)
+ PKGFORMAT=portable
+ ;;
*BSD)
PKGFORMAT=bsd
;;
@@ -12378,7 +12390,7 @@ fi
{ echo "$as_me:$LINENO: result: $ac_cv_header_db_h" >&5
echo "${ECHO_T}$ac_cv_header_db_h" >&6; }
if test $ac_cv_header_db_h = yes; then
- DB_INCLUDES=/usr/include
+ DB_INCLUDES=/usr/local/include/db4
else
CFLAGS=-I/usr/include/db4

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

@ -1,30 +0,0 @@
$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)
{
ResMgr * pResMgr = DeploymentResMgr::get();
- OUString s1(String(ResId(RID_STR_UNOPKG_ACCEPT_LIC_1, pResMgr)));
+ OUString s1 = String(ResId(RID_STR_UNOPKG_ACCEPT_LIC_1, pResMgr));
::rtl::OString os1 = ::rtl::OUStringToOString(s1, osl_getThreadTextEncoding());
- OUString s2(String(ResId(RID_STR_UNOPKG_ACCEPT_LIC_2, pResMgr)));
+ OUString s2 = String(ResId(RID_STR_UNOPKG_ACCEPT_LIC_2, pResMgr));
::rtl::OString os2 = ::rtl::OUStringToOString(s2, osl_getThreadTextEncoding());
- OUString s3(String(ResId(RID_STR_UNOPKG_ACCEPT_LIC_3, pResMgr)));
+ OUString s3 = String(ResId(RID_STR_UNOPKG_ACCEPT_LIC_3, pResMgr));
::rtl::OString os3 = ::rtl::OUStringToOString(s3, osl_getThreadTextEncoding());
- OUString s4(String(ResId(RID_STR_UNOPKG_ACCEPT_LIC_4, pResMgr)));
+ OUString s4 = String(ResId(RID_STR_UNOPKG_ACCEPT_LIC_4, pResMgr));
::rtl::OString os4 = ::rtl::OUStringToOString(s4, osl_getThreadTextEncoding());
- OUString sYES(String(ResId(RID_STR_UNOPKG_ACCEPT_LIC_YES, pResMgr)));
- OUString sY(String(ResId(RID_STR_UNOPKG_ACCEPT_LIC_Y, pResMgr)));
- OUString sNO(String(ResId(RID_STR_UNOPKG_ACCEPT_LIC_NO, pResMgr)));
- OUString sN(String(ResId(RID_STR_UNOPKG_ACCEPT_LIC_N, pResMgr)));
+ OUString sYES = String(ResId(RID_STR_UNOPKG_ACCEPT_LIC_YES, pResMgr));
+ OUString sY = String(ResId(RID_STR_UNOPKG_ACCEPT_LIC_Y, pResMgr));
+ OUString sNO = String(ResId(RID_STR_UNOPKG_ACCEPT_LIC_NO, pResMgr));
+ OUString sN =String(ResId(RID_STR_UNOPKG_ACCEPT_LIC_N, pResMgr));
fprintf(stdout, "\n\n%s\n\n", os1.getStr());
fprintf(stdout, "%s\n\n", OUStringToOString(sLicense, osl_getThreadTextEncoding()).getStr());

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

@ -1,39 +0,0 @@
$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);
}
+*** misc/epm-3.7/portable.c Wed Jul 23 17:41:08 2003
+--- misc/build/epm-3.7/portable.c Thu Aug 10 09:54:13 2006
+***************
+*** 1515,1525 ****
+ fputs("# Determine correct extract options for the tar command...\n", fp);
+ fputs("if test `uname` = Darwin; then\n", fp);
+ fputs(" ac_tar=\"tar -xpPf\"\n", fp);
+ fputs("else if test \"`tar --help 2>&1 | grep GNU`\" = \"\"; then\n", fp);
+ fputs(" ac_tar=\"tar -xpf\"\n", fp);
+ fputs("else\n", fp);
+ fputs(" ac_tar=\"tar -xpPf\"\n", fp);
+! fputs("fi fi\n", fp);
+
+ return (0);
+ }
+--- 1515,1527 ----
+ fputs("# Determine correct extract options for the tar command...\n", fp);
+ fputs("if test `uname` = Darwin; then\n", fp);
+ fputs(" ac_tar=\"tar -xpPf\"\n", fp);
++ fputs("else if test `uname` = OpenBSD; then\n", fp);
++ fputs(" ac_tar=\"tar -xpPf\"\n", fp);
+ fputs("else if test \"`tar --help 2>&1 | grep GNU`\" = \"\"; then\n", fp);
+ fputs(" ac_tar=\"tar -xpf\"\n", fp);
+ fputs("else\n", fp);
+ fputs(" ac_tar=\"tar -xpPf\"\n", fp);
+! fputs("fi fi fi\n", fp);
+
+ return (0);
+ }
*** misc/epm-3.7/qprintf.c Tue Jan 28 06:48:03 2003
--- misc/build/epm-3.7/qprintf.c Thu Jan 19 17:04:22 2006
***************

257
editors/openoffice/patches/patch-portaudio_portaudio_v18_1_patch Normal file
View File

@ -0,0 +1,257 @@
$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* )
---- 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 ****
OBJS = $(COMMON_OBJS) $(OTHER_OBJS)
@@ -67,52 +13,166 @@
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)
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
***************
-*** 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
+
+ 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;
+ }
+
+ /* 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. */
+***************
+*** 466,471 ****
+--- 464,470 ----
+
+ lowerAudio:
+ {
++ #if 0
+ struct sched_param schat = { 0 };
+ if( sched_setscheduler(pahsc->pahsc_AudioThreadPID, SCHED_OTHER, &schat) != 0)
+ {
+***************
+*** 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
+
+ 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 ****
+
#ifdef __linux__
#include <linux/soundcard.h>
-+ #elif defined (__FreeBSD__)
-+ #include <sys/soundcard.h>
- #else
+! #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;
- }
-+ return 0;
- }
+--- 43,51 ----
+ #ifdef __linux__
+ #include <linux/soundcard.h>
+! #elif defined (__OpenBSD__)
+! #include <soundcard.h>
+! #else
+ #include <machine/soundcard.h> /* JH20010905 */
+ #endif

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

@ -0,0 +1,21 @@
$OpenBSD: patch-readlicense_oo_util_makefile_pmk,v 1.1 2006/09/20 09:06:19 robert Exp $
--- readlicense_oo/util/makefile.pmk.orig Fri Sep 1 09:56:11 2006
+++ readlicense_oo/util/makefile.pmk Fri Sep 1 09:57:53 2006
@@ -70,7 +70,7 @@
$(MISC)$/readme%.html :
@+-$(MKDIR) $(@:d)
.IF "$(XSLTPROC)"=="NO_XSLTPROC"
- $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR) -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=html file=$@
+ $(JAVAI) $(JAVACPS) $(XT_JAR)$(PATH_SEPERATOR)$(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR) -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=html file=$@
.ELSE
sed 's|xmlns:xt="http://www.jclark.com/xt"||;s|extension-element-prefixes="xt"||;s|.*xt:document.*||;s|<xsl:output method = "HTML" doctype-public = "-//W3C//DTD HTML 3.2//EN" />|<xsl:output method="html" doctype-public="-//W3C//DTD HTML 3.2//EN" />|' < ..$/readme.xsl | xsltproc -o $@ \
--stringparam os1 $(OS) \
@@ -86,7 +86,7 @@
$(MISC)$/readme%.txt :
@+-$(MKDIR) $(@:d)
.IF "$(XSLTPROC)"=="NO_XSLTPROC"
- $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR) -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=text file=$@
+ $(JAVAI) $(JAVACPS) $(XT_JAR)$(PATH_SEPERATOR)$(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR) -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=text file=$@
.ELSE
sed 's|xmlns:xt="http://www.jclark.com/xt"||;s|extension-element-prefixes="xt"||;s|.*xt:document.*||;s|<xsl:output method = "HTML" doctype-public = "-//W3C//DTD HTML 3.2//EN" />|<xsl:output method="text" />|' < ..$/readme.xsl | xsltproc -o $@ \
--stringparam os1 $(OS) \

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

@ -1,7 +1,7 @@
$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 @@
$OpenBSD: patch-sal_osl_unx_system_h,v 1.3 2006/09/20 09:06:19 robert Exp $
--- sal/osl/unx/system.h.orig.port Fri Aug 11 21:48:49 2006
+++ sal/osl/unx/system.h Tue Sep 19 19:27:58 2006
@@ -198,6 +198,32 @@
# define NO_PTHREAD_RTL
#endif
@ -23,14 +23,18 @@ $OpenBSD: patch-sal_osl_unx_system_h,v 1.2 2006/08/20 03:36:52 kurt Exp $
+# define IORESOURCE_TRANSFER_BSD
+# include <machine/endian.h>
+# define PTR_SIZE_T(s) ((size_t *)&(s))
+# define IORESOURCE_TRANSFER_BSD
+# define IOCHANNEL_TRANSFER_BSD_RENO
+# define pthread_testcancel()
+# define NO_PTHREAD_PRIORITY
+# define NO_PTHREAD_RTL
+# define NO_PTHREAD_PRIORITY
+# define PTHREAD_SIGACTION pthread_sigaction
+#endif
+
#ifdef SCO
# define AF_IPX -1
# include <strings.h>
@@ -386,7 +408,7 @@ int macxp_resolveAlias(char *path, int b
@@ -386,7 +412,7 @@
!defined(LINUX) && !defined(NETBSD) && !defined(FREEBSD) && !defined(SCO) && \
!defined(AIX) && !defined(HPUX) && \
!defined(SOLARIS) && !defined(IRIX) && !defined(MAC) && \

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

@ -1,20 +0,0 @@
$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
+#ifdef SOLAR_JAVA
+
File gid_File_Jar_Writer2latex
TXT_FILE_BODY;
Name = "writer2latex.jar";
Dir = gid_Dir_Classes;
Styles = (PACKED,PATCH);
End
+
+#endif
#if defined UNX && ! defined MACOSX

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

@ -1,12 +0,0 @@
$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,
// range is ensured by max below
- ::std::max( 0,
+ ::std::max( (long int)0,
::std::distance( maKeyTimes.begin(),
::std::lower_bound( maKeyTimes.begin(),
maKeyTimes.end(),

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

@ -1,55 +1,27 @@
$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
$OpenBSD: patch-solenv_config_stand_lst,v 1.3 2006/09/20 09:06:20 robert Exp $
--- solenv/config/stand.lst.orig.port Sat Aug 19 17:15:05 2006
+++ solenv/config/stand.lst Mon Aug 21 21:31:59 2006
@@ -37,6 +37,11 @@
}
Environments
{
- unxfbsdi.pro
+ unxobsdi.pro
+ {
+ prio 12
+ setsolar -SRC680 -pro -bsclient unxobsdi
+ }
unxfbsdi.pro
{
prio 12
- setsolar -SRC680 -pro -bsclient unxfbsdi
+ setsolar -SRC680 -pro -bsclient unxobsdi
}
unxlngi5.pro
@@ -96,6 +101,11 @@
{
@@ -97,10 +97,10 @@ SRC680
prio 15
setsolar -SRC680 -pro -bsclient unxsols64b1
}
- unxfbsdi
+ }
+ unxobsdi
{
prio 15
- setsolar -SRC680 -bsclient unxfbsdi
+ {
+ prio 15
+ setsolar -SRC680 -bsclient unxobsdi
}
unxlngi5
{
@@ -996,10 +996,10 @@ OOB680
}
Environments
{
- unxfbsdi.pro
+ unxobsdi.pro
{
prio 12
- setsolar -OOB680 -pro -bsclient unxfbsdi
+ setsolar -OOB680 -pro -bsclient unxobsdi
}
unxlngi5.pro
{
@@ -1056,10 +1056,10 @@ OOB680
prio 15
setsolar -OOB680 -pro -bsclient unxsols64b1
}
- unxfbsdi
+ unxobsdi
{
prio 15
- setsolar -OOB680 -bsclient unxfbsdi
+ setsolar -OOB680 -bsclient unxobsdi
}
unxlngi5
unxfbsdi
{

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

@ -1,4 +1,4 @@
$OpenBSD: patch-solenv_inc_unxobsdi_mk,v 1.2 2006/08/20 03:36:53 kurt Exp $
$OpenBSD: patch-solenv_inc_unxobsdi_mk,v 1.3 2006/09/20 09:06:20 robert 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.2 2006/08/20 03:36:53 kurt Exp $
+#
+# $RCSfile: patch-solenv_inc_unxobsdi_mk,v $
+#
+# $Revision: 1.2 $
+# $Revision: 1.3 $
+#
+# last change: $Author: kurt $ $Date: 2006/08/20 03:36:53 $
+# last change: $Author: robert $ $Date: 2006/09/20 09:06:20 $
+#
+# 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.2 2006/08/20 03:36:53 kurt Exp $
+CC+:=$(CFLAGS_SYSBASE)
+.ENDIF # "$(SYSBASE)"!=""
+CFLAGS+=-fmessage-length=0 -c
+CLFAGS+=-I/usr/local/include -I/usr/X11R6/include
+CLFAGS+=-I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/db4 -I%%X11BASE%%/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.2 2006/08/20 03:36:53 kurt Exp $
+
+# flags for the C++ Compiler
+CFLAGSCC= -pipe $(ARCH_FLAGS)
+CFLAGSCC+=-I/usr/local/include -I/usr/X11R6/include
+CFLAGSCC+=-I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/db4 -I%%X11BASE%%/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.2 2006/08/20 03:36:53 kurt Exp $
+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+CFLAGSCXX += -fvisibility-inlines-hidden
+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+CFLAGSCXX += -I/usr/local/include -I/usr/X11R6/include
+CFLAGSCXX += -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/db4 -I%%X11BASE%%/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.2 2006/08/20 03:36:53 kurt Exp $
+#LINKFLAGSDEFS*=#-Wl,-z,defs
+#LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
+#LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
+LINKFLAGS=-Wl,-z,combreloc -L/usr/local/lib -L/usr/X11R6/lib
+LINKFLAGS=-Wl,-z,combreloc -L%%LOCALBASE%%/lib -L%%X11BASE%%/lib
+
+# linker flags for linking applications
+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2006/08/17 14:56:24 robert Exp $
@comment $OpenBSD: PFRAG.shared,v 1.2 2006/09/20 09:06:20 robert Exp $
openoffice/program/acceptor.uno.so
openoffice/program/basprov680.uno.so
openoffice/program/behelper.uno.so
@ -9,6 +9,7 @@ openoffice/program/configmgr2.uno.so
openoffice/program/connector.uno.so
openoffice/program/deployment680.uno.so
openoffice/program/deploymentgui680.uno.so
openoffice/program/desktopbe1.uno.so
openoffice/program/dlgprov680.uno.so
openoffice/program/fpicker.uno.so
openoffice/program/fps_gnome.uno.so
@ -188,6 +189,7 @@ openoffice/program/libuno_cppuhelpergcc3.so
openoffice/program/libuno_sal.so
openoffice/program/libuno_salhelpergcc3.so
openoffice/program/libunoxml680.so
openoffice/program/libupdchk680.so
openoffice/program/liburp_uno.so
openoffice/program/libutl680.so
openoffice/program/libuui680.so

6
editors/openoffice/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2006/08/17 14:56:28 robert Exp $
@comment $OpenBSD: PLIST,v 1.2 2006/09/20 09:06:20 robert Exp $
%%SHARED%%
bin/scalc
bin/sdraw
@ -54,7 +54,6 @@ openoffice/presets/gallery/sg100.thm
openoffice/presets/gallery/sg30.sdv
openoffice/presets/gallery/sg30.thm
openoffice/program/
openoffice/program/.testtoolrc
openoffice/program/bootstraprc
openoffice/program/cde-open-url
openoffice/program/configimport
@ -153,6 +152,7 @@ openoffice/program/resource/textconversiondlgs680en-US.res
openoffice/program/resource/tfu680en-US.res
openoffice/program/resource/tk680en-US.res
openoffice/program/resource/tpl680en-US.res
openoffice/program/resource/updchk680en-US.res
openoffice/program/resource/uui680en-US.res
openoffice/program/resource/vcl680en-US.res
openoffice/program/resource/wzi680en-US.res
@ -174,6 +174,7 @@ openoffice/program/spadmin
openoffice/program/spadmin.bin
openoffice/program/swriter
openoffice/program/testtool.bin
openoffice/program/testtoolrc
openoffice/program/types.rdb
openoffice/program/uno
openoffice/program/uno.bin
@ -1845,6 +1846,7 @@ openoffice/share/registry/schema/org/openoffice/LDAP.xcs
openoffice/share/registry/schema/org/openoffice/Office/
openoffice/share/registry/schema/org/openoffice/Office/Addons.xcs
openoffice/share/registry/schema/org/openoffice/Office/Calc.xcs
openoffice/share/registry/schema/org/openoffice/Office/CalcAddIns.xcs
openoffice/share/registry/schema/org/openoffice/Office/Chart.xcs
openoffice/share/registry/schema/org/openoffice/Office/Commands.xcs
openoffice/share/registry/schema/org/openoffice/Office/Common.xcs