mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-07 06:40:06 +00:00
Code Issues Releases Activity

Remove upstreamed patches

Browse Source 
Submitted by:	"Jack L." <xxjack12xx@gmail.com>
This commit is contained in:
Maho Nakata 2006-03-15 12:55:21 +00:00
parent ed7f0d1073
commit b7a1c28108
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=157253
15 changed files with 0 additions and 1200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
editors/openoffice-3-devel/files/patch-backtrace
View File

@ -1,95 +0,0 @@
Issuetracker : #i56946#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : FreeBSD porting : An implementation of backtrace at sal/osl/unx
To pass the compilation, we had been preparing dummy function at sal.
We implemented this.
--- sal/osl/unx/backtrace.c Thu Sep 8 23:52:44 2005
+++ sal/osl/unx/backtrace.c Sun Oct 23 09:19:04 2005
@@ -129,6 +129,7 @@
#include <pthread.h>
#include <setjmp.h>
#include <stdio.h>
+#include <stddef.h>
#include "backtrace.h"
#define FRAME_PTR_OFFSET 1
@@ -136,11 +137,55 @@
int backtrace( void **buffer, int max_frames )
{
- return 1;
+ struct frame *fp;
+ jmp_buf ctx;
+ int i;
+ /* get stack- and framepointer */
+ setjmp(ctx);
+ fp = (struct frame*)(((size_t*)(ctx))[FRAME_PTR_OFFSET]);
+ for ( i=0; (i<FRAME_OFFSET) && (fp!=0); i++)
+ fp = fp->fr_savfp;
+ /* iterate through backtrace */
+ for (i=0; fp && fp->fr_savpc && i<max_frames; i++)
+ {
+ /* store frame */
+ *(buffer++) = (void *)fp->fr_savpc;
+ /* next frame */
+ fp=fp->fr_savfp;
+ }
+ return i;
}
void backtrace_symbols_fd( void **buffer, int size, int fd )
{
+ FILE *fp = fdopen( fd, "w" );
+
+ if ( fp )
+ {
+ void **pFramePtr;
+ for ( pFramePtr = buffer; size > 0 && pFramePtr && *pFramePtr; pFramePtr++, size-- )
+ {
+ Dl_info dli;
+ ptrdiff_t offset;
+
+ if ( 0 != dladdr( *pFramePtr, &dli ) )
+ {
+ if ( dli.dli_fname && dli.dli_fbase )
+ {
+ offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_fbase;
+ fprintf( fp, "%s+0x%x", dli.dli_fname, offset );
+ }
+ if ( dli.dli_sname && dli.dli_saddr )
+ {
+ offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_saddr;
+ fprintf( fp, "(%s+0x%x)", dli.dli_sname, offset );
+ }
+ }
+ fprintf( fp, "[0x%x]\n", *pFramePtr );
+ }
+ fflush( fp );
+ fclose( fp );
+ }
}
#endif /* defined FREEBSD */
--- sal/osl/unx/backtrace.h Thu Sep 8 23:52:59 2005
+++ sal/osl/unx/backtrace.h Sun Oct 23 09:19:40 2005
@@ -46,6 +46,16 @@
void backtrace_symbols_fd( void **buffer, int size, int fd );
+/* no frame.h on FreeBSD */
+#if defined FREEBSD
+struct frame {
+ long arg0[8];
+ long arg1[6];
+ struct frame *fr_savfp;
+ long fr_savpc;
+};
+#endif
+
#ifdef __cplusplus
} /* extern "C" */
#endif

124
editors/openoffice-3-devel/files/patch-epm
View File

