diff options
78 files changed, 1783 insertions, 474 deletions
diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile index 7b6c77346bf5..c2fc4d02c4f3 100644 --- a/editors/openoffice-1.0/Makefile +++ b/editors/openoffice-1.0/Makefile @@ -15,23 +15,24 @@ MASTER_SITES= ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/${PORTVERSION}/ \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/ \ http://people.freebsd.org/~mbr/distfiles/ DISTFILES= OOo_${PORTVERSION}_source.tar.bz2 gpc231.tar.Z \ - oo_moz1.0RC3_includes.tgz + oo_moz1.0RC3_includes.tgz ${MOZILLADIST} .include <bsd.port.pre.mk> .if ${OSVERSION} > 500000 .if defined(USE_GCC) && ${USE_GCC} == 2.95 -DISTFILES+= oo_moz1.0RC3_${ARCH}_FreeBSD-5-gcc2.95-ports.tar.gz +MOZILLADIST= oo_moz1.0RC3_${ARCH}_FreeBSD-5-gcc2.95-ports.tar.gz .else -DISTFILES+= oo_moz1.0RC3_${ARCH}_FreeBSD-5-gcc3.1-system.tar.gz +MOZILLADIST= oo_moz1.0RC3_${ARCH}_FreeBSD-5-gcc3.1-system.tar.gz .endif .else .if defined(USE_GCC) && ${USE_GCC} == 3.1 -DISTFILES+= oo_moz1.0RC3_${ARCH}_FreeBSD-4-gcc3.1-ports.tar.gz +MOZILLADIST= oo_moz1.0RC3_${ARCH}_FreeBSD-4-gcc3.1-ports.tar.gz .else -DISTFILES+= oo_moz1.0RC3_${ARCH}_FreeBSD-4-gcc2.95-system.tar.gz +MOZILLADIST= oo_moz1.0RC3_${ARCH}_FreeBSD-4-gcc2.95-system.tar.gz .endif .endif + EXTRACT_ONLY= OOo_${PORTVERSION}_source.tar.bz2 MAINTAINER= mbr@FreeBSD.org @@ -51,21 +52,7 @@ USE_GMAKE= yes EXTRACT_BEFORE_ARGS_R= -dc EXTRACT_AFTER_ARGS_R= | ${TAR} -xf - EXTRACT_CMD_R= ${GZIP_CMD} -.if ${OSVERSION} > 500000 -.if defined(USE_GCC) && ${USE_GCC} == 2.95 -EXTRACT_REST= gpc231.tar.Z oo_moz1.0RC3_${ARCH}_FreeBSD-5-gcc2.95-ports.tar.gz -.else -EXTRACT_REST= gpc231.tar.Z oo_moz1.0RC3_${ARCH}_FreeBSD-5-gcc3.1-system.tar.gz -.endif -.else -.if defined(USE_GCC) && ${USE_GCC} == 3.1 -EXTRACT_REST= gpc231.tar.Z oo_moz1.0RC3_${ARCH}_FreeBSD-4-gcc3.1-ports.tar.gz -.else -EXTRACT_REST= gpc231.tar.Z oo_moz1.0RC3_${ARCH}_FreeBSD-4-gcc2.95-system.tar.gz -.endif -.endif - -EXTRACT_REST+= oo_moz1.0RC3_includes.tgz +EXTRACT_REST= gpc231.tar.Z ${MOZILLADIST} oo_moz1.0RC3_includes.tgz JDK13DIR?= ${LOCALBASE}/jdk1.3.1 JAVAVM= ${JDK13DIR}/bin/java @@ -86,6 +73,10 @@ CONFIGURE_ARGS+= --with-jdk-home=${JDK13DIR} \ CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} .endif +.if defined(WITH_DEBUG) +CONFIGURE_ARGS+= --enable-debug +.endif + .if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2) CONFIGURE_ARGS+= --enable-gcc3 .endif @@ -95,35 +86,47 @@ CONFIGURE_ARGS+= --enable-gcc3 .endif pre-fetch: +.if !defined(USE_GCC) || !defined(WITH_DEBUG) + @${ECHO} + @${ECHO} OPTIONS: +.endif .if !defined(USE_GCC) @${ECHO} - @${ECHO} You can compile openoffice with different + @${ECHO} You can compile OO with different @${ECHO} gcc compiler versions: @${ECHO} - @${ECHO} Use: USE_GCC=2.95 or USE_GCC=3.1 + @${ECHO} Add USE_GCC=2.95 or USE_GCC=3.1 @${ECHO} to compile openoffice with your @${ECHO} prefered compiler. +.endif +.if !defined(WITH_DEBUG) @${ECHO} + @${ECHO} You can compile OO with debug symbols + @${ECHO} if you call make with WITH_DEBUG=YES .endif .if ${OSVERSION} < 450002 @${ECHO} @${ECHO} OS-VERSION ${OSVERSION} too low @${ECHO} - @${ECHO} Openoffice need some important libc_r and + @${ECHO} OO need some important libc_r and @${ECHO} gcc fixes to build. Please upgrade to 4.6 - @${ECHO} PRE-RELEASE or RELEASE. + @${ECHO} RELEASE or 4.6 STABLE. @${FALSE} .endif @${ECHO} @${ECHO} NOTICE: @${ECHO} @${ECHO} To build Openoffice, you should have a lot - @${ECHO} of free diskspace \(~ 6GB\) and you should +.if defined(WITH_DEBUG) + @${ECHO} of free diskspace \(~ 8GB\) and you should +.else + @${ECHO} of free diskspace \(~ 4GB\) and you should +.endif @${ECHO} be an experienced port builder. This port @${ECHO} has beta quality and does not yet work as @${ECHO} stable as it should. @${ECHO} -pre-extract: + @${ECHO} KERNEL CONFIGURATION: @${ECHO} @${ECHO} Openoffice needs a larger stack- and @${ECHO} datasize to build. Check your limit @@ -143,8 +146,8 @@ pre-extract: @${ECHO} @${ECHO} langinfo.h is missing ! @${ECHO} - @${ECHO} Please upgrade to 4.5 STABLE or - @${ECHO} 4.6 RELEASE. + @${ECHO} Please upgrade to 4.6 RELEASE or + @${ECHO} 4.6 STABLE. @${ECHO} @${FALSE} .endif @@ -158,20 +161,53 @@ post-extract: exit 1; \ fi \ done - ${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/ - ${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/ - ${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/ - ${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/ - ${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/ + @${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/ + @${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/ + @${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/ + @${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/ + @${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/ post-patch: +.if defined(WITH_DEBUG) + @if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \ + ${ECHO_MSG} "===> Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \ + PATCHES_APPLIED="" ; \ + for i in ${PATCHDIR}/debugpatch-*; do \ + case $$i in \ + *.orig|*.rej|*~) \ + ${ECHO_MSG} "===> Ignoring patchfile $$i" ; \ + ;; \ + *) \ + if [ ${PATCH_DEBUG_TMP} = yes ]; then \ + ${ECHO_MSG} "===> Applying ${OPSYS} patch $$i" ; \ + fi; \ + if ${PATCH} ${PATCH_ARGS} < $$i ; then \ + PATCHES_APPLIED="$$PATCHES_APPLIED $$i" ; \ + else \ + ${ECHO_MSG} `${ECHO_CMD} ">> Patch $$i failed to apply cleanly." | ${SED} "s|${PATCHDIR}/||"` ; \ + if [ x"$$PATCHES_APPLIED" != x"" ]; then \ + ${ECHO_MSG} `${ECHO_CMD} ">> Patch(es) $$PATCHES_APPLIED applied cleanly." | ${SED} "s|${PATCHDIR}/||g"` ; \ + fi; \ + ${FALSE} ; \ + fi; \ + ;; \ + esac; \ + done; \ + fi; +.endif + @${ECHO_MSG} "===> Find old malloc.h defines and fix them in ${PKGNAME} source" @${FIND} ${WRKSRC}/.. | ${EGREP} "\.(cxx|h|c)$$" | ${XARGS} \ ${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g" do-build: @cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap +.if defined(WITH_DEBUG) @cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \ - tcsh -c 'source FreeBSDEnv.Set && dmake' + tcsh -c 'source FreeBSDEnv.Set && dmake debug=true' +.else + @cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \ + tcsh -c 'source FreeBSDEnv.Set && dmake strip=true' +.endif pre-install: @${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \ diff --git a/editors/openoffice-1.0/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice-1.0/files/debugpatch-setup2+mow+source+loader+loader.c new file mode 100644 index 000000000000..96c651ce22c8 --- /dev/null +++ b/editors/openoffice-1.0/files/debugpatch-setup2+mow+source+loader+loader.c @@ -0,0 +1,21 @@ +--- ../setup2/mow/source/loader/loader.c.orig2 Thu Jun 6 11:23:17 2002 ++++ ../setup2/mow/source/loader/loader.c Thu Jun 6 11:24:14 2002 +@@ -902,6 +902,7 @@ + + void KillSetupDir() + { ++#if 0 + DIR* pDir = opendir( strTmpPath ); + struct dirent* pFile; + +@@ -915,6 +916,10 @@ + + chdir( strInitPath ); + rmdir( strTmpPath ); ++#else ++ fprintf(stderr, "\nLeaving behind temporary directory: %s\n", ++ strTmpPath); ++#endif + } + + void makeSymLink( char* s ) diff --git a/editors/openoffice-1.0/files/debugpatch-setup2::mow::source::loader::loader.c b/editors/openoffice-1.0/files/debugpatch-setup2::mow::source::loader::loader.c new file mode 100644 index 000000000000..96c651ce22c8 --- /dev/null +++ b/editors/openoffice-1.0/files/debugpatch-setup2::mow::source::loader::loader.c @@ -0,0 +1,21 @@ +--- ../setup2/mow/source/loader/loader.c.orig2 Thu Jun 6 11:23:17 2002 ++++ ../setup2/mow/source/loader/loader.c Thu Jun 6 11:24:14 2002 +@@ -902,6 +902,7 @@ + + void KillSetupDir() + { ++#if 0 + DIR* pDir = opendir( strTmpPath ); + struct dirent* pFile; + +@@ -915,6 +916,10 @@ + + chdir( strInitPath ); + rmdir( strTmpPath ); ++#else ++ fprintf(stderr, "\nLeaving behind temporary directory: %s\n", ++ strTmpPath); ++#endif + } + + void makeSymLink( char* s ) diff --git a/editors/openoffice-1.0/files/patch-config_office+configure.in b/editors/openoffice-1.0/files/patch-config_office+configure.in index bc28e6f4a92d..5a563718c8e0 100644 --- a/editors/openoffice-1.0/files/patch-config_office+configure.in +++ b/editors/openoffice-1.0/files/patch-config_office+configure.in @@ -1,6 +1,18 @@ --- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Tue Jun 4 14:11:42 2002 -@@ -103,6 +103,12 @@ ++++ configure.in Thu Jun 6 13:10:49 2002 +@@ -28,6 +28,11 @@ + + Usage: --enable-gcc3 + ],,) ++AC_ARG_ENABLE(debug, ++[ --enable-debug if you like to build with debug symbols ++ ++ Usage: --enable-debug ++],,) + AC_ARG_WITH(stlport4-home, + [ --with-stlport4-home The location that STLport4 is installed in. The STL + header files are assumed to be in stlport4-home/stlport +@@ -103,6 +108,12 @@ Usage: --with-asm-home=<path to ml.exe directory> ],,) @@ -13,7 +25,7 @@ AC_ARG_WITH(unzip-home, [ --with-unzip-home For Windows users, please supply the path for unzip.exe. -@@ -241,7 +247,7 @@ +@@ -241,7 +252,7 @@ if test "$_os" != "WINNT" && test -z "$with_gcc_home"; then AC_PROG_CC fi @@ -22,7 +34,7 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +283,13 @@ +@@ -277,13 +288,13 @@ if test $GCC; then AC_MSG_CHECKING([the GNU gcc compiler version]) @@ -39,7 +51,7 @@ fi _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` if test -n "$enable_gcc3"; then -@@ -296,13 +302,13 @@ +@@ -296,13 +307,13 @@ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn COMPATH="NO_GCC" else @@ -55,7 +67,7 @@ if test "$_gcc_minor" = "false"; then AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn -@@ -366,8 +372,9 @@ +@@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi else @@ -67,7 +79,7 @@ else AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) >> warn -@@ -408,6 +415,71 @@ +@@ -408,6 +420,71 @@ fi fi fi @@ -139,7 +151,7 @@ if test "$_os" = "Darwin"; then if test "$CC" = "cc"; then AC_PATH_PROGS(_cc, cc) -@@ -589,6 +661,26 @@ +@@ -589,6 +666,26 @@ fi fi @@ -166,7 +178,7 @@ dnl ************************************************************** dnl Testing for required Solaris and workshop compiler patches... dnl ************************************************************** -@@ -815,6 +907,10 @@ +@@ -815,6 +912,10 @@ fi if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` @@ -177,18 +189,32 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1196,12 +1292,13 @@ +@@ -1169,6 +1270,12 @@ + USE_GCC3="FALSE" + fi + ++if test -n "$enable_debug"; then ++ ENABLE_DEBUG="TRUE" ++else ++ ENABLE_DEBUG="FALSE" ++fi ++ + # Print args passed to set_soenv. + if test 1 = 1; then + echo +@@ -1196,12 +1303,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 +echo "\$EXCEPTIONS="$exceptions_type ++echo "\$ENABLE_DEBUG="$ENABLE_DEBUG echo fi # Executing the set_soenv script to setup the environment variables. if test -z "$enable_check_only"; then - './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 -+ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type ++ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type $ENABLE_DEBUG else echo echo Test Complete diff --git a/editors/openoffice-1.0/files/patch-config_office+set_soenv.1 b/editors/openoffice-1.0/files/patch-config_office+set_soenv.1 index 66e6e4cbf2dd..6ef61a0b7151 100644 --- a/editors/openoffice-1.0/files/patch-config_office+set_soenv.1 +++ b/editors/openoffice-1.0/files/patch-config_office+set_soenv.1 @@ -1,11 +1,11 @@ --- set_soenv.1.orig Wed Apr 17 22:41:31 2002 -+++ set_soenv.1 Wed Jun 5 00:33:59 2002 ++++ set_soenv.1 Thu Jun 6 13:10:51 2002 @@ -40,7 +40,7 @@ # # Set this value equal to the corresponding amount of # command line arguments. -my $numArgs = 20; -+my $numArgs = 26; ++my $numArgs = 27; # Determining the amount of arguments in the call. my $numEnter = $#ARGV + 1; if ( $numEnter != $numArgs ) @@ -28,7 +28,16 @@ # #------------------------------------------- # IIc. Declaring the environment variables. -@@ -145,7 +146,10 @@ +@@ -96,7 +97,7 @@ + $SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL, + $COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME, + $BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS, +- $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3 ); ++ $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG); + # + #------------------------------------------- + # IId. Declaring the aliases. +@@ -145,7 +146,11 @@ $STLPORT4 = $ARGV [ 12 ]; # Location of STLport4 $MINGWIN32 = $ARGV [ 17 ]; # use MINGWIN32 $use_shell = $ARGV [ 18 ]; # preferred shell @@ -37,10 +46,11 @@ +$CC = $ARGV [ 23 ]; # get cc from environment +$CXX = $ARGV [ 24 ]; # use c++ from environment +$EXCEPTIONS = $ARGV [ 25 ]; # Exception handling type ++$ENABLE_DEBUG = $ARGV [ 26 ]; # Enable a debug build # #--------------------------------------------------------------- # IIIb. Initialising the variables for the system commands, etc. -@@ -316,7 +320,7 @@ +@@ -316,7 +321,7 @@ $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; $SOLAR_JAVA = "TRUE"; @@ -49,7 +59,7 @@ } elsif ( $platform eq "$FreeBSD" ) { print "Setting FreeBSD specific values... "; -@@ -326,7 +330,14 @@ +@@ -326,7 +331,14 @@ $COMPATH = $ARGV[ 0 ]; $CPU = "I"; $CPUNAME = "INTEL"; @@ -64,7 +74,7 @@ $DLLSUFFIX = "fi"; $GUI = "UNX"; $GUIBASE = "unx"; -@@ -339,6 +350,9 @@ +@@ -339,6 +351,9 @@ $PATH_SEPERATOR = $ps; $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; @@ -74,7 +84,7 @@ } elsif ( $platform eq "$Linux" ) { -@@ -934,15 +948,16 @@ +@@ -934,15 +949,16 @@ $D.$COM. $D.$CVER. $D.$GVER. @@ -94,7 +104,7 @@ { $SOLARDEF .= $D."GLIBC=".$GLIBC; } $SOLARDEF .= $D."SUPD=$UPD". -@@ -959,7 +974,7 @@ +@@ -959,7 +975,7 @@ $L.$USR_DT.$LIB. $L.$USR_OPENWIN.$LIB.'"'; } @@ -103,7 +113,7 @@ { $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB. $L.$LIB. $L.$USR.$LIB. -@@ -969,6 +984,11 @@ +@@ -969,6 +985,11 @@ { $SOLAREXTRALIB = '"'.$L.$LIB. $L.$USR.$LIB.'"'; } @@ -115,7 +125,7 @@ # Compiler include search directory paths. if (($platform eq "$Solaris") || ($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"'; -@@ -1039,7 +1059,7 @@ +@@ -1039,7 +1060,7 @@ $ps.$USR.$LIB. $ps.$USR_LOCAL.$BIN; } @@ -124,7 +134,7 @@ { $PATH = $cur_dir. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN. $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. -@@ -1058,6 +1078,22 @@ +@@ -1058,6 +1079,22 @@ $ps.$USR.$ds."X11".$BIN. $ps.$USR.$LIB; } @@ -147,7 +157,7 @@ elsif ($platform eq "$Winnt") { my ( $noldPATH ); -@@ -1155,7 +1191,7 @@ +@@ -1155,7 +1192,7 @@ $L_STLPORT_LIB. $L.$XLIB.'"'; } @@ -156,7 +166,7 @@ { $SOLARLIB = '"'.$L.$par_dir.$LIB. $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. -@@ -1167,6 +1203,15 @@ +@@ -1167,6 +1204,15 @@ $L_STLPORT_LIB. $L.$XLIB.'"'; } @@ -172,7 +182,7 @@ elsif ($platform eq "$Winnt") { $SOLARLIB = '"'.$L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. $L.$par_dir.$LIB. -@@ -1196,7 +1241,7 @@ +@@ -1196,7 +1242,7 @@ $SOLARINC .= $I.$USR.$INCLUDE; } $SOLARINC .= $STLPORT_stlport; @@ -181,7 +191,7 @@ { # This simply adds an include path, so even cases that break the FHS work $SOLARINC .= $STLPORT_inc_stlport; -@@ -1210,11 +1255,6 @@ +@@ -1210,11 +1256,6 @@ { $SOLARINC .= $I.'$COMPATH'.$ds."include"; } @@ -193,7 +203,17 @@ $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31". $I.'$JAVA_HOME'.$INCLUDE; -@@ -1407,6 +1447,12 @@ +@@ -1382,6 +1423,9 @@ + ToFile( "NEW_JAR_PACK", $NEW_JAR_PACK, "e" ); + ToFile( "NO_BSYMBOLIC", $NO_BSYMBOLIC, "e" ); + ToFile( "TF_FILTER", "TRUE", "e" ); ++if ($ENABLE_DEBUG eq "TRUE") { ++ToFile( "debug", "true", "e" ); ++} + if ( $platform ne "$Macosx" ) + { ToFile( "PSPRINT", "TRUE", "e" ); + } elsif ( $GUIBASE eq "unx" ) { +@@ -1407,6 +1451,12 @@ ToFile( "GUIENV", $GUIENV, "e" ); ToFile( "GVER", $GVER, "e" ); ToFile( "OS", $OS, "e" ); diff --git a/editors/openoffice-1.0/files/patch-config_office::configure.in b/editors/openoffice-1.0/files/patch-config_office::configure.in index bc28e6f4a92d..5a563718c8e0 100644 --- a/editors/openoffice-1.0/files/patch-config_office::configure.in +++ b/editors/openoffice-1.0/files/patch-config_office::configure.in @@ -1,6 +1,18 @@ --- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Tue Jun 4 14:11:42 2002 -@@ -103,6 +103,12 @@ ++++ configure.in Thu Jun 6 13:10:49 2002 +@@ -28,6 +28,11 @@ + + Usage: --enable-gcc3 + ],,) ++AC_ARG_ENABLE(debug, ++[ --enable-debug if you like to build with debug symbols ++ ++ Usage: --enable-debug ++],,) + AC_ARG_WITH(stlport4-home, + [ --with-stlport4-home The location that STLport4 is installed in. The STL + header files are assumed to be in stlport4-home/stlport +@@ -103,6 +108,12 @@ Usage: --with-asm-home=<path to ml.exe directory> ],,) @@ -13,7 +25,7 @@ AC_ARG_WITH(unzip-home, [ --with-unzip-home For Windows users, please supply the path for unzip.exe. -@@ -241,7 +247,7 @@ +@@ -241,7 +252,7 @@ if test "$_os" != "WINNT" && test -z "$with_gcc_home"; then AC_PROG_CC fi @@ -22,7 +34,7 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +283,13 @@ +@@ -277,13 +288,13 @@ if test $GCC; then AC_MSG_CHECKING([the GNU gcc compiler version]) @@ -39,7 +51,7 @@ fi _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` if test -n "$enable_gcc3"; then -@@ -296,13 +302,13 @@ +@@ -296,13 +307,13 @@ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn COMPATH="NO_GCC" else @@ -55,7 +67,7 @@ if test "$_gcc_minor" = "false"; then AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn -@@ -366,8 +372,9 @@ +@@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi else @@ -67,7 +79,7 @@ else AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) >> warn -@@ -408,6 +415,71 @@ +@@ -408,6 +420,71 @@ fi fi fi @@ -139,7 +151,7 @@ if test "$_os" = "Darwin"; then if test "$CC" = "cc"; then AC_PATH_PROGS(_cc, cc) -@@ -589,6 +661,26 @@ +@@ -589,6 +666,26 @@ fi fi @@ -166,7 +178,7 @@ dnl ************************************************************** dnl Testing for required Solaris and workshop compiler patches... dnl ************************************************************** -@@ -815,6 +907,10 @@ +@@ -815,6 +912,10 @@ fi if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` @@ -177,18 +189,32 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1196,12 +1292,13 @@ +@@ -1169,6 +1270,12 @@ + USE_GCC3="FALSE" + fi + ++if test -n "$enable_debug"; then ++ ENABLE_DEBUG="TRUE" ++else ++ ENABLE_DEBUG="FALSE" ++fi ++ + # Print args passed to set_soenv. + if test 1 = 1; then + echo +@@ -1196,12 +1303,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 +echo "\$EXCEPTIONS="$exceptions_type ++echo "\$ENABLE_DEBUG="$ENABLE_DEBUG echo fi # Executing the set_soenv script to setup the environment variables. if test -z "$enable_check_only"; then - './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 -+ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type ++ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type $ENABLE_DEBUG else echo echo Test Complete diff --git a/editors/openoffice-1.0/files/patch-set_soenv.1 b/editors/openoffice-1.0/files/patch-set_soenv.1 index 66e6e4cbf2dd..6ef61a0b7151 100644 --- a/editors/openoffice-1.0/files/patch-set_soenv.1 +++ b/editors/openoffice-1.0/files/patch-set_soenv.1 @@ -1,11 +1,11 @@ --- set_soenv.1.orig Wed Apr 17 22:41:31 2002 -+++ set_soenv.1 Wed Jun 5 00:33:59 2002 ++++ set_soenv.1 Thu Jun 6 13:10:51 2002 @@ -40,7 +40,7 @@ # # Set this value equal to the corresponding amount of # command line arguments. -my $numArgs = 20; -+my $numArgs = 26; ++my $numArgs = 27; # Determining the amount of arguments in the call. my $numEnter = $#ARGV + 1; if ( $numEnter != $numArgs ) @@ -28,7 +28,16 @@ # #------------------------------------------- # IIc. Declaring the environment variables. -@@ -145,7 +146,10 @@ +@@ -96,7 +97,7 @@ + $SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL, + $COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME, + $BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS, +- $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3 ); ++ $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG); + # + #------------------------------------------- + # IId. Declaring the aliases. +@@ -145,7 +146,11 @@ $STLPORT4 = $ARGV [ 12 ]; # Location of STLport4 $MINGWIN32 = $ARGV [ 17 ]; # use MINGWIN32 $use_shell = $ARGV [ 18 ]; # preferred shell @@ -37,10 +46,11 @@ +$CC = $ARGV [ 23 ]; # get cc from environment +$CXX = $ARGV [ 24 ]; # use c++ from environment +$EXCEPTIONS = $ARGV [ 25 ]; # Exception handling type ++$ENABLE_DEBUG = $ARGV [ 26 ]; # Enable a debug build # #--------------------------------------------------------------- # IIIb. Initialising the variables for the system commands, etc. -@@ -316,7 +320,7 @@ +@@ -316,7 +321,7 @@ $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; $SOLAR_JAVA = "TRUE"; @@ -49,7 +59,7 @@ } elsif ( $platform eq "$FreeBSD" ) { print "Setting FreeBSD specific values... "; -@@ -326,7 +330,14 @@ +@@ -326,7 +331,14 @@ $COMPATH = $ARGV[ 0 ]; $CPU = "I"; $CPUNAME = "INTEL"; @@ -64,7 +74,7 @@ $DLLSUFFIX = "fi"; $GUI = "UNX"; $GUIBASE = "unx"; -@@ -339,6 +350,9 @@ +@@ -339,6 +351,9 @@ $PATH_SEPERATOR = $ps; $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; @@ -74,7 +84,7 @@ } elsif ( $platform eq "$Linux" ) { -@@ -934,15 +948,16 @@ +@@ -934,15 +949,16 @@ $D.$COM. $D.$CVER. $D.$GVER. @@ -94,7 +104,7 @@ { $SOLARDEF .= $D."GLIBC=".$GLIBC; } $SOLARDEF .= $D."SUPD=$UPD". -@@ -959,7 +974,7 @@ +@@ -959,7 +975,7 @@ $L.$USR_DT.$LIB. $L.$USR_OPENWIN.$LIB.'"'; } @@ -103,7 +113,7 @@ { $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB. $L.$LIB. $L.$USR.$LIB. -@@ -969,6 +984,11 @@ +@@ -969,6 +985,11 @@ { $SOLAREXTRALIB = '"'.$L.$LIB. $L.$USR.$LIB.'"'; } @@ -115,7 +125,7 @@ # Compiler include search directory paths. if (($platform eq "$Solaris") || ($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"'; -@@ -1039,7 +1059,7 @@ +@@ -1039,7 +1060,7 @@ $ps.$USR.$LIB. $ps.$USR_LOCAL.$BIN; } @@ -124,7 +134,7 @@ { $PATH = $cur_dir. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN. $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. -@@ -1058,6 +1078,22 @@ +@@ -1058,6 +1079,22 @@ $ps.$USR.$ds."X11".$BIN. $ps.$USR.$LIB; } @@ -147,7 +157,7 @@ elsif ($platform eq "$Winnt") { my ( $noldPATH ); -@@ -1155,7 +1191,7 @@ +@@ -1155,7 +1192,7 @@ $L_STLPORT_LIB. $L.$XLIB.'"'; } @@ -156,7 +166,7 @@ { $SOLARLIB = '"'.$L.$par_dir.$LIB. $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. -@@ -1167,6 +1203,15 @@ +@@ -1167,6 +1204,15 @@ $L_STLPORT_LIB. $L.$XLIB.'"'; } @@ -172,7 +182,7 @@ elsif ($platform eq "$Winnt") { $SOLARLIB = '"'.$L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. $L.$par_dir.$LIB. -@@ -1196,7 +1241,7 @@ +@@ -1196,7 +1242,7 @@ $SOLARINC .= $I.$USR.$INCLUDE; } $SOLARINC .= $STLPORT_stlport; @@ -181,7 +191,7 @@ { # This simply adds an include path, so even cases that break the FHS work $SOLARINC .= $STLPORT_inc_stlport; -@@ -1210,11 +1255,6 @@ +@@ -1210,11 +1256,6 @@ { $SOLARINC .= $I.'$COMPATH'.$ds."include"; } @@ -193,7 +203,17 @@ $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31". $I.'$JAVA_HOME'.$INCLUDE; -@@ -1407,6 +1447,12 @@ +@@ -1382,6 +1423,9 @@ + ToFile( "NEW_JAR_PACK", $NEW_JAR_PACK, "e" ); + ToFile( "NO_BSYMBOLIC", $NO_BSYMBOLIC, "e" ); + ToFile( "TF_FILTER", "TRUE", "e" ); ++if ($ENABLE_DEBUG eq "TRUE") { ++ToFile( "debug", "true", "e" ); ++} + if ( $platform ne "$Macosx" ) + { ToFile( "PSPRINT", "TRUE", "e" ); + } elsif ( $GUIBASE eq "unx" ) { +@@ -1407,6 +1451,12 @@ ToFile( "GUIENV", $GUIENV, "e" ); ToFile( "GVER", $GVER, "e" ); ToFile( "OS", $OS, "e" ); diff --git a/editors/openoffice-1.0/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice-1.0/files/patch-solenv+inc+unxfbsdi.mk index b020a1924fb4..d9a06e4a004f 100644 --- a/editors/openoffice-1.0/files/patch-solenv+inc+unxfbsdi.mk +++ b/editors/openoffice-1.0/files/patch-solenv+inc+unxfbsdi.mk @@ -90,7 +90,7 @@ +CFLAGSPROF=-pg + +# Compiler flags for debugging -+CFLAGSDEBUG=-g ++CFLAGSDEBUG=-g -ggdb CFLAGSDBGUTIL= -CFLAGSOPT= -O2 -CFLAGSNOOPT= -O diff --git a/editors/openoffice-1.0/files/patch-solenv::inc::unxfbsdi.mk b/editors/openoffice-1.0/files/patch-solenv::inc::unxfbsdi.mk index b020a1924fb4..d9a06e4a004f 100644 --- a/editors/openoffice-1.0/files/patch-solenv::inc::unxfbsdi.mk +++ b/editors/openoffice-1.0/files/patch-solenv::inc::unxfbsdi.mk @@ -90,7 +90,7 @@ +CFLAGSPROF=-pg + +# Compiler flags for debugging -+CFLAGSDEBUG=-g ++CFLAGSDEBUG=-g -ggdb CFLAGSDBGUTIL= -CFLAGSOPT= -O2 -CFLAGSNOOPT= -O diff --git a/editors/openoffice-1.1-devel/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice-1.1-devel/files/debugpatch-setup2+mow+source+loader+loader.c new file mode 100644 index 000000000000..96c651ce22c8 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/debugpatch-setup2+mow+source+loader+loader.c @@ -0,0 +1,21 @@ +--- ../setup2/mow/source/loader/loader.c.orig2 Thu Jun 6 11:23:17 2002 ++++ ../setup2/mow/source/loader/loader.c Thu Jun 6 11:24:14 2002 +@@ -902,6 +902,7 @@ + + void KillSetupDir() + { ++#if 0 + DIR* pDir = opendir( strTmpPath ); + struct dirent* pFile; + +@@ -915,6 +916,10 @@ + + chdir( strInitPath ); + rmdir( strTmpPath ); ++#else ++ fprintf(stderr, "\nLeaving behind temporary directory: %s\n", ++ strTmpPath); ++#endif + } + + void makeSymLink( char* s ) diff --git a/editors/openoffice-1.1-devel/files/patch-config_office+configure.in b/editors/openoffice-1.1-devel/files/patch-config_office+configure.in index bc28e6f4a92d..5a563718c8e0 100644 --- a/editors/openoffice-1.1-devel/files/patch-config_office+configure.in +++ b/editors/openoffice-1.1-devel/files/patch-config_office+configure.in @@ -1,6 +1,18 @@ --- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Tue Jun 4 14:11:42 2002 -@@ -103,6 +103,12 @@ ++++ configure.in Thu Jun 6 13:10:49 2002 +@@ -28,6 +28,11 @@ + + Usage: --enable-gcc3 + ],,) ++AC_ARG_ENABLE(debug, ++[ --enable-debug if you like to build with debug symbols ++ ++ Usage: --enable-debug ++],,) + AC_ARG_WITH(stlport4-home, + [ --with-stlport4-home The location that STLport4 is installed in. The STL + header files are assumed to be in stlport4-home/stlport +@@ -103,6 +108,12 @@ Usage: --with-asm-home=<path to ml.exe directory> ],,) @@ -13,7 +25,7 @@ AC_ARG_WITH(unzip-home, [ --with-unzip-home For Windows users, please supply the path for unzip.exe. -@@ -241,7 +247,7 @@ +@@ -241,7 +252,7 @@ if test "$_os" != "WINNT" && test -z "$with_gcc_home"; then AC_PROG_CC fi @@ -22,7 +34,7 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +283,13 @@ +@@ -277,13 +288,13 @@ if test $GCC; then AC_MSG_CHECKING([the GNU gcc compiler version]) @@ -39,7 +51,7 @@ fi _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` if test -n "$enable_gcc3"; then -@@ -296,13 +302,13 @@ +@@ -296,13 +307,13 @@ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn COMPATH="NO_GCC" else @@ -55,7 +67,7 @@ if test "$_gcc_minor" = "false"; then AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn -@@ -366,8 +372,9 @@ +@@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi else @@ -67,7 +79,7 @@ else AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) >> warn -@@ -408,6 +415,71 @@ +@@ -408,6 +420,71 @@ fi fi fi @@ -139,7 +151,7 @@ if test "$_os" = "Darwin"; then if test "$CC" = "cc"; then AC_PATH_PROGS(_cc, cc) -@@ -589,6 +661,26 @@ +@@ -589,6 +666,26 @@ fi fi @@ -166,7 +178,7 @@ dnl ************************************************************** dnl Testing for required Solaris and workshop compiler patches... dnl ************************************************************** -@@ -815,6 +907,10 @@ +@@ -815,6 +912,10 @@ fi if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` @@ -177,18 +189,32 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1196,12 +1292,13 @@ +@@ -1169,6 +1270,12 @@ + USE_GCC3="FALSE" + fi + ++if test -n "$enable_debug"; then ++ ENABLE_DEBUG="TRUE" ++else ++ ENABLE_DEBUG="FALSE" ++fi ++ + # Print args passed to set_soenv. + if test 1 = 1; then + echo +@@ -1196,12 +1303,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 +echo "\$EXCEPTIONS="$exceptions_type ++echo "\$ENABLE_DEBUG="$ENABLE_DEBUG echo fi # Executing the set_soenv script to setup the environment variables. if test -z "$enable_check_only"; then - './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 -+ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type ++ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type $ENABLE_DEBUG else echo echo Test Complete diff --git a/editors/openoffice-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk index b020a1924fb4..d9a06e4a004f 100644 --- a/editors/openoffice-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk +++ b/editors/openoffice-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk @@ -90,7 +90,7 @@ +CFLAGSPROF=-pg + +# Compiler flags for debugging -+CFLAGSDEBUG=-g ++CFLAGSDEBUG=-g -ggdb CFLAGSDBGUTIL= -CFLAGSOPT= -O2 -CFLAGSNOOPT= -O diff --git a/editors/openoffice-1.1/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice-1.1/files/debugpatch-setup2+mow+source+loader+loader.c new file mode 100644 index 000000000000..96c651ce22c8 --- /dev/null +++ b/editors/openoffice-1.1/files/debugpatch-setup2+mow+source+loader+loader.c @@ -0,0 +1,21 @@ +--- ../setup2/mow/source/loader/loader.c.orig2 Thu Jun 6 11:23:17 2002 ++++ ../setup2/mow/source/loader/loader.c Thu Jun 6 11:24:14 2002 +@@ -902,6 +902,7 @@ + + void KillSetupDir() + { ++#if 0 + DIR* pDir = opendir( strTmpPath ); + struct dirent* pFile; + +@@ -915,6 +916,10 @@ + + chdir( strInitPath ); + rmdir( strTmpPath ); ++#else ++ fprintf(stderr, "\nLeaving behind temporary directory: %s\n", ++ strTmpPath); ++#endif + } + + void makeSymLink( char* s ) diff --git a/editors/openoffice-1.1/files/patch-config_office+configure.in b/editors/openoffice-1.1/files/patch-config_office+configure.in index bc28e6f4a92d..5a563718c8e0 100644 --- a/editors/openoffice-1.1/files/patch-config_office+configure.in +++ b/editors/openoffice-1.1/files/patch-config_office+configure.in @@ -1,6 +1,18 @@ --- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Tue Jun 4 14:11:42 2002 -@@ -103,6 +103,12 @@ ++++ configure.in Thu Jun 6 13:10:49 2002 +@@ -28,6 +28,11 @@ + + Usage: --enable-gcc3 + ],,) ++AC_ARG_ENABLE(debug, ++[ --enable-debug if you like to build with debug symbols ++ ++ Usage: --enable-debug ++],,) + AC_ARG_WITH(stlport4-home, + [ --with-stlport4-home The location that STLport4 is installed in. The STL + header files are assumed to be in stlport4-home/stlport +@@ -103,6 +108,12 @@ Usage: --with-asm-home=<path to ml.exe directory> ],,) @@ -13,7 +25,7 @@ AC_ARG_WITH(unzip-home, [ --with-unzip-home For Windows users, please supply the path for unzip.exe. -@@ -241,7 +247,7 @@ +@@ -241,7 +252,7 @@ if test "$_os" != "WINNT" && test -z "$with_gcc_home"; then AC_PROG_CC fi @@ -22,7 +34,7 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +283,13 @@ +@@ -277,13 +288,13 @@ if test $GCC; then AC_MSG_CHECKING([the GNU gcc compiler version]) @@ -39,7 +51,7 @@ fi _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` if test -n "$enable_gcc3"; then -@@ -296,13 +302,13 @@ +@@ -296,13 +307,13 @@ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn COMPATH="NO_GCC" else @@ -55,7 +67,7 @@ if test "$_gcc_minor" = "false"; then AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn -@@ -366,8 +372,9 @@ +@@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi else @@ -67,7 +79,7 @@ else AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) >> warn -@@ -408,6 +415,71 @@ +@@ -408,6 +420,71 @@ fi fi fi @@ -139,7 +151,7 @@ if test "$_os" = "Darwin"; then if test "$CC" = "cc"; then AC_PATH_PROGS(_cc, cc) -@@ -589,6 +661,26 @@ +@@ -589,6 +666,26 @@ fi fi @@ -166,7 +178,7 @@ dnl ************************************************************** dnl Testing for required Solaris and workshop compiler patches... dnl ************************************************************** -@@ -815,6 +907,10 @@ +@@ -815,6 +912,10 @@ fi if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` @@ -177,18 +189,32 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1196,12 +1292,13 @@ +@@ -1169,6 +1270,12 @@ + USE_GCC3="FALSE" + fi + ++if test -n "$enable_debug"; then ++ ENABLE_DEBUG="TRUE" ++else ++ ENABLE_DEBUG="FALSE" ++fi ++ + # Print args passed to set_soenv. + if test 1 = 1; then + echo +@@ -1196,12 +1303,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 +echo "\$EXCEPTIONS="$exceptions_type ++echo "\$ENABLE_DEBUG="$ENABLE_DEBUG echo fi # Executing the set_soenv script to setup the environment variables. if test -z "$enable_check_only"; then - './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 -+ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type ++ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type $ENABLE_DEBUG else echo echo Test Complete diff --git a/editors/openoffice-1.1/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice-1.1/files/patch-solenv+inc+unxfbsdi.mk index b020a1924fb4..d9a06e4a004f 100644 --- a/editors/openoffice-1.1/files/patch-solenv+inc+unxfbsdi.mk +++ b/editors/openoffice-1.1/files/patch-solenv+inc+unxfbsdi.mk @@ -90,7 +90,7 @@ +CFLAGSPROF=-pg + +# Compiler flags for debugging -+CFLAGSDEBUG=-g ++CFLAGSDEBUG=-g -ggdb CFLAGSDBGUTIL= -CFLAGSOPT= -O2 -CFLAGSNOOPT= -O diff --git a/editors/openoffice-2.0-devel/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice-2.0-devel/files/debugpatch-setup2+mow+source+loader+loader.c new file mode 100644 index 000000000000..96c651ce22c8 --- /dev/null +++ b/editors/openoffice-2.0-devel/files/debugpatch-setup2+mow+source+loader+loader.c @@ -0,0 +1,21 @@ +--- ../setup2/mow/source/loader/loader.c.orig2 Thu Jun 6 11:23:17 2002 ++++ ../setup2/mow/source/loader/loader.c Thu Jun 6 11:24:14 2002 +@@ -902,6 +902,7 @@ + + void KillSetupDir() + { ++#if 0 + DIR* pDir = opendir( strTmpPath ); + struct dirent* pFile; + +@@ -915,6 +916,10 @@ + + chdir( strInitPath ); + rmdir( strTmpPath ); ++#else ++ fprintf(stderr, "\nLeaving behind temporary directory: %s\n", ++ strTmpPath); ++#endif + } + + void makeSymLink( char* s ) diff --git a/editors/openoffice-2.0-devel/files/patch-config_office+configure.in b/editors/openoffice-2.0-devel/files/patch-config_office+configure.in index bc28e6f4a92d..5a563718c8e0 100644 --- a/editors/openoffice-2.0-devel/files/patch-config_office+configure.in +++ b/editors/openoffice-2.0-devel/files/patch-config_office+configure.in @@ -1,6 +1,18 @@ --- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Tue Jun 4 14:11:42 2002 -@@ -103,6 +103,12 @@ ++++ configure.in Thu Jun 6 13:10:49 2002 +@@ -28,6 +28,11 @@ + + Usage: --enable-gcc3 + ],,) ++AC_ARG_ENABLE(debug, ++[ --enable-debug if you like to build with debug symbols ++ ++ Usage: --enable-debug ++],,) + AC_ARG_WITH(stlport4-home, + [ --with-stlport4-home The location that STLport4 is installed in. The STL + header files are assumed to be in stlport4-home/stlport +@@ -103,6 +108,12 @@ Usage: --with-asm-home=<path to ml.exe directory> ],,) @@ -13,7 +25,7 @@ AC_ARG_WITH(unzip-home, [ --with-unzip-home For Windows users, please supply the path for unzip.exe. -@@ -241,7 +247,7 @@ +@@ -241,7 +252,7 @@ if test "$_os" != "WINNT" && test -z "$with_gcc_home"; then AC_PROG_CC fi @@ -22,7 +34,7 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +283,13 @@ +@@ -277,13 +288,13 @@ if test $GCC; then AC_MSG_CHECKING([the GNU gcc compiler version]) @@ -39,7 +51,7 @@ fi _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` if test -n "$enable_gcc3"; then -@@ -296,13 +302,13 @@ +@@ -296,13 +307,13 @@ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn COMPATH="NO_GCC" else @@ -55,7 +67,7 @@ if test "$_gcc_minor" = "false"; then AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn -@@ -366,8 +372,9 @@ +@@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi else @@ -67,7 +79,7 @@ else AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) >> warn -@@ -408,6 +415,71 @@ +@@ -408,6 +420,71 @@ fi fi fi @@ -139,7 +151,7 @@ if test "$_os" = "Darwin"; then if test "$CC" = "cc"; then AC_PATH_PROGS(_cc, cc) -@@ -589,6 +661,26 @@ +@@ -589,6 +666,26 @@ fi fi @@ -166,7 +178,7 @@ dnl ************************************************************** dnl Testing for required Solaris and workshop compiler patches... dnl ************************************************************** -@@ -815,6 +907,10 @@ +@@ -815,6 +912,10 @@ fi if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` @@ -177,18 +189,32 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1196,12 +1292,13 @@ +@@ -1169,6 +1270,12 @@ + USE_GCC3="FALSE" + fi + ++if test -n "$enable_debug"; then ++ ENABLE_DEBUG="TRUE" ++else ++ ENABLE_DEBUG="FALSE" ++fi ++ + # Print args passed to set_soenv. + if test 1 = 1; then + echo +@@ -1196,12 +1303,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 +echo "\$EXCEPTIONS="$exceptions_type ++echo "\$ENABLE_DEBUG="$ENABLE_DEBUG echo fi # Executing the set_soenv script to setup the environment variables. if test -z "$enable_check_only"; then - './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 -+ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type ++ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type $ENABLE_DEBUG else echo echo Test Complete diff --git a/editors/openoffice-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk index b020a1924fb4..d9a06e4a004f 100644 --- a/editors/openoffice-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk +++ b/editors/openoffice-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk @@ -90,7 +90,7 @@ +CFLAGSPROF=-pg + +# Compiler flags for debugging -+CFLAGSDEBUG=-g ++CFLAGSDEBUG=-g -ggdb CFLAGSDBGUTIL= -CFLAGSOPT= -O2 -CFLAGSNOOPT= -O diff --git a/editors/openoffice-3-devel/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice-3-devel/files/debugpatch-setup2+mow+source+loader+loader.c new file mode 100644 index 000000000000..96c651ce22c8 --- /dev/null +++ b/editors/openoffice-3-devel/files/debugpatch-setup2+mow+source+loader+loader.c @@ -0,0 +1,21 @@ +--- ../setup2/mow/source/loader/loader.c.orig2 Thu Jun 6 11:23:17 2002 ++++ ../setup2/mow/source/loader/loader.c Thu Jun 6 11:24:14 2002 +@@ -902,6 +902,7 @@ + + void KillSetupDir() + { ++#if 0 + DIR* pDir = opendir( strTmpPath ); + struct dirent* pFile; + +@@ -915,6 +916,10 @@ + + chdir( strInitPath ); + rmdir( strTmpPath ); ++#else ++ fprintf(stderr, "\nLeaving behind temporary directory: %s\n", ++ strTmpPath); ++#endif + } + + void makeSymLink( char* s ) diff --git a/editors/openoffice-3-devel/files/patch-config_office+configure.in b/editors/openoffice-3-devel/files/patch-config_office+configure.in index bc28e6f4a92d..5a563718c8e0 100644 --- a/editors/openoffice-3-devel/files/patch-config_office+configure.in +++ b/editors/openoffice-3-devel/files/patch-config_office+configure.in @@ -1,6 +1,18 @@ --- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Tue Jun 4 14:11:42 2002 -@@ -103,6 +103,12 @@ ++++ configure.in Thu Jun 6 13:10:49 2002 +@@ -28,6 +28,11 @@ + + Usage: --enable-gcc3 + ],,) ++AC_ARG_ENABLE(debug, ++[ --enable-debug if you like to build with debug symbols ++ ++ Usage: --enable-debug ++],,) + AC_ARG_WITH(stlport4-home, + [ --with-stlport4-home The location that STLport4 is installed in. The STL + header files are assumed to be in stlport4-home/stlport +@@ -103,6 +108,12 @@ Usage: --with-asm-home=<path to ml.exe directory> ],,) @@ -13,7 +25,7 @@ AC_ARG_WITH(unzip-home, [ --with-unzip-home For Windows users, please supply the path for unzip.exe. -@@ -241,7 +247,7 @@ +@@ -241,7 +252,7 @@ if test "$_os" != "WINNT" && test -z "$with_gcc_home"; then AC_PROG_CC fi @@ -22,7 +34,7 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +283,13 @@ +@@ -277,13 +288,13 @@ if test $GCC; then AC_MSG_CHECKING([the GNU gcc compiler version]) @@ -39,7 +51,7 @@ fi _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` if test -n "$enable_gcc3"; then -@@ -296,13 +302,13 @@ +@@ -296,13 +307,13 @@ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn COMPATH="NO_GCC" else @@ -55,7 +67,7 @@ if test "$_gcc_minor" = "false"; then AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn -@@ -366,8 +372,9 @@ +@@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi else @@ -67,7 +79,7 @@ else AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) >> warn -@@ -408,6 +415,71 @@ +@@ -408,6 +420,71 @@ fi fi fi @@ -139,7 +151,7 @@ if test "$_os" = "Darwin"; then if test "$CC" = "cc"; then AC_PATH_PROGS(_cc, cc) -@@ -589,6 +661,26 @@ +@@ -589,6 +666,26 @@ fi fi @@ -166,7 +178,7 @@ dnl ************************************************************** dnl Testing for required Solaris and workshop compiler patches... dnl ************************************************************** -@@ -815,6 +907,10 @@ +@@ -815,6 +912,10 @@ fi if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` @@ -177,18 +189,32 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1196,12 +1292,13 @@ +@@ -1169,6 +1270,12 @@ + USE_GCC3="FALSE" + fi + ++if test -n "$enable_debug"; then ++ ENABLE_DEBUG="TRUE" ++else ++ ENABLE_DEBUG="FALSE" ++fi ++ + # Print args passed to set_soenv. + if test 1 = 1; then + echo +@@ -1196,12 +1303,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 +echo "\$EXCEPTIONS="$exceptions_type ++echo "\$ENABLE_DEBUG="$ENABLE_DEBUG echo fi # Executing the set_soenv script to setup the environment variables. if test -z "$enable_check_only"; then - './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 -+ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type ++ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type $ENABLE_DEBUG else echo echo Test Complete diff --git a/editors/openoffice-3-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice-3-devel/files/patch-solenv+inc+unxfbsdi.mk index b020a1924fb4..d9a06e4a004f 100644 --- a/editors/openoffice-3-devel/files/patch-solenv+inc+unxfbsdi.mk +++ b/editors/openoffice-3-devel/files/patch-solenv+inc+unxfbsdi.mk @@ -90,7 +90,7 @@ +CFLAGSPROF=-pg + +# Compiler flags for debugging -+CFLAGSDEBUG=-g ++CFLAGSDEBUG=-g -ggdb CFLAGSDBGUTIL= -CFLAGSOPT= -O2 -CFLAGSNOOPT= -O diff --git a/editors/openoffice-3/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice-3/files/debugpatch-setup2+mow+source+loader+loader.c new file mode 100644 index 000000000000..96c651ce22c8 --- /dev/null +++ b/editors/openoffice-3/files/debugpatch-setup2+mow+source+loader+loader.c @@ -0,0 +1,21 @@ +--- ../setup2/mow/source/loader/loader.c.orig2 Thu Jun 6 11:23:17 2002 ++++ ../setup2/mow/source/loader/loader.c Thu Jun 6 11:24:14 2002 +@@ -902,6 +902,7 @@ + + void KillSetupDir() + { ++#if 0 + DIR* pDir = opendir( strTmpPath ); + struct dirent* pFile; + +@@ -915,6 +916,10 @@ + + chdir( strInitPath ); + rmdir( strTmpPath ); ++#else ++ fprintf(stderr, "\nLeaving behind temporary directory: %s\n", ++ strTmpPath); ++#endif + } + + void makeSymLink( char* s ) diff --git a/editors/openoffice-3/files/patch-config_office+configure.in b/editors/openoffice-3/files/patch-config_office+configure.in index bc28e6f4a92d..5a563718c8e0 100644 --- a/editors/openoffice-3/files/patch-config_office+configure.in +++ b/editors/openoffice-3/files/patch-config_office+configure.in @@ -1,6 +1,18 @@ --- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Tue Jun 4 14:11:42 2002 -@@ -103,6 +103,12 @@ ++++ configure.in Thu Jun 6 13:10:49 2002 +@@ -28,6 +28,11 @@ + + Usage: --enable-gcc3 + ],,) ++AC_ARG_ENABLE(debug, ++[ --enable-debug if you like to build with debug symbols ++ ++ Usage: --enable-debug ++],,) + AC_ARG_WITH(stlport4-home, + [ --with-stlport4-home The location that STLport4 is installed in. The STL + header files are assumed to be in stlport4-home/stlport +@@ -103,6 +108,12 @@ Usage: --with-asm-home=<path to ml.exe directory> ],,) @@ -13,7 +25,7 @@ AC_ARG_WITH(unzip-home, [ --with-unzip-home For Windows users, please supply the path for unzip.exe. -@@ -241,7 +247,7 @@ +@@ -241,7 +252,7 @@ if test "$_os" != "WINNT" && test -z "$with_gcc_home"; then AC_PROG_CC fi @@ -22,7 +34,7 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +283,13 @@ +@@ -277,13 +288,13 @@ if test $GCC; then AC_MSG_CHECKING([the GNU gcc compiler version]) @@ -39,7 +51,7 @@ fi _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` if test -n "$enable_gcc3"; then -@@ -296,13 +302,13 @@ +@@ -296,13 +307,13 @@ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn COMPATH="NO_GCC" else @@ -55,7 +67,7 @@ if test "$_gcc_minor" = "false"; then AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn -@@ -366,8 +372,9 @@ +@@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi else @@ -67,7 +79,7 @@ else AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) >> warn -@@ -408,6 +415,71 @@ +@@ -408,6 +420,71 @@ fi fi fi @@ -139,7 +151,7 @@ if test "$_os" = "Darwin"; then if test "$CC" = "cc"; then AC_PATH_PROGS(_cc, cc) -@@ -589,6 +661,26 @@ +@@ -589,6 +666,26 @@ fi fi @@ -166,7 +178,7 @@ dnl ************************************************************** dnl Testing for required Solaris and workshop compiler patches... dnl ************************************************************** -@@ -815,6 +907,10 @@ +@@ -815,6 +912,10 @@ fi if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` @@ -177,18 +189,32 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1196,12 +1292,13 @@ +@@ -1169,6 +1270,12 @@ + USE_GCC3="FALSE" + fi + ++if test -n "$enable_debug"; then ++ ENABLE_DEBUG="TRUE" ++else ++ ENABLE_DEBUG="FALSE" ++fi ++ + # Print args passed to set_soenv. + if test 1 = 1; then + echo +@@ -1196,12 +1303,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 +echo "\$EXCEPTIONS="$exceptions_type ++echo "\$ENABLE_DEBUG="$ENABLE_DEBUG echo fi # Executing the set_soenv script to setup the environment variables. if test -z "$enable_check_only"; then - './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 -+ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type ++ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type $ENABLE_DEBUG else echo echo Test Complete diff --git a/editors/openoffice-3/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice-3/files/patch-solenv+inc+unxfbsdi.mk index b020a1924fb4..d9a06e4a004f 100644 --- a/editors/openoffice-3/files/patch-solenv+inc+unxfbsdi.mk +++ b/editors/openoffice-3/files/patch-solenv+inc+unxfbsdi.mk @@ -90,7 +90,7 @@ +CFLAGSPROF=-pg + +# Compiler flags for debugging -+CFLAGSDEBUG=-g ++CFLAGSDEBUG=-g -ggdb CFLAGSDBGUTIL= -CFLAGSOPT= -O2 -CFLAGSNOOPT= -O diff --git a/editors/openoffice-devel/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice-devel/files/debugpatch-setup2+mow+source+loader+loader.c new file mode 100644 index 000000000000..96c651ce22c8 --- /dev/null +++ b/editors/openoffice-devel/files/debugpatch-setup2+mow+source+loader+loader.c @@ -0,0 +1,21 @@ +--- ../setup2/mow/source/loader/loader.c.orig2 Thu Jun 6 11:23:17 2002 ++++ ../setup2/mow/source/loader/loader.c Thu Jun 6 11:24:14 2002 +@@ -902,6 +902,7 @@ + + void KillSetupDir() + { ++#if 0 + DIR* pDir = opendir( strTmpPath ); + struct dirent* pFile; + +@@ -915,6 +916,10 @@ + + chdir( strInitPath ); + rmdir( strTmpPath ); ++#else ++ fprintf(stderr, "\nLeaving behind temporary directory: %s\n", ++ strTmpPath); ++#endif + } + + void makeSymLink( char* s ) diff --git a/editors/openoffice-devel/files/patch-config_office+configure.in b/editors/openoffice-devel/files/patch-config_office+configure.in index bc28e6f4a92d..5a563718c8e0 100644 --- a/editors/openoffice-devel/files/patch-config_office+configure.in +++ b/editors/openoffice-devel/files/patch-config_office+configure.in @@ -1,6 +1,18 @@ --- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Tue Jun 4 14:11:42 2002 -@@ -103,6 +103,12 @@ ++++ configure.in Thu Jun 6 13:10:49 2002 +@@ -28,6 +28,11 @@ + + Usage: --enable-gcc3 + ],,) ++AC_ARG_ENABLE(debug, ++[ --enable-debug if you like to build with debug symbols ++ ++ Usage: --enable-debug ++],,) + AC_ARG_WITH(stlport4-home, + [ --with-stlport4-home The location that STLport4 is installed in. The STL + header files are assumed to be in stlport4-home/stlport +@@ -103,6 +108,12 @@ Usage: --with-asm-home=<path to ml.exe directory> ],,) @@ -13,7 +25,7 @@ AC_ARG_WITH(unzip-home, [ --with-unzip-home For Windows users, please supply the path for unzip.exe. -@@ -241,7 +247,7 @@ +@@ -241,7 +252,7 @@ if test "$_os" != "WINNT" && test -z "$with_gcc_home"; then AC_PROG_CC fi @@ -22,7 +34,7 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +283,13 @@ +@@ -277,13 +288,13 @@ if test $GCC; then AC_MSG_CHECKING([the GNU gcc compiler version]) @@ -39,7 +51,7 @@ fi _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` if test -n "$enable_gcc3"; then -@@ -296,13 +302,13 @@ +@@ -296,13 +307,13 @@ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn COMPATH="NO_GCC" else @@ -55,7 +67,7 @@ if test "$_gcc_minor" = "false"; then AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn -@@ -366,8 +372,9 @@ +@@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi else @@ -67,7 +79,7 @@ else AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) >> warn -@@ -408,6 +415,71 @@ +@@ -408,6 +420,71 @@ fi fi fi @@ -139,7 +151,7 @@ if test "$_os" = "Darwin"; then if test "$CC" = "cc"; then AC_PATH_PROGS(_cc, cc) -@@ -589,6 +661,26 @@ +@@ -589,6 +666,26 @@ fi fi @@ -166,7 +178,7 @@ dnl ************************************************************** dnl Testing for required Solaris and workshop compiler patches... dnl ************************************************************** -@@ -815,6 +907,10 @@ +@@ -815,6 +912,10 @@ fi if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` @@ -177,18 +189,32 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1196,12 +1292,13 @@ +@@ -1169,6 +1270,12 @@ + USE_GCC3="FALSE" + fi + ++if test -n "$enable_debug"; then ++ ENABLE_DEBUG="TRUE" ++else ++ ENABLE_DEBUG="FALSE" ++fi ++ + # Print args passed to set_soenv. + if test 1 = 1; then + echo +@@ -1196,12 +1303,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 +echo "\$EXCEPTIONS="$exceptions_type ++echo "\$ENABLE_DEBUG="$ENABLE_DEBUG echo fi # Executing the set_soenv script to setup the environment variables. if test -z "$enable_check_only"; then - './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 -+ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type ++ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type $ENABLE_DEBUG else echo echo Test Complete diff --git a/editors/openoffice-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice-devel/files/patch-solenv+inc+unxfbsdi.mk index b020a1924fb4..d9a06e4a004f 100644 --- a/editors/openoffice-devel/files/patch-solenv+inc+unxfbsdi.mk +++ b/editors/openoffice-devel/files/patch-solenv+inc+unxfbsdi.mk @@ -90,7 +90,7 @@ +CFLAGSPROF=-pg + +# Compiler flags for debugging -+CFLAGSDEBUG=-g ++CFLAGSDEBUG=-g -ggdb CFLAGSDBGUTIL= -CFLAGSOPT= -O2 -CFLAGSNOOPT= -O diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile index 7b6c77346bf5..c2fc4d02c4f3 100644 --- a/editors/openoffice.org-1.0/Makefile +++ b/editors/openoffice.org-1.0/Makefile @@ -15,23 +15,24 @@ MASTER_SITES= ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/${PORTVERSION}/ \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/ \ http://people.freebsd.org/~mbr/distfiles/ DISTFILES= OOo_${PORTVERSION}_source.tar.bz2 gpc231.tar.Z \ - oo_moz1.0RC3_includes.tgz + oo_moz1.0RC3_includes.tgz ${MOZILLADIST} .include <bsd.port.pre.mk> .if ${OSVERSION} > 500000 .if defined(USE_GCC) && ${USE_GCC} == 2.95 -DISTFILES+= oo_moz1.0RC3_${ARCH}_FreeBSD-5-gcc2.95-ports.tar.gz +MOZILLADIST= oo_moz1.0RC3_${ARCH}_FreeBSD-5-gcc2.95-ports.tar.gz .else -DISTFILES+= oo_moz1.0RC3_${ARCH}_FreeBSD-5-gcc3.1-system.tar.gz +MOZILLADIST= oo_moz1.0RC3_${ARCH}_FreeBSD-5-gcc3.1-system.tar.gz .endif .else .if defined(USE_GCC) && ${USE_GCC} == 3.1 -DISTFILES+= oo_moz1.0RC3_${ARCH}_FreeBSD-4-gcc3.1-ports.tar.gz +MOZILLADIST= oo_moz1.0RC3_${ARCH}_FreeBSD-4-gcc3.1-ports.tar.gz .else -DISTFILES+= oo_moz1.0RC3_${ARCH}_FreeBSD-4-gcc2.95-system.tar.gz +MOZILLADIST= oo_moz1.0RC3_${ARCH}_FreeBSD-4-gcc2.95-system.tar.gz .endif .endif + EXTRACT_ONLY= OOo_${PORTVERSION}_source.tar.bz2 MAINTAINER= mbr@FreeBSD.org @@ -51,21 +52,7 @@ USE_GMAKE= yes EXTRACT_BEFORE_ARGS_R= -dc EXTRACT_AFTER_ARGS_R= | ${TAR} -xf - EXTRACT_CMD_R= ${GZIP_CMD} -.if ${OSVERSION} > 500000 -.if defined(USE_GCC) && ${USE_GCC} == 2.95 -EXTRACT_REST= gpc231.tar.Z oo_moz1.0RC3_${ARCH}_FreeBSD-5-gcc2.95-ports.tar.gz -.else -EXTRACT_REST= gpc231.tar.Z oo_moz1.0RC3_${ARCH}_FreeBSD-5-gcc3.1-system.tar.gz -.endif -.else -.if defined(USE_GCC) && ${USE_GCC} == 3.1 -EXTRACT_REST= gpc231.tar.Z oo_moz1.0RC3_${ARCH}_FreeBSD-4-gcc3.1-ports.tar.gz -.else -EXTRACT_REST= gpc231.tar.Z oo_moz1.0RC3_${ARCH}_FreeBSD-4-gcc2.95-system.tar.gz -.endif -.endif - -EXTRACT_REST+= oo_moz1.0RC3_includes.tgz +EXTRACT_REST= gpc231.tar.Z ${MOZILLADIST} oo_moz1.0RC3_includes.tgz JDK13DIR?= ${LOCALBASE}/jdk1.3.1 JAVAVM= ${JDK13DIR}/bin/java @@ -86,6 +73,10 @@ CONFIGURE_ARGS+= --with-jdk-home=${JDK13DIR} \ CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} .endif +.if defined(WITH_DEBUG) +CONFIGURE_ARGS+= --enable-debug +.endif + .if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2) CONFIGURE_ARGS+= --enable-gcc3 .endif @@ -95,35 +86,47 @@ CONFIGURE_ARGS+= --enable-gcc3 .endif pre-fetch: +.if !defined(USE_GCC) || !defined(WITH_DEBUG) + @${ECHO} + @${ECHO} OPTIONS: +.endif .if !defined(USE_GCC) @${ECHO} - @${ECHO} You can compile openoffice with different + @${ECHO} You can compile OO with different @${ECHO} gcc compiler versions: @${ECHO} - @${ECHO} Use: USE_GCC=2.95 or USE_GCC=3.1 + @${ECHO} Add USE_GCC=2.95 or USE_GCC=3.1 @${ECHO} to compile openoffice with your @${ECHO} prefered compiler. +.endif +.if !defined(WITH_DEBUG) @${ECHO} + @${ECHO} You can compile OO with debug symbols + @${ECHO} if you call make with WITH_DEBUG=YES .endif .if ${OSVERSION} < 450002 @${ECHO} @${ECHO} OS-VERSION ${OSVERSION} too low @${ECHO} - @${ECHO} Openoffice need some important libc_r and + @${ECHO} OO need some important libc_r and @${ECHO} gcc fixes to build. Please upgrade to 4.6 - @${ECHO} PRE-RELEASE or RELEASE. + @${ECHO} RELEASE or 4.6 STABLE. @${FALSE} .endif @${ECHO} @${ECHO} NOTICE: @${ECHO} @${ECHO} To build Openoffice, you should have a lot - @${ECHO} of free diskspace \(~ 6GB\) and you should +.if defined(WITH_DEBUG) + @${ECHO} of free diskspace \(~ 8GB\) and you should +.else + @${ECHO} of free diskspace \(~ 4GB\) and you should +.endif @${ECHO} be an experienced port builder. This port @${ECHO} has beta quality and does not yet work as @${ECHO} stable as it should. @${ECHO} -pre-extract: + @${ECHO} KERNEL CONFIGURATION: @${ECHO} @${ECHO} Openoffice needs a larger stack- and @${ECHO} datasize to build. Check your limit @@ -143,8 +146,8 @@ pre-extract: @${ECHO} @${ECHO} langinfo.h is missing ! @${ECHO} - @${ECHO} Please upgrade to 4.5 STABLE or - @${ECHO} 4.6 RELEASE. + @${ECHO} Please upgrade to 4.6 RELEASE or + @${ECHO} 4.6 STABLE. @${ECHO} @${FALSE} .endif @@ -158,20 +161,53 @@ post-extract: exit 1; \ fi \ done - ${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/ - ${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/ - ${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/ - ${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/ - ${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/ + @${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/ + @${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/ + @${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/ + @${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/ + @${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/ post-patch: +.if defined(WITH_DEBUG) + @if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \ + ${ECHO_MSG} "===> Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \ + PATCHES_APPLIED="" ; \ + for i in ${PATCHDIR}/debugpatch-*; do \ + case $$i in \ + *.orig|*.rej|*~) \ + ${ECHO_MSG} "===> Ignoring patchfile $$i" ; \ + ;; \ + *) \ + if [ ${PATCH_DEBUG_TMP} = yes ]; then \ + ${ECHO_MSG} "===> Applying ${OPSYS} patch $$i" ; \ + fi; \ + if ${PATCH} ${PATCH_ARGS} < $$i ; then \ + PATCHES_APPLIED="$$PATCHES_APPLIED $$i" ; \ + else \ + ${ECHO_MSG} `${ECHO_CMD} ">> Patch $$i failed to apply cleanly." | ${SED} "s|${PATCHDIR}/||"` ; \ + if [ x"$$PATCHES_APPLIED" != x"" ]; then \ + ${ECHO_MSG} `${ECHO_CMD} ">> Patch(es) $$PATCHES_APPLIED applied cleanly." | ${SED} "s|${PATCHDIR}/||g"` ; \ + fi; \ + ${FALSE} ; \ + fi; \ + ;; \ + esac; \ + done; \ + fi; +.endif + @${ECHO_MSG} "===> Find old malloc.h defines and fix them in ${PKGNAME} source" @${FIND} ${WRKSRC}/.. | ${EGREP} "\.(cxx|h|c)$$" | ${XARGS} \ ${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g" do-build: @cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap +.if defined(WITH_DEBUG) @cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \ - tcsh -c 'source FreeBSDEnv.Set && dmake' + tcsh -c 'source FreeBSDEnv.Set && dmake debug=true' +.else + @cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \ + tcsh -c 'source FreeBSDEnv.Set && dmake strip=true' +.endif pre-install: @${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \ diff --git a/editors/openoffice.org-1.0/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-1.0/files/debugpatch-setup2+mow+source+loader+loader.c new file mode 100644 index 000000000000..96c651ce22c8 --- /dev/null +++ b/editors/openoffice.org-1.0/files/debugpatch-setup2+mow+source+loader+loader.c @@ -0,0 +1,21 @@ +--- ../setup2/mow/source/loader/loader.c.orig2 Thu Jun 6 11:23:17 2002 ++++ ../setup2/mow/source/loader/loader.c Thu Jun 6 11:24:14 2002 +@@ -902,6 +902,7 @@ + + void KillSetupDir() + { ++#if 0 + DIR* pDir = opendir( strTmpPath ); + struct dirent* pFile; + +@@ -915,6 +916,10 @@ + + chdir( strInitPath ); + rmdir( strTmpPath ); ++#else ++ fprintf(stderr, "\nLeaving behind temporary directory: %s\n", ++ strTmpPath); ++#endif + } + + void makeSymLink( char* s ) diff --git a/editors/openoffice.org-1.0/files/debugpatch-setup2::mow::source::loader::loader.c b/editors/openoffice.org-1.0/files/debugpatch-setup2::mow::source::loader::loader.c new file mode 100644 index 000000000000..96c651ce22c8 --- /dev/null +++ b/editors/openoffice.org-1.0/files/debugpatch-setup2::mow::source::loader::loader.c @@ -0,0 +1,21 @@ +--- ../setup2/mow/source/loader/loader.c.orig2 Thu Jun 6 11:23:17 2002 ++++ ../setup2/mow/source/loader/loader.c Thu Jun 6 11:24:14 2002 +@@ -902,6 +902,7 @@ + + void KillSetupDir() + { ++#if 0 + DIR* pDir = opendir( strTmpPath ); + struct dirent* pFile; + +@@ -915,6 +916,10 @@ + + chdir( strInitPath ); + rmdir( strTmpPath ); ++#else ++ fprintf(stderr, "\nLeaving behind temporary directory: %s\n", ++ strTmpPath); ++#endif + } + + void makeSymLink( char* s ) diff --git a/editors/openoffice.org-1.0/files/patch-config_office+configure.in b/editors/openoffice.org-1.0/files/patch-config_office+configure.in index bc28e6f4a92d..5a563718c8e0 100644 --- a/editors/openoffice.org-1.0/files/patch-config_office+configure.in +++ b/editors/openoffice.org-1.0/files/patch-config_office+configure.in @@ -1,6 +1,18 @@ --- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Tue Jun 4 14:11:42 2002 -@@ -103,6 +103,12 @@ ++++ configure.in Thu Jun 6 13:10:49 2002 +@@ -28,6 +28,11 @@ + + Usage: --enable-gcc3 + ],,) ++AC_ARG_ENABLE(debug, ++[ --enable-debug if you like to build with debug symbols ++ ++ Usage: --enable-debug ++],,) + AC_ARG_WITH(stlport4-home, + [ --with-stlport4-home The location that STLport4 is installed in. The STL + header files are assumed to be in stlport4-home/stlport +@@ -103,6 +108,12 @@ Usage: --with-asm-home=<path to ml.exe directory> ],,) @@ -13,7 +25,7 @@ AC_ARG_WITH(unzip-home, [ --with-unzip-home For Windows users, please supply the path for unzip.exe. -@@ -241,7 +247,7 @@ +@@ -241,7 +252,7 @@ if test "$_os" != "WINNT" && test -z "$with_gcc_home"; then AC_PROG_CC fi @@ -22,7 +34,7 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +283,13 @@ +@@ -277,13 +288,13 @@ if test $GCC; then AC_MSG_CHECKING([the GNU gcc compiler version]) @@ -39,7 +51,7 @@ fi _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` if test -n "$enable_gcc3"; then -@@ -296,13 +302,13 @@ +@@ -296,13 +307,13 @@ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn COMPATH="NO_GCC" else @@ -55,7 +67,7 @@ if test "$_gcc_minor" = "false"; then AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn -@@ -366,8 +372,9 @@ +@@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi else @@ -67,7 +79,7 @@ else AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) >> warn -@@ -408,6 +415,71 @@ +@@ -408,6 +420,71 @@ fi fi fi @@ -139,7 +151,7 @@ if test "$_os" = "Darwin"; then if test "$CC" = "cc"; then AC_PATH_PROGS(_cc, cc) -@@ -589,6 +661,26 @@ +@@ -589,6 +666,26 @@ fi fi @@ -166,7 +178,7 @@ dnl ************************************************************** dnl Testing for required Solaris and workshop compiler patches... dnl ************************************************************** -@@ -815,6 +907,10 @@ +@@ -815,6 +912,10 @@ fi if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` @@ -177,18 +189,32 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1196,12 +1292,13 @@ +@@ -1169,6 +1270,12 @@ + USE_GCC3="FALSE" + fi + ++if test -n "$enable_debug"; then ++ ENABLE_DEBUG="TRUE" ++else ++ ENABLE_DEBUG="FALSE" ++fi ++ + # Print args passed to set_soenv. + if test 1 = 1; then + echo +@@ -1196,12 +1303,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 +echo "\$EXCEPTIONS="$exceptions_type ++echo "\$ENABLE_DEBUG="$ENABLE_DEBUG echo fi # Executing the set_soenv script to setup the environment variables. if test -z "$enable_check_only"; then - './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 -+ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type ++ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type $ENABLE_DEBUG else echo echo Test Complete diff --git a/editors/openoffice.org-1.0/files/patch-config_office+set_soenv.1 b/editors/openoffice.org-1.0/files/patch-config_office+set_soenv.1 index 66e6e4cbf2dd..6ef61a0b7151 100644 --- a/editors/openoffice.org-1.0/files/patch-config_office+set_soenv.1 +++ b/editors/openoffice.org-1.0/files/patch-config_office+set_soenv.1 @@ -1,11 +1,11 @@ --- set_soenv.1.orig Wed Apr 17 22:41:31 2002 -+++ set_soenv.1 Wed Jun 5 00:33:59 2002 ++++ set_soenv.1 Thu Jun 6 13:10:51 2002 @@ -40,7 +40,7 @@ # # Set this value equal to the corresponding amount of # command line arguments. -my $numArgs = 20; -+my $numArgs = 26; ++my $numArgs = 27; # Determining the amount of arguments in the call. my $numEnter = $#ARGV + 1; if ( $numEnter != $numArgs ) @@ -28,7 +28,16 @@ # #------------------------------------------- # IIc. Declaring the environment variables. -@@ -145,7 +146,10 @@ +@@ -96,7 +97,7 @@ + $SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL, + $COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME, + $BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS, +- $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3 ); ++ $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG); + # + #------------------------------------------- + # IId. Declaring the aliases. +@@ -145,7 +146,11 @@ $STLPORT4 = $ARGV [ 12 ]; # Location of STLport4 $MINGWIN32 = $ARGV [ 17 ]; # use MINGWIN32 $use_shell = $ARGV [ 18 ]; # preferred shell @@ -37,10 +46,11 @@ +$CC = $ARGV [ 23 ]; # get cc from environment +$CXX = $ARGV [ 24 ]; # use c++ from environment +$EXCEPTIONS = $ARGV [ 25 ]; # Exception handling type ++$ENABLE_DEBUG = $ARGV [ 26 ]; # Enable a debug build # #--------------------------------------------------------------- # IIIb. Initialising the variables for the system commands, etc. -@@ -316,7 +320,7 @@ +@@ -316,7 +321,7 @@ $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; $SOLAR_JAVA = "TRUE"; @@ -49,7 +59,7 @@ } elsif ( $platform eq "$FreeBSD" ) { print "Setting FreeBSD specific values... "; -@@ -326,7 +330,14 @@ +@@ -326,7 +331,14 @@ $COMPATH = $ARGV[ 0 ]; $CPU = "I"; $CPUNAME = "INTEL"; @@ -64,7 +74,7 @@ $DLLSUFFIX = "fi"; $GUI = "UNX"; $GUIBASE = "unx"; -@@ -339,6 +350,9 @@ +@@ -339,6 +351,9 @@ $PATH_SEPERATOR = $ps; $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; @@ -74,7 +84,7 @@ } elsif ( $platform eq "$Linux" ) { -@@ -934,15 +948,16 @@ +@@ -934,15 +949,16 @@ $D.$COM. $D.$CVER. $D.$GVER. @@ -94,7 +104,7 @@ { $SOLARDEF .= $D."GLIBC=".$GLIBC; } $SOLARDEF .= $D."SUPD=$UPD". -@@ -959,7 +974,7 @@ +@@ -959,7 +975,7 @@ $L.$USR_DT.$LIB. $L.$USR_OPENWIN.$LIB.'"'; } @@ -103,7 +113,7 @@ { $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB. $L.$LIB. $L.$USR.$LIB. -@@ -969,6 +984,11 @@ +@@ -969,6 +985,11 @@ { $SOLAREXTRALIB = '"'.$L.$LIB. $L.$USR.$LIB.'"'; } @@ -115,7 +125,7 @@ # Compiler include search directory paths. if (($platform eq "$Solaris") || ($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"'; -@@ -1039,7 +1059,7 @@ +@@ -1039,7 +1060,7 @@ $ps.$USR.$LIB. $ps.$USR_LOCAL.$BIN; } @@ -124,7 +134,7 @@ { $PATH = $cur_dir. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN. $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. -@@ -1058,6 +1078,22 @@ +@@ -1058,6 +1079,22 @@ $ps.$USR.$ds."X11".$BIN. $ps.$USR.$LIB; } @@ -147,7 +157,7 @@ elsif ($platform eq "$Winnt") { my ( $noldPATH ); -@@ -1155,7 +1191,7 @@ +@@ -1155,7 +1192,7 @@ $L_STLPORT_LIB. $L.$XLIB.'"'; } @@ -156,7 +166,7 @@ { $SOLARLIB = '"'.$L.$par_dir.$LIB. $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. -@@ -1167,6 +1203,15 @@ +@@ -1167,6 +1204,15 @@ $L_STLPORT_LIB. $L.$XLIB.'"'; } @@ -172,7 +182,7 @@ elsif ($platform eq "$Winnt") { $SOLARLIB = '"'.$L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. $L.$par_dir.$LIB. -@@ -1196,7 +1241,7 @@ +@@ -1196,7 +1242,7 @@ $SOLARINC .= $I.$USR.$INCLUDE; } $SOLARINC .= $STLPORT_stlport; @@ -181,7 +191,7 @@ { # This simply adds an include path, so even cases that break the FHS work $SOLARINC .= $STLPORT_inc_stlport; -@@ -1210,11 +1255,6 @@ +@@ -1210,11 +1256,6 @@ { $SOLARINC .= $I.'$COMPATH'.$ds."include"; } @@ -193,7 +203,17 @@ $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31". $I.'$JAVA_HOME'.$INCLUDE; -@@ -1407,6 +1447,12 @@ +@@ -1382,6 +1423,9 @@ + ToFile( "NEW_JAR_PACK", $NEW_JAR_PACK, "e" ); + ToFile( "NO_BSYMBOLIC", $NO_BSYMBOLIC, "e" ); + ToFile( "TF_FILTER", "TRUE", "e" ); ++if ($ENABLE_DEBUG eq "TRUE") { ++ToFile( "debug", "true", "e" ); ++} + if ( $platform ne "$Macosx" ) + { ToFile( "PSPRINT", "TRUE", "e" ); + } elsif ( $GUIBASE eq "unx" ) { +@@ -1407,6 +1451,12 @@ ToFile( "GUIENV", $GUIENV, "e" ); ToFile( "GVER", $GVER, "e" ); ToFile( "OS", $OS, "e" ); diff --git a/editors/openoffice.org-1.0/files/patch-config_office::configure.in b/editors/openoffice.org-1.0/files/patch-config_office::configure.in index bc28e6f4a92d..5a563718c8e0 100644 --- a/editors/openoffice.org-1.0/files/patch-config_office::configure.in +++ b/editors/openoffice.org-1.0/files/patch-config_office::configure.in @@ -1,6 +1,18 @@ --- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Tue Jun 4 14:11:42 2002 -@@ -103,6 +103,12 @@ ++++ configure.in Thu Jun 6 13:10:49 2002 +@@ -28,6 +28,11 @@ + + Usage: --enable-gcc3 + ],,) ++AC_ARG_ENABLE(debug, ++[ --enable-debug if you like to build with debug symbols ++ ++ Usage: --enable-debug ++],,) + AC_ARG_WITH(stlport4-home, + [ --with-stlport4-home The location that STLport4 is installed in. The STL + header files are assumed to be in stlport4-home/stlport +@@ -103,6 +108,12 @@ Usage: --with-asm-home=<path to ml.exe directory> ],,) @@ -13,7 +25,7 @@ AC_ARG_WITH(unzip-home, [ --with-unzip-home For Windows users, please supply the path for unzip.exe. -@@ -241,7 +247,7 @@ +@@ -241,7 +252,7 @@ if test "$_os" != "WINNT" && test -z "$with_gcc_home"; then AC_PROG_CC fi @@ -22,7 +34,7 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +283,13 @@ +@@ -277,13 +288,13 @@ if test $GCC; then AC_MSG_CHECKING([the GNU gcc compiler version]) @@ -39,7 +51,7 @@ fi _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` if test -n "$enable_gcc3"; then -@@ -296,13 +302,13 @@ +@@ -296,13 +307,13 @@ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn COMPATH="NO_GCC" else @@ -55,7 +67,7 @@ if test "$_gcc_minor" = "false"; then AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn -@@ -366,8 +372,9 @@ +@@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi else @@ -67,7 +79,7 @@ else AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) >> warn -@@ -408,6 +415,71 @@ +@@ -408,6 +420,71 @@ fi fi fi @@ -139,7 +151,7 @@ if test "$_os" = "Darwin"; then if test "$CC" = "cc"; then AC_PATH_PROGS(_cc, cc) -@@ -589,6 +661,26 @@ +@@ -589,6 +666,26 @@ fi fi @@ -166,7 +178,7 @@ dnl ************************************************************** dnl Testing for required Solaris and workshop compiler patches... dnl ************************************************************** -@@ -815,6 +907,10 @@ +@@ -815,6 +912,10 @@ fi if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` @@ -177,18 +189,32 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1196,12 +1292,13 @@ +@@ -1169,6 +1270,12 @@ + USE_GCC3="FALSE" + fi + ++if test -n "$enable_debug"; then ++ ENABLE_DEBUG="TRUE" ++else ++ ENABLE_DEBUG="FALSE" ++fi ++ + # Print args passed to set_soenv. + if test 1 = 1; then + echo +@@ -1196,12 +1303,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 +echo "\$EXCEPTIONS="$exceptions_type ++echo "\$ENABLE_DEBUG="$ENABLE_DEBUG echo fi # Executing the set_soenv script to setup the environment variables. if test -z "$enable_check_only"; then - './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 -+ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type ++ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type $ENABLE_DEBUG else echo echo Test Complete diff --git a/editors/openoffice.org-1.0/files/patch-set_soenv.1 b/editors/openoffice.org-1.0/files/patch-set_soenv.1 index 66e6e4cbf2dd..6ef61a0b7151 100644 --- a/editors/openoffice.org-1.0/files/patch-set_soenv.1 +++ b/editors/openoffice.org-1.0/files/patch-set_soenv.1 @@ -1,11 +1,11 @@ --- set_soenv.1.orig Wed Apr 17 22:41:31 2002 -+++ set_soenv.1 Wed Jun 5 00:33:59 2002 ++++ set_soenv.1 Thu Jun 6 13:10:51 2002 @@ -40,7 +40,7 @@ # # Set this value equal to the corresponding amount of # command line arguments. -my $numArgs = 20; -+my $numArgs = 26; ++my $numArgs = 27; # Determining the amount of arguments in the call. my $numEnter = $#ARGV + 1; if ( $numEnter != $numArgs ) @@ -28,7 +28,16 @@ # #------------------------------------------- # IIc. Declaring the environment variables. -@@ -145,7 +146,10 @@ +@@ -96,7 +97,7 @@ + $SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL, + $COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME, + $BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS, +- $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3 ); ++ $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG); + # + #------------------------------------------- + # IId. Declaring the aliases. +@@ -145,7 +146,11 @@ $STLPORT4 = $ARGV [ 12 ]; # Location of STLport4 $MINGWIN32 = $ARGV [ 17 ]; # use MINGWIN32 $use_shell = $ARGV [ 18 ]; # preferred shell @@ -37,10 +46,11 @@ +$CC = $ARGV [ 23 ]; # get cc from environment +$CXX = $ARGV [ 24 ]; # use c++ from environment +$EXCEPTIONS = $ARGV [ 25 ]; # Exception handling type ++$ENABLE_DEBUG = $ARGV [ 26 ]; # Enable a debug build # #--------------------------------------------------------------- # IIIb. Initialising the variables for the system commands, etc. -@@ -316,7 +320,7 @@ +@@ -316,7 +321,7 @@ $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; $SOLAR_JAVA = "TRUE"; @@ -49,7 +59,7 @@ } elsif ( $platform eq "$FreeBSD" ) { print "Setting FreeBSD specific values... "; -@@ -326,7 +330,14 @@ +@@ -326,7 +331,14 @@ $COMPATH = $ARGV[ 0 ]; $CPU = "I"; $CPUNAME = "INTEL"; @@ -64,7 +74,7 @@ $DLLSUFFIX = "fi"; $GUI = "UNX"; $GUIBASE = "unx"; -@@ -339,6 +350,9 @@ +@@ -339,6 +351,9 @@ $PATH_SEPERATOR = $ps; $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; @@ -74,7 +84,7 @@ } elsif ( $platform eq "$Linux" ) { -@@ -934,15 +948,16 @@ +@@ -934,15 +949,16 @@ $D.$COM. $D.$CVER. $D.$GVER. @@ -94,7 +104,7 @@ { $SOLARDEF .= $D."GLIBC=".$GLIBC; } $SOLARDEF .= $D."SUPD=$UPD". -@@ -959,7 +974,7 @@ +@@ -959,7 +975,7 @@ $L.$USR_DT.$LIB. $L.$USR_OPENWIN.$LIB.'"'; } @@ -103,7 +113,7 @@ { $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB. $L.$LIB. $L.$USR.$LIB. -@@ -969,6 +984,11 @@ +@@ -969,6 +985,11 @@ { $SOLAREXTRALIB = '"'.$L.$LIB. $L.$USR.$LIB.'"'; } @@ -115,7 +125,7 @@ # Compiler include search directory paths. if (($platform eq "$Solaris") || ($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"'; -@@ -1039,7 +1059,7 @@ +@@ -1039,7 +1060,7 @@ $ps.$USR.$LIB. $ps.$USR_LOCAL.$BIN; } @@ -124,7 +134,7 @@ { $PATH = $cur_dir. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN. $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. -@@ -1058,6 +1078,22 @@ +@@ -1058,6 +1079,22 @@ $ps.$USR.$ds."X11".$BIN. $ps.$USR.$LIB; } @@ -147,7 +157,7 @@ elsif ($platform eq "$Winnt") { my ( $noldPATH ); -@@ -1155,7 +1191,7 @@ +@@ -1155,7 +1192,7 @@ $L_STLPORT_LIB. $L.$XLIB.'"'; } @@ -156,7 +166,7 @@ { $SOLARLIB = '"'.$L.$par_dir.$LIB. $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. -@@ -1167,6 +1203,15 @@ +@@ -1167,6 +1204,15 @@ $L_STLPORT_LIB. $L.$XLIB.'"'; } @@ -172,7 +182,7 @@ elsif ($platform eq "$Winnt") { $SOLARLIB = '"'.$L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. $L.$par_dir.$LIB. -@@ -1196,7 +1241,7 @@ +@@ -1196,7 +1242,7 @@ $SOLARINC .= $I.$USR.$INCLUDE; } $SOLARINC .= $STLPORT_stlport; @@ -181,7 +191,7 @@ { # This simply adds an include path, so even cases that break the FHS work $SOLARINC .= $STLPORT_inc_stlport; -@@ -1210,11 +1255,6 @@ +@@ -1210,11 +1256,6 @@ { $SOLARINC .= $I.'$COMPATH'.$ds."include"; } @@ -193,7 +203,17 @@ $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31". $I.'$JAVA_HOME'.$INCLUDE; -@@ -1407,6 +1447,12 @@ +@@ -1382,6 +1423,9 @@ + ToFile( "NEW_JAR_PACK", $NEW_JAR_PACK, "e" ); + ToFile( "NO_BSYMBOLIC", $NO_BSYMBOLIC, "e" ); + ToFile( "TF_FILTER", "TRUE", "e" ); ++if ($ENABLE_DEBUG eq "TRUE") { ++ToFile( "debug", "true", "e" ); ++} + if ( $platform ne "$Macosx" ) + { ToFile( "PSPRINT", "TRUE", "e" ); + } elsif ( $GUIBASE eq "unx" ) { +@@ -1407,6 +1451,12 @@ ToFile( "GUIENV", $GUIENV, "e" ); ToFile( "GVER", $GVER, "e" ); ToFile( "OS", $OS, "e" ); diff --git a/editors/openoffice.org-1.0/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-1.0/files/patch-solenv+inc+unxfbsdi.mk index b020a1924fb4..d9a06e4a004f 100644 --- a/editors/openoffice.org-1.0/files/patch-solenv+inc+unxfbsdi.mk +++ b/editors/openoffice.org-1.0/files/patch-solenv+inc+unxfbsdi.mk @@ -90,7 +90,7 @@ +CFLAGSPROF=-pg + +# Compiler flags for debugging -+CFLAGSDEBUG=-g ++CFLAGSDEBUG=-g -ggdb CFLAGSDBGUTIL= -CFLAGSOPT= -O2 -CFLAGSNOOPT= -O diff --git a/editors/openoffice.org-1.0/files/patch-solenv::inc::unxfbsdi.mk b/editors/openoffice.org-1.0/files/patch-solenv::inc::unxfbsdi.mk index b020a1924fb4..d9a06e4a004f 100644 --- a/editors/openoffice.org-1.0/files/patch-solenv::inc::unxfbsdi.mk +++ b/editors/openoffice.org-1.0/files/patch-solenv::inc::unxfbsdi.mk @@ -90,7 +90,7 @@ +CFLAGSPROF=-pg + +# Compiler flags for debugging -+CFLAGSDEBUG=-g ++CFLAGSDEBUG=-g -ggdb CFLAGSDBGUTIL= -CFLAGSOPT= -O2 -CFLAGSNOOPT= -O diff --git a/editors/openoffice.org-1.1-devel/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-1.1-devel/files/debugpatch-setup2+mow+source+loader+loader.c new file mode 100644 index 000000000000..96c651ce22c8 --- /dev/null +++ b/editors/openoffice.org-1.1-devel/files/debugpatch-setup2+mow+source+loader+loader.c @@ -0,0 +1,21 @@ +--- ../setup2/mow/source/loader/loader.c.orig2 Thu Jun 6 11:23:17 2002 ++++ ../setup2/mow/source/loader/loader.c Thu Jun 6 11:24:14 2002 +@@ -902,6 +902,7 @@ + + void KillSetupDir() + { ++#if 0 + DIR* pDir = opendir( strTmpPath ); + struct dirent* pFile; + +@@ -915,6 +916,10 @@ + + chdir( strInitPath ); + rmdir( strTmpPath ); ++#else ++ fprintf(stderr, "\nLeaving behind temporary directory: %s\n", ++ strTmpPath); ++#endif + } + + void makeSymLink( char* s ) diff --git a/editors/openoffice.org-1.1-devel/files/patch-config_office+configure.in b/editors/openoffice.org-1.1-devel/files/patch-config_office+configure.in index bc28e6f4a92d..5a563718c8e0 100644 --- a/editors/openoffice.org-1.1-devel/files/patch-config_office+configure.in +++ b/editors/openoffice.org-1.1-devel/files/patch-config_office+configure.in @@ -1,6 +1,18 @@ --- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Tue Jun 4 14:11:42 2002 -@@ -103,6 +103,12 @@ ++++ configure.in Thu Jun 6 13:10:49 2002 +@@ -28,6 +28,11 @@ + + Usage: --enable-gcc3 + ],,) ++AC_ARG_ENABLE(debug, ++[ --enable-debug if you like to build with debug symbols ++ ++ Usage: --enable-debug ++],,) + AC_ARG_WITH(stlport4-home, + [ --with-stlport4-home The location that STLport4 is installed in. The STL + header files are assumed to be in stlport4-home/stlport +@@ -103,6 +108,12 @@ Usage: --with-asm-home=<path to ml.exe directory> ],,) @@ -13,7 +25,7 @@ AC_ARG_WITH(unzip-home, [ --with-unzip-home For Windows users, please supply the path for unzip.exe. -@@ -241,7 +247,7 @@ +@@ -241,7 +252,7 @@ if test "$_os" != "WINNT" && test -z "$with_gcc_home"; then AC_PROG_CC fi @@ -22,7 +34,7 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +283,13 @@ +@@ -277,13 +288,13 @@ if test $GCC; then AC_MSG_CHECKING([the GNU gcc compiler version]) @@ -39,7 +51,7 @@ fi _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` if test -n "$enable_gcc3"; then -@@ -296,13 +302,13 @@ +@@ -296,13 +307,13 @@ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn COMPATH="NO_GCC" else @@ -55,7 +67,7 @@ if test "$_gcc_minor" = "false"; then AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn -@@ -366,8 +372,9 @@ +@@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi else @@ -67,7 +79,7 @@ else AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) >> warn -@@ -408,6 +415,71 @@ +@@ -408,6 +420,71 @@ fi fi fi @@ -139,7 +151,7 @@ if test "$_os" = "Darwin"; then if test "$CC" = "cc"; then AC_PATH_PROGS(_cc, cc) -@@ -589,6 +661,26 @@ +@@ -589,6 +666,26 @@ fi fi @@ -166,7 +178,7 @@ dnl ************************************************************** dnl Testing for required Solaris and workshop compiler patches... dnl ************************************************************** -@@ -815,6 +907,10 @@ +@@ -815,6 +912,10 @@ fi if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` @@ -177,18 +189,32 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1196,12 +1292,13 @@ +@@ -1169,6 +1270,12 @@ + USE_GCC3="FALSE" + fi + ++if test -n "$enable_debug"; then ++ ENABLE_DEBUG="TRUE" ++else ++ ENABLE_DEBUG="FALSE" ++fi ++ + # Print args passed to set_soenv. + if test 1 = 1; then + echo +@@ -1196,12 +1303,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 +echo "\$EXCEPTIONS="$exceptions_type ++echo "\$ENABLE_DEBUG="$ENABLE_DEBUG echo fi # Executing the set_soenv script to setup the environment variables. if test -z "$enable_check_only"; then - './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 -+ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type ++ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type $ENABLE_DEBUG else echo echo Test Complete diff --git a/editors/openoffice.org-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk index b020a1924fb4..d9a06e4a004f 100644 --- a/editors/openoffice.org-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk +++ b/editors/openoffice.org-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk @@ -90,7 +90,7 @@ +CFLAGSPROF=-pg + +# Compiler flags for debugging -+CFLAGSDEBUG=-g ++CFLAGSDEBUG=-g -ggdb CFLAGSDBGUTIL= -CFLAGSOPT= -O2 -CFLAGSNOOPT= -O diff --git a/editors/openoffice.org-1.1/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-1.1/files/debugpatch-setup2+mow+source+loader+loader.c new file mode 100644 index 000000000000..96c651ce22c8 --- /dev/null +++ b/editors/openoffice.org-1.1/files/debugpatch-setup2+mow+source+loader+loader.c @@ -0,0 +1,21 @@ +--- ../setup2/mow/source/loader/loader.c.orig2 Thu Jun 6 11:23:17 2002 ++++ ../setup2/mow/source/loader/loader.c Thu Jun 6 11:24:14 2002 +@@ -902,6 +902,7 @@ + + void KillSetupDir() + { ++#if 0 + DIR* pDir = opendir( strTmpPath ); + struct dirent* pFile; + +@@ -915,6 +916,10 @@ + + chdir( strInitPath ); + rmdir( strTmpPath ); ++#else ++ fprintf(stderr, "\nLeaving behind temporary directory: %s\n", ++ strTmpPath); ++#endif + } + + void makeSymLink( char* s ) diff --git a/editors/openoffice.org-1.1/files/patch-config_office+configure.in b/editors/openoffice.org-1.1/files/patch-config_office+configure.in index bc28e6f4a92d..5a563718c8e0 100644 --- a/editors/openoffice.org-1.1/files/patch-config_office+configure.in +++ b/editors/openoffice.org-1.1/files/patch-config_office+configure.in @@ -1,6 +1,18 @@ --- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Tue Jun 4 14:11:42 2002 -@@ -103,6 +103,12 @@ ++++ configure.in Thu Jun 6 13:10:49 2002 +@@ -28,6 +28,11 @@ + + Usage: --enable-gcc3 + ],,) ++AC_ARG_ENABLE(debug, ++[ --enable-debug if you like to build with debug symbols ++ ++ Usage: --enable-debug ++],,) + AC_ARG_WITH(stlport4-home, + [ --with-stlport4-home The location that STLport4 is installed in. The STL + header files are assumed to be in stlport4-home/stlport +@@ -103,6 +108,12 @@ Usage: --with-asm-home=<path to ml.exe directory> ],,) @@ -13,7 +25,7 @@ AC_ARG_WITH(unzip-home, [ --with-unzip-home For Windows users, please supply the path for unzip.exe. -@@ -241,7 +247,7 @@ +@@ -241,7 +252,7 @@ if test "$_os" != "WINNT" && test -z "$with_gcc_home"; then AC_PROG_CC fi @@ -22,7 +34,7 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +283,13 @@ +@@ -277,13 +288,13 @@ if test $GCC; then AC_MSG_CHECKING([the GNU gcc compiler version]) @@ -39,7 +51,7 @@ fi _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` if test -n "$enable_gcc3"; then -@@ -296,13 +302,13 @@ +@@ -296,13 +307,13 @@ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn COMPATH="NO_GCC" else @@ -55,7 +67,7 @@ if test "$_gcc_minor" = "false"; then AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn -@@ -366,8 +372,9 @@ +@@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi else @@ -67,7 +79,7 @@ else AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) >> warn -@@ -408,6 +415,71 @@ +@@ -408,6 +420,71 @@ fi fi fi @@ -139,7 +151,7 @@ if test "$_os" = "Darwin"; then if test "$CC" = "cc"; then AC_PATH_PROGS(_cc, cc) -@@ -589,6 +661,26 @@ +@@ -589,6 +666,26 @@ fi fi @@ -166,7 +178,7 @@ dnl ************************************************************** dnl Testing for required Solaris and workshop compiler patches... dnl ************************************************************** -@@ -815,6 +907,10 @@ +@@ -815,6 +912,10 @@ fi if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` @@ -177,18 +189,32 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1196,12 +1292,13 @@ +@@ -1169,6 +1270,12 @@ + USE_GCC3="FALSE" + fi + ++if test -n "$enable_debug"; then ++ ENABLE_DEBUG="TRUE" ++else ++ ENABLE_DEBUG="FALSE" ++fi ++ + # Print args passed to set_soenv. + if test 1 = 1; then + echo +@@ -1196,12 +1303,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 +echo "\$EXCEPTIONS="$exceptions_type ++echo "\$ENABLE_DEBUG="$ENABLE_DEBUG echo fi # Executing the set_soenv script to setup the environment variables. if test -z "$enable_check_only"; then - './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 -+ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type ++ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type $ENABLE_DEBUG else echo echo Test Complete diff --git a/editors/openoffice.org-1.1/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-1.1/files/patch-solenv+inc+unxfbsdi.mk index b020a1924fb4..d9a06e4a004f 100644 --- a/editors/openoffice.org-1.1/files/patch-solenv+inc+unxfbsdi.mk +++ b/editors/openoffice.org-1.1/files/patch-solenv+inc+unxfbsdi.mk @@ -90,7 +90,7 @@ +CFLAGSPROF=-pg + +# Compiler flags for debugging -+CFLAGSDEBUG=-g ++CFLAGSDEBUG=-g -ggdb CFLAGSDBGUTIL= -CFLAGSOPT= -O2 -CFLAGSNOOPT= -O diff --git a/editors/openoffice.org-2-RC/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-2-RC/files/debugpatch-setup2+mow+source+loader+loader.c new file mode 100644 index 000000000000..96c651ce22c8 --- /dev/null +++ b/editors/openoffice.org-2-RC/files/debugpatch-setup2+mow+source+loader+loader.c @@ -0,0 +1,21 @@ +--- ../setup2/mow/source/loader/loader.c.orig2 Thu Jun 6 11:23:17 2002 ++++ ../setup2/mow/source/loader/loader.c Thu Jun 6 11:24:14 2002 +@@ -902,6 +902,7 @@ + + void KillSetupDir() + { ++#if 0 + DIR* pDir = opendir( strTmpPath ); + struct dirent* pFile; + +@@ -915,6 +916,10 @@ + + chdir( strInitPath ); + rmdir( strTmpPath ); ++#else ++ fprintf(stderr, "\nLeaving behind temporary directory: %s\n", ++ strTmpPath); ++#endif + } + + void makeSymLink( char* s ) diff --git a/editors/openoffice.org-2-RC/files/patch-config_office+configure.in b/editors/openoffice.org-2-RC/files/patch-config_office+configure.in index bc28e6f4a92d..5a563718c8e0 100644 --- a/editors/openoffice.org-2-RC/files/patch-config_office+configure.in +++ b/editors/openoffice.org-2-RC/files/patch-config_office+configure.in @@ -1,6 +1,18 @@ --- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Tue Jun 4 14:11:42 2002 -@@ -103,6 +103,12 @@ ++++ configure.in Thu Jun 6 13:10:49 2002 +@@ -28,6 +28,11 @@ + + Usage: --enable-gcc3 + ],,) ++AC_ARG_ENABLE(debug, ++[ --enable-debug if you like to build with debug symbols ++ ++ Usage: --enable-debug ++],,) + AC_ARG_WITH(stlport4-home, + [ --with-stlport4-home The location that STLport4 is installed in. The STL + header files are assumed to be in stlport4-home/stlport +@@ -103,6 +108,12 @@ Usage: --with-asm-home=<path to ml.exe directory> ],,) @@ -13,7 +25,7 @@ AC_ARG_WITH(unzip-home, [ --with-unzip-home For Windows users, please supply the path for unzip.exe. -@@ -241,7 +247,7 @@ +@@ -241,7 +252,7 @@ if test "$_os" != "WINNT" && test -z "$with_gcc_home"; then AC_PROG_CC fi @@ -22,7 +34,7 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +283,13 @@ +@@ -277,13 +288,13 @@ if test $GCC; then AC_MSG_CHECKING([the GNU gcc compiler version]) @@ -39,7 +51,7 @@ fi _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` if test -n "$enable_gcc3"; then -@@ -296,13 +302,13 @@ +@@ -296,13 +307,13 @@ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn COMPATH="NO_GCC" else @@ -55,7 +67,7 @@ if test "$_gcc_minor" = "false"; then AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn -@@ -366,8 +372,9 @@ +@@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi else @@ -67,7 +79,7 @@ else AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) >> warn -@@ -408,6 +415,71 @@ +@@ -408,6 +420,71 @@ fi fi fi @@ -139,7 +151,7 @@ if test "$_os" = "Darwin"; then if test "$CC" = "cc"; then AC_PATH_PROGS(_cc, cc) -@@ -589,6 +661,26 @@ +@@ -589,6 +666,26 @@ fi fi @@ -166,7 +178,7 @@ dnl ************************************************************** dnl Testing for required Solaris and workshop compiler patches... dnl ************************************************************** -@@ -815,6 +907,10 @@ +@@ -815,6 +912,10 @@ fi if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` @@ -177,18 +189,32 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1196,12 +1292,13 @@ +@@ -1169,6 +1270,12 @@ + USE_GCC3="FALSE" + fi + ++if test -n "$enable_debug"; then ++ ENABLE_DEBUG="TRUE" ++else ++ ENABLE_DEBUG="FALSE" ++fi ++ + # Print args passed to set_soenv. + if test 1 = 1; then + echo +@@ -1196,12 +1303,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 +echo "\$EXCEPTIONS="$exceptions_type ++echo "\$ENABLE_DEBUG="$ENABLE_DEBUG echo fi # Executing the set_soenv script to setup the environment variables. if test -z "$enable_check_only"; then - './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 -+ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type ++ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type $ENABLE_DEBUG else echo echo Test Complete diff --git a/editors/openoffice.org-2-RC/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2-RC/files/patch-solenv+inc+unxfbsdi.mk index b020a1924fb4..d9a06e4a004f 100644 --- a/editors/openoffice.org-2-RC/files/patch-solenv+inc+unxfbsdi.mk +++ b/editors/openoffice.org-2-RC/files/patch-solenv+inc+unxfbsdi.mk @@ -90,7 +90,7 @@ +CFLAGSPROF=-pg + +# Compiler flags for debugging -+CFLAGSDEBUG=-g ++CFLAGSDEBUG=-g -ggdb CFLAGSDBGUTIL= -CFLAGSOPT= -O2 -CFLAGSNOOPT= -O diff --git a/editors/openoffice.org-2-devel/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-2-devel/files/debugpatch-setup2+mow+source+loader+loader.c new file mode 100644 index 000000000000..96c651ce22c8 --- /dev/null +++ b/editors/openoffice.org-2-devel/files/debugpatch-setup2+mow+source+loader+loader.c @@ -0,0 +1,21 @@ +--- ../setup2/mow/source/loader/loader.c.orig2 Thu Jun 6 11:23:17 2002 ++++ ../setup2/mow/source/loader/loader.c Thu Jun 6 11:24:14 2002 +@@ -902,6 +902,7 @@ + + void KillSetupDir() + { ++#if 0 + DIR* pDir = opendir( strTmpPath ); + struct dirent* pFile; + +@@ -915,6 +916,10 @@ + + chdir( strInitPath ); + rmdir( strTmpPath ); ++#else ++ fprintf(stderr, "\nLeaving behind temporary directory: %s\n", ++ strTmpPath); ++#endif + } + + void makeSymLink( char* s ) diff --git a/editors/openoffice.org-2-devel/files/patch-config_office+configure.in b/editors/openoffice.org-2-devel/files/patch-config_office+configure.in index bc28e6f4a92d..5a563718c8e0 100644 --- a/editors/openoffice.org-2-devel/files/patch-config_office+configure.in +++ b/editors/openoffice.org-2-devel/files/patch-config_office+configure.in @@ -1,6 +1,18 @@ --- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Tue Jun 4 14:11:42 2002 -@@ -103,6 +103,12 @@ ++++ configure.in Thu Jun 6 13:10:49 2002 +@@ -28,6 +28,11 @@ + + Usage: --enable-gcc3 + ],,) ++AC_ARG_ENABLE(debug, ++[ --enable-debug if you like to build with debug symbols ++ ++ Usage: --enable-debug ++],,) + AC_ARG_WITH(stlport4-home, + [ --with-stlport4-home The location that STLport4 is installed in. The STL + header files are assumed to be in stlport4-home/stlport +@@ -103,6 +108,12 @@ Usage: --with-asm-home=<path to ml.exe directory> ],,) @@ -13,7 +25,7 @@ AC_ARG_WITH(unzip-home, [ --with-unzip-home For Windows users, please supply the path for unzip.exe. -@@ -241,7 +247,7 @@ +@@ -241,7 +252,7 @@ if test "$_os" != "WINNT" && test -z "$with_gcc_home"; then AC_PROG_CC fi @@ -22,7 +34,7 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +283,13 @@ +@@ -277,13 +288,13 @@ if test $GCC; then AC_MSG_CHECKING([the GNU gcc compiler version]) @@ -39,7 +51,7 @@ fi _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` if test -n "$enable_gcc3"; then -@@ -296,13 +302,13 @@ +@@ -296,13 +307,13 @@ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn COMPATH="NO_GCC" else @@ -55,7 +67,7 @@ if test "$_gcc_minor" = "false"; then AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn -@@ -366,8 +372,9 @@ +@@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi else @@ -67,7 +79,7 @@ else AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) >> warn -@@ -408,6 +415,71 @@ +@@ -408,6 +420,71 @@ fi fi fi @@ -139,7 +151,7 @@ if test "$_os" = "Darwin"; then if test "$CC" = "cc"; then AC_PATH_PROGS(_cc, cc) -@@ -589,6 +661,26 @@ +@@ -589,6 +666,26 @@ fi fi @@ -166,7 +178,7 @@ dnl ************************************************************** dnl Testing for required Solaris and workshop compiler patches... dnl ************************************************************** -@@ -815,6 +907,10 @@ +@@ -815,6 +912,10 @@ fi if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` @@ -177,18 +189,32 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1196,12 +1292,13 @@ +@@ -1169,6 +1270,12 @@ + USE_GCC3="FALSE" + fi + ++if test -n "$enable_debug"; then ++ ENABLE_DEBUG="TRUE" ++else ++ ENABLE_DEBUG="FALSE" ++fi ++ + # Print args passed to set_soenv. + if test 1 = 1; then + echo +@@ -1196,12 +1303,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 +echo "\$EXCEPTIONS="$exceptions_type ++echo "\$ENABLE_DEBUG="$ENABLE_DEBUG echo fi # Executing the set_soenv script to setup the environment variables. if test -z "$enable_check_only"; then - './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 -+ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type ++ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type $ENABLE_DEBUG else echo echo Test Complete diff --git a/editors/openoffice.org-2-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2-devel/files/patch-solenv+inc+unxfbsdi.mk index b020a1924fb4..d9a06e4a004f 100644 --- a/editors/openoffice.org-2-devel/files/patch-solenv+inc+unxfbsdi.mk +++ b/editors/openoffice.org-2-devel/files/patch-solenv+inc+unxfbsdi.mk @@ -90,7 +90,7 @@ +CFLAGSPROF=-pg + +# Compiler flags for debugging -+CFLAGSDEBUG=-g ++CFLAGSDEBUG=-g -ggdb CFLAGSDBGUTIL= -CFLAGSOPT= -O2 -CFLAGSNOOPT= -O diff --git a/editors/openoffice.org-2.0-devel/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-2.0-devel/files/debugpatch-setup2+mow+source+loader+loader.c new file mode 100644 index 000000000000..96c651ce22c8 --- /dev/null +++ b/editors/openoffice.org-2.0-devel/files/debugpatch-setup2+mow+source+loader+loader.c @@ -0,0 +1,21 @@ +--- ../setup2/mow/source/loader/loader.c.orig2 Thu Jun 6 11:23:17 2002 ++++ ../setup2/mow/source/loader/loader.c Thu Jun 6 11:24:14 2002 +@@ -902,6 +902,7 @@ + + void KillSetupDir() + { ++#if 0 + DIR* pDir = opendir( strTmpPath ); + struct dirent* pFile; + +@@ -915,6 +916,10 @@ + + chdir( strInitPath ); + rmdir( strTmpPath ); ++#else ++ fprintf(stderr, "\nLeaving behind temporary directory: %s\n", ++ strTmpPath); ++#endif + } + + void makeSymLink( char* s ) diff --git a/editors/openoffice.org-2.0-devel/files/patch-config_office+configure.in b/editors/openoffice.org-2.0-devel/files/patch-config_office+configure.in index bc28e6f4a92d..5a563718c8e0 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-config_office+configure.in +++ b/editors/openoffice.org-2.0-devel/files/patch-config_office+configure.in @@ -1,6 +1,18 @@ --- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Tue Jun 4 14:11:42 2002 -@@ -103,6 +103,12 @@ ++++ configure.in Thu Jun 6 13:10:49 2002 +@@ -28,6 +28,11 @@ + + Usage: --enable-gcc3 + ],,) ++AC_ARG_ENABLE(debug, ++[ --enable-debug if you like to build with debug symbols ++ ++ Usage: --enable-debug ++],,) + AC_ARG_WITH(stlport4-home, + [ --with-stlport4-home The location that STLport4 is installed in. The STL + header files are assumed to be in stlport4-home/stlport +@@ -103,6 +108,12 @@ Usage: --with-asm-home=<path to ml.exe directory> ],,) @@ -13,7 +25,7 @@ AC_ARG_WITH(unzip-home, [ --with-unzip-home For Windows users, please supply the path for unzip.exe. -@@ -241,7 +247,7 @@ +@@ -241,7 +252,7 @@ if test "$_os" != "WINNT" && test -z "$with_gcc_home"; then AC_PROG_CC fi @@ -22,7 +34,7 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +283,13 @@ +@@ -277,13 +288,13 @@ if test $GCC; then AC_MSG_CHECKING([the GNU gcc compiler version]) @@ -39,7 +51,7 @@ fi _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` if test -n "$enable_gcc3"; then -@@ -296,13 +302,13 @@ +@@ -296,13 +307,13 @@ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn COMPATH="NO_GCC" else @@ -55,7 +67,7 @@ if test "$_gcc_minor" = "false"; then AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn -@@ -366,8 +372,9 @@ +@@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi else @@ -67,7 +79,7 @@ else AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) >> warn -@@ -408,6 +415,71 @@ +@@ -408,6 +420,71 @@ fi fi fi @@ -139,7 +151,7 @@ if test "$_os" = "Darwin"; then if test "$CC" = "cc"; then AC_PATH_PROGS(_cc, cc) -@@ -589,6 +661,26 @@ +@@ -589,6 +666,26 @@ fi fi @@ -166,7 +178,7 @@ dnl ************************************************************** dnl Testing for required Solaris and workshop compiler patches... dnl ************************************************************** -@@ -815,6 +907,10 @@ +@@ -815,6 +912,10 @@ fi if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` @@ -177,18 +189,32 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1196,12 +1292,13 @@ +@@ -1169,6 +1270,12 @@ + USE_GCC3="FALSE" + fi + ++if test -n "$enable_debug"; then ++ ENABLE_DEBUG="TRUE" ++else ++ ENABLE_DEBUG="FALSE" ++fi ++ + # Print args passed to set_soenv. + if test 1 = 1; then + echo +@@ -1196,12 +1303,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 +echo "\$EXCEPTIONS="$exceptions_type ++echo "\$ENABLE_DEBUG="$ENABLE_DEBUG echo fi # Executing the set_soenv script to setup the environment variables. if test -z "$enable_check_only"; then - './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 -+ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type ++ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type $ENABLE_DEBUG else echo echo Test Complete diff --git a/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk index b020a1924fb4..d9a06e4a004f 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk +++ b/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk @@ -90,7 +90,7 @@ +CFLAGSPROF=-pg + +# Compiler flags for debugging -+CFLAGSDEBUG=-g ++CFLAGSDEBUG=-g -ggdb CFLAGSDBGUTIL= -CFLAGSOPT= -O2 -CFLAGSNOOPT= -O diff --git a/editors/openoffice.org-2.0/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-2.0/files/debugpatch-setup2+mow+source+loader+loader.c new file mode 100644 index 000000000000..96c651ce22c8 --- /dev/null +++ b/editors/openoffice.org-2.0/files/debugpatch-setup2+mow+source+loader+loader.c @@ -0,0 +1,21 @@ +--- ../setup2/mow/source/loader/loader.c.orig2 Thu Jun 6 11:23:17 2002 ++++ ../setup2/mow/source/loader/loader.c Thu Jun 6 11:24:14 2002 +@@ -902,6 +902,7 @@ + + void KillSetupDir() + { ++#if 0 + DIR* pDir = opendir( strTmpPath ); + struct dirent* pFile; + +@@ -915,6 +916,10 @@ + + chdir( strInitPath ); + rmdir( strTmpPath ); ++#else ++ fprintf(stderr, "\nLeaving behind temporary directory: %s\n", ++ strTmpPath); ++#endif + } + + void makeSymLink( char* s ) diff --git a/editors/openoffice.org-2.0/files/patch-config_office+configure.in b/editors/openoffice.org-2.0/files/patch-config_office+configure.in index bc28e6f4a92d..5a563718c8e0 100644 --- a/editors/openoffice.org-2.0/files/patch-config_office+configure.in +++ b/editors/openoffice.org-2.0/files/patch-config_office+configure.in @@ -1,6 +1,18 @@ --- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Tue Jun 4 14:11:42 2002 -@@ -103,6 +103,12 @@ ++++ configure.in Thu Jun 6 13:10:49 2002 +@@ -28,6 +28,11 @@ + + Usage: --enable-gcc3 + ],,) ++AC_ARG_ENABLE(debug, ++[ --enable-debug if you like to build with debug symbols ++ ++ Usage: --enable-debug ++],,) + AC_ARG_WITH(stlport4-home, + [ --with-stlport4-home The location that STLport4 is installed in. The STL + header files are assumed to be in stlport4-home/stlport +@@ -103,6 +108,12 @@ Usage: --with-asm-home=<path to ml.exe directory> ],,) @@ -13,7 +25,7 @@ AC_ARG_WITH(unzip-home, [ --with-unzip-home For Windows users, please supply the path for unzip.exe. -@@ -241,7 +247,7 @@ +@@ -241,7 +252,7 @@ if test "$_os" != "WINNT" && test -z "$with_gcc_home"; then AC_PROG_CC fi @@ -22,7 +34,7 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +283,13 @@ +@@ -277,13 +288,13 @@ if test $GCC; then AC_MSG_CHECKING([the GNU gcc compiler version]) @@ -39,7 +51,7 @@ fi _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` if test -n "$enable_gcc3"; then -@@ -296,13 +302,13 @@ +@@ -296,13 +307,13 @@ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn COMPATH="NO_GCC" else @@ -55,7 +67,7 @@ if test "$_gcc_minor" = "false"; then AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn -@@ -366,8 +372,9 @@ +@@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi else @@ -67,7 +79,7 @@ else AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) >> warn -@@ -408,6 +415,71 @@ +@@ -408,6 +420,71 @@ fi fi fi @@ -139,7 +151,7 @@ if test "$_os" = "Darwin"; then if test "$CC" = "cc"; then AC_PATH_PROGS(_cc, cc) -@@ -589,6 +661,26 @@ +@@ -589,6 +666,26 @@ fi fi @@ -166,7 +178,7 @@ dnl ************************************************************** dnl Testing for required Solaris and workshop compiler patches... dnl ************************************************************** -@@ -815,6 +907,10 @@ +@@ -815,6 +912,10 @@ fi if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` @@ -177,18 +189,32 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1196,12 +1292,13 @@ +@@ -1169,6 +1270,12 @@ + USE_GCC3="FALSE" + fi + ++if test -n "$enable_debug"; then ++ ENABLE_DEBUG="TRUE" ++else ++ ENABLE_DEBUG="FALSE" ++fi ++ + # Print args passed to set_soenv. + if test 1 = 1; then + echo +@@ -1196,12 +1303,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 +echo "\$EXCEPTIONS="$exceptions_type ++echo "\$ENABLE_DEBUG="$ENABLE_DEBUG echo fi # Executing the set_soenv script to setup the environment variables. if test -z "$enable_check_only"; then - './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 -+ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type ++ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type $ENABLE_DEBUG else echo echo Test Complete diff --git a/editors/openoffice.org-2.0/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2.0/files/patch-solenv+inc+unxfbsdi.mk index b020a1924fb4..d9a06e4a004f 100644 --- a/editors/openoffice.org-2.0/files/patch-solenv+inc+unxfbsdi.mk +++ b/editors/openoffice.org-2.0/files/patch-solenv+inc+unxfbsdi.mk @@ -90,7 +90,7 @@ +CFLAGSPROF=-pg + +# Compiler flags for debugging -+CFLAGSDEBUG=-g ++CFLAGSDEBUG=-g -ggdb CFLAGSDBGUTIL= -CFLAGSOPT= -O2 -CFLAGSNOOPT= -O diff --git a/editors/openoffice.org-2/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-2/files/debugpatch-setup2+mow+source+loader+loader.c new file mode 100644 index 000000000000..96c651ce22c8 --- /dev/null +++ b/editors/openoffice.org-2/files/debugpatch-setup2+mow+source+loader+loader.c @@ -0,0 +1,21 @@ +--- ../setup2/mow/source/loader/loader.c.orig2 Thu Jun 6 11:23:17 2002 ++++ ../setup2/mow/source/loader/loader.c Thu Jun 6 11:24:14 2002 +@@ -902,6 +902,7 @@ + + void KillSetupDir() + { ++#if 0 + DIR* pDir = opendir( strTmpPath ); + struct dirent* pFile; + +@@ -915,6 +916,10 @@ + + chdir( strInitPath ); + rmdir( strTmpPath ); ++#else ++ fprintf(stderr, "\nLeaving behind temporary directory: %s\n", ++ strTmpPath); ++#endif + } + + void makeSymLink( char* s ) diff --git a/editors/openoffice.org-2/files/patch-config_office+configure.in b/editors/openoffice.org-2/files/patch-config_office+configure.in index bc28e6f4a92d..5a563718c8e0 100644 --- a/editors/openoffice.org-2/files/patch-config_office+configure.in +++ b/editors/openoffice.org-2/files/patch-config_office+configure.in @@ -1,6 +1,18 @@ --- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Tue Jun 4 14:11:42 2002 -@@ -103,6 +103,12 @@ ++++ configure.in Thu Jun 6 13:10:49 2002 +@@ -28,6 +28,11 @@ + + Usage: --enable-gcc3 + ],,) ++AC_ARG_ENABLE(debug, ++[ --enable-debug if you like to build with debug symbols ++ ++ Usage: --enable-debug ++],,) + AC_ARG_WITH(stlport4-home, + [ --with-stlport4-home The location that STLport4 is installed in. The STL + header files are assumed to be in stlport4-home/stlport +@@ -103,6 +108,12 @@ Usage: --with-asm-home=<path to ml.exe directory> ],,) @@ -13,7 +25,7 @@ AC_ARG_WITH(unzip-home, [ --with-unzip-home For Windows users, please supply the path for unzip.exe. -@@ -241,7 +247,7 @@ +@@ -241,7 +252,7 @@ if test "$_os" != "WINNT" && test -z "$with_gcc_home"; then AC_PROG_CC fi @@ -22,7 +34,7 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +283,13 @@ +@@ -277,13 +288,13 @@ if test $GCC; then AC_MSG_CHECKING([the GNU gcc compiler version]) @@ -39,7 +51,7 @@ fi _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` if test -n "$enable_gcc3"; then -@@ -296,13 +302,13 @@ +@@ -296,13 +307,13 @@ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn COMPATH="NO_GCC" else @@ -55,7 +67,7 @@ if test "$_gcc_minor" = "false"; then AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn -@@ -366,8 +372,9 @@ +@@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi else @@ -67,7 +79,7 @@ else AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) >> warn -@@ -408,6 +415,71 @@ +@@ -408,6 +420,71 @@ fi fi fi @@ -139,7 +151,7 @@ if test "$_os" = "Darwin"; then if test "$CC" = "cc"; then AC_PATH_PROGS(_cc, cc) -@@ -589,6 +661,26 @@ +@@ -589,6 +666,26 @@ fi fi @@ -166,7 +178,7 @@ dnl ************************************************************** dnl Testing for required Solaris and workshop compiler patches... dnl ************************************************************** -@@ -815,6 +907,10 @@ +@@ -815,6 +912,10 @@ fi if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` @@ -177,18 +189,32 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1196,12 +1292,13 @@ +@@ -1169,6 +1270,12 @@ + USE_GCC3="FALSE" + fi + ++if test -n "$enable_debug"; then ++ ENABLE_DEBUG="TRUE" ++else ++ ENABLE_DEBUG="FALSE" ++fi ++ + # Print args passed to set_soenv. + if test 1 = 1; then + echo +@@ -1196,12 +1303,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 +echo "\$EXCEPTIONS="$exceptions_type ++echo "\$ENABLE_DEBUG="$ENABLE_DEBUG echo fi # Executing the set_soenv script to setup the environment variables. if test -z "$enable_check_only"; then - './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 -+ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type ++ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type $ENABLE_DEBUG else echo echo Test Complete diff --git a/editors/openoffice.org-2/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2/files/patch-solenv+inc+unxfbsdi.mk index b020a1924fb4..d9a06e4a004f 100644 --- a/editors/openoffice.org-2/files/patch-solenv+inc+unxfbsdi.mk +++ b/editors/openoffice.org-2/files/patch-solenv+inc+unxfbsdi.mk @@ -90,7 +90,7 @@ +CFLAGSPROF=-pg + +# Compiler flags for debugging -+CFLAGSDEBUG=-g ++CFLAGSDEBUG=-g -ggdb CFLAGSDBGUTIL= -CFLAGSOPT= -O2 -CFLAGSNOOPT= -O diff --git a/editors/openoffice.org-3-RC/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-3-RC/files/debugpatch-setup2+mow+source+loader+loader.c new file mode 100644 index 000000000000..96c651ce22c8 --- /dev/null +++ b/editors/openoffice.org-3-RC/files/debugpatch-setup2+mow+source+loader+loader.c @@ -0,0 +1,21 @@ +--- ../setup2/mow/source/loader/loader.c.orig2 Thu Jun 6 11:23:17 2002 ++++ ../setup2/mow/source/loader/loader.c Thu Jun 6 11:24:14 2002 +@@ -902,6 +902,7 @@ + + void KillSetupDir() + { ++#if 0 + DIR* pDir = opendir( strTmpPath ); + struct dirent* pFile; + +@@ -915,6 +916,10 @@ + + chdir( strInitPath ); + rmdir( strTmpPath ); ++#else ++ fprintf(stderr, "\nLeaving behind temporary directory: %s\n", ++ strTmpPath); ++#endif + } + + void makeSymLink( char* s ) diff --git a/editors/openoffice.org-3-RC/files/patch-config_office+configure.in b/editors/openoffice.org-3-RC/files/patch-config_office+configure.in index bc28e6f4a92d..5a563718c8e0 100644 --- a/editors/openoffice.org-3-RC/files/patch-config_office+configure.in +++ b/editors/openoffice.org-3-RC/files/patch-config_office+configure.in @@ -1,6 +1,18 @@ --- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Tue Jun 4 14:11:42 2002 -@@ -103,6 +103,12 @@ ++++ configure.in Thu Jun 6 13:10:49 2002 +@@ -28,6 +28,11 @@ + + Usage: --enable-gcc3 + ],,) ++AC_ARG_ENABLE(debug, ++[ --enable-debug if you like to build with debug symbols ++ ++ Usage: --enable-debug ++],,) + AC_ARG_WITH(stlport4-home, + [ --with-stlport4-home The location that STLport4 is installed in. The STL + header files are assumed to be in stlport4-home/stlport +@@ -103,6 +108,12 @@ Usage: --with-asm-home=<path to ml.exe directory> ],,) @@ -13,7 +25,7 @@ AC_ARG_WITH(unzip-home, [ --with-unzip-home For Windows users, please supply the path for unzip.exe. -@@ -241,7 +247,7 @@ +@@ -241,7 +252,7 @@ if test "$_os" != "WINNT" && test -z "$with_gcc_home"; then AC_PROG_CC fi @@ -22,7 +34,7 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +283,13 @@ +@@ -277,13 +288,13 @@ if test $GCC; then AC_MSG_CHECKING([the GNU gcc compiler version]) @@ -39,7 +51,7 @@ fi _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` if test -n "$enable_gcc3"; then -@@ -296,13 +302,13 @@ +@@ -296,13 +307,13 @@ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn COMPATH="NO_GCC" else @@ -55,7 +67,7 @@ if test "$_gcc_minor" = "false"; then AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn -@@ -366,8 +372,9 @@ +@@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi else @@ -67,7 +79,7 @@ else AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) >> warn -@@ -408,6 +415,71 @@ +@@ -408,6 +420,71 @@ fi fi fi @@ -139,7 +151,7 @@ if test "$_os" = "Darwin"; then if test "$CC" = "cc"; then AC_PATH_PROGS(_cc, cc) -@@ -589,6 +661,26 @@ +@@ -589,6 +666,26 @@ fi fi @@ -166,7 +178,7 @@ dnl ************************************************************** dnl Testing for required Solaris and workshop compiler patches... dnl ************************************************************** -@@ -815,6 +907,10 @@ +@@ -815,6 +912,10 @@ fi if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` @@ -177,18 +189,32 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1196,12 +1292,13 @@ +@@ -1169,6 +1270,12 @@ + USE_GCC3="FALSE" + fi + ++if test -n "$enable_debug"; then ++ ENABLE_DEBUG="TRUE" ++else ++ ENABLE_DEBUG="FALSE" ++fi ++ + # Print args passed to set_soenv. + if test 1 = 1; then + echo +@@ -1196,12 +1303,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 +echo "\$EXCEPTIONS="$exceptions_type ++echo "\$ENABLE_DEBUG="$ENABLE_DEBUG echo fi # Executing the set_soenv script to setup the environment variables. if test -z "$enable_check_only"; then - './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 -+ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type ++ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type $ENABLE_DEBUG else echo echo Test Complete diff --git a/editors/openoffice.org-3-RC/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-3-RC/files/patch-solenv+inc+unxfbsdi.mk index b020a1924fb4..d9a06e4a004f 100644 --- a/editors/openoffice.org-3-RC/files/patch-solenv+inc+unxfbsdi.mk +++ b/editors/openoffice.org-3-RC/files/patch-solenv+inc+unxfbsdi.mk @@ -90,7 +90,7 @@ +CFLAGSPROF=-pg + +# Compiler flags for debugging -+CFLAGSDEBUG=-g ++CFLAGSDEBUG=-g -ggdb CFLAGSDBGUTIL= -CFLAGSOPT= -O2 -CFLAGSNOOPT= -O diff --git a/editors/openoffice.org-3-devel/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-3-devel/files/debugpatch-setup2+mow+source+loader+loader.c new file mode 100644 index 000000000000..96c651ce22c8 --- /dev/null +++ b/editors/openoffice.org-3-devel/files/debugpatch-setup2+mow+source+loader+loader.c @@ -0,0 +1,21 @@ +--- ../setup2/mow/source/loader/loader.c.orig2 Thu Jun 6 11:23:17 2002 ++++ ../setup2/mow/source/loader/loader.c Thu Jun 6 11:24:14 2002 +@@ -902,6 +902,7 @@ + + void KillSetupDir() + { ++#if 0 + DIR* pDir = opendir( strTmpPath ); + struct dirent* pFile; + +@@ -915,6 +916,10 @@ + + chdir( strInitPath ); + rmdir( strTmpPath ); ++#else ++ fprintf(stderr, "\nLeaving behind temporary directory: %s\n", ++ strTmpPath); ++#endif + } + + void makeSymLink( char* s ) diff --git a/editors/openoffice.org-3-devel/files/patch-config_office+configure.in b/editors/openoffice.org-3-devel/files/patch-config_office+configure.in index bc28e6f4a92d..5a563718c8e0 100644 --- a/editors/openoffice.org-3-devel/files/patch-config_office+configure.in +++ b/editors/openoffice.org-3-devel/files/patch-config_office+configure.in @@ -1,6 +1,18 @@ --- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Tue Jun 4 14:11:42 2002 -@@ -103,6 +103,12 @@ ++++ configure.in Thu Jun 6 13:10:49 2002 +@@ -28,6 +28,11 @@ + + Usage: --enable-gcc3 + ],,) ++AC_ARG_ENABLE(debug, ++[ --enable-debug if you like to build with debug symbols ++ ++ Usage: --enable-debug ++],,) + AC_ARG_WITH(stlport4-home, + [ --with-stlport4-home The location that STLport4 is installed in. The STL + header files are assumed to be in stlport4-home/stlport +@@ -103,6 +108,12 @@ Usage: --with-asm-home=<path to ml.exe directory> ],,) @@ -13,7 +25,7 @@ AC_ARG_WITH(unzip-home, [ --with-unzip-home For Windows users, please supply the path for unzip.exe. -@@ -241,7 +247,7 @@ +@@ -241,7 +252,7 @@ if test "$_os" != "WINNT" && test -z "$with_gcc_home"; then AC_PROG_CC fi @@ -22,7 +34,7 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +283,13 @@ +@@ -277,13 +288,13 @@ if test $GCC; then AC_MSG_CHECKING([the GNU gcc compiler version]) @@ -39,7 +51,7 @@ fi _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` if test -n "$enable_gcc3"; then -@@ -296,13 +302,13 @@ +@@ -296,13 +307,13 @@ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn COMPATH="NO_GCC" else @@ -55,7 +67,7 @@ if test "$_gcc_minor" = "false"; then AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn -@@ -366,8 +372,9 @@ +@@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi else @@ -67,7 +79,7 @@ else AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) >> warn -@@ -408,6 +415,71 @@ +@@ -408,6 +420,71 @@ fi fi fi @@ -139,7 +151,7 @@ if test "$_os" = "Darwin"; then if test "$CC" = "cc"; then AC_PATH_PROGS(_cc, cc) -@@ -589,6 +661,26 @@ +@@ -589,6 +666,26 @@ fi fi @@ -166,7 +178,7 @@ dnl ************************************************************** dnl Testing for required Solaris and workshop compiler patches... dnl ************************************************************** -@@ -815,6 +907,10 @@ +@@ -815,6 +912,10 @@ fi if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` @@ -177,18 +189,32 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1196,12 +1292,13 @@ +@@ -1169,6 +1270,12 @@ + USE_GCC3="FALSE" + fi + ++if test -n "$enable_debug"; then ++ ENABLE_DEBUG="TRUE" ++else ++ ENABLE_DEBUG="FALSE" ++fi ++ + # Print args passed to set_soenv. + if test 1 = 1; then + echo +@@ -1196,12 +1303,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 +echo "\$EXCEPTIONS="$exceptions_type ++echo "\$ENABLE_DEBUG="$ENABLE_DEBUG echo fi # Executing the set_soenv script to setup the environment variables. if test -z "$enable_check_only"; then - './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 -+ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type ++ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type $ENABLE_DEBUG else echo echo Test Complete diff --git a/editors/openoffice.org-3-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-3-devel/files/patch-solenv+inc+unxfbsdi.mk index b020a1924fb4..d9a06e4a004f 100644 --- a/editors/openoffice.org-3-devel/files/patch-solenv+inc+unxfbsdi.mk +++ b/editors/openoffice.org-3-devel/files/patch-solenv+inc+unxfbsdi.mk @@ -90,7 +90,7 @@ +CFLAGSPROF=-pg + +# Compiler flags for debugging -+CFLAGSDEBUG=-g ++CFLAGSDEBUG=-g -ggdb CFLAGSDBGUTIL= -CFLAGSOPT= -O2 -CFLAGSNOOPT= -O diff --git a/editors/openoffice.org-3/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-3/files/debugpatch-setup2+mow+source+loader+loader.c new file mode 100644 index 000000000000..96c651ce22c8 --- /dev/null +++ b/editors/openoffice.org-3/files/debugpatch-setup2+mow+source+loader+loader.c @@ -0,0 +1,21 @@ +--- ../setup2/mow/source/loader/loader.c.orig2 Thu Jun 6 11:23:17 2002 ++++ ../setup2/mow/source/loader/loader.c Thu Jun 6 11:24:14 2002 +@@ -902,6 +902,7 @@ + + void KillSetupDir() + { ++#if 0 + DIR* pDir = opendir( strTmpPath ); + struct dirent* pFile; + +@@ -915,6 +916,10 @@ + + chdir( strInitPath ); + rmdir( strTmpPath ); ++#else ++ fprintf(stderr, "\nLeaving behind temporary directory: %s\n", ++ strTmpPath); ++#endif + } + + void makeSymLink( char* s ) diff --git a/editors/openoffice.org-3/files/patch-config_office+configure.in b/editors/openoffice.org-3/files/patch-config_office+configure.in index bc28e6f4a92d..5a563718c8e0 100644 --- a/editors/openoffice.org-3/files/patch-config_office+configure.in +++ b/editors/openoffice.org-3/files/patch-config_office+configure.in @@ -1,6 +1,18 @@ --- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Tue Jun 4 14:11:42 2002 -@@ -103,6 +103,12 @@ ++++ configure.in Thu Jun 6 13:10:49 2002 +@@ -28,6 +28,11 @@ + + Usage: --enable-gcc3 + ],,) ++AC_ARG_ENABLE(debug, ++[ --enable-debug if you like to build with debug symbols ++ ++ Usage: --enable-debug ++],,) + AC_ARG_WITH(stlport4-home, + [ --with-stlport4-home The location that STLport4 is installed in. The STL + header files are assumed to be in stlport4-home/stlport +@@ -103,6 +108,12 @@ Usage: --with-asm-home=<path to ml.exe directory> ],,) @@ -13,7 +25,7 @@ AC_ARG_WITH(unzip-home, [ --with-unzip-home For Windows users, please supply the path for unzip.exe. -@@ -241,7 +247,7 @@ +@@ -241,7 +252,7 @@ if test "$_os" != "WINNT" && test -z "$with_gcc_home"; then AC_PROG_CC fi @@ -22,7 +34,7 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +283,13 @@ +@@ -277,13 +288,13 @@ if test $GCC; then AC_MSG_CHECKING([the GNU gcc compiler version]) @@ -39,7 +51,7 @@ fi _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` if test -n "$enable_gcc3"; then -@@ -296,13 +302,13 @@ +@@ -296,13 +307,13 @@ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn COMPATH="NO_GCC" else @@ -55,7 +67,7 @@ if test "$_gcc_minor" = "false"; then AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn -@@ -366,8 +372,9 @@ +@@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi else @@ -67,7 +79,7 @@ else AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) >> warn -@@ -408,6 +415,71 @@ +@@ -408,6 +420,71 @@ fi fi fi @@ -139,7 +151,7 @@ if test "$_os" = "Darwin"; then if test "$CC" = "cc"; then AC_PATH_PROGS(_cc, cc) -@@ -589,6 +661,26 @@ +@@ -589,6 +666,26 @@ fi fi @@ -166,7 +178,7 @@ dnl ************************************************************** dnl Testing for required Solaris and workshop compiler patches... dnl ************************************************************** -@@ -815,6 +907,10 @@ +@@ -815,6 +912,10 @@ fi if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` @@ -177,18 +189,32 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1196,12 +1292,13 @@ +@@ -1169,6 +1270,12 @@ + USE_GCC3="FALSE" + fi + ++if test -n "$enable_debug"; then ++ ENABLE_DEBUG="TRUE" ++else ++ ENABLE_DEBUG="FALSE" ++fi ++ + # Print args passed to set_soenv. + if test 1 = 1; then + echo +@@ -1196,12 +1303,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 +echo "\$EXCEPTIONS="$exceptions_type ++echo "\$ENABLE_DEBUG="$ENABLE_DEBUG echo fi # Executing the set_soenv script to setup the environment variables. if test -z "$enable_check_only"; then - './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 -+ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type ++ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type $ENABLE_DEBUG else echo echo Test Complete diff --git a/editors/openoffice.org-3/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-3/files/patch-solenv+inc+unxfbsdi.mk index b020a1924fb4..d9a06e4a004f 100644 --- a/editors/openoffice.org-3/files/patch-solenv+inc+unxfbsdi.mk +++ b/editors/openoffice.org-3/files/patch-solenv+inc+unxfbsdi.mk @@ -90,7 +90,7 @@ +CFLAGSPROF=-pg + +# Compiler flags for debugging -+CFLAGSDEBUG=-g ++CFLAGSDEBUG=-g -ggdb CFLAGSDBGUTIL= -CFLAGSOPT= -O2 -CFLAGSNOOPT= -O diff --git a/editors/openoffice.org-vcltesttool/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-vcltesttool/files/debugpatch-setup2+mow+source+loader+loader.c new file mode 100644 index 000000000000..96c651ce22c8 --- /dev/null +++ b/editors/openoffice.org-vcltesttool/files/debugpatch-setup2+mow+source+loader+loader.c @@ -0,0 +1,21 @@ +--- ../setup2/mow/source/loader/loader.c.orig2 Thu Jun 6 11:23:17 2002 ++++ ../setup2/mow/source/loader/loader.c Thu Jun 6 11:24:14 2002 +@@ -902,6 +902,7 @@ + + void KillSetupDir() + { ++#if 0 + DIR* pDir = opendir( strTmpPath ); + struct dirent* pFile; + +@@ -915,6 +916,10 @@ + + chdir( strInitPath ); + rmdir( strTmpPath ); ++#else ++ fprintf(stderr, "\nLeaving behind temporary directory: %s\n", ++ strTmpPath); ++#endif + } + + void makeSymLink( char* s ) diff --git a/editors/openoffice.org-vcltesttool/files/patch-config_office+configure.in b/editors/openoffice.org-vcltesttool/files/patch-config_office+configure.in index bc28e6f4a92d..5a563718c8e0 100644 --- a/editors/openoffice.org-vcltesttool/files/patch-config_office+configure.in +++ b/editors/openoffice.org-vcltesttool/files/patch-config_office+configure.in @@ -1,6 +1,18 @@ --- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Tue Jun 4 14:11:42 2002 -@@ -103,6 +103,12 @@ ++++ configure.in Thu Jun 6 13:10:49 2002 +@@ -28,6 +28,11 @@ + + Usage: --enable-gcc3 + ],,) ++AC_ARG_ENABLE(debug, ++[ --enable-debug if you like to build with debug symbols ++ ++ Usage: --enable-debug ++],,) + AC_ARG_WITH(stlport4-home, + [ --with-stlport4-home The location that STLport4 is installed in. The STL + header files are assumed to be in stlport4-home/stlport +@@ -103,6 +108,12 @@ Usage: --with-asm-home=<path to ml.exe directory> ],,) @@ -13,7 +25,7 @@ AC_ARG_WITH(unzip-home, [ --with-unzip-home For Windows users, please supply the path for unzip.exe. -@@ -241,7 +247,7 @@ +@@ -241,7 +252,7 @@ if test "$_os" != "WINNT" && test -z "$with_gcc_home"; then AC_PROG_CC fi @@ -22,7 +34,7 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +283,13 @@ +@@ -277,13 +288,13 @@ if test $GCC; then AC_MSG_CHECKING([the GNU gcc compiler version]) @@ -39,7 +51,7 @@ fi _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` if test -n "$enable_gcc3"; then -@@ -296,13 +302,13 @@ +@@ -296,13 +307,13 @@ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn COMPATH="NO_GCC" else @@ -55,7 +67,7 @@ if test "$_gcc_minor" = "false"; then AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn -@@ -366,8 +372,9 @@ +@@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi else @@ -67,7 +79,7 @@ else AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) >> warn -@@ -408,6 +415,71 @@ +@@ -408,6 +420,71 @@ fi fi fi @@ -139,7 +151,7 @@ if test "$_os" = "Darwin"; then if test "$CC" = "cc"; then AC_PATH_PROGS(_cc, cc) -@@ -589,6 +661,26 @@ +@@ -589,6 +666,26 @@ fi fi @@ -166,7 +178,7 @@ dnl ************************************************************** dnl Testing for required Solaris and workshop compiler patches... dnl ************************************************************** -@@ -815,6 +907,10 @@ +@@ -815,6 +912,10 @@ fi if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` @@ -177,18 +189,32 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1196,12 +1292,13 @@ +@@ -1169,6 +1270,12 @@ + USE_GCC3="FALSE" + fi + ++if test -n "$enable_debug"; then ++ ENABLE_DEBUG="TRUE" ++else ++ ENABLE_DEBUG="FALSE" ++fi ++ + # Print args passed to set_soenv. + if test 1 = 1; then + echo +@@ -1196,12 +1303,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 +echo "\$EXCEPTIONS="$exceptions_type ++echo "\$ENABLE_DEBUG="$ENABLE_DEBUG echo fi # Executing the set_soenv script to setup the environment variables. if test -z "$enable_check_only"; then - './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 -+ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type ++ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type $ENABLE_DEBUG else echo echo Test Complete diff --git a/editors/openoffice.org-vcltesttool/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-vcltesttool/files/patch-solenv+inc+unxfbsdi.mk index b020a1924fb4..d9a06e4a004f 100644 --- a/editors/openoffice.org-vcltesttool/files/patch-solenv+inc+unxfbsdi.mk +++ b/editors/openoffice.org-vcltesttool/files/patch-solenv+inc+unxfbsdi.mk @@ -90,7 +90,7 @@ +CFLAGSPROF=-pg + +# Compiler flags for debugging -+CFLAGSDEBUG=-g ++CFLAGSDEBUG=-g -ggdb CFLAGSDBGUTIL= -CFLAGSOPT= -O2 -CFLAGSNOOPT= -O diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile index 7b6c77346bf5..c2fc4d02c4f3 100644 --- a/editors/openoffice/Makefile +++ b/editors/openoffice/Makefile @@ -15,23 +15,24 @@ MASTER_SITES= ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/${PORTVERSION}/ \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/ \ http://people.freebsd.org/~mbr/distfiles/ DISTFILES= OOo_${PORTVERSION}_source.tar.bz2 gpc231.tar.Z \ - oo_moz1.0RC3_includes.tgz + oo_moz1.0RC3_includes.tgz ${MOZILLADIST} .include <bsd.port.pre.mk> .if ${OSVERSION} > 500000 .if defined(USE_GCC) && ${USE_GCC} == 2.95 -DISTFILES+= oo_moz1.0RC3_${ARCH}_FreeBSD-5-gcc2.95-ports.tar.gz +MOZILLADIST= oo_moz1.0RC3_${ARCH}_FreeBSD-5-gcc2.95-ports.tar.gz .else -DISTFILES+= oo_moz1.0RC3_${ARCH}_FreeBSD-5-gcc3.1-system.tar.gz +MOZILLADIST= oo_moz1.0RC3_${ARCH}_FreeBSD-5-gcc3.1-system.tar.gz .endif .else .if defined(USE_GCC) && ${USE_GCC} == 3.1 -DISTFILES+= oo_moz1.0RC3_${ARCH}_FreeBSD-4-gcc3.1-ports.tar.gz +MOZILLADIST= oo_moz1.0RC3_${ARCH}_FreeBSD-4-gcc3.1-ports.tar.gz .else -DISTFILES+= oo_moz1.0RC3_${ARCH}_FreeBSD-4-gcc2.95-system.tar.gz +MOZILLADIST= oo_moz1.0RC3_${ARCH}_FreeBSD-4-gcc2.95-system.tar.gz .endif .endif + EXTRACT_ONLY= OOo_${PORTVERSION}_source.tar.bz2 MAINTAINER= mbr@FreeBSD.org @@ -51,21 +52,7 @@ USE_GMAKE= yes EXTRACT_BEFORE_ARGS_R= -dc EXTRACT_AFTER_ARGS_R= | ${TAR} -xf - EXTRACT_CMD_R= ${GZIP_CMD} -.if ${OSVERSION} > 500000 -.if defined(USE_GCC) && ${USE_GCC} == 2.95 -EXTRACT_REST= gpc231.tar.Z oo_moz1.0RC3_${ARCH}_FreeBSD-5-gcc2.95-ports.tar.gz -.else -EXTRACT_REST= gpc231.tar.Z oo_moz1.0RC3_${ARCH}_FreeBSD-5-gcc3.1-system.tar.gz -.endif -.else -.if defined(USE_GCC) && ${USE_GCC} == 3.1 -EXTRACT_REST= gpc231.tar.Z oo_moz1.0RC3_${ARCH}_FreeBSD-4-gcc3.1-ports.tar.gz -.else -EXTRACT_REST= gpc231.tar.Z oo_moz1.0RC3_${ARCH}_FreeBSD-4-gcc2.95-system.tar.gz -.endif -.endif - -EXTRACT_REST+= oo_moz1.0RC3_includes.tgz +EXTRACT_REST= gpc231.tar.Z ${MOZILLADIST} oo_moz1.0RC3_includes.tgz JDK13DIR?= ${LOCALBASE}/jdk1.3.1 JAVAVM= ${JDK13DIR}/bin/java @@ -86,6 +73,10 @@ CONFIGURE_ARGS+= --with-jdk-home=${JDK13DIR} \ CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} .endif +.if defined(WITH_DEBUG) +CONFIGURE_ARGS+= --enable-debug +.endif + .if defined(USE_GCC) && (${USE_GCC} == 3.1 || ${USE_GCC} == 3.2) CONFIGURE_ARGS+= --enable-gcc3 .endif @@ -95,35 +86,47 @@ CONFIGURE_ARGS+= --enable-gcc3 .endif pre-fetch: +.if !defined(USE_GCC) || !defined(WITH_DEBUG) + @${ECHO} + @${ECHO} OPTIONS: +.endif .if !defined(USE_GCC) @${ECHO} - @${ECHO} You can compile openoffice with different + @${ECHO} You can compile OO with different @${ECHO} gcc compiler versions: @${ECHO} - @${ECHO} Use: USE_GCC=2.95 or USE_GCC=3.1 + @${ECHO} Add USE_GCC=2.95 or USE_GCC=3.1 @${ECHO} to compile openoffice with your @${ECHO} prefered compiler. +.endif +.if !defined(WITH_DEBUG) @${ECHO} + @${ECHO} You can compile OO with debug symbols + @${ECHO} if you call make with WITH_DEBUG=YES .endif .if ${OSVERSION} < 450002 @${ECHO} @${ECHO} OS-VERSION ${OSVERSION} too low @${ECHO} - @${ECHO} Openoffice need some important libc_r and + @${ECHO} OO need some important libc_r and @${ECHO} gcc fixes to build. Please upgrade to 4.6 - @${ECHO} PRE-RELEASE or RELEASE. + @${ECHO} RELEASE or 4.6 STABLE. @${FALSE} .endif @${ECHO} @${ECHO} NOTICE: @${ECHO} @${ECHO} To build Openoffice, you should have a lot - @${ECHO} of free diskspace \(~ 6GB\) and you should +.if defined(WITH_DEBUG) + @${ECHO} of free diskspace \(~ 8GB\) and you should +.else + @${ECHO} of free diskspace \(~ 4GB\) and you should +.endif @${ECHO} be an experienced port builder. This port @${ECHO} has beta quality and does not yet work as @${ECHO} stable as it should. @${ECHO} -pre-extract: + @${ECHO} KERNEL CONFIGURATION: @${ECHO} @${ECHO} Openoffice needs a larger stack- and @${ECHO} datasize to build. Check your limit @@ -143,8 +146,8 @@ pre-extract: @${ECHO} @${ECHO} langinfo.h is missing ! @${ECHO} - @${ECHO} Please upgrade to 4.5 STABLE or - @${ECHO} 4.6 RELEASE. + @${ECHO} Please upgrade to 4.6 RELEASE or + @${ECHO} 4.6 STABLE. @${ECHO} @${FALSE} .endif @@ -158,20 +161,53 @@ post-extract: exit 1; \ fi \ done - ${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/ - ${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/ - ${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/ - ${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/ - ${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/ + @${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/ + @${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/ + @${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/ + @${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/ + @${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/ post-patch: +.if defined(WITH_DEBUG) + @if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \ + ${ECHO_MSG} "===> Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \ + PATCHES_APPLIED="" ; \ + for i in ${PATCHDIR}/debugpatch-*; do \ + case $$i in \ + *.orig|*.rej|*~) \ + ${ECHO_MSG} "===> Ignoring patchfile $$i" ; \ + ;; \ + *) \ + if [ ${PATCH_DEBUG_TMP} = yes ]; then \ + ${ECHO_MSG} "===> Applying ${OPSYS} patch $$i" ; \ + fi; \ + if ${PATCH} ${PATCH_ARGS} < $$i ; then \ + PATCHES_APPLIED="$$PATCHES_APPLIED $$i" ; \ + else \ + ${ECHO_MSG} `${ECHO_CMD} ">> Patch $$i failed to apply cleanly." | ${SED} "s|${PATCHDIR}/||"` ; \ + if [ x"$$PATCHES_APPLIED" != x"" ]; then \ + ${ECHO_MSG} `${ECHO_CMD} ">> Patch(es) $$PATCHES_APPLIED applied cleanly." | ${SED} "s|${PATCHDIR}/||g"` ; \ + fi; \ + ${FALSE} ; \ + fi; \ + ;; \ + esac; \ + done; \ + fi; +.endif + @${ECHO_MSG} "===> Find old malloc.h defines and fix them in ${PKGNAME} source" @${FIND} ${WRKSRC}/.. | ${EGREP} "\.(cxx|h|c)$$" | ${XARGS} \ ${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g" do-build: @cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap +.if defined(WITH_DEBUG) @cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \ - tcsh -c 'source FreeBSDEnv.Set && dmake' + tcsh -c 'source FreeBSDEnv.Set && dmake debug=true' +.else + @cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \ + tcsh -c 'source FreeBSDEnv.Set && dmake strip=true' +.endif pre-install: @${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \ diff --git a/editors/openoffice/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice/files/debugpatch-setup2+mow+source+loader+loader.c new file mode 100644 index 000000000000..96c651ce22c8 --- /dev/null +++ b/editors/openoffice/files/debugpatch-setup2+mow+source+loader+loader.c @@ -0,0 +1,21 @@ +--- ../setup2/mow/source/loader/loader.c.orig2 Thu Jun 6 11:23:17 2002 ++++ ../setup2/mow/source/loader/loader.c Thu Jun 6 11:24:14 2002 +@@ -902,6 +902,7 @@ + + void KillSetupDir() + { ++#if 0 + DIR* pDir = opendir( strTmpPath ); + struct dirent* pFile; + +@@ -915,6 +916,10 @@ + + chdir( strInitPath ); + rmdir( strTmpPath ); ++#else ++ fprintf(stderr, "\nLeaving behind temporary directory: %s\n", ++ strTmpPath); ++#endif + } + + void makeSymLink( char* s ) diff --git a/editors/openoffice/files/debugpatch-setup2::mow::source::loader::loader.c b/editors/openoffice/files/debugpatch-setup2::mow::source::loader::loader.c new file mode 100644 index 000000000000..96c651ce22c8 --- /dev/null +++ b/editors/openoffice/files/debugpatch-setup2::mow::source::loader::loader.c @@ -0,0 +1,21 @@ +--- ../setup2/mow/source/loader/loader.c.orig2 Thu Jun 6 11:23:17 2002 ++++ ../setup2/mow/source/loader/loader.c Thu Jun 6 11:24:14 2002 +@@ -902,6 +902,7 @@ + + void KillSetupDir() + { ++#if 0 + DIR* pDir = opendir( strTmpPath ); + struct dirent* pFile; + +@@ -915,6 +916,10 @@ + + chdir( strInitPath ); + rmdir( strTmpPath ); ++#else ++ fprintf(stderr, "\nLeaving behind temporary directory: %s\n", ++ strTmpPath); ++#endif + } + + void makeSymLink( char* s ) diff --git a/editors/openoffice/files/patch-config_office+configure.in b/editors/openoffice/files/patch-config_office+configure.in index bc28e6f4a92d..5a563718c8e0 100644 --- a/editors/openoffice/files/patch-config_office+configure.in +++ b/editors/openoffice/files/patch-config_office+configure.in @@ -1,6 +1,18 @@ --- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Tue Jun 4 14:11:42 2002 -@@ -103,6 +103,12 @@ ++++ configure.in Thu Jun 6 13:10:49 2002 +@@ -28,6 +28,11 @@ + + Usage: --enable-gcc3 + ],,) ++AC_ARG_ENABLE(debug, ++[ --enable-debug if you like to build with debug symbols ++ ++ Usage: --enable-debug ++],,) + AC_ARG_WITH(stlport4-home, + [ --with-stlport4-home The location that STLport4 is installed in. The STL + header files are assumed to be in stlport4-home/stlport +@@ -103,6 +108,12 @@ Usage: --with-asm-home=<path to ml.exe directory> ],,) @@ -13,7 +25,7 @@ AC_ARG_WITH(unzip-home, [ --with-unzip-home For Windows users, please supply the path for unzip.exe. -@@ -241,7 +247,7 @@ +@@ -241,7 +252,7 @@ if test "$_os" != "WINNT" && test -z "$with_gcc_home"; then AC_PROG_CC fi @@ -22,7 +34,7 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +283,13 @@ +@@ -277,13 +288,13 @@ if test $GCC; then AC_MSG_CHECKING([the GNU gcc compiler version]) @@ -39,7 +51,7 @@ fi _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` if test -n "$enable_gcc3"; then -@@ -296,13 +302,13 @@ +@@ -296,13 +307,13 @@ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn COMPATH="NO_GCC" else @@ -55,7 +67,7 @@ if test "$_gcc_minor" = "false"; then AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn -@@ -366,8 +372,9 @@ +@@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi else @@ -67,7 +79,7 @@ else AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) >> warn -@@ -408,6 +415,71 @@ +@@ -408,6 +420,71 @@ fi fi fi @@ -139,7 +151,7 @@ if test "$_os" = "Darwin"; then if test "$CC" = "cc"; then AC_PATH_PROGS(_cc, cc) -@@ -589,6 +661,26 @@ +@@ -589,6 +666,26 @@ fi fi @@ -166,7 +178,7 @@ dnl ************************************************************** dnl Testing for required Solaris and workshop compiler patches... dnl ************************************************************** -@@ -815,6 +907,10 @@ +@@ -815,6 +912,10 @@ fi if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` @@ -177,18 +189,32 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1196,12 +1292,13 @@ +@@ -1169,6 +1270,12 @@ + USE_GCC3="FALSE" + fi + ++if test -n "$enable_debug"; then ++ ENABLE_DEBUG="TRUE" ++else ++ ENABLE_DEBUG="FALSE" ++fi ++ + # Print args passed to set_soenv. + if test 1 = 1; then + echo +@@ -1196,12 +1303,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 +echo "\$EXCEPTIONS="$exceptions_type ++echo "\$ENABLE_DEBUG="$ENABLE_DEBUG echo fi # Executing the set_soenv script to setup the environment variables. if test -z "$enable_check_only"; then - './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 -+ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type ++ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type $ENABLE_DEBUG else echo echo Test Complete diff --git a/editors/openoffice/files/patch-config_office+set_soenv.1 b/editors/openoffice/files/patch-config_office+set_soenv.1 index 66e6e4cbf2dd..6ef61a0b7151 100644 --- a/editors/openoffice/files/patch-config_office+set_soenv.1 +++ b/editors/openoffice/files/patch-config_office+set_soenv.1 @@ -1,11 +1,11 @@ --- set_soenv.1.orig Wed Apr 17 22:41:31 2002 -+++ set_soenv.1 Wed Jun 5 00:33:59 2002 ++++ set_soenv.1 Thu Jun 6 13:10:51 2002 @@ -40,7 +40,7 @@ # # Set this value equal to the corresponding amount of # command line arguments. -my $numArgs = 20; -+my $numArgs = 26; ++my $numArgs = 27; # Determining the amount of arguments in the call. my $numEnter = $#ARGV + 1; if ( $numEnter != $numArgs ) @@ -28,7 +28,16 @@ # #------------------------------------------- # IIc. Declaring the environment variables. -@@ -145,7 +146,10 @@ +@@ -96,7 +97,7 @@ + $SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL, + $COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME, + $BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS, +- $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3 ); ++ $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG); + # + #------------------------------------------- + # IId. Declaring the aliases. +@@ -145,7 +146,11 @@ $STLPORT4 = $ARGV [ 12 ]; # Location of STLport4 $MINGWIN32 = $ARGV [ 17 ]; # use MINGWIN32 $use_shell = $ARGV [ 18 ]; # preferred shell @@ -37,10 +46,11 @@ +$CC = $ARGV [ 23 ]; # get cc from environment +$CXX = $ARGV [ 24 ]; # use c++ from environment +$EXCEPTIONS = $ARGV [ 25 ]; # Exception handling type ++$ENABLE_DEBUG = $ARGV [ 26 ]; # Enable a debug build # #--------------------------------------------------------------- # IIIb. Initialising the variables for the system commands, etc. -@@ -316,7 +320,7 @@ +@@ -316,7 +321,7 @@ $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; $SOLAR_JAVA = "TRUE"; @@ -49,7 +59,7 @@ } elsif ( $platform eq "$FreeBSD" ) { print "Setting FreeBSD specific values... "; -@@ -326,7 +330,14 @@ +@@ -326,7 +331,14 @@ $COMPATH = $ARGV[ 0 ]; $CPU = "I"; $CPUNAME = "INTEL"; @@ -64,7 +74,7 @@ $DLLSUFFIX = "fi"; $GUI = "UNX"; $GUIBASE = "unx"; -@@ -339,6 +350,9 @@ +@@ -339,6 +351,9 @@ $PATH_SEPERATOR = $ps; $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; @@ -74,7 +84,7 @@ } elsif ( $platform eq "$Linux" ) { -@@ -934,15 +948,16 @@ +@@ -934,15 +949,16 @@ $D.$COM. $D.$CVER. $D.$GVER. @@ -94,7 +104,7 @@ { $SOLARDEF .= $D."GLIBC=".$GLIBC; } $SOLARDEF .= $D."SUPD=$UPD". -@@ -959,7 +974,7 @@ +@@ -959,7 +975,7 @@ $L.$USR_DT.$LIB. $L.$USR_OPENWIN.$LIB.'"'; } @@ -103,7 +113,7 @@ { $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB. $L.$LIB. $L.$USR.$LIB. -@@ -969,6 +984,11 @@ +@@ -969,6 +985,11 @@ { $SOLAREXTRALIB = '"'.$L.$LIB. $L.$USR.$LIB.'"'; } @@ -115,7 +125,7 @@ # Compiler include search directory paths. if (($platform eq "$Solaris") || ($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"'; -@@ -1039,7 +1059,7 @@ +@@ -1039,7 +1060,7 @@ $ps.$USR.$LIB. $ps.$USR_LOCAL.$BIN; } @@ -124,7 +134,7 @@ { $PATH = $cur_dir. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN. $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. -@@ -1058,6 +1078,22 @@ +@@ -1058,6 +1079,22 @@ $ps.$USR.$ds."X11".$BIN. $ps.$USR.$LIB; } @@ -147,7 +157,7 @@ elsif ($platform eq "$Winnt") { my ( $noldPATH ); -@@ -1155,7 +1191,7 @@ +@@ -1155,7 +1192,7 @@ $L_STLPORT_LIB. $L.$XLIB.'"'; } @@ -156,7 +166,7 @@ { $SOLARLIB = '"'.$L.$par_dir.$LIB. $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. -@@ -1167,6 +1203,15 @@ +@@ -1167,6 +1204,15 @@ $L_STLPORT_LIB. $L.$XLIB.'"'; } @@ -172,7 +182,7 @@ elsif ($platform eq "$Winnt") { $SOLARLIB = '"'.$L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. $L.$par_dir.$LIB. -@@ -1196,7 +1241,7 @@ +@@ -1196,7 +1242,7 @@ $SOLARINC .= $I.$USR.$INCLUDE; } $SOLARINC .= $STLPORT_stlport; @@ -181,7 +191,7 @@ { # This simply adds an include path, so even cases that break the FHS work $SOLARINC .= $STLPORT_inc_stlport; -@@ -1210,11 +1255,6 @@ +@@ -1210,11 +1256,6 @@ { $SOLARINC .= $I.'$COMPATH'.$ds."include"; } @@ -193,7 +203,17 @@ $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31". $I.'$JAVA_HOME'.$INCLUDE; -@@ -1407,6 +1447,12 @@ +@@ -1382,6 +1423,9 @@ + ToFile( "NEW_JAR_PACK", $NEW_JAR_PACK, "e" ); + ToFile( "NO_BSYMBOLIC", $NO_BSYMBOLIC, "e" ); + ToFile( "TF_FILTER", "TRUE", "e" ); ++if ($ENABLE_DEBUG eq "TRUE") { ++ToFile( "debug", "true", "e" ); ++} + if ( $platform ne "$Macosx" ) + { ToFile( "PSPRINT", "TRUE", "e" ); + } elsif ( $GUIBASE eq "unx" ) { +@@ -1407,6 +1451,12 @@ ToFile( "GUIENV", $GUIENV, "e" ); ToFile( "GVER", $GVER, "e" ); ToFile( "OS", $OS, "e" ); diff --git a/editors/openoffice/files/patch-config_office::configure.in b/editors/openoffice/files/patch-config_office::configure.in index bc28e6f4a92d..5a563718c8e0 100644 --- a/editors/openoffice/files/patch-config_office::configure.in +++ b/editors/openoffice/files/patch-config_office::configure.in @@ -1,6 +1,18 @@ --- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Tue Jun 4 14:11:42 2002 -@@ -103,6 +103,12 @@ ++++ configure.in Thu Jun 6 13:10:49 2002 +@@ -28,6 +28,11 @@ + + Usage: --enable-gcc3 + ],,) ++AC_ARG_ENABLE(debug, ++[ --enable-debug if you like to build with debug symbols ++ ++ Usage: --enable-debug ++],,) + AC_ARG_WITH(stlport4-home, + [ --with-stlport4-home The location that STLport4 is installed in. The STL + header files are assumed to be in stlport4-home/stlport +@@ -103,6 +108,12 @@ Usage: --with-asm-home=<path to ml.exe directory> ],,) @@ -13,7 +25,7 @@ AC_ARG_WITH(unzip-home, [ --with-unzip-home For Windows users, please supply the path for unzip.exe. -@@ -241,7 +247,7 @@ +@@ -241,7 +252,7 @@ if test "$_os" != "WINNT" && test -z "$with_gcc_home"; then AC_PROG_CC fi @@ -22,7 +34,7 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +283,13 @@ +@@ -277,13 +288,13 @@ if test $GCC; then AC_MSG_CHECKING([the GNU gcc compiler version]) @@ -39,7 +51,7 @@ fi _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` if test -n "$enable_gcc3"; then -@@ -296,13 +302,13 @@ +@@ -296,13 +307,13 @@ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn COMPATH="NO_GCC" else @@ -55,7 +67,7 @@ if test "$_gcc_minor" = "false"; then AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn -@@ -366,8 +372,9 @@ +@@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi else @@ -67,7 +79,7 @@ else AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) >> warn -@@ -408,6 +415,71 @@ +@@ -408,6 +420,71 @@ fi fi fi @@ -139,7 +151,7 @@ if test "$_os" = "Darwin"; then if test "$CC" = "cc"; then AC_PATH_PROGS(_cc, cc) -@@ -589,6 +661,26 @@ +@@ -589,6 +666,26 @@ fi fi @@ -166,7 +178,7 @@ dnl ************************************************************** dnl Testing for required Solaris and workshop compiler patches... dnl ************************************************************** -@@ -815,6 +907,10 @@ +@@ -815,6 +912,10 @@ fi if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` @@ -177,18 +189,32 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1196,12 +1292,13 @@ +@@ -1169,6 +1270,12 @@ + USE_GCC3="FALSE" + fi + ++if test -n "$enable_debug"; then ++ ENABLE_DEBUG="TRUE" ++else ++ ENABLE_DEBUG="FALSE" ++fi ++ + # Print args passed to set_soenv. + if test 1 = 1; then + echo +@@ -1196,12 +1303,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 +echo "\$EXCEPTIONS="$exceptions_type ++echo "\$ENABLE_DEBUG="$ENABLE_DEBUG echo fi # Executing the set_soenv script to setup the environment variables. if test -z "$enable_check_only"; then - './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 -+ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type ++ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type $ENABLE_DEBUG else echo echo Test Complete diff --git a/editors/openoffice/files/patch-set_soenv.1 b/editors/openoffice/files/patch-set_soenv.1 index 66e6e4cbf2dd..6ef61a0b7151 100644 --- a/editors/openoffice/files/patch-set_soenv.1 +++ b/editors/openoffice/files/patch-set_soenv.1 @@ -1,11 +1,11 @@ --- set_soenv.1.orig Wed Apr 17 22:41:31 2002 -+++ set_soenv.1 Wed Jun 5 00:33:59 2002 ++++ set_soenv.1 Thu Jun 6 13:10:51 2002 @@ -40,7 +40,7 @@ # # Set this value equal to the corresponding amount of # command line arguments. -my $numArgs = 20; -+my $numArgs = 26; ++my $numArgs = 27; # Determining the amount of arguments in the call. my $numEnter = $#ARGV + 1; if ( $numEnter != $numArgs ) @@ -28,7 +28,16 @@ # #------------------------------------------- # IIc. Declaring the environment variables. -@@ -145,7 +146,10 @@ +@@ -96,7 +97,7 @@ + $SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL, + $COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME, + $BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS, +- $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3 ); ++ $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG); + # + #------------------------------------------- + # IId. Declaring the aliases. +@@ -145,7 +146,11 @@ $STLPORT4 = $ARGV [ 12 ]; # Location of STLport4 $MINGWIN32 = $ARGV [ 17 ]; # use MINGWIN32 $use_shell = $ARGV [ 18 ]; # preferred shell @@ -37,10 +46,11 @@ +$CC = $ARGV [ 23 ]; # get cc from environment +$CXX = $ARGV [ 24 ]; # use c++ from environment +$EXCEPTIONS = $ARGV [ 25 ]; # Exception handling type ++$ENABLE_DEBUG = $ARGV [ 26 ]; # Enable a debug build # #--------------------------------------------------------------- # IIIb. Initialising the variables for the system commands, etc. -@@ -316,7 +320,7 @@ +@@ -316,7 +321,7 @@ $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; $SOLAR_JAVA = "TRUE"; @@ -49,7 +59,7 @@ } elsif ( $platform eq "$FreeBSD" ) { print "Setting FreeBSD specific values... "; -@@ -326,7 +330,14 @@ +@@ -326,7 +331,14 @@ $COMPATH = $ARGV[ 0 ]; $CPU = "I"; $CPUNAME = "INTEL"; @@ -64,7 +74,7 @@ $DLLSUFFIX = "fi"; $GUI = "UNX"; $GUIBASE = "unx"; -@@ -339,6 +350,9 @@ +@@ -339,6 +351,9 @@ $PATH_SEPERATOR = $ps; $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; @@ -74,7 +84,7 @@ } elsif ( $platform eq "$Linux" ) { -@@ -934,15 +948,16 @@ +@@ -934,15 +949,16 @@ $D.$COM. $D.$CVER. $D.$GVER. @@ -94,7 +104,7 @@ { $SOLARDEF .= $D."GLIBC=".$GLIBC; } $SOLARDEF .= $D."SUPD=$UPD". -@@ -959,7 +974,7 @@ +@@ -959,7 +975,7 @@ $L.$USR_DT.$LIB. $L.$USR_OPENWIN.$LIB.'"'; } @@ -103,7 +113,7 @@ { $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB. $L.$LIB. $L.$USR.$LIB. -@@ -969,6 +984,11 @@ +@@ -969,6 +985,11 @@ { $SOLAREXTRALIB = '"'.$L.$LIB. $L.$USR.$LIB.'"'; } @@ -115,7 +125,7 @@ # Compiler include search directory paths. if (($platform eq "$Solaris") || ($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"'; -@@ -1039,7 +1059,7 @@ +@@ -1039,7 +1060,7 @@ $ps.$USR.$LIB. $ps.$USR_LOCAL.$BIN; } @@ -124,7 +134,7 @@ { $PATH = $cur_dir. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN. $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. -@@ -1058,6 +1078,22 @@ +@@ -1058,6 +1079,22 @@ $ps.$USR.$ds."X11".$BIN. $ps.$USR.$LIB; } @@ -147,7 +157,7 @@ elsif ($platform eq "$Winnt") { my ( $noldPATH ); -@@ -1155,7 +1191,7 @@ +@@ -1155,7 +1192,7 @@ $L_STLPORT_LIB. $L.$XLIB.'"'; } @@ -156,7 +166,7 @@ { $SOLARLIB = '"'.$L.$par_dir.$LIB. $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. -@@ -1167,6 +1203,15 @@ +@@ -1167,6 +1204,15 @@ $L_STLPORT_LIB. $L.$XLIB.'"'; } @@ -172,7 +182,7 @@ elsif ($platform eq "$Winnt") { $SOLARLIB = '"'.$L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. $L.$par_dir.$LIB. -@@ -1196,7 +1241,7 @@ +@@ -1196,7 +1242,7 @@ $SOLARINC .= $I.$USR.$INCLUDE; } $SOLARINC .= $STLPORT_stlport; @@ -181,7 +191,7 @@ { # This simply adds an include path, so even cases that break the FHS work $SOLARINC .= $STLPORT_inc_stlport; -@@ -1210,11 +1255,6 @@ +@@ -1210,11 +1256,6 @@ { $SOLARINC .= $I.'$COMPATH'.$ds."include"; } @@ -193,7 +203,17 @@ $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31". $I.'$JAVA_HOME'.$INCLUDE; -@@ -1407,6 +1447,12 @@ +@@ -1382,6 +1423,9 @@ + ToFile( "NEW_JAR_PACK", $NEW_JAR_PACK, "e" ); + ToFile( "NO_BSYMBOLIC", $NO_BSYMBOLIC, "e" ); + ToFile( "TF_FILTER", "TRUE", "e" ); ++if ($ENABLE_DEBUG eq "TRUE") { ++ToFile( "debug", "true", "e" ); ++} + if ( $platform ne "$Macosx" ) + { ToFile( "PSPRINT", "TRUE", "e" ); + } elsif ( $GUIBASE eq "unx" ) { +@@ -1407,6 +1451,12 @@ ToFile( "GUIENV", $GUIENV, "e" ); ToFile( "GVER", $GVER, "e" ); ToFile( "OS", $OS, "e" ); diff --git a/editors/openoffice/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice/files/patch-solenv+inc+unxfbsdi.mk index b020a1924fb4..d9a06e4a004f 100644 --- a/editors/openoffice/files/patch-solenv+inc+unxfbsdi.mk +++ b/editors/openoffice/files/patch-solenv+inc+unxfbsdi.mk @@ -90,7 +90,7 @@ +CFLAGSPROF=-pg + +# Compiler flags for debugging -+CFLAGSDEBUG=-g ++CFLAGSDEBUG=-g -ggdb CFLAGSDBGUTIL= -CFLAGSOPT= -O2 -CFLAGSNOOPT= -O diff --git a/editors/openoffice/files/patch-solenv::inc::unxfbsdi.mk b/editors/openoffice/files/patch-solenv::inc::unxfbsdi.mk index b020a1924fb4..d9a06e4a004f 100644 --- a/editors/openoffice/files/patch-solenv::inc::unxfbsdi.mk +++ b/editors/openoffice/files/patch-solenv::inc::unxfbsdi.mk @@ -90,7 +90,7 @@ +CFLAGSPROF=-pg + +# Compiler flags for debugging -+CFLAGSDEBUG=-g ++CFLAGSDEBUG=-g -ggdb CFLAGSDBGUTIL= -CFLAGSOPT= -O2 -CFLAGSNOOPT= -O |