diff options
26 files changed, 444 insertions, 3 deletions
diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile index 7acb647ee826..61959f65cb26 100644 --- a/editors/openoffice-1.0/Makefile +++ b/editors/openoffice-1.0/Makefile @@ -127,7 +127,9 @@ WRKSRC= ${WRKDIR}/oo_1.0.1_src/config_office LD_PATH1= ${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/ LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/641/unxfbsd.pro/lib/ .if defined(WITH_DEBUG) +.if ${WITH_DEBUG} == 2 DMAKE= dmake debug="true" +.endif .else DMAKE= dmake strip="true" .endif @@ -147,8 +149,10 @@ CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} .endif .if defined(WITH_DEBUG) +.if ${WITH_DEBUG} == 2 CONFIGURE_ARGS+= --enable-debug .endif +.endif .if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2) CONFIGURE_ARGS+= --enable-gcc3 @@ -175,7 +179,12 @@ pre-fetch: .if !defined(WITH_DEBUG) @${ECHO} @${ECHO} "You can compile OO with debug symbols" - @${ECHO} "if you call make with WITH_DEBUG=YES" + @${ECHO} "if you call make with WITH_DEBUG=1" + @${ECHO} + @${ECHO} "If you set WITH_DEBUG=2, you add internal" + @${ECHO} "OO.org debug support. This is currently" + @${ECHO} "broken." + @${ECHO} .endif .if ${OSVERSION} < 450002 @${ECHO} diff --git a/editors/openoffice-1.0/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice-1.0/files/debugpatch-solenv+inc+unxfbsdi.mk new file mode 100644 index 000000000000..52bd2b3d58d6 --- /dev/null +++ b/editors/openoffice-1.0/files/debugpatch-solenv+inc+unxfbsdi.mk @@ -0,0 +1,18 @@ +--- ../solenv/inc/unxfbsdi.mk.orig Mon Jul 22 00:40:56 2002 ++++ ../solenv/inc/unxfbsdi.mk Mon Jul 22 00:42:02 2002 +@@ -25,12 +25,12 @@ + .ENDIF + + # flags for C and C++ Compiler +-CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include ++CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include + CFLAGS+=-I/usr/X11R6/include + + # flags for the C++ Compiler +-CFLAGSCC=-pipe +-CFLAGSCXX=-pipe -fno-for-scope -fpermissive ++CFLAGSCC=-g -ggdb -pipe ++CFLAGSCXX=-g -ggdb -pipe -fno-for-scope -fpermissive + + # Flags for enabling exception handling + CFLAGSEXCEPTIONS=-fexceptions diff --git a/editors/openoffice-1.0/files/debugpatch-solenv::inc::unxfbsdi.mk b/editors/openoffice-1.0/files/debugpatch-solenv::inc::unxfbsdi.mk new file mode 100644 index 000000000000..52bd2b3d58d6 --- /dev/null +++ b/editors/openoffice-1.0/files/debugpatch-solenv::inc::unxfbsdi.mk @@ -0,0 +1,18 @@ +--- ../solenv/inc/unxfbsdi.mk.orig Mon Jul 22 00:40:56 2002 ++++ ../solenv/inc/unxfbsdi.mk Mon Jul 22 00:42:02 2002 +@@ -25,12 +25,12 @@ + .ENDIF + + # flags for C and C++ Compiler +-CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include ++CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include + CFLAGS+=-I/usr/X11R6/include + + # flags for the C++ Compiler +-CFLAGSCC=-pipe +-CFLAGSCXX=-pipe -fno-for-scope -fpermissive ++CFLAGSCC=-g -ggdb -pipe ++CFLAGSCXX=-g -ggdb -pipe -fno-for-scope -fpermissive + + # Flags for enabling exception handling + CFLAGSEXCEPTIONS=-fexceptions diff --git a/editors/openoffice-1.1-devel/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice-1.1-devel/files/debugpatch-solenv+inc+unxfbsdi.mk new file mode 100644 index 000000000000..52bd2b3d58d6 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/debugpatch-solenv+inc+unxfbsdi.mk @@ -0,0 +1,18 @@ +--- ../solenv/inc/unxfbsdi.mk.orig Mon Jul 22 00:40:56 2002 ++++ ../solenv/inc/unxfbsdi.mk Mon Jul 22 00:42:02 2002 +@@ -25,12 +25,12 @@ + .ENDIF + + # flags for C and C++ Compiler +-CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include ++CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include + CFLAGS+=-I/usr/X11R6/include + + # flags for the C++ Compiler +-CFLAGSCC=-pipe +-CFLAGSCXX=-pipe -fno-for-scope -fpermissive ++CFLAGSCC=-g -ggdb -pipe ++CFLAGSCXX=-g -ggdb -pipe -fno-for-scope -fpermissive + + # Flags for enabling exception handling + CFLAGSEXCEPTIONS=-fexceptions diff --git a/editors/openoffice-1.1/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice-1.1/files/debugpatch-solenv+inc+unxfbsdi.mk new file mode 100644 index 000000000000..52bd2b3d58d6 --- /dev/null +++ b/editors/openoffice-1.1/files/debugpatch-solenv+inc+unxfbsdi.mk @@ -0,0 +1,18 @@ +--- ../solenv/inc/unxfbsdi.mk.orig Mon Jul 22 00:40:56 2002 ++++ ../solenv/inc/unxfbsdi.mk Mon Jul 22 00:42:02 2002 +@@ -25,12 +25,12 @@ + .ENDIF + + # flags for C and C++ Compiler +-CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include ++CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include + CFLAGS+=-I/usr/X11R6/include + + # flags for the C++ Compiler +-CFLAGSCC=-pipe +-CFLAGSCXX=-pipe -fno-for-scope -fpermissive ++CFLAGSCC=-g -ggdb -pipe ++CFLAGSCXX=-g -ggdb -pipe -fno-for-scope -fpermissive + + # Flags for enabling exception handling + CFLAGSEXCEPTIONS=-fexceptions diff --git a/editors/openoffice-2.0-devel/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice-2.0-devel/files/debugpatch-solenv+inc+unxfbsdi.mk new file mode 100644 index 000000000000..52bd2b3d58d6 --- /dev/null +++ b/editors/openoffice-2.0-devel/files/debugpatch-solenv+inc+unxfbsdi.mk @@ -0,0 +1,18 @@ +--- ../solenv/inc/unxfbsdi.mk.orig Mon Jul 22 00:40:56 2002 ++++ ../solenv/inc/unxfbsdi.mk Mon Jul 22 00:42:02 2002 +@@ -25,12 +25,12 @@ + .ENDIF + + # flags for C and C++ Compiler +-CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include ++CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include + CFLAGS+=-I/usr/X11R6/include + + # flags for the C++ Compiler +-CFLAGSCC=-pipe +-CFLAGSCXX=-pipe -fno-for-scope -fpermissive ++CFLAGSCC=-g -ggdb -pipe ++CFLAGSCXX=-g -ggdb -pipe -fno-for-scope -fpermissive + + # Flags for enabling exception handling + CFLAGSEXCEPTIONS=-fexceptions diff --git a/editors/openoffice-3-devel/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice-3-devel/files/debugpatch-solenv+inc+unxfbsdi.mk new file mode 100644 index 000000000000..52bd2b3d58d6 --- /dev/null +++ b/editors/openoffice-3-devel/files/debugpatch-solenv+inc+unxfbsdi.mk @@ -0,0 +1,18 @@ +--- ../solenv/inc/unxfbsdi.mk.orig Mon Jul 22 00:40:56 2002 ++++ ../solenv/inc/unxfbsdi.mk Mon Jul 22 00:42:02 2002 +@@ -25,12 +25,12 @@ + .ENDIF + + # flags for C and C++ Compiler +-CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include ++CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include + CFLAGS+=-I/usr/X11R6/include + + # flags for the C++ Compiler +-CFLAGSCC=-pipe +-CFLAGSCXX=-pipe -fno-for-scope -fpermissive ++CFLAGSCC=-g -ggdb -pipe ++CFLAGSCXX=-g -ggdb -pipe -fno-for-scope -fpermissive + + # Flags for enabling exception handling + CFLAGSEXCEPTIONS=-fexceptions diff --git a/editors/openoffice-3/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice-3/files/debugpatch-solenv+inc+unxfbsdi.mk new file mode 100644 index 000000000000..52bd2b3d58d6 --- /dev/null +++ b/editors/openoffice-3/files/debugpatch-solenv+inc+unxfbsdi.mk @@ -0,0 +1,18 @@ +--- ../solenv/inc/unxfbsdi.mk.orig Mon Jul 22 00:40:56 2002 ++++ ../solenv/inc/unxfbsdi.mk Mon Jul 22 00:42:02 2002 +@@ -25,12 +25,12 @@ + .ENDIF + + # flags for C and C++ Compiler +-CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include ++CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include + CFLAGS+=-I/usr/X11R6/include + + # flags for the C++ Compiler +-CFLAGSCC=-pipe +-CFLAGSCXX=-pipe -fno-for-scope -fpermissive ++CFLAGSCC=-g -ggdb -pipe ++CFLAGSCXX=-g -ggdb -pipe -fno-for-scope -fpermissive + + # Flags for enabling exception handling + CFLAGSEXCEPTIONS=-fexceptions diff --git a/editors/openoffice-devel/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice-devel/files/debugpatch-solenv+inc+unxfbsdi.mk new file mode 100644 index 000000000000..52bd2b3d58d6 --- /dev/null +++ b/editors/openoffice-devel/files/debugpatch-solenv+inc+unxfbsdi.mk @@ -0,0 +1,18 @@ +--- ../solenv/inc/unxfbsdi.mk.orig Mon Jul 22 00:40:56 2002 ++++ ../solenv/inc/unxfbsdi.mk Mon Jul 22 00:42:02 2002 +@@ -25,12 +25,12 @@ + .ENDIF + + # flags for C and C++ Compiler +-CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include ++CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include + CFLAGS+=-I/usr/X11R6/include + + # flags for the C++ Compiler +-CFLAGSCC=-pipe +-CFLAGSCXX=-pipe -fno-for-scope -fpermissive ++CFLAGSCC=-g -ggdb -pipe ++CFLAGSCXX=-g -ggdb -pipe -fno-for-scope -fpermissive + + # Flags for enabling exception handling + CFLAGSEXCEPTIONS=-fexceptions diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile index 7acb647ee826..61959f65cb26 100644 --- a/editors/openoffice.org-1.0/Makefile +++ b/editors/openoffice.org-1.0/Makefile @@ -127,7 +127,9 @@ WRKSRC= ${WRKDIR}/oo_1.0.1_src/config_office LD_PATH1= ${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/ LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/641/unxfbsd.pro/lib/ .if defined(WITH_DEBUG) +.if ${WITH_DEBUG} == 2 DMAKE= dmake debug="true" +.endif .else DMAKE= dmake strip="true" .endif @@ -147,8 +149,10 @@ CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} .endif .if defined(WITH_DEBUG) +.if ${WITH_DEBUG} == 2 CONFIGURE_ARGS+= --enable-debug .endif +.endif .if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2) CONFIGURE_ARGS+= --enable-gcc3 @@ -175,7 +179,12 @@ pre-fetch: .if !defined(WITH_DEBUG) @${ECHO} @${ECHO} "You can compile OO with debug symbols" - @${ECHO} "if you call make with WITH_DEBUG=YES" + @${ECHO} "if you call make with WITH_DEBUG=1" + @${ECHO} + @${ECHO} "If you set WITH_DEBUG=2, you add internal" + @${ECHO} "OO.org debug support. This is currently" + @${ECHO} "broken." + @${ECHO} .endif .if ${OSVERSION} < 450002 @${ECHO} diff --git a/editors/openoffice.org-1.0/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-1.0/files/debugpatch-solenv+inc+unxfbsdi.mk new file mode 100644 index 000000000000..52bd2b3d58d6 --- /dev/null +++ b/editors/openoffice.org-1.0/files/debugpatch-solenv+inc+unxfbsdi.mk @@ -0,0 +1,18 @@ +--- ../solenv/inc/unxfbsdi.mk.orig Mon Jul 22 00:40:56 2002 ++++ ../solenv/inc/unxfbsdi.mk Mon Jul 22 00:42:02 2002 +@@ -25,12 +25,12 @@ + .ENDIF + + # flags for C and C++ Compiler +-CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include ++CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include + CFLAGS+=-I/usr/X11R6/include + + # flags for the C++ Compiler +-CFLAGSCC=-pipe +-CFLAGSCXX=-pipe -fno-for-scope -fpermissive ++CFLAGSCC=-g -ggdb -pipe ++CFLAGSCXX=-g -ggdb -pipe -fno-for-scope -fpermissive + + # Flags for enabling exception handling + CFLAGSEXCEPTIONS=-fexceptions diff --git a/editors/openoffice.org-1.0/files/debugpatch-solenv::inc::unxfbsdi.mk b/editors/openoffice.org-1.0/files/debugpatch-solenv::inc::unxfbsdi.mk new file mode 100644 index 000000000000..52bd2b3d58d6 --- /dev/null +++ b/editors/openoffice.org-1.0/files/debugpatch-solenv::inc::unxfbsdi.mk @@ -0,0 +1,18 @@ +--- ../solenv/inc/unxfbsdi.mk.orig Mon Jul 22 00:40:56 2002 ++++ ../solenv/inc/unxfbsdi.mk Mon Jul 22 00:42:02 2002 +@@ -25,12 +25,12 @@ + .ENDIF + + # flags for C and C++ Compiler +-CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include ++CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include + CFLAGS+=-I/usr/X11R6/include + + # flags for the C++ Compiler +-CFLAGSCC=-pipe +-CFLAGSCXX=-pipe -fno-for-scope -fpermissive ++CFLAGSCC=-g -ggdb -pipe ++CFLAGSCXX=-g -ggdb -pipe -fno-for-scope -fpermissive + + # Flags for enabling exception handling + CFLAGSEXCEPTIONS=-fexceptions diff --git a/editors/openoffice.org-1.1-devel/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-1.1-devel/files/debugpatch-solenv+inc+unxfbsdi.mk new file mode 100644 index 000000000000..52bd2b3d58d6 --- /dev/null +++ b/editors/openoffice.org-1.1-devel/files/debugpatch-solenv+inc+unxfbsdi.mk @@ -0,0 +1,18 @@ +--- ../solenv/inc/unxfbsdi.mk.orig Mon Jul 22 00:40:56 2002 ++++ ../solenv/inc/unxfbsdi.mk Mon Jul 22 00:42:02 2002 +@@ -25,12 +25,12 @@ + .ENDIF + + # flags for C and C++ Compiler +-CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include ++CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include + CFLAGS+=-I/usr/X11R6/include + + # flags for the C++ Compiler +-CFLAGSCC=-pipe +-CFLAGSCXX=-pipe -fno-for-scope -fpermissive ++CFLAGSCC=-g -ggdb -pipe ++CFLAGSCXX=-g -ggdb -pipe -fno-for-scope -fpermissive + + # Flags for enabling exception handling + CFLAGSEXCEPTIONS=-fexceptions diff --git a/editors/openoffice.org-1.1/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-1.1/files/debugpatch-solenv+inc+unxfbsdi.mk new file mode 100644 index 000000000000..52bd2b3d58d6 --- /dev/null +++ b/editors/openoffice.org-1.1/files/debugpatch-solenv+inc+unxfbsdi.mk @@ -0,0 +1,18 @@ +--- ../solenv/inc/unxfbsdi.mk.orig Mon Jul 22 00:40:56 2002 ++++ ../solenv/inc/unxfbsdi.mk Mon Jul 22 00:42:02 2002 +@@ -25,12 +25,12 @@ + .ENDIF + + # flags for C and C++ Compiler +-CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include ++CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include + CFLAGS+=-I/usr/X11R6/include + + # flags for the C++ Compiler +-CFLAGSCC=-pipe +-CFLAGSCXX=-pipe -fno-for-scope -fpermissive ++CFLAGSCC=-g -ggdb -pipe ++CFLAGSCXX=-g -ggdb -pipe -fno-for-scope -fpermissive + + # Flags for enabling exception handling + CFLAGSEXCEPTIONS=-fexceptions diff --git a/editors/openoffice.org-2-RC/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2-RC/files/debugpatch-solenv+inc+unxfbsdi.mk new file mode 100644 index 000000000000..52bd2b3d58d6 --- /dev/null +++ b/editors/openoffice.org-2-RC/files/debugpatch-solenv+inc+unxfbsdi.mk @@ -0,0 +1,18 @@ +--- ../solenv/inc/unxfbsdi.mk.orig Mon Jul 22 00:40:56 2002 ++++ ../solenv/inc/unxfbsdi.mk Mon Jul 22 00:42:02 2002 +@@ -25,12 +25,12 @@ + .ENDIF + + # flags for C and C++ Compiler +-CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include ++CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include + CFLAGS+=-I/usr/X11R6/include + + # flags for the C++ Compiler +-CFLAGSCC=-pipe +-CFLAGSCXX=-pipe -fno-for-scope -fpermissive ++CFLAGSCC=-g -ggdb -pipe ++CFLAGSCXX=-g -ggdb -pipe -fno-for-scope -fpermissive + + # Flags for enabling exception handling + CFLAGSEXCEPTIONS=-fexceptions diff --git a/editors/openoffice.org-2-devel/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2-devel/files/debugpatch-solenv+inc+unxfbsdi.mk new file mode 100644 index 000000000000..52bd2b3d58d6 --- /dev/null +++ b/editors/openoffice.org-2-devel/files/debugpatch-solenv+inc+unxfbsdi.mk @@ -0,0 +1,18 @@ +--- ../solenv/inc/unxfbsdi.mk.orig Mon Jul 22 00:40:56 2002 ++++ ../solenv/inc/unxfbsdi.mk Mon Jul 22 00:42:02 2002 +@@ -25,12 +25,12 @@ + .ENDIF + + # flags for C and C++ Compiler +-CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include ++CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include + CFLAGS+=-I/usr/X11R6/include + + # flags for the C++ Compiler +-CFLAGSCC=-pipe +-CFLAGSCXX=-pipe -fno-for-scope -fpermissive ++CFLAGSCC=-g -ggdb -pipe ++CFLAGSCXX=-g -ggdb -pipe -fno-for-scope -fpermissive + + # Flags for enabling exception handling + CFLAGSEXCEPTIONS=-fexceptions diff --git a/editors/openoffice.org-2.0-devel/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2.0-devel/files/debugpatch-solenv+inc+unxfbsdi.mk new file mode 100644 index 000000000000..52bd2b3d58d6 --- /dev/null +++ b/editors/openoffice.org-2.0-devel/files/debugpatch-solenv+inc+unxfbsdi.mk @@ -0,0 +1,18 @@ +--- ../solenv/inc/unxfbsdi.mk.orig Mon Jul 22 00:40:56 2002 ++++ ../solenv/inc/unxfbsdi.mk Mon Jul 22 00:42:02 2002 +@@ -25,12 +25,12 @@ + .ENDIF + + # flags for C and C++ Compiler +-CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include ++CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include + CFLAGS+=-I/usr/X11R6/include + + # flags for the C++ Compiler +-CFLAGSCC=-pipe +-CFLAGSCXX=-pipe -fno-for-scope -fpermissive ++CFLAGSCC=-g -ggdb -pipe ++CFLAGSCXX=-g -ggdb -pipe -fno-for-scope -fpermissive + + # Flags for enabling exception handling + CFLAGSEXCEPTIONS=-fexceptions diff --git a/editors/openoffice.org-2.0/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2.0/files/debugpatch-solenv+inc+unxfbsdi.mk new file mode 100644 index 000000000000..52bd2b3d58d6 --- /dev/null +++ b/editors/openoffice.org-2.0/files/debugpatch-solenv+inc+unxfbsdi.mk @@ -0,0 +1,18 @@ +--- ../solenv/inc/unxfbsdi.mk.orig Mon Jul 22 00:40:56 2002 ++++ ../solenv/inc/unxfbsdi.mk Mon Jul 22 00:42:02 2002 +@@ -25,12 +25,12 @@ + .ENDIF + + # flags for C and C++ Compiler +-CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include ++CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include + CFLAGS+=-I/usr/X11R6/include + + # flags for the C++ Compiler +-CFLAGSCC=-pipe +-CFLAGSCXX=-pipe -fno-for-scope -fpermissive ++CFLAGSCC=-g -ggdb -pipe ++CFLAGSCXX=-g -ggdb -pipe -fno-for-scope -fpermissive + + # Flags for enabling exception handling + CFLAGSEXCEPTIONS=-fexceptions diff --git a/editors/openoffice.org-2/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2/files/debugpatch-solenv+inc+unxfbsdi.mk new file mode 100644 index 000000000000..52bd2b3d58d6 --- /dev/null +++ b/editors/openoffice.org-2/files/debugpatch-solenv+inc+unxfbsdi.mk @@ -0,0 +1,18 @@ +--- ../solenv/inc/unxfbsdi.mk.orig Mon Jul 22 00:40:56 2002 ++++ ../solenv/inc/unxfbsdi.mk Mon Jul 22 00:42:02 2002 +@@ -25,12 +25,12 @@ + .ENDIF + + # flags for C and C++ Compiler +-CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include ++CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include + CFLAGS+=-I/usr/X11R6/include + + # flags for the C++ Compiler +-CFLAGSCC=-pipe +-CFLAGSCXX=-pipe -fno-for-scope -fpermissive ++CFLAGSCC=-g -ggdb -pipe ++CFLAGSCXX=-g -ggdb -pipe -fno-for-scope -fpermissive + + # Flags for enabling exception handling + CFLAGSEXCEPTIONS=-fexceptions diff --git a/editors/openoffice.org-3-RC/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-3-RC/files/debugpatch-solenv+inc+unxfbsdi.mk new file mode 100644 index 000000000000..52bd2b3d58d6 --- /dev/null +++ b/editors/openoffice.org-3-RC/files/debugpatch-solenv+inc+unxfbsdi.mk @@ -0,0 +1,18 @@ +--- ../solenv/inc/unxfbsdi.mk.orig Mon Jul 22 00:40:56 2002 ++++ ../solenv/inc/unxfbsdi.mk Mon Jul 22 00:42:02 2002 +@@ -25,12 +25,12 @@ + .ENDIF + + # flags for C and C++ Compiler +-CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include ++CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include + CFLAGS+=-I/usr/X11R6/include + + # flags for the C++ Compiler +-CFLAGSCC=-pipe +-CFLAGSCXX=-pipe -fno-for-scope -fpermissive ++CFLAGSCC=-g -ggdb -pipe ++CFLAGSCXX=-g -ggdb -pipe -fno-for-scope -fpermissive + + # Flags for enabling exception handling + CFLAGSEXCEPTIONS=-fexceptions diff --git a/editors/openoffice.org-3-devel/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-3-devel/files/debugpatch-solenv+inc+unxfbsdi.mk new file mode 100644 index 000000000000..52bd2b3d58d6 --- /dev/null +++ b/editors/openoffice.org-3-devel/files/debugpatch-solenv+inc+unxfbsdi.mk @@ -0,0 +1,18 @@ +--- ../solenv/inc/unxfbsdi.mk.orig Mon Jul 22 00:40:56 2002 ++++ ../solenv/inc/unxfbsdi.mk Mon Jul 22 00:42:02 2002 +@@ -25,12 +25,12 @@ + .ENDIF + + # flags for C and C++ Compiler +-CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include ++CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include + CFLAGS+=-I/usr/X11R6/include + + # flags for the C++ Compiler +-CFLAGSCC=-pipe +-CFLAGSCXX=-pipe -fno-for-scope -fpermissive ++CFLAGSCC=-g -ggdb -pipe ++CFLAGSCXX=-g -ggdb -pipe -fno-for-scope -fpermissive + + # Flags for enabling exception handling + CFLAGSEXCEPTIONS=-fexceptions diff --git a/editors/openoffice.org-3/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-3/files/debugpatch-solenv+inc+unxfbsdi.mk new file mode 100644 index 000000000000..52bd2b3d58d6 --- /dev/null +++ b/editors/openoffice.org-3/files/debugpatch-solenv+inc+unxfbsdi.mk @@ -0,0 +1,18 @@ +--- ../solenv/inc/unxfbsdi.mk.orig Mon Jul 22 00:40:56 2002 ++++ ../solenv/inc/unxfbsdi.mk Mon Jul 22 00:42:02 2002 +@@ -25,12 +25,12 @@ + .ENDIF + + # flags for C and C++ Compiler +-CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include ++CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include + CFLAGS+=-I/usr/X11R6/include + + # flags for the C++ Compiler +-CFLAGSCC=-pipe +-CFLAGSCXX=-pipe -fno-for-scope -fpermissive ++CFLAGSCC=-g -ggdb -pipe ++CFLAGSCXX=-g -ggdb -pipe -fno-for-scope -fpermissive + + # Flags for enabling exception handling + CFLAGSEXCEPTIONS=-fexceptions diff --git a/editors/openoffice.org-vcltesttool/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-vcltesttool/files/debugpatch-solenv+inc+unxfbsdi.mk new file mode 100644 index 000000000000..52bd2b3d58d6 --- /dev/null +++ b/editors/openoffice.org-vcltesttool/files/debugpatch-solenv+inc+unxfbsdi.mk @@ -0,0 +1,18 @@ +--- ../solenv/inc/unxfbsdi.mk.orig Mon Jul 22 00:40:56 2002 ++++ ../solenv/inc/unxfbsdi.mk Mon Jul 22 00:42:02 2002 +@@ -25,12 +25,12 @@ + .ENDIF + + # flags for C and C++ Compiler +-CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include ++CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include + CFLAGS+=-I/usr/X11R6/include + + # flags for the C++ Compiler +-CFLAGSCC=-pipe +-CFLAGSCXX=-pipe -fno-for-scope -fpermissive ++CFLAGSCC=-g -ggdb -pipe ++CFLAGSCXX=-g -ggdb -pipe -fno-for-scope -fpermissive + + # Flags for enabling exception handling + CFLAGSEXCEPTIONS=-fexceptions diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile index 7acb647ee826..61959f65cb26 100644 --- a/editors/openoffice/Makefile +++ b/editors/openoffice/Makefile @@ -127,7 +127,9 @@ WRKSRC= ${WRKDIR}/oo_1.0.1_src/config_office LD_PATH1= ${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/ LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/641/unxfbsd.pro/lib/ .if defined(WITH_DEBUG) +.if ${WITH_DEBUG} == 2 DMAKE= dmake debug="true" +.endif .else DMAKE= dmake strip="true" .endif @@ -147,8 +149,10 @@ CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} .endif .if defined(WITH_DEBUG) +.if ${WITH_DEBUG} == 2 CONFIGURE_ARGS+= --enable-debug .endif +.endif .if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2) CONFIGURE_ARGS+= --enable-gcc3 @@ -175,7 +179,12 @@ pre-fetch: .if !defined(WITH_DEBUG) @${ECHO} @${ECHO} "You can compile OO with debug symbols" - @${ECHO} "if you call make with WITH_DEBUG=YES" + @${ECHO} "if you call make with WITH_DEBUG=1" + @${ECHO} + @${ECHO} "If you set WITH_DEBUG=2, you add internal" + @${ECHO} "OO.org debug support. This is currently" + @${ECHO} "broken." + @${ECHO} .endif .if ${OSVERSION} < 450002 @${ECHO} diff --git a/editors/openoffice/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice/files/debugpatch-solenv+inc+unxfbsdi.mk new file mode 100644 index 000000000000..52bd2b3d58d6 --- /dev/null +++ b/editors/openoffice/files/debugpatch-solenv+inc+unxfbsdi.mk @@ -0,0 +1,18 @@ +--- ../solenv/inc/unxfbsdi.mk.orig Mon Jul 22 00:40:56 2002 ++++ ../solenv/inc/unxfbsdi.mk Mon Jul 22 00:42:02 2002 +@@ -25,12 +25,12 @@ + .ENDIF + + # flags for C and C++ Compiler +-CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include ++CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include + CFLAGS+=-I/usr/X11R6/include + + # flags for the C++ Compiler +-CFLAGSCC=-pipe +-CFLAGSCXX=-pipe -fno-for-scope -fpermissive ++CFLAGSCC=-g -ggdb -pipe ++CFLAGSCXX=-g -ggdb -pipe -fno-for-scope -fpermissive + + # Flags for enabling exception handling + CFLAGSEXCEPTIONS=-fexceptions diff --git a/editors/openoffice/files/debugpatch-solenv::inc::unxfbsdi.mk b/editors/openoffice/files/debugpatch-solenv::inc::unxfbsdi.mk new file mode 100644 index 000000000000..52bd2b3d58d6 --- /dev/null +++ b/editors/openoffice/files/debugpatch-solenv::inc::unxfbsdi.mk @@ -0,0 +1,18 @@ +--- ../solenv/inc/unxfbsdi.mk.orig Mon Jul 22 00:40:56 2002 ++++ ../solenv/inc/unxfbsdi.mk Mon Jul 22 00:42:02 2002 +@@ -25,12 +25,12 @@ + .ENDIF + + # flags for C and C++ Compiler +-CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include ++CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include + CFLAGS+=-I/usr/X11R6/include + + # flags for the C++ Compiler +-CFLAGSCC=-pipe +-CFLAGSCXX=-pipe -fno-for-scope -fpermissive ++CFLAGSCC=-g -ggdb -pipe ++CFLAGSCXX=-g -ggdb -pipe -fno-for-scope -fpermissive + + # Flags for enabling exception handling + CFLAGSEXCEPTIONS=-fexceptions |