@ -1,124 +0,0 @@
Index: epm/epm-3.7.patch
===================================================================
RCS file: /cvs/external/epm/epm-3.7.patch,v
retrieving revision 1.8
diff -u -r1.8 epm-3.7.patch
--- epm/epm-3.7.patch 3 Feb 2006 17:32:08 -0000 1.8
+++ epm/epm-3.7.patch 11 Feb 2006 09:28:33 -0000
@@ -546,3 +546,116 @@
}
--- 457,462 ----
+*** misc/epm-3.7/bsd.c Wed Jan 15 02:05:01 2003
+--- misc/build/epm-3.7/bsd.c Thu Jan 19 17:05:43 2006
+***************
+*** 26,31 ****
+--- 26,38 ----
+
+ #include "epm.h"
+
++ void cr2semicolon(char *command)
++ {
++ int len, i;
++ len=strlen(command);
++ for (i=0;i<len;i++)
++ if(*(command+i)=='\n') *(command+i)=';';
++ }
+
+ /*
+ * 'make_bsd()' - Make a FreeBSD software distribution package.
+***************
+*** 149,156 ****
+
+ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++)
+ {
+! if (d->type == DEPEND_REQUIRES)
+! fprintf(fp, "@pkgdep %s", d->product);
+ else
+ #ifdef __FreeBSD__
+ /*
+--- 156,172 ----
+
+ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++)
+ {
+! #ifdef __FreeBSD__
+! if (d->type == DEPEND_REQUIRES) {
+! if (dist->relnumber)
+! fprintf(fp, "@pkgdep %s-%s-%d-%s", d->product, dist->version, dist->relnumber, platname);
+! else
+! fprintf(fp, "@pkgdep %s-%s-%s", d->product, dist->version, platname);
+! }
+! #else
+! if (d->type == DEPEND_REQUIRES)
+! fprintf(fp, "@pkgdep %s", d->product);
+! #endif
+ else
+ #ifdef __FreeBSD__
+ /*
+***************
+*** 179,187 ****
+--- 196,206 ----
+ " by the BSD packager.\n", stderr);
+ break;
+ case COMMAND_POST_INSTALL :
++ cr2semicolon(c->command);
+ fprintf(fp, "@exec %s\n", c->command);
+ break;
+ case COMMAND_PRE_REMOVE :
++ cr2semicolon(c->command);
+ fprintf(fp, "@unexec %s\n", c->command);
+ break;
+ case COMMAND_POST_REMOVE :
+***************
+*** 199,205 ****
+ */
+
+ fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst);
+! fprintf(fp, "@exec /bin/chown %s:%s %s\n", file->user, file->group,
+ file->dst);
+ fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst);
+ }
+--- 218,224 ----
+ */
+
+ fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst);
+! fprintf(fp, "@exec /usr/sbin/chown %s:%s %s\n", file->user, file->group,
+ file->dst);
+ fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst);
+ }
+*** 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
+***************
+*** 181,192 ****
+
+ for (i = slen; i > 0; i --, s ++, bytes ++)
+ {
+ if (strchr("`~!#$%^&*()[{]}\\|;\'\"<>? ", *s))
+ {
+ putc('\\', fp);
+ bytes ++;
+ }
+!
+ putc(*s, fp);
+ }
+
+--- 181,199 ----
+
+ for (i = slen; i > 0; i --, s ++, bytes ++)
+ {
++ #if defined(__FreeBSD__)
++ if (strchr("`~!#%^&*()[{]}\\|;\'\"<>? ", *s))
++ {
++ putc('\\', fp);
++ bytes ++;
++ }
++ #else
+ if (strchr("`~!#$%^&*()[{]}\\|;\'\"<>? ", *s))
+ {
+ putc('\\', fp);
+ bytes ++;
+ }
+! #endif
+ putc(*s, fp);
+ }
+

21
editors/openoffice-3-devel/files/patch-rsc+source+rscpp+makefile.mk
View File

@ -1,21 +0,0 @@
Issuetracker : #i54178#
CWS : hr17
Author: :
Description :
Index: rsc/source/rscpp/makefile.mk
===================================================================
RCS file: /cvs/gsl/rsc/source/rscpp/makefile.mk,v
retrieving revision 1.5
diff -u -r1.5 makefile.mk
--- rsc/source/rscpp/makefile.mk 8 Sep 2005 14:00:27 -0000 1.5
+++ rsc/source/rscpp/makefile.mk 21 Sep 2005 10:18:09 -0000
@@ -36,6 +36,8 @@
TARGETTYPE=CUI
TARGETTHREAD=ST
+# we don't need STL in this project
+NO_DEFAULT_STL=TRUE
PRJNAME=rsc
TARGET=rscpp

95
editors/openoffice.org-2-devel/files/patch-backtrace
View File

@ -1,95 +0,0 @@
Issuetracker : #i56946#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : FreeBSD porting : An implementation of backtrace at sal/osl/unx
To pass the compilation, we had been preparing dummy function at sal.
We implemented this.
--- sal/osl/unx/backtrace.c Thu Sep 8 23:52:44 2005
+++ sal/osl/unx/backtrace.c Sun Oct 23 09:19:04 2005
@@ -129,6 +129,7 @@
#include <pthread.h>
#include <setjmp.h>
#include <stdio.h>
+#include <stddef.h>
#include "backtrace.h"
#define FRAME_PTR_OFFSET 1
@@ -136,11 +137,55 @@
int backtrace( void **buffer, int max_frames )
{
- return 1;
+ struct frame *fp;
+ jmp_buf ctx;
+ int i;
+ /* get stack- and framepointer */
+ setjmp(ctx);
+ fp = (struct frame*)(((size_t*)(ctx))[FRAME_PTR_OFFSET]);
+ for ( i=0; (i<FRAME_OFFSET) && (fp!=0); i++)
+ fp = fp->fr_savfp;
+ /* iterate through backtrace */
+ for (i=0; fp && fp->fr_savpc && i<max_frames; i++)
+ {
+ /* store frame */
+ *(buffer++) = (void *)fp->fr_savpc;
+ /* next frame */
+ fp=fp->fr_savfp;
+ }
+ return i;
}
void backtrace_symbols_fd( void **buffer, int size, int fd )
{
+ FILE *fp = fdopen( fd, "w" );
+
+ if ( fp )
+ {
+ void **pFramePtr;
+ for ( pFramePtr = buffer; size > 0 && pFramePtr && *pFramePtr; pFramePtr++, size-- )
+ {
+ Dl_info dli;
+ ptrdiff_t offset;
+
+ if ( 0 != dladdr( *pFramePtr, &dli ) )
+ {
+ if ( dli.dli_fname && dli.dli_fbase )
+ {
+ offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_fbase;
+ fprintf( fp, "%s+0x%x", dli.dli_fname, offset );
+ }
+ if ( dli.dli_sname && dli.dli_saddr )
+ {
+ offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_saddr;
+ fprintf( fp, "(%s+0x%x)", dli.dli_sname, offset );
+ }
+ }
+ fprintf( fp, "[0x%x]\n", *pFramePtr );
+ }
+ fflush( fp );
+ fclose( fp );
+ }
}
#endif /* defined FREEBSD */
--- sal/osl/unx/backtrace.h Thu Sep 8 23:52:59 2005
+++ sal/osl/unx/backtrace.h Sun Oct 23 09:19:40 2005
@@ -46,6 +46,16 @@
void backtrace_symbols_fd( void **buffer, int size, int fd );
+/* no frame.h on FreeBSD */
+#if defined FREEBSD
+struct frame {
+ long arg0[8];
+ long arg1[6];
+ struct frame *fr_savfp;
+ long fr_savpc;
+};
+#endif
+
#ifdef __cplusplus
} /* extern "C" */
#endif

124
editors/openoffice.org-2-devel/files/patch-epm
View File

@ -1,124 +0,0 @@
Index: epm/epm-3.7.patch
===================================================================
RCS file: /cvs/external/epm/epm-3.7.patch,v
retrieving revision 1.8
diff -u -r1.8 epm-3.7.patch
--- epm/epm-3.7.patch 3 Feb 2006 17:32:08 -0000 1.8
+++ epm/epm-3.7.patch 11 Feb 2006 09:28:33 -0000
@@ -546,3 +546,116 @@
}
--- 457,462 ----
+*** misc/epm-3.7/bsd.c Wed Jan 15 02:05:01 2003
+--- misc/build/epm-3.7/bsd.c Thu Jan 19 17:05:43 2006
+***************
+*** 26,31 ****
+--- 26,38 ----
+
+ #include "epm.h"
+
++ void cr2semicolon(char *command)
++ {
++ int len, i;
++ len=strlen(command);
++ for (i=0;i<len;i++)
++ if(*(command+i)=='\n') *(command+i)=';';
++ }
+
+ /*
+ * 'make_bsd()' - Make a FreeBSD software distribution package.
+***************
+*** 149,156 ****
+
+ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++)
+ {
+! if (d->type == DEPEND_REQUIRES)
+! fprintf(fp, "@pkgdep %s", d->product);
+ else
+ #ifdef __FreeBSD__
+ /*
+--- 156,172 ----
+
+ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++)
+ {
+! #ifdef __FreeBSD__
+! if (d->type == DEPEND_REQUIRES) {
+! if (dist->relnumber)
+! fprintf(fp, "@pkgdep %s-%s-%d-%s", d->product, dist->version, dist->relnumber, platname);
+! else
+! fprintf(fp, "@pkgdep %s-%s-%s", d->product, dist->version, platname);
+! }
+! #else
+! if (d->type == DEPEND_REQUIRES)
+! fprintf(fp, "@pkgdep %s", d->product);
+! #endif
+ else
+ #ifdef __FreeBSD__
+ /*
+***************
+*** 179,187 ****
+--- 196,206 ----
+ " by the BSD packager.\n", stderr);
+ break;
+ case COMMAND_POST_INSTALL :
++ cr2semicolon(c->command);
+ fprintf(fp, "@exec %s\n", c->command);
+ break;
+ case COMMAND_PRE_REMOVE :
++ cr2semicolon(c->command);
+ fprintf(fp, "@unexec %s\n", c->command);
+ break;
+ case COMMAND_POST_REMOVE :
+***************
+*** 199,205 ****
+ */
+
+ fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst);
+! fprintf(fp, "@exec /bin/chown %s:%s %s\n", file->user, file->group,
+ file->dst);
+ fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst);
+ }
+--- 218,224 ----
+ */
+
+ fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst);
+! fprintf(fp, "@exec /usr/sbin/chown %s:%s %s\n", file->user, file->group,
+ file->dst);
+ fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst);
+ }
+*** 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
+***************
+*** 181,192 ****
+
+ for (i = slen; i > 0; i --, s ++, bytes ++)
+ {
+ if (strchr("`~!#$%^&*()[{]}\\|;\'\"<>? ", *s))
+ {
+ putc('\\', fp);
+ bytes ++;
+ }
+!
+ putc(*s, fp);
+ }
+
+--- 181,199 ----
+
+ for (i = slen; i > 0; i --, s ++, bytes ++)
+ {
++ #if defined(__FreeBSD__)
++ if (strchr("`~!#%^&*()[{]}\\|;\'\"<>? ", *s))
++ {
++ putc('\\', fp);
++ bytes ++;
++ }
++ #else
+ if (strchr("`~!#$%^&*()[{]}\\|;\'\"<>? ", *s))
+ {
+ putc('\\', fp);
+ bytes ++;
+ }
+! #endif
+ putc(*s, fp);
+ }
+

21
editors/openoffice.org-2-devel/files/patch-rsc+source+rscpp+makefile.mk
View File

@ -1,21 +0,0 @@
Issuetracker : #i54178#
CWS : hr17
Author: :
Description :
Index: rsc/source/rscpp/makefile.mk
===================================================================
RCS file: /cvs/gsl/rsc/source/rscpp/makefile.mk,v
retrieving revision 1.5
diff -u -r1.5 makefile.mk
--- rsc/source/rscpp/makefile.mk 8 Sep 2005 14:00:27 -0000 1.5
+++ rsc/source/rscpp/makefile.mk 21 Sep 2005 10:18:09 -0000
@@ -36,6 +36,8 @@
TARGETTYPE=CUI
TARGETTHREAD=ST
+# we don't need STL in this project
+NO_DEFAULT_STL=TRUE
PRJNAME=rsc
TARGET=rscpp

95
editors/openoffice.org-2.0-devel/files/patch-backtrace
View File

@ -1,95 +0,0 @@
Issuetracker : #i56946#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : FreeBSD porting : An implementation of backtrace at sal/osl/unx
To pass the compilation, we had been preparing dummy function at sal.
We implemented this.
--- sal/osl/unx/backtrace.c Thu Sep 8 23:52:44 2005
+++ sal/osl/unx/backtrace.c Sun Oct 23 09:19:04 2005
@@ -129,6 +129,7 @@
#include <pthread.h>
#include <setjmp.h>
#include <stdio.h>
+#include <stddef.h>
#include "backtrace.h"
#define FRAME_PTR_OFFSET 1
@@ -136,11 +137,55 @@
int backtrace( void **buffer, int max_frames )
{
- return 1;
+ struct frame *fp;
+ jmp_buf ctx;
+ int i;
+ /* get stack- and framepointer */
+ setjmp(ctx);
+ fp = (struct frame*)(((size_t*)(ctx))[FRAME_PTR_OFFSET]);
+ for ( i=0; (i<FRAME_OFFSET) && (fp!=0); i++)
+ fp = fp->fr_savfp;
+ /* iterate through backtrace */
+ for (i=0; fp && fp->fr_savpc && i<max_frames; i++)
+ {
+ /* store frame */
+ *(buffer++) = (void *)fp->fr_savpc;
+ /* next frame */
+ fp=fp->fr_savfp;
+ }
+ return i;
}
void backtrace_symbols_fd( void **buffer, int size, int fd )
{
+ FILE *fp = fdopen( fd, "w" );
+
+ if ( fp )
+ {
+ void **pFramePtr;
+ for ( pFramePtr = buffer; size > 0 && pFramePtr && *pFramePtr; pFramePtr++, size-- )
+ {
+ Dl_info dli;
+ ptrdiff_t offset;
+
+ if ( 0 != dladdr( *pFramePtr, &dli ) )
+ {
+ if ( dli.dli_fname && dli.dli_fbase )
+ {
+ offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_fbase;
+ fprintf( fp, "%s+0x%x", dli.dli_fname, offset );
+ }
+ if ( dli.dli_sname && dli.dli_saddr )
+ {
+ offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_saddr;
+ fprintf( fp, "(%s+0x%x)", dli.dli_sname, offset );
+ }
+ }
+ fprintf( fp, "[0x%x]\n", *pFramePtr );
+ }
+ fflush( fp );
+ fclose( fp );
+ }
}
#endif /* defined FREEBSD */
--- sal/osl/unx/backtrace.h Thu Sep 8 23:52:59 2005
+++ sal/osl/unx/backtrace.h Sun Oct 23 09:19:40 2005
@@ -46,6 +46,16 @@
void backtrace_symbols_fd( void **buffer, int size, int fd );
+/* no frame.h on FreeBSD */
+#if defined FREEBSD
+struct frame {
+ long arg0[8];
+ long arg1[6];
+ struct frame *fr_savfp;
+ long fr_savpc;
+};
+#endif
+
#ifdef __cplusplus
} /* extern "C" */
#endif

124
editors/openoffice.org-2.0-devel/files/patch-epm
View File

@ -1,124 +0,0 @@
Index: epm/epm-3.7.patch
===================================================================
RCS file: /cvs/external/epm/epm-3.7.patch,v
retrieving revision 1.8
diff -u -r1.8 epm-3.7.patch
--- epm/epm-3.7.patch 3 Feb 2006 17:32:08 -0000 1.8
+++ epm/epm-3.7.patch 11 Feb 2006 09:28:33 -0000
@@ -546,3 +546,116 @@
}
--- 457,462 ----
+*** misc/epm-3.7/bsd.c Wed Jan 15 02:05:01 2003
+--- misc/build/epm-3.7/bsd.c Thu Jan 19 17:05:43 2006
+***************
+*** 26,31 ****
+--- 26,38 ----
+
+ #include "epm.h"
+
++ void cr2semicolon(char *command)
++ {
++ int len, i;
++ len=strlen(command);
++ for (i=0;i<len;i++)
++ if(*(command+i)=='\n') *(command+i)=';';
++ }
+
+ /*
+ * 'make_bsd()' - Make a FreeBSD software distribution package.
+***************
+*** 149,156 ****
+
+ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++)
+ {
+! if (d->type == DEPEND_REQUIRES)
+! fprintf(fp, "@pkgdep %s", d->product);
+ else
+ #ifdef __FreeBSD__
+ /*
+--- 156,172 ----
+
+ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++)
+ {
+! #ifdef __FreeBSD__
+! if (d->type == DEPEND_REQUIRES) {
+! if (dist->relnumber)
+! fprintf(fp, "@pkgdep %s-%s-%d-%s", d->product, dist->version, dist->relnumber, platname);
+! else
+! fprintf(fp, "@pkgdep %s-%s-%s", d->product, dist->version, platname);
+! }
+! #else
+! if (d->type == DEPEND_REQUIRES)
+! fprintf(fp, "@pkgdep %s", d->product);
+! #endif
+ else
+ #ifdef __FreeBSD__
+ /*
+***************
+*** 179,187 ****
+--- 196,206 ----
+ " by the BSD packager.\n", stderr);
+ break;
+ case COMMAND_POST_INSTALL :
++ cr2semicolon(c->command);
+ fprintf(fp, "@exec %s\n", c->command);
+ break;
+ case COMMAND_PRE_REMOVE :
++ cr2semicolon(c->command);
+ fprintf(fp, "@unexec %s\n", c->command);
+ break;
+ case COMMAND_POST_REMOVE :
+***************
+*** 199,205 ****
+ */
+
+ fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst);
+! fprintf(fp, "@exec /bin/chown %s:%s %s\n", file->user, file->group,
+ file->dst);
+ fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst);
+ }
+--- 218,224 ----
+ */
+
+ fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst);
+! fprintf(fp, "@exec /usr/sbin/chown %s:%s %s\n", file->user, file->group,
+ file->dst);
+ fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst);
+ }
+*** 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
+***************
+*** 181,192 ****
+
+ for (i = slen; i > 0; i --, s ++, bytes ++)
+ {
+ if (strchr("`~!#$%^&*()[{]}\\|;\'\"<>? ", *s))
+ {
+ putc('\\', fp);
+ bytes ++;
+ }
+!
+ putc(*s, fp);
+ }
+
+--- 181,199 ----
+
+ for (i = slen; i > 0; i --, s ++, bytes ++)
+ {
++ #if defined(__FreeBSD__)
++ if (strchr("`~!#%^&*()[{]}\\|;\'\"<>? ", *s))
++ {
++ putc('\\', fp);
++ bytes ++;
++ }
++ #else
+ if (strchr("`~!#$%^&*()[{]}\\|;\'\"<>? ", *s))
+ {
+ putc('\\', fp);
+ bytes ++;
+ }
+! #endif
+ putc(*s, fp);
+ }
+

21
editors/openoffice.org-2.0-devel/files/patch-rsc+source+rscpp+makefile.mk
View File

@ -1,21 +0,0 @@
Issuetracker : #i54178#
CWS : hr17
Author: :
Description :
Index: rsc/source/rscpp/makefile.mk
===================================================================
RCS file: /cvs/gsl/rsc/source/rscpp/makefile.mk,v
retrieving revision 1.5
diff -u -r1.5 makefile.mk
--- rsc/source/rscpp/makefile.mk 8 Sep 2005 14:00:27 -0000 1.5
+++ rsc/source/rscpp/makefile.mk 21 Sep 2005 10:18:09 -0000
@@ -36,6 +36,8 @@
TARGETTYPE=CUI
TARGETTHREAD=ST
+# we don't need STL in this project
+NO_DEFAULT_STL=TRUE
PRJNAME=rsc
TARGET=rscpp

95
editors/openoffice.org-3-devel/files/patch-backtrace
View File

@ -1,95 +0,0 @@
Issuetracker : #i56946#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : FreeBSD porting : An implementation of backtrace at sal/osl/unx
To pass the compilation, we had been preparing dummy function at sal.
We implemented this.
--- sal/osl/unx/backtrace.c Thu Sep 8 23:52:44 2005
+++ sal/osl/unx/backtrace.c Sun Oct 23 09:19:04 2005
@@ -129,6 +129,7 @@
#include <pthread.h>
#include <setjmp.h>
#include <stdio.h>
+#include <stddef.h>
#include "backtrace.h"
#define FRAME_PTR_OFFSET 1
@@ -136,11 +137,55 @@
int backtrace( void **buffer, int max_frames )
{
- return 1;
+ struct frame *fp;
+ jmp_buf ctx;
+ int i;
+ /* get stack- and framepointer */
+ setjmp(ctx);
+ fp = (struct frame*)(((size_t*)(ctx))[FRAME_PTR_OFFSET]);
+ for ( i=0; (i<FRAME_OFFSET) && (fp!=0); i++)
+ fp = fp->fr_savfp;
+ /* iterate through backtrace */
+ for (i=0; fp && fp->fr_savpc && i<max_frames; i++)
+ {
+ /* store frame */
+ *(buffer++) = (void *)fp->fr_savpc;
+ /* next frame */
+ fp=fp->fr_savfp;
+ }
+ return i;
}
void backtrace_symbols_fd( void **buffer, int size, int fd )
{
+ FILE *fp = fdopen( fd, "w" );
+
+ if ( fp )
+ {
+ void **pFramePtr;
+ for ( pFramePtr = buffer; size > 0 && pFramePtr && *pFramePtr; pFramePtr++, size-- )
+ {
+ Dl_info dli;
+ ptrdiff_t offset;
+
+ if ( 0 != dladdr( *pFramePtr, &dli ) )
+ {
+ if ( dli.dli_fname && dli.dli_fbase )
+ {
+ offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_fbase;
+ fprintf( fp, "%s+0x%x", dli.dli_fname, offset );
+ }
+ if ( dli.dli_sname && dli.dli_saddr )
+ {
+ offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_saddr;
+ fprintf( fp, "(%s+0x%x)", dli.dli_sname, offset );
+ }
+ }
+ fprintf( fp, "[0x%x]\n", *pFramePtr );
+ }
+ fflush( fp );
+ fclose( fp );
+ }
}
#endif /* defined FREEBSD */
--- sal/osl/unx/backtrace.h Thu Sep 8 23:52:59 2005
+++ sal/osl/unx/backtrace.h Sun Oct 23 09:19:40 2005
@@ -46,6 +46,16 @@
void backtrace_symbols_fd( void **buffer, int size, int fd );
+/* no frame.h on FreeBSD */
+#if defined FREEBSD
+struct frame {
+ long arg0[8];
+ long arg1[6];
+ struct frame *fr_savfp;
+ long fr_savpc;
+};
+#endif
+
#ifdef __cplusplus
} /* extern "C" */
#endif

124
editors/openoffice.org-3-devel/files/patch-epm
View File

@ -1,124 +0,0 @@
Index: epm/epm-3.7.patch
===================================================================
RCS file: /cvs/external/epm/epm-3.7.patch,v
retrieving revision 1.8
diff -u -r1.8 epm-3.7.patch
--- epm/epm-3.7.patch 3 Feb 2006 17:32:08 -0000 1.8
+++ epm/epm-3.7.patch 11 Feb 2006 09:28:33 -0000
@@ -546,3 +546,116 @@
}
--- 457,462 ----
+*** misc/epm-3.7/bsd.c Wed Jan 15 02:05:01 2003
+--- misc/build/epm-3.7/bsd.c Thu Jan 19 17:05:43 2006
+***************
+*** 26,31 ****
+--- 26,38 ----
+
+ #include "epm.h"
+
++ void cr2semicolon(char *command)
++ {
++ int len, i;
++ len=strlen(command);
++ for (i=0;i<len;i++)
++ if(*(command+i)=='\n') *(command+i)=';';
++ }
+
+ /*
+ * 'make_bsd()' - Make a FreeBSD software distribution package.
+***************
+*** 149,156 ****
+
+ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++)
+ {
+! if (d->type == DEPEND_REQUIRES)
+! fprintf(fp, "@pkgdep %s", d->product);
+ else
+ #ifdef __FreeBSD__
+ /*
+--- 156,172 ----
+
+ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++)
+ {
+! #ifdef __FreeBSD__
+! if (d->type == DEPEND_REQUIRES) {
+! if (dist->relnumber)
+! fprintf(fp, "@pkgdep %s-%s-%d-%s", d->product, dist->version, dist->relnumber, platname);
+! else
+! fprintf(fp, "@pkgdep %s-%s-%s", d->product, dist->version, platname);
+! }
+! #else
+! if (d->type == DEPEND_REQUIRES)
+! fprintf(fp, "@pkgdep %s", d->product);
+! #endif
+ else
+ #ifdef __FreeBSD__
+ /*
+***************
+*** 179,187 ****
+--- 196,206 ----
+ " by the BSD packager.\n", stderr);
+ break;
+ case COMMAND_POST_INSTALL :
++ cr2semicolon(c->command);
+ fprintf(fp, "@exec %s\n", c->command);
+ break;
+ case COMMAND_PRE_REMOVE :
++ cr2semicolon(c->command);
+ fprintf(fp, "@unexec %s\n", c->command);
+ break;
+ case COMMAND_POST_REMOVE :
+***************
+*** 199,205 ****
+ */
+
+ fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst);
+! fprintf(fp, "@exec /bin/chown %s:%s %s\n", file->user, file->group,
+ file->dst);
+ fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst);
+ }
+--- 218,224 ----
+ */
+
+ fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst);
+! fprintf(fp, "@exec /usr/sbin/chown %s:%s %s\n", file->user, file->group,
+ file->dst);
+ fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst);
+ }
+*** 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
+***************
+*** 181,192 ****
+
+ for (i = slen; i > 0; i --, s ++, bytes ++)
+ {
+ if (strchr("`~!#$%^&*()[{]}\\|;\'\"<>? ", *s))
+ {
+ putc('\\', fp);
+ bytes ++;
+ }
+!
+ putc(*s, fp);
+ }
+
+--- 181,199 ----
+
+ for (i = slen; i > 0; i --, s ++, bytes ++)
+ {
++ #if defined(__FreeBSD__)
++ if (strchr("`~!#%^&*()[{]}\\|;\'\"<>? ", *s))
++ {
++ putc('\\', fp);
++ bytes ++;
++ }
++ #else
+ if (strchr("`~!#$%^&*()[{]}\\|;\'\"<>? ", *s))
+ {
+ putc('\\', fp);
+ bytes ++;
+ }
+! #endif
+ putc(*s, fp);
+ }
+

21
editors/openoffice.org-3-devel/files/patch-rsc+source+rscpp+makefile.mk
View File

@ -1,21 +0,0 @@
Issuetracker : #i54178#
CWS : hr17
Author: :
Description :
Index: rsc/source/rscpp/makefile.mk
===================================================================
RCS file: /cvs/gsl/rsc/source/rscpp/makefile.mk,v
retrieving revision 1.5
diff -u -r1.5 makefile.mk
--- rsc/source/rscpp/makefile.mk 8 Sep 2005 14:00:27 -0000 1.5
+++ rsc/source/rscpp/makefile.mk 21 Sep 2005 10:18:09 -0000
@@ -36,6 +36,8 @@
TARGETTYPE=CUI
TARGETTHREAD=ST
+# we don't need STL in this project
+NO_DEFAULT_STL=TRUE
PRJNAME=rsc
TARGET=rscpp

95
editors/openoffice.org-vcltesttool/files/patch-backtrace
View File

@ -1,95 +0,0 @@
Issuetracker : #i56946#
CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : FreeBSD porting : An implementation of backtrace at sal/osl/unx
To pass the compilation, we had been preparing dummy function at sal.
We implemented this.
--- sal/osl/unx/backtrace.c Thu Sep 8 23:52:44 2005
+++ sal/osl/unx/backtrace.c Sun Oct 23 09:19:04 2005
@@ -129,6 +129,7 @@
#include <pthread.h>
#include <setjmp.h>
#include <stdio.h>
+#include <stddef.h>
#include "backtrace.h"
#define FRAME_PTR_OFFSET 1
@@ -136,11 +137,55 @@
int backtrace( void **buffer, int max_frames )
{
- return 1;
+ struct frame *fp;
+ jmp_buf ctx;
+ int i;
+ /* get stack- and framepointer */
+ setjmp(ctx);
+ fp = (struct frame*)(((size_t*)(ctx))[FRAME_PTR_OFFSET]);
+ for ( i=0; (i<FRAME_OFFSET) && (fp!=0); i++)
+ fp = fp->fr_savfp;
+ /* iterate through backtrace */
+ for (i=0; fp && fp->fr_savpc && i<max_frames; i++)
+ {
+ /* store frame */
+ *(buffer++) = (void *)fp->fr_savpc;
+ /* next frame */
+ fp=fp->fr_savfp;
+ }
+ return i;
}
void backtrace_symbols_fd( void **buffer, int size, int fd )
{
+ FILE *fp = fdopen( fd, "w" );
+
+ if ( fp )
+ {
+ void **pFramePtr;
+ for ( pFramePtr = buffer; size > 0 && pFramePtr && *pFramePtr; pFramePtr++, size-- )
+ {
+ Dl_info dli;
+ ptrdiff_t offset;
+
+ if ( 0 != dladdr( *pFramePtr, &dli ) )
+ {
+ if ( dli.dli_fname && dli.dli_fbase )
+ {
+ offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_fbase;
+ fprintf( fp, "%s+0x%x", dli.dli_fname, offset );
+ }
+ if ( dli.dli_sname && dli.dli_saddr )
+ {
+ offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_saddr;
+ fprintf( fp, "(%s+0x%x)", dli.dli_sname, offset );
+ }
+ }
+ fprintf( fp, "[0x%x]\n", *pFramePtr );
+ }
+ fflush( fp );
+ fclose( fp );
+ }
}
#endif /* defined FREEBSD */
--- sal/osl/unx/backtrace.h Thu Sep 8 23:52:59 2005
+++ sal/osl/unx/backtrace.h Sun Oct 23 09:19:40 2005
@@ -46,6 +46,16 @@
void backtrace_symbols_fd( void **buffer, int size, int fd );
+/* no frame.h on FreeBSD */
+#if defined FREEBSD
+struct frame {
+ long arg0[8];
+ long arg1[6];
+ struct frame *fr_savfp;
+ long fr_savpc;
+};
+#endif
+
#ifdef __cplusplus
} /* extern "C" */
#endif

124
editors/openoffice.org-vcltesttool/files/patch-epm
View File

@ -1,124 +0,0 @@
Index: epm/epm-3.7.patch
===================================================================
RCS file: /cvs/external/epm/epm-3.7.patch,v
retrieving revision 1.8
diff -u -r1.8 epm-3.7.patch
--- epm/epm-3.7.patch 3 Feb 2006 17:32:08 -0000 1.8
+++ epm/epm-3.7.patch 11 Feb 2006 09:28:33 -0000
@@ -546,3 +546,116 @@
}
--- 457,462 ----
+*** misc/epm-3.7/bsd.c Wed Jan 15 02:05:01 2003
+--- misc/build/epm-3.7/bsd.c Thu Jan 19 17:05:43 2006
+***************
+*** 26,31 ****
+--- 26,38 ----
+
+ #include "epm.h"
+
++ void cr2semicolon(char *command)
++ {
++ int len, i;
++ len=strlen(command);
++ for (i=0;i<len;i++)
++ if(*(command+i)=='\n') *(command+i)=';';
++ }
+
+ /*
+ * 'make_bsd()' - Make a FreeBSD software distribution package.
+***************
+*** 149,156 ****
+
+ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++)
+ {
+! if (d->type == DEPEND_REQUIRES)
+! fprintf(fp, "@pkgdep %s", d->product);
+ else
+ #ifdef __FreeBSD__
+ /*
+--- 156,172 ----
+
+ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++)
+ {
+! #ifdef __FreeBSD__
+! if (d->type == DEPEND_REQUIRES) {
+! if (dist->relnumber)
+! fprintf(fp, "@pkgdep %s-%s-%d-%s", d->product, dist->version, dist->relnumber, platname);
+! else
+! fprintf(fp, "@pkgdep %s-%s-%s", d->product, dist->version, platname);
+! }
+! #else
+! if (d->type == DEPEND_REQUIRES)
+! fprintf(fp, "@pkgdep %s", d->product);
+! #endif
+ else
+ #ifdef __FreeBSD__
+ /*
+***************
+*** 179,187 ****
+--- 196,206 ----
+ " by the BSD packager.\n", stderr);
+ break;
+ case COMMAND_POST_INSTALL :
++ cr2semicolon(c->command);
+ fprintf(fp, "@exec %s\n", c->command);
+ break;
+ case COMMAND_PRE_REMOVE :
++ cr2semicolon(c->command);
+ fprintf(fp, "@unexec %s\n", c->command);
+ break;
+ case COMMAND_POST_REMOVE :
+***************
+*** 199,205 ****
+ */
+
+ fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst);
+! fprintf(fp, "@exec /bin/chown %s:%s %s\n", file->user, file->group,
+ file->dst);
+ fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst);
+ }
+--- 218,224 ----
+ */
+
+ fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst);
+! fprintf(fp, "@exec /usr/sbin/chown %s:%s %s\n", file->user, file->group,
+ file->dst);
+ fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst);
+ }
+*** 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
+***************
+*** 181,192 ****
+
+ for (i = slen; i > 0; i --, s ++, bytes ++)
+ {
+ if (strchr("`~!#$%^&*()[{]}\\|;\'\"<>? ", *s))
+ {
+ putc('\\', fp);
+ bytes ++;
+ }
+!
+ putc(*s, fp);
+ }
+
+--- 181,199 ----
+
+ for (i = slen; i > 0; i --, s ++, bytes ++)
+ {
++ #if defined(__FreeBSD__)
++ if (strchr("`~!#%^&*()[{]}\\|;\'\"<>? ", *s))
++ {
++ putc('\\', fp);
++ bytes ++;
++ }
++ #else
+ if (strchr("`~!#$%^&*()[{]}\\|;\'\"<>? ", *s))
+ {
+ putc('\\', fp);
+ bytes ++;
+ }
+! #endif
+ putc(*s, fp);
+ }
+

21
editors/openoffice.org-vcltesttool/files/patch-rsc+source+rscpp+makefile.mk
View File

@ -1,21 +0,0 @@
Issuetracker : #i54178#
CWS : hr17
Author: :
Description :
Index: rsc/source/rscpp/makefile.mk
===================================================================
RCS file: /cvs/gsl/rsc/source/rscpp/makefile.mk,v
retrieving revision 1.5
diff -u -r1.5 makefile.mk
--- rsc/source/rscpp/makefile.mk 8 Sep 2005 14:00:27 -0000 1.5
+++ rsc/source/rscpp/makefile.mk 21 Sep 2005 10:18:09 -0000
@@ -36,6 +36,8 @@
TARGETTYPE=CUI
TARGETTHREAD=ST
+# we don't need STL in this project
+NO_DEFAULT_STL=TRUE
PRJNAME=rsc
TARGET=rscpp