diff options
| author | mbr <mbr@FreeBSD.org> | 2002-03-14 03:23:32 +0800 |
|---|---|---|
| committer | mbr <mbr@FreeBSD.org> | 2002-03-14 03:23:32 +0800 |
| commit | 6c9a99e517b4ffbfe126675a9c276b9a6a846766 (patch) | |
| tree | a7b17d4f1fd9eadafa869d5ed21295878f126826 /editors | |
| parent | a8bd53f1dd9e1bb690a23173ce4a5bc0814d707a (diff) | |
| download | freebsd-ports-gnome-6c9a99e517b4ffbfe126675a9c276b9a6a846766.tar.gz freebsd-ports-gnome-6c9a99e517b4ffbfe126675a9c276b9a6a846766.tar.zst freebsd-ports-gnome-6c9a99e517b4ffbfe126675a9c276b9a6a846766.zip | |
Use CXX and CC, so we can specify cc295 and g++295 from ports. More
commits will follow.
Diffstat (limited to 'editors')
51 files changed, 629 insertions, 238 deletions
diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile index 0d27392347bc..5556075829d7 100644 --- a/editors/openoffice-1.1-devel/Makefile +++ b/editors/openoffice-1.1-devel/Makefile @@ -18,6 +18,7 @@ EXTRACT_ONLY= oo_${PORTVERSION}_src.tar.bz2 MAINTAINER= mbr@FreeBSD.org BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport +BUILD_DEPENDS+= ${LOCALBASE}/bin/gcc295:${PORTSDIR}/lang/gcc295 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 LIB_DEPENDS+= pth.14:${PORTSDIR}/devel/pth @@ -46,7 +47,9 @@ CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \ --with-os-version=${OSVERSION} CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ - PTHREAD_LIBS=${PTHREAD_LIBS} + PTHREAD_LIBS=${PTHREAD_LIBS} \ + CC=gcc295 \ + CXX=g++295 .include <bsd.port.pre.mk> diff --git a/editors/openoffice-1.1-devel/files/patch-set_soenv.1 b/editors/openoffice-1.1-devel/files/patch-set_soenv.1 index d3d34f896e88..bb2dccced07b 100644 --- a/editors/openoffice-1.1-devel/files/patch-set_soenv.1 +++ b/editors/openoffice-1.1-devel/files/patch-set_soenv.1 @@ -1,15 +1,22 @@ --- set_soenv.1.orig Wed Feb 27 10:46:41 2002 -+++ set_soenv.1 Mon Mar 11 13:46:57 2002 ++++ set_soenv.1 Wed Mar 13 19:13:01 2002 @@ -40,7 +40,7 @@ # # Set this value equal to the corresponding amount of # command line arguments. -my $numArgs = 19; -+my $numArgs = 22; ++my $numArgs = 24; # Determining the amount of arguments in the call. my $numEnter = $#ARGV + 1; if ( $numEnter != $numArgs ) -@@ -72,8 +72,9 @@ +@@ -66,14 +66,15 @@ + my ( $CALL_CDECL, $COMMON_OUTDIR, $NO_SRS_PATCH, $PROFULLSWITCH, $BIG_GOODIES, $BMP_WRITES_FLAG, + $common_build, $MK_UNROLL, $NO_REC_RES, $PROEXT, $SO3, $SOLAR_JAVA, + $SOLAR_PLUGIN, $TF_PACKAGES, $TF_SDBAPI, $TF_FILEURL, $UPDATER, $BUILD_DELIVER, $USE_NEWCHARSET, $USE_NEW_RSC, $VCL, +- $TF_CFGDATA, $TF_SVDATA, ++ $TF_CFGDATA, $TF_SVDATA, $CC, $CXX, + $USE_NAMESPACE, $BUILD_SOSL, $LOCAL_SOLENV, $ENABLEUNICODE, $NEW_JAR_PACK, $NO_BSYMBOLIC, + $USE_XPRINT, $BUILD_SOSL_RELEASE ); # # Platform dependent constant values. my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV, @@ -21,7 +28,16 @@ # #------------------------------------------- # IIc. Declaring the environment variables. -@@ -303,7 +304,7 @@ +@@ -145,6 +146,8 @@ + $STLPORT4 = $ARGV [ 12 ]; # Location of STLport4 + $MINGWIN32 = $ARGV [ 17 ]; # use MINGWIN32 + $USE_GCC3 = $ARGV [ 18 ]; # use gcc3 (only for unxlngi4 at the moment) ++$CC = $ARGV [ 22 ]; # get cc from environment ++$CXX = $ARGV [ 23 ]; # use c++ from environment + # + #--------------------------------------------------------------- + # IIIb. Initialising the variables for the system commands, etc. +@@ -303,7 +306,7 @@ $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; $SOLAR_JAVA = "TRUE"; @@ -30,7 +46,7 @@ } elsif ( $platform eq "$FreeBSD" ) { print "Setting FreeBSD specific values... "; -@@ -326,6 +327,9 @@ +@@ -326,6 +329,9 @@ $PATH_SEPERATOR = $ps; $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; @@ -40,7 +56,7 @@ } elsif ( $platform eq "$Linux" ) { -@@ -889,15 +893,16 @@ +@@ -889,15 +895,16 @@ $D.$COM. $D.$CVER. $D.$GVER. @@ -60,7 +76,7 @@ { $SOLARDEF .= $D."GLIBC=".$GLIBC; } $SOLARDEF .= $D."SUPD=$UPD". -@@ -990,7 +995,7 @@ +@@ -990,7 +997,7 @@ $ps.$USR.$LIB. $ps.$USR_LOCAL.$BIN; } @@ -69,7 +85,7 @@ { $PATH = $cur_dir. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN. $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. -@@ -1004,6 +1009,22 @@ +@@ -1004,6 +1011,22 @@ $ps.$USR.$BIN.$ds."X11". $ps.$USR.$LIB; } @@ -92,7 +108,7 @@ elsif ($platform eq "$Winnt") { $COMPATH_ROOT = $COMPATH; $COMPATH_ROOT =~ s/\/vc98$//; -@@ -1107,21 +1128,14 @@ +@@ -1107,21 +1130,14 @@ $SOLARINC .= $I.$USR.$INCLUDE; } $SOLARINC .= $STLPORT_stlport; @@ -117,8 +133,12 @@ { # This simply adds an include path, so even cases that break the FHS work $SOLARINC .= $STLPORT_inc_stlport; -@@ -1313,6 +1327,9 @@ +@@ -1311,8 +1327,13 @@ + ToFile( "GLIBC", $GLIBC, "e" ); + ToFile( "GUIBASE", $GUIBASE, "e" ); ToFile( "GUIENV", $GUIENV, "e" ); ++ToFile( "CC", $CC, "e" ); ++ToFile( "CXX", $CXX, "e" ); ToFile( "GVER", $GVER, "e" ); ToFile( "OS", $OS, "e" ); +ToFile( "OSVERSION", $OSVERSION, "e" ); 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 ab5e980366fb..3a9f86bb8d2f 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 @@ -1,5 +1,5 @@ --- ../solenv/inc/unxfbsdi.mk.orig Wed Oct 24 19:21:47 2001 -+++ ../solenv/inc/unxfbsdi.mk Sat Mar 9 23:28:50 2002 ++++ ../solenv/inc/unxfbsdi.mk Wed Mar 13 19:13:59 2002 @@ -1,84 +1,145 @@ - # mak file fuer unxfbsdi @@ -17,10 +17,10 @@ LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" +# name of C Compiler -+cc=gcc ++cc=$(CC) + +# name of C++ Compiler -+CC=g++ ++CC=$(CXX) + +# options for C and C++ Compiler +CDEFS+=-D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 -DOSVERSION=$(OSVERSION) diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile index 0d27392347bc..5556075829d7 100644 --- a/editors/openoffice-1.1/Makefile +++ b/editors/openoffice-1.1/Makefile @@ -18,6 +18,7 @@ EXTRACT_ONLY= oo_${PORTVERSION}_src.tar.bz2 MAINTAINER= mbr@FreeBSD.org BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport +BUILD_DEPENDS+= ${LOCALBASE}/bin/gcc295:${PORTSDIR}/lang/gcc295 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 LIB_DEPENDS+= pth.14:${PORTSDIR}/devel/pth @@ -46,7 +47,9 @@ CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \ --with-os-version=${OSVERSION} CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ - PTHREAD_LIBS=${PTHREAD_LIBS} + PTHREAD_LIBS=${PTHREAD_LIBS} \ + CC=gcc295 \ + CXX=g++295 .include <bsd.port.pre.mk> diff --git a/editors/openoffice-1.1/files/patch-set_soenv.1 b/editors/openoffice-1.1/files/patch-set_soenv.1 index d3d34f896e88..bb2dccced07b 100644 --- a/editors/openoffice-1.1/files/patch-set_soenv.1 +++ b/editors/openoffice-1.1/files/patch-set_soenv.1 @@ -1,15 +1,22 @@ --- set_soenv.1.orig Wed Feb 27 10:46:41 2002 -+++ set_soenv.1 Mon Mar 11 13:46:57 2002 ++++ set_soenv.1 Wed Mar 13 19:13:01 2002 @@ -40,7 +40,7 @@ # # Set this value equal to the corresponding amount of # command line arguments. -my $numArgs = 19; -+my $numArgs = 22; ++my $numArgs = 24; # Determining the amount of arguments in the call. my $numEnter = $#ARGV + 1; if ( $numEnter != $numArgs ) -@@ -72,8 +72,9 @@ +@@ -66,14 +66,15 @@ + my ( $CALL_CDECL, $COMMON_OUTDIR, $NO_SRS_PATCH, $PROFULLSWITCH, $BIG_GOODIES, $BMP_WRITES_FLAG, + $common_build, $MK_UNROLL, $NO_REC_RES, $PROEXT, $SO3, $SOLAR_JAVA, + $SOLAR_PLUGIN, $TF_PACKAGES, $TF_SDBAPI, $TF_FILEURL, $UPDATER, $BUILD_DELIVER, $USE_NEWCHARSET, $USE_NEW_RSC, $VCL, +- $TF_CFGDATA, $TF_SVDATA, ++ $TF_CFGDATA, $TF_SVDATA, $CC, $CXX, + $USE_NAMESPACE, $BUILD_SOSL, $LOCAL_SOLENV, $ENABLEUNICODE, $NEW_JAR_PACK, $NO_BSYMBOLIC, + $USE_XPRINT, $BUILD_SOSL_RELEASE ); # # Platform dependent constant values. my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV, @@ -21,7 +28,16 @@ # #------------------------------------------- # IIc. Declaring the environment variables. -@@ -303,7 +304,7 @@ +@@ -145,6 +146,8 @@ + $STLPORT4 = $ARGV [ 12 ]; # Location of STLport4 + $MINGWIN32 = $ARGV [ 17 ]; # use MINGWIN32 + $USE_GCC3 = $ARGV [ 18 ]; # use gcc3 (only for unxlngi4 at the moment) ++$CC = $ARGV [ 22 ]; # get cc from environment ++$CXX = $ARGV [ 23 ]; # use c++ from environment + # + #--------------------------------------------------------------- + # IIIb. Initialising the variables for the system commands, etc. +@@ -303,7 +306,7 @@ $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; $SOLAR_JAVA = "TRUE"; @@ -30,7 +46,7 @@ } elsif ( $platform eq "$FreeBSD" ) { print "Setting FreeBSD specific values... "; -@@ -326,6 +327,9 @@ +@@ -326,6 +329,9 @@ $PATH_SEPERATOR = $ps; $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; @@ -40,7 +56,7 @@ } elsif ( $platform eq "$Linux" ) { -@@ -889,15 +893,16 @@ +@@ -889,15 +895,16 @@ $D.$COM. $D.$CVER. $D.$GVER. @@ -60,7 +76,7 @@ { $SOLARDEF .= $D."GLIBC=".$GLIBC; } $SOLARDEF .= $D."SUPD=$UPD". -@@ -990,7 +995,7 @@ +@@ -990,7 +997,7 @@ $ps.$USR.$LIB. $ps.$USR_LOCAL.$BIN; } @@ -69,7 +85,7 @@ { $PATH = $cur_dir. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN. $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. -@@ -1004,6 +1009,22 @@ +@@ -1004,6 +1011,22 @@ $ps.$USR.$BIN.$ds."X11". $ps.$USR.$LIB; } @@ -92,7 +108,7 @@ elsif ($platform eq "$Winnt") { $COMPATH_ROOT = $COMPATH; $COMPATH_ROOT =~ s/\/vc98$//; -@@ -1107,21 +1128,14 @@ +@@ -1107,21 +1130,14 @@ $SOLARINC .= $I.$USR.$INCLUDE; } $SOLARINC .= $STLPORT_stlport; @@ -117,8 +133,12 @@ { # This simply adds an include path, so even cases that break the FHS work $SOLARINC .= $STLPORT_inc_stlport; -@@ -1313,6 +1327,9 @@ +@@ -1311,8 +1327,13 @@ + ToFile( "GLIBC", $GLIBC, "e" ); + ToFile( "GUIBASE", $GUIBASE, "e" ); ToFile( "GUIENV", $GUIENV, "e" ); ++ToFile( "CC", $CC, "e" ); ++ToFile( "CXX", $CXX, "e" ); ToFile( "GVER", $GVER, "e" ); ToFile( "OS", $OS, "e" ); +ToFile( "OSVERSION", $OSVERSION, "e" ); 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 ab5e980366fb..3a9f86bb8d2f 100644 --- a/editors/openoffice-1.1/files/patch-solenv::inc::unxfbsdi.mk +++ b/editors/openoffice-1.1/files/patch-solenv::inc::unxfbsdi.mk @@ -1,5 +1,5 @@ --- ../solenv/inc/unxfbsdi.mk.orig Wed Oct 24 19:21:47 2001 -+++ ../solenv/inc/unxfbsdi.mk Sat Mar 9 23:28:50 2002 ++++ ../solenv/inc/unxfbsdi.mk Wed Mar 13 19:13:59 2002 @@ -1,84 +1,145 @@ - # mak file fuer unxfbsdi @@ -17,10 +17,10 @@ LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" +# name of C Compiler -+cc=gcc ++cc=$(CC) + +# name of C++ Compiler -+CC=g++ ++CC=$(CXX) + +# options for C and C++ Compiler +CDEFS+=-D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 -DOSVERSION=$(OSVERSION) diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile index 0d27392347bc..5556075829d7 100644 --- a/editors/openoffice-2.0-devel/Makefile +++ b/editors/openoffice-2.0-devel/Makefile @@ -18,6 +18,7 @@ EXTRACT_ONLY= oo_${PORTVERSION}_src.tar.bz2 MAINTAINER= mbr@FreeBSD.org BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport +BUILD_DEPENDS+= ${LOCALBASE}/bin/gcc295:${PORTSDIR}/lang/gcc295 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 LIB_DEPENDS+= pth.14:${PORTSDIR}/devel/pth @@ -46,7 +47,9 @@ CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \ --with-os-version=${OSVERSION} CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ - PTHREAD_LIBS=${PTHREAD_LIBS} + PTHREAD_LIBS=${PTHREAD_LIBS} \ + CC=gcc295 \ + CXX=g++295 .include <bsd.port.pre.mk> diff --git a/editors/openoffice-2.0-devel/files/patch-set_soenv.1 b/editors/openoffice-2.0-devel/files/patch-set_soenv.1 index d3d34f896e88..bb2dccced07b 100644 --- a/editors/openoffice-2.0-devel/files/patch-set_soenv.1 +++ b/editors/openoffice-2.0-devel/files/patch-set_soenv.1 @@ -1,15 +1,22 @@ --- set_soenv.1.orig Wed Feb 27 10:46:41 2002 -+++ set_soenv.1 Mon Mar 11 13:46:57 2002 ++++ set_soenv.1 Wed Mar 13 19:13:01 2002 @@ -40,7 +40,7 @@ # # Set this value equal to the corresponding amount of # command line arguments. -my $numArgs = 19; -+my $numArgs = 22; ++my $numArgs = 24; # Determining the amount of arguments in the call. my $numEnter = $#ARGV + 1; if ( $numEnter != $numArgs ) -@@ -72,8 +72,9 @@ +@@ -66,14 +66,15 @@ + my ( $CALL_CDECL, $COMMON_OUTDIR, $NO_SRS_PATCH, $PROFULLSWITCH, $BIG_GOODIES, $BMP_WRITES_FLAG, + $common_build, $MK_UNROLL, $NO_REC_RES, $PROEXT, $SO3, $SOLAR_JAVA, + $SOLAR_PLUGIN, $TF_PACKAGES, $TF_SDBAPI, $TF_FILEURL, $UPDATER, $BUILD_DELIVER, $USE_NEWCHARSET, $USE_NEW_RSC, $VCL, +- $TF_CFGDATA, $TF_SVDATA, ++ $TF_CFGDATA, $TF_SVDATA, $CC, $CXX, + $USE_NAMESPACE, $BUILD_SOSL, $LOCAL_SOLENV, $ENABLEUNICODE, $NEW_JAR_PACK, $NO_BSYMBOLIC, + $USE_XPRINT, $BUILD_SOSL_RELEASE ); # # Platform dependent constant values. my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV, @@ -21,7 +28,16 @@ # #------------------------------------------- # IIc. Declaring the environment variables. -@@ -303,7 +304,7 @@ +@@ -145,6 +146,8 @@ + $STLPORT4 = $ARGV [ 12 ]; # Location of STLport4 + $MINGWIN32 = $ARGV [ 17 ]; # use MINGWIN32 + $USE_GCC3 = $ARGV [ 18 ]; # use gcc3 (only for unxlngi4 at the moment) ++$CC = $ARGV [ 22 ]; # get cc from environment ++$CXX = $ARGV [ 23 ]; # use c++ from environment + # + #--------------------------------------------------------------- + # IIIb. Initialising the variables for the system commands, etc. +@@ -303,7 +306,7 @@ $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; $SOLAR_JAVA = "TRUE"; @@ -30,7 +46,7 @@ } elsif ( $platform eq "$FreeBSD" ) { print "Setting FreeBSD specific values... "; -@@ -326,6 +327,9 @@ +@@ -326,6 +329,9 @@ $PATH_SEPERATOR = $ps; $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; @@ -40,7 +56,7 @@ } elsif ( $platform eq "$Linux" ) { -@@ -889,15 +893,16 @@ +@@ -889,15 +895,16 @@ $D.$COM. $D.$CVER. $D.$GVER. @@ -60,7 +76,7 @@ { $SOLARDEF .= $D."GLIBC=".$GLIBC; } $SOLARDEF .= $D."SUPD=$UPD". -@@ -990,7 +995,7 @@ +@@ -990,7 +997,7 @@ $ps.$USR.$LIB. $ps.$USR_LOCAL.$BIN; } @@ -69,7 +85,7 @@ { $PATH = $cur_dir. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN. $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. -@@ -1004,6 +1009,22 @@ +@@ -1004,6 +1011,22 @@ $ps.$USR.$BIN.$ds."X11". $ps.$USR.$LIB; } @@ -92,7 +108,7 @@ elsif ($platform eq "$Winnt") { $COMPATH_ROOT = $COMPATH; $COMPATH_ROOT =~ s/\/vc98$//; -@@ -1107,21 +1128,14 @@ +@@ -1107,21 +1130,14 @@ $SOLARINC .= $I.$USR.$INCLUDE; } $SOLARINC .= $STLPORT_stlport; @@ -117,8 +133,12 @@ { # This simply adds an include path, so even cases that break the FHS work $SOLARINC .= $STLPORT_inc_stlport; -@@ -1313,6 +1327,9 @@ +@@ -1311,8 +1327,13 @@ + ToFile( "GLIBC", $GLIBC, "e" ); + ToFile( "GUIBASE", $GUIBASE, "e" ); ToFile( "GUIENV", $GUIENV, "e" ); ++ToFile( "CC", $CC, "e" ); ++ToFile( "CXX", $CXX, "e" ); ToFile( "GVER", $GVER, "e" ); ToFile( "OS", $OS, "e" ); +ToFile( "OSVERSION", $OSVERSION, "e" ); 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 ab5e980366fb..3a9f86bb8d2f 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 @@ -1,5 +1,5 @@ --- ../solenv/inc/unxfbsdi.mk.orig Wed Oct 24 19:21:47 2001 -+++ ../solenv/inc/unxfbsdi.mk Sat Mar 9 23:28:50 2002 ++++ ../solenv/inc/unxfbsdi.mk Wed Mar 13 19:13:59 2002 @@ -1,84 +1,145 @@ - # mak file fuer unxfbsdi @@ -17,10 +17,10 @@ LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" +# name of C Compiler -+cc=gcc ++cc=$(CC) + +# name of C++ Compiler -+CC=g++ ++CC=$(CXX) + +# options for C and C++ Compiler +CDEFS+=-D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 -DOSVERSION=$(OSVERSION) diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index 0d27392347bc..5556075829d7 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/Makefile @@ -18,6 +18,7 @@ EXTRACT_ONLY= oo_${PORTVERSION}_src.tar.bz2 MAINTAINER= mbr@FreeBSD.org BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport +BUILD_DEPENDS+= ${LOCALBASE}/bin/gcc295:${PORTSDIR}/lang/gcc295 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 LIB_DEPENDS+= pth.14:${PORTSDIR}/devel/pth @@ -46,7 +47,9 @@ CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \ --with-os-version=${OSVERSION} CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ - PTHREAD_LIBS=${PTHREAD_LIBS} + PTHREAD_LIBS=${PTHREAD_LIBS} \ + CC=gcc295 \ + CXX=g++295 .include <bsd.port.pre.mk> diff --git a/editors/openoffice-3-devel/files/patch-set_soenv.1 b/editors/openoffice-3-devel/files/patch-set_soenv.1 index d3d34f896e88..bb2dccced07b 100644 --- a/editors/openoffice-3-devel/files/patch-set_soenv.1 +++ b/editors/openoffice-3-devel/files/patch-set_soenv.1 @@ -1,15 +1,22 @@ --- set_soenv.1.orig Wed Feb 27 10:46:41 2002 -+++ set_soenv.1 Mon Mar 11 13:46:57 2002 ++++ set_soenv.1 Wed Mar 13 19:13:01 2002 @@ -40,7 +40,7 @@ # # Set this value equal to the corresponding amount of # command line arguments. -my $numArgs = 19; -+my $numArgs = 22; ++my $numArgs = 24; # Determining the amount of arguments in the call. my $numEnter = $#ARGV + 1; if ( $numEnter != $numArgs ) -@@ -72,8 +72,9 @@ +@@ -66,14 +66,15 @@ + my ( $CALL_CDECL, $COMMON_OUTDIR, $NO_SRS_PATCH, $PROFULLSWITCH, $BIG_GOODIES, $BMP_WRITES_FLAG, + $common_build, $MK_UNROLL, $NO_REC_RES, $PROEXT, $SO3, $SOLAR_JAVA, + $SOLAR_PLUGIN, $TF_PACKAGES, $TF_SDBAPI, $TF_FILEURL, $UPDATER, $BUILD_DELIVER, $USE_NEWCHARSET, $USE_NEW_RSC, $VCL, +- $TF_CFGDATA, $TF_SVDATA, ++ $TF_CFGDATA, $TF_SVDATA, $CC, $CXX, + $USE_NAMESPACE, $BUILD_SOSL, $LOCAL_SOLENV, $ENABLEUNICODE, $NEW_JAR_PACK, $NO_BSYMBOLIC, + $USE_XPRINT, $BUILD_SOSL_RELEASE ); # # Platform dependent constant values. my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV, @@ -21,7 +28,16 @@ # #------------------------------------------- # IIc. Declaring the environment variables. -@@ -303,7 +304,7 @@ +@@ -145,6 +146,8 @@ + $STLPORT4 = $ARGV [ 12 ]; # Location of STLport4 + $MINGWIN32 = $ARGV [ 17 ]; # use MINGWIN32 + $USE_GCC3 = $ARGV [ 18 ]; # use gcc3 (only for unxlngi4 at the moment) ++$CC = $ARGV [ 22 ]; # get cc from environment ++$CXX = $ARGV [ 23 ]; # use c++ from environment + # + #--------------------------------------------------------------- + # IIIb. Initialising the variables for the system commands, etc. +@@ -303,7 +306,7 @@ $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; $SOLAR_JAVA = "TRUE"; @@ -30,7 +46,7 @@ } elsif ( $platform eq "$FreeBSD" ) { print "Setting FreeBSD specific values... "; -@@ -326,6 +327,9 @@ +@@ -326,6 +329,9 @@ $PATH_SEPERATOR = $ps; $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; @@ -40,7 +56,7 @@ } elsif ( $platform eq "$Linux" ) { -@@ -889,15 +893,16 @@ +@@ -889,15 +895,16 @@ $D.$COM. $D.$CVER. $D.$GVER. @@ -60,7 +76,7 @@ { $SOLARDEF .= $D."GLIBC=".$GLIBC; } $SOLARDEF .= $D."SUPD=$UPD". -@@ -990,7 +995,7 @@ +@@ -990,7 +997,7 @@ $ps.$USR.$LIB. $ps.$USR_LOCAL.$BIN; } @@ -69,7 +85,7 @@ { $PATH = $cur_dir. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN. $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. -@@ -1004,6 +1009,22 @@ +@@ -1004,6 +1011,22 @@ $ps.$USR.$BIN.$ds."X11". $ps.$USR.$LIB; } @@ -92,7 +108,7 @@ elsif ($platform eq "$Winnt") { $COMPATH_ROOT = $COMPATH; $COMPATH_ROOT =~ s/\/vc98$//; -@@ -1107,21 +1128,14 @@ +@@ -1107,21 +1130,14 @@ $SOLARINC .= $I.$USR.$INCLUDE; } $SOLARINC .= $STLPORT_stlport; @@ -117,8 +133,12 @@ { # This simply adds an include path, so even cases that break the FHS work $SOLARINC .= $STLPORT_inc_stlport; -@@ -1313,6 +1327,9 @@ +@@ -1311,8 +1327,13 @@ + ToFile( "GLIBC", $GLIBC, "e" ); + ToFile( "GUIBASE", $GUIBASE, "e" ); ToFile( "GUIENV", $GUIENV, "e" ); ++ToFile( "CC", $CC, "e" ); ++ToFile( "CXX", $CXX, "e" ); ToFile( "GVER", $GVER, "e" ); ToFile( "OS", $OS, "e" ); +ToFile( "OSVERSION", $OSVERSION, "e" ); 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 ab5e980366fb..3a9f86bb8d2f 100644 --- a/editors/openoffice-3-devel/files/patch-solenv::inc::unxfbsdi.mk +++ b/editors/openoffice-3-devel/files/patch-solenv::inc::unxfbsdi.mk @@ -1,5 +1,5 @@ --- ../solenv/inc/unxfbsdi.mk.orig Wed Oct 24 19:21:47 2001 -+++ ../solenv/inc/unxfbsdi.mk Sat Mar 9 23:28:50 2002 ++++ ../solenv/inc/unxfbsdi.mk Wed Mar 13 19:13:59 2002 @@ -1,84 +1,145 @@ - # mak file fuer unxfbsdi @@ -17,10 +17,10 @@ LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" +# name of C Compiler -+cc=gcc ++cc=$(CC) + +# name of C++ Compiler -+CC=g++ ++CC=$(CXX) + +# options for C and C++ Compiler +CDEFS+=-D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 -DOSVERSION=$(OSVERSION) diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile index 0d27392347bc..5556075829d7 100644 --- a/editors/openoffice-3/Makefile +++ b/editors/openoffice-3/Makefile @@ -18,6 +18,7 @@ EXTRACT_ONLY= oo_${PORTVERSION}_src.tar.bz2 MAINTAINER= mbr@FreeBSD.org BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport +BUILD_DEPENDS+= ${LOCALBASE}/bin/gcc295:${PORTSDIR}/lang/gcc295 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 LIB_DEPENDS+= pth.14:${PORTSDIR}/devel/pth @@ -46,7 +47,9 @@ CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \ --with-os-version=${OSVERSION} CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ - PTHREAD_LIBS=${PTHREAD_LIBS} + PTHREAD_LIBS=${PTHREAD_LIBS} \ + CC=gcc295 \ + CXX=g++295 .include <bsd.port.pre.mk> diff --git a/editors/openoffice-3/files/patch-set_soenv.1 b/editors/openoffice-3/files/patch-set_soenv.1 index d3d34f896e88..bb2dccced07b 100644 --- a/editors/openoffice-3/files/patch-set_soenv.1 +++ b/editors/openoffice-3/files/patch-set_soenv.1 @@ -1,15 +1,22 @@ --- set_soenv.1.orig Wed Feb 27 10:46:41 2002 -+++ set_soenv.1 Mon Mar 11 13:46:57 2002 ++++ set_soenv.1 Wed Mar 13 19:13:01 2002 @@ -40,7 +40,7 @@ # # Set this value equal to the corresponding amount of # command line arguments. -my $numArgs = 19; -+my $numArgs = 22; ++my $numArgs = 24; # Determining the amount of arguments in the call. my $numEnter = $#ARGV + 1; if ( $numEnter != $numArgs ) -@@ -72,8 +72,9 @@ +@@ -66,14 +66,15 @@ + my ( $CALL_CDECL, $COMMON_OUTDIR, $NO_SRS_PATCH, $PROFULLSWITCH, $BIG_GOODIES, $BMP_WRITES_FLAG, + $common_build, $MK_UNROLL, $NO_REC_RES, $PROEXT, $SO3, $SOLAR_JAVA, + $SOLAR_PLUGIN, $TF_PACKAGES, $TF_SDBAPI, $TF_FILEURL, $UPDATER, $BUILD_DELIVER, $USE_NEWCHARSET, $USE_NEW_RSC, $VCL, +- $TF_CFGDATA, $TF_SVDATA, ++ $TF_CFGDATA, $TF_SVDATA, $CC, $CXX, + $USE_NAMESPACE, $BUILD_SOSL, $LOCAL_SOLENV, $ENABLEUNICODE, $NEW_JAR_PACK, $NO_BSYMBOLIC, + $USE_XPRINT, $BUILD_SOSL_RELEASE ); # # Platform dependent constant values. my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV, @@ -21,7 +28,16 @@ # #------------------------------------------- # IIc. Declaring the environment variables. -@@ -303,7 +304,7 @@ +@@ -145,6 +146,8 @@ + $STLPORT4 = $ARGV [ 12 ]; # Location of STLport4 + $MINGWIN32 = $ARGV [ 17 ]; # use MINGWIN32 + $USE_GCC3 = $ARGV [ 18 ]; # use gcc3 (only for unxlngi4 at the moment) ++$CC = $ARGV [ 22 ]; # get cc from environment ++$CXX = $ARGV [ 23 ]; # use c++ from environment + # + #--------------------------------------------------------------- + # IIIb. Initialising the variables for the system commands, etc. +@@ -303,7 +306,7 @@ $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; $SOLAR_JAVA = "TRUE"; @@ -30,7 +46,7 @@ } elsif ( $platform eq "$FreeBSD" ) { print "Setting FreeBSD specific values... "; -@@ -326,6 +327,9 @@ +@@ -326,6 +329,9 @@ $PATH_SEPERATOR = $ps; $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; @@ -40,7 +56,7 @@ } elsif ( $platform eq "$Linux" ) { -@@ -889,15 +893,16 @@ +@@ -889,15 +895,16 @@ $D.$COM. $D.$CVER. $D.$GVER. @@ -60,7 +76,7 @@ { $SOLARDEF .= $D."GLIBC=".$GLIBC; } $SOLARDEF .= $D."SUPD=$UPD". -@@ -990,7 +995,7 @@ +@@ -990,7 +997,7 @@ $ps.$USR.$LIB. $ps.$USR_LOCAL.$BIN; } @@ -69,7 +85,7 @@ { $PATH = $cur_dir. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN. $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. -@@ -1004,6 +1009,22 @@ +@@ -1004,6 +1011,22 @@ $ps.$USR.$BIN.$ds."X11". $ps.$USR.$LIB; } @@ -92,7 +108,7 @@ elsif ($platform eq "$Winnt") { $COMPATH_ROOT = $COMPATH; $COMPATH_ROOT =~ s/\/vc98$//; -@@ -1107,21 +1128,14 @@ +@@ -1107,21 +1130,14 @@ $SOLARINC .= $I.$USR.$INCLUDE; } $SOLARINC .= $STLPORT_stlport; @@ -117,8 +133,12 @@ { # This simply adds an include path, so even cases that break the FHS work $SOLARINC .= $STLPORT_inc_stlport; -@@ -1313,6 +1327,9 @@ +@@ -1311,8 +1327,13 @@ + ToFile( "GLIBC", $GLIBC, "e" ); + ToFile( "GUIBASE", $GUIBASE, "e" ); ToFile( "GUIENV", $GUIENV, "e" ); ++ToFile( "CC", $CC, "e" ); ++ToFile( "CXX", $CXX, "e" ); ToFile( "GVER", $GVER, "e" ); ToFile( "OS", $OS, "e" ); +ToFile( "OSVERSION", $OSVERSION, "e" ); diff --git a/editors/openoffice-3/files/patch-solenv::inc::unxfbsdi.mk b/editors/openoffice-3/files/patch-solenv::inc::unxfbsdi.mk index ab5e980366fb..3a9f86bb8d2f 100644 --- a/editors/openoffice-3/files/patch-solenv::inc::unxfbsdi.mk +++ b/editors/openoffice-3/files/patch-solenv::inc::unxfbsdi.mk @@ -1,5 +1,5 @@ --- ../solenv/inc/unxfbsdi.mk.orig Wed Oct 24 19:21:47 2001 -+++ ../solenv/inc/unxfbsdi.mk Sat Mar 9 23:28:50 2002 ++++ ../solenv/inc/unxfbsdi.mk Wed Mar 13 19:13:59 2002 @@ -1,84 +1,145 @@ - # mak file fuer unxfbsdi @@ -17,10 +17,10 @@ LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" +# name of C Compiler -+cc=gcc ++cc=$(CC) + +# name of C++ Compiler -+CC=g++ ++CC=$(CXX) + +# options for C and C++ Compiler +CDEFS+=-D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 -DOSVERSION=$(OSVERSION) diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index 0d27392347bc..5556075829d7 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -18,6 +18,7 @@ EXTRACT_ONLY= oo_${PORTVERSION}_src.tar.bz2 MAINTAINER= mbr@FreeBSD.org BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport +BUILD_DEPENDS+= ${LOCALBASE}/bin/gcc295:${PORTSDIR}/lang/gcc295 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 LIB_DEPENDS+= pth.14:${PORTSDIR}/devel/pth @@ -46,7 +47,9 @@ CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \ --with-os-version=${OSVERSION} CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ - PTHREAD_LIBS=${PTHREAD_LIBS} + PTHREAD_LIBS=${PTHREAD_LIBS} \ + CC=gcc295 \ + CXX=g++295 .include <bsd.port.pre.mk> diff --git a/editors/openoffice-devel/files/patch-set_soenv.1 b/editors/openoffice-devel/files/patch-set_soenv.1 index d3d34f896e88..bb2dccced07b 100644 --- a/editors/openoffice-devel/files/patch-set_soenv.1 +++ b/editors/openoffice-devel/files/patch-set_soenv.1 @@ -1,15 +1,22 @@ --- set_soenv.1.orig Wed Feb 27 10:46:41 2002 -+++ set_soenv.1 Mon Mar 11 13:46:57 2002 ++++ set_soenv.1 Wed Mar 13 19:13:01 2002 @@ -40,7 +40,7 @@ # # Set this value equal to the corresponding amount of # command line arguments. -my $numArgs = 19; -+my $numArgs = 22; ++my $numArgs = 24; # Determining the amount of arguments in the call. my $numEnter = $#ARGV + 1; if ( $numEnter != $numArgs ) -@@ -72,8 +72,9 @@ +@@ -66,14 +66,15 @@ + my ( $CALL_CDECL, $COMMON_OUTDIR, $NO_SRS_PATCH, $PROFULLSWITCH, $BIG_GOODIES, $BMP_WRITES_FLAG, + $common_build, $MK_UNROLL, $NO_REC_RES, $PROEXT, $SO3, $SOLAR_JAVA, + $SOLAR_PLUGIN, $TF_PACKAGES, $TF_SDBAPI, $TF_FILEURL, $UPDATER, $BUILD_DELIVER, $USE_NEWCHARSET, $USE_NEW_RSC, $VCL, +- $TF_CFGDATA, $TF_SVDATA, ++ $TF_CFGDATA, $TF_SVDATA, $CC, $CXX, + $USE_NAMESPACE, $BUILD_SOSL, $LOCAL_SOLENV, $ENABLEUNICODE, $NEW_JAR_PACK, $NO_BSYMBOLIC, + $USE_XPRINT, $BUILD_SOSL_RELEASE ); # # Platform dependent constant values. my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV, @@ -21,7 +28,16 @@ # #------------------------------------------- # IIc. Declaring the environment variables. -@@ -303,7 +304,7 @@ +@@ -145,6 +146,8 @@ + $STLPORT4 = $ARGV [ 12 ]; # Location of STLport4 + $MINGWIN32 = $ARGV [ 17 ]; # use MINGWIN32 + $USE_GCC3 = $ARGV [ 18 ]; # use gcc3 (only for unxlngi4 at the moment) ++$CC = $ARGV [ 22 ]; # get cc from environment ++$CXX = $ARGV [ 23 ]; # use c++ from environment + # + #--------------------------------------------------------------- + # IIIb. Initialising the variables for the system commands, etc. +@@ -303,7 +306,7 @@ $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; $SOLAR_JAVA = "TRUE"; @@ -30,7 +46,7 @@ } elsif ( $platform eq "$FreeBSD" ) { print "Setting FreeBSD specific values... "; -@@ -326,6 +327,9 @@ +@@ -326,6 +329,9 @@ $PATH_SEPERATOR = $ps; $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; @@ -40,7 +56,7 @@ } elsif ( $platform eq "$Linux" ) { -@@ -889,15 +893,16 @@ +@@ -889,15 +895,16 @@ $D.$COM. $D.$CVER. $D.$GVER. @@ -60,7 +76,7 @@ { $SOLARDEF .= $D."GLIBC=".$GLIBC; } $SOLARDEF .= $D."SUPD=$UPD". -@@ -990,7 +995,7 @@ +@@ -990,7 +997,7 @@ $ps.$USR.$LIB. $ps.$USR_LOCAL.$BIN; } @@ -69,7 +85,7 @@ { $PATH = $cur_dir. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN. $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. -@@ -1004,6 +1009,22 @@ +@@ -1004,6 +1011,22 @@ $ps.$USR.$BIN.$ds."X11". $ps.$USR.$LIB; } @@ -92,7 +108,7 @@ elsif ($platform eq "$Winnt") { $COMPATH_ROOT = $COMPATH; $COMPATH_ROOT =~ s/\/vc98$//; -@@ -1107,21 +1128,14 @@ +@@ -1107,21 +1130,14 @@ $SOLARINC .= $I.$USR.$INCLUDE; } $SOLARINC .= $STLPORT_stlport; @@ -117,8 +133,12 @@ { # This simply adds an include path, so even cases that break the FHS work $SOLARINC .= $STLPORT_inc_stlport; -@@ -1313,6 +1327,9 @@ +@@ -1311,8 +1327,13 @@ + ToFile( "GLIBC", $GLIBC, "e" ); + ToFile( "GUIBASE", $GUIBASE, "e" ); ToFile( "GUIENV", $GUIENV, "e" ); ++ToFile( "CC", $CC, "e" ); ++ToFile( "CXX", $CXX, "e" ); ToFile( "GVER", $GVER, "e" ); ToFile( "OS", $OS, "e" ); +ToFile( "OSVERSION", $OSVERSION, "e" ); diff --git a/editors/openoffice-devel/files/patch-solenv::inc::unxfbsdi.mk b/editors/openoffice-devel/files/patch-solenv::inc::unxfbsdi.mk index ab5e980366fb..3a9f86bb8d2f 100644 --- a/editors/openoffice-devel/files/patch-solenv::inc::unxfbsdi.mk +++ b/editors/openoffice-devel/files/patch-solenv::inc::unxfbsdi.mk @@ -1,5 +1,5 @@ --- ../solenv/inc/unxfbsdi.mk.orig Wed Oct 24 19:21:47 2001 -+++ ../solenv/inc/unxfbsdi.mk Sat Mar 9 23:28:50 2002 ++++ ../solenv/inc/unxfbsdi.mk Wed Mar 13 19:13:59 2002 @@ -1,84 +1,145 @@ - # mak file fuer unxfbsdi @@ -17,10 +17,10 @@ LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" +# name of C Compiler -+cc=gcc ++cc=$(CC) + +# name of C++ Compiler -+CC=g++ ++CC=$(CXX) + +# options for C and C++ Compiler +CDEFS+=-D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 -DOSVERSION=$(OSVERSION) diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile index 0d27392347bc..5556075829d7 100644 --- a/editors/openoffice.org-1.1-devel/Makefile +++ b/editors/openoffice.org-1.1-devel/Makefile @@ -18,6 +18,7 @@ EXTRACT_ONLY= oo_${PORTVERSION}_src.tar.bz2 MAINTAINER= mbr@FreeBSD.org BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport +BUILD_DEPENDS+= ${LOCALBASE}/bin/gcc295:${PORTSDIR}/lang/gcc295 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 LIB_DEPENDS+= pth.14:${PORTSDIR}/devel/pth @@ -46,7 +47,9 @@ CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \ --with-os-version=${OSVERSION} CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ - PTHREAD_LIBS=${PTHREAD_LIBS} + PTHREAD_LIBS=${PTHREAD_LIBS} \ + CC=gcc295 \ + CXX=g++295 .include <bsd.port.pre.mk> diff --git a/editors/openoffice.org-1.1-devel/files/patch-set_soenv.1 b/editors/openoffice.org-1.1-devel/files/patch-set_soenv.1 index d3d34f896e88..bb2dccced07b 100644 --- a/editors/openoffice.org-1.1-devel/files/patch-set_soenv.1 +++ b/editors/openoffice.org-1.1-devel/files/patch-set_soenv.1 @@ -1,15 +1,22 @@ --- set_soenv.1.orig Wed Feb 27 10:46:41 2002 -+++ set_soenv.1 Mon Mar 11 13:46:57 2002 ++++ set_soenv.1 Wed Mar 13 19:13:01 2002 @@ -40,7 +40,7 @@ # # Set this value equal to the corresponding amount of # command line arguments. -my $numArgs = 19; -+my $numArgs = 22; ++my $numArgs = 24; # Determining the amount of arguments in the call. my $numEnter = $#ARGV + 1; if ( $numEnter != $numArgs ) -@@ -72,8 +72,9 @@ +@@ -66,14 +66,15 @@ + my ( $CALL_CDECL, $COMMON_OUTDIR, $NO_SRS_PATCH, $PROFULLSWITCH, $BIG_GOODIES, $BMP_WRITES_FLAG, + $common_build, $MK_UNROLL, $NO_REC_RES, $PROEXT, $SO3, $SOLAR_JAVA, + $SOLAR_PLUGIN, $TF_PACKAGES, $TF_SDBAPI, $TF_FILEURL, $UPDATER, $BUILD_DELIVER, $USE_NEWCHARSET, $USE_NEW_RSC, $VCL, +- $TF_CFGDATA, $TF_SVDATA, ++ $TF_CFGDATA, $TF_SVDATA, $CC, $CXX, + $USE_NAMESPACE, $BUILD_SOSL, $LOCAL_SOLENV, $ENABLEUNICODE, $NEW_JAR_PACK, $NO_BSYMBOLIC, + $USE_XPRINT, $BUILD_SOSL_RELEASE ); # # Platform dependent constant values. my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV, @@ -21,7 +28,16 @@ # #------------------------------------------- # IIc. Declaring the environment variables. -@@ -303,7 +304,7 @@ +@@ -145,6 +146,8 @@ + $STLPORT4 = $ARGV [ 12 ]; # Location of STLport4 + $MINGWIN32 = $ARGV [ 17 ]; # use MINGWIN32 + $USE_GCC3 = $ARGV [ 18 ]; # use gcc3 (only for unxlngi4 at the moment) ++$CC = $ARGV [ 22 ]; # get cc from environment ++$CXX = $ARGV [ 23 ]; # use c++ from environment + # + #--------------------------------------------------------------- + # IIIb. Initialising the variables for the system commands, etc. +@@ -303,7 +306,7 @@ $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; $SOLAR_JAVA = "TRUE"; @@ -30,7 +46,7 @@ } elsif ( $platform eq "$FreeBSD" ) { print "Setting FreeBSD specific values... "; -@@ -326,6 +327,9 @@ +@@ -326,6 +329,9 @@ $PATH_SEPERATOR = $ps; $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; @@ -40,7 +56,7 @@ } elsif ( $platform eq "$Linux" ) { -@@ -889,15 +893,16 @@ +@@ -889,15 +895,16 @@ $D.$COM. $D.$CVER. $D.$GVER. @@ -60,7 +76,7 @@ { $SOLARDEF .= $D."GLIBC=".$GLIBC; } $SOLARDEF .= $D."SUPD=$UPD". -@@ -990,7 +995,7 @@ +@@ -990,7 +997,7 @@ $ps.$USR.$LIB. $ps.$USR_LOCAL.$BIN; } @@ -69,7 +85,7 @@ { $PATH = $cur_dir. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN. $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. -@@ -1004,6 +1009,22 @@ +@@ -1004,6 +1011,22 @@ $ps.$USR.$BIN.$ds."X11". $ps.$USR.$LIB; } @@ -92,7 +108,7 @@ elsif ($platform eq "$Winnt") { $COMPATH_ROOT = $COMPATH; $COMPATH_ROOT =~ s/\/vc98$//; -@@ -1107,21 +1128,14 @@ +@@ -1107,21 +1130,14 @@ $SOLARINC .= $I.$USR.$INCLUDE; } $SOLARINC .= $STLPORT_stlport; @@ -117,8 +133,12 @@ { # This simply adds an include path, so even cases that break the FHS work $SOLARINC .= $STLPORT_inc_stlport; -@@ -1313,6 +1327,9 @@ +@@ -1311,8 +1327,13 @@ + ToFile( "GLIBC", $GLIBC, "e" ); + ToFile( "GUIBASE", $GUIBASE, "e" ); ToFile( "GUIENV", $GUIENV, "e" ); ++ToFile( "CC", $CC, "e" ); ++ToFile( "CXX", $CXX, "e" ); ToFile( "GVER", $GVER, "e" ); ToFile( "OS", $OS, "e" ); +ToFile( "OSVERSION", $OSVERSION, "e" ); 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 ab5e980366fb..3a9f86bb8d2f 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 @@ -1,5 +1,5 @@ --- ../solenv/inc/unxfbsdi.mk.orig Wed Oct 24 19:21:47 2001 -+++ ../solenv/inc/unxfbsdi.mk Sat Mar 9 23:28:50 2002 ++++ ../solenv/inc/unxfbsdi.mk Wed Mar 13 19:13:59 2002 @@ -1,84 +1,145 @@ - # mak file fuer unxfbsdi @@ -17,10 +17,10 @@ LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" +# name of C Compiler -+cc=gcc ++cc=$(CC) + +# name of C++ Compiler -+CC=g++ ++CC=$(CXX) + +# options for C and C++ Compiler +CDEFS+=-D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 -DOSVERSION=$(OSVERSION) diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile index 0d27392347bc..5556075829d7 100644 --- a/editors/openoffice.org-1.1/Makefile +++ b/editors/openoffice.org-1.1/Makefile @@ -18,6 +18,7 @@ EXTRACT_ONLY= oo_${PORTVERSION}_src.tar.bz2 MAINTAINER= mbr@FreeBSD.org BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport +BUILD_DEPENDS+= ${LOCALBASE}/bin/gcc295:${PORTSDIR}/lang/gcc295 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 LIB_DEPENDS+= pth.14:${PORTSDIR}/devel/pth @@ -46,7 +47,9 @@ CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \ --with-os-version=${OSVERSION} CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ - PTHREAD_LIBS=${PTHREAD_LIBS} + PTHREAD_LIBS=${PTHREAD_LIBS} \ + CC=gcc295 \ + CXX=g++295 .include <bsd.port.pre.mk> diff --git a/editors/openoffice.org-1.1/files/patch-set_soenv.1 b/editors/openoffice.org-1.1/files/patch-set_soenv.1 index d3d34f896e88..bb2dccced07b 100644 --- a/editors/openoffice.org-1.1/files/patch-set_soenv.1 +++ b/editors/openoffice.org-1.1/files/patch-set_soenv.1 @@ -1,15 +1,22 @@ --- set_soenv.1.orig Wed Feb 27 10:46:41 2002 -+++ set_soenv.1 Mon Mar 11 13:46:57 2002 ++++ set_soenv.1 Wed Mar 13 19:13:01 2002 @@ -40,7 +40,7 @@ # # Set this value equal to the corresponding amount of # command line arguments. -my $numArgs = 19; -+my $numArgs = 22; ++my $numArgs = 24; # Determining the amount of arguments in the call. my $numEnter = $#ARGV + 1; if ( $numEnter != $numArgs ) -@@ -72,8 +72,9 @@ +@@ -66,14 +66,15 @@ + my ( $CALL_CDECL, $COMMON_OUTDIR, $NO_SRS_PATCH, $PROFULLSWITCH, $BIG_GOODIES, $BMP_WRITES_FLAG, + $common_build, $MK_UNROLL, $NO_REC_RES, $PROEXT, $SO3, $SOLAR_JAVA, + $SOLAR_PLUGIN, $TF_PACKAGES, $TF_SDBAPI, $TF_FILEURL, $UPDATER, $BUILD_DELIVER, $USE_NEWCHARSET, $USE_NEW_RSC, $VCL, +- $TF_CFGDATA, $TF_SVDATA, ++ $TF_CFGDATA, $TF_SVDATA, $CC, $CXX, + $USE_NAMESPACE, $BUILD_SOSL, $LOCAL_SOLENV, $ENABLEUNICODE, $NEW_JAR_PACK, $NO_BSYMBOLIC, + $USE_XPRINT, $BUILD_SOSL_RELEASE ); # # Platform dependent constant values. my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV, @@ -21,7 +28,16 @@ # #------------------------------------------- # IIc. Declaring the environment variables. -@@ -303,7 +304,7 @@ +@@ -145,6 +146,8 @@ + $STLPORT4 = $ARGV [ 12 ]; # Location of STLport4 + $MINGWIN32 = $ARGV [ 17 ]; # use MINGWIN32 + $USE_GCC3 = $ARGV [ 18 ]; # use gcc3 (only for unxlngi4 at the moment) ++$CC = $ARGV [ 22 ]; # get cc from environment ++$CXX = $ARGV [ 23 ]; # use c++ from environment + # + #--------------------------------------------------------------- + # IIIb. Initialising the variables for the system commands, etc. +@@ -303,7 +306,7 @@ $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; $SOLAR_JAVA = "TRUE"; @@ -30,7 +46,7 @@ } elsif ( $platform eq "$FreeBSD" ) { print "Setting FreeBSD specific values... "; -@@ -326,6 +327,9 @@ +@@ -326,6 +329,9 @@ $PATH_SEPERATOR = $ps; $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; @@ -40,7 +56,7 @@ } elsif ( $platform eq "$Linux" ) { -@@ -889,15 +893,16 @@ +@@ -889,15 +895,16 @@ $D.$COM. $D.$CVER. $D.$GVER. @@ -60,7 +76,7 @@ { $SOLARDEF .= $D."GLIBC=".$GLIBC; } $SOLARDEF .= $D."SUPD=$UPD". -@@ -990,7 +995,7 @@ +@@ -990,7 +997,7 @@ $ps.$USR.$LIB. $ps.$USR_LOCAL.$BIN; } @@ -69,7 +85,7 @@ { $PATH = $cur_dir. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN. $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. -@@ -1004,6 +1009,22 @@ +@@ -1004,6 +1011,22 @@ $ps.$USR.$BIN.$ds."X11". $ps.$USR.$LIB; } @@ -92,7 +108,7 @@ elsif ($platform eq "$Winnt") { $COMPATH_ROOT = $COMPATH; $COMPATH_ROOT =~ s/\/vc98$//; -@@ -1107,21 +1128,14 @@ +@@ -1107,21 +1130,14 @@ $SOLARINC .= $I.$USR.$INCLUDE; } $SOLARINC .= $STLPORT_stlport; @@ -117,8 +133,12 @@ { # This simply adds an include path, so even cases that break the FHS work $SOLARINC .= $STLPORT_inc_stlport; -@@ -1313,6 +1327,9 @@ +@@ -1311,8 +1327,13 @@ + ToFile( "GLIBC", $GLIBC, "e" ); + ToFile( "GUIBASE", $GUIBASE, "e" ); ToFile( "GUIENV", $GUIENV, "e" ); ++ToFile( "CC", $CC, "e" ); ++ToFile( "CXX", $CXX, "e" ); ToFile( "GVER", $GVER, "e" ); ToFile( "OS", $OS, "e" ); +ToFile( "OSVERSION", $OSVERSION, "e" ); 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 ab5e980366fb..3a9f86bb8d2f 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 @@ -1,5 +1,5 @@ --- ../solenv/inc/unxfbsdi.mk.orig Wed Oct 24 19:21:47 2001 -+++ ../solenv/inc/unxfbsdi.mk Sat Mar 9 23:28:50 2002 ++++ ../solenv/inc/unxfbsdi.mk Wed Mar 13 19:13:59 2002 @@ -1,84 +1,145 @@ - # mak file fuer unxfbsdi @@ -17,10 +17,10 @@ LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" +# name of C Compiler -+cc=gcc ++cc=$(CC) + +# name of C++ Compiler -+CC=g++ ++CC=$(CXX) + +# options for C and C++ Compiler +CDEFS+=-D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 -DOSVERSION=$(OSVERSION) diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile index 0d27392347bc..5556075829d7 100644 --- a/editors/openoffice.org-2-RC/Makefile +++ b/editors/openoffice.org-2-RC/Makefile @@ -18,6 +18,7 @@ EXTRACT_ONLY= oo_${PORTVERSION}_src.tar.bz2 MAINTAINER= mbr@FreeBSD.org BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport +BUILD_DEPENDS+= ${LOCALBASE}/bin/gcc295:${PORTSDIR}/lang/gcc295 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 LIB_DEPENDS+= pth.14:${PORTSDIR}/devel/pth @@ -46,7 +47,9 @@ CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \ --with-os-version=${OSVERSION} CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ - PTHREAD_LIBS=${PTHREAD_LIBS} + PTHREAD_LIBS=${PTHREAD_LIBS} \ + CC=gcc295 \ + CXX=g++295 .include <bsd.port.pre.mk> diff --git a/editors/openoffice.org-2-RC/files/patch-set_soenv.1 b/editors/openoffice.org-2-RC/files/patch-set_soenv.1 index d3d34f896e88..bb2dccced07b 100644 --- a/editors/openoffice.org-2-RC/files/patch-set_soenv.1 +++ b/editors/openoffice.org-2-RC/files/patch-set_soenv.1 @@ -1,15 +1,22 @@ --- set_soenv.1.orig Wed Feb 27 10:46:41 2002 -+++ set_soenv.1 Mon Mar 11 13:46:57 2002 ++++ set_soenv.1 Wed Mar 13 19:13:01 2002 @@ -40,7 +40,7 @@ # # Set this value equal to the corresponding amount of # command line arguments. -my $numArgs = 19; -+my $numArgs = 22; ++my $numArgs = 24; # Determining the amount of arguments in the call. my $numEnter = $#ARGV + 1; if ( $numEnter != $numArgs ) -@@ -72,8 +72,9 @@ +@@ -66,14 +66,15 @@ + my ( $CALL_CDECL, $COMMON_OUTDIR, $NO_SRS_PATCH, $PROFULLSWITCH, $BIG_GOODIES, $BMP_WRITES_FLAG, + $common_build, $MK_UNROLL, $NO_REC_RES, $PROEXT, $SO3, $SOLAR_JAVA, + $SOLAR_PLUGIN, $TF_PACKAGES, $TF_SDBAPI, $TF_FILEURL, $UPDATER, $BUILD_DELIVER, $USE_NEWCHARSET, $USE_NEW_RSC, $VCL, +- $TF_CFGDATA, $TF_SVDATA, ++ $TF_CFGDATA, $TF_SVDATA, $CC, $CXX, + $USE_NAMESPACE, $BUILD_SOSL, $LOCAL_SOLENV, $ENABLEUNICODE, $NEW_JAR_PACK, $NO_BSYMBOLIC, + $USE_XPRINT, $BUILD_SOSL_RELEASE ); # # Platform dependent constant values. my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV, @@ -21,7 +28,16 @@ # #------------------------------------------- # IIc. Declaring the environment variables. -@@ -303,7 +304,7 @@ +@@ -145,6 +146,8 @@ + $STLPORT4 = $ARGV [ 12 ]; # Location of STLport4 + $MINGWIN32 = $ARGV [ 17 ]; # use MINGWIN32 + $USE_GCC3 = $ARGV [ 18 ]; # use gcc3 (only for unxlngi4 at the moment) ++$CC = $ARGV [ 22 ]; # get cc from environment ++$CXX = $ARGV [ 23 ]; # use c++ from environment + # + #--------------------------------------------------------------- + # IIIb. Initialising the variables for the system commands, etc. +@@ -303,7 +306,7 @@ $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; $SOLAR_JAVA = "TRUE"; @@ -30,7 +46,7 @@ } elsif ( $platform eq "$FreeBSD" ) { print "Setting FreeBSD specific values... "; -@@ -326,6 +327,9 @@ +@@ -326,6 +329,9 @@ $PATH_SEPERATOR = $ps; $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; @@ -40,7 +56,7 @@ } elsif ( $platform eq "$Linux" ) { -@@ -889,15 +893,16 @@ +@@ -889,15 +895,16 @@ $D.$COM. $D.$CVER. $D.$GVER. @@ -60,7 +76,7 @@ { $SOLARDEF .= $D."GLIBC=".$GLIBC; } $SOLARDEF .= $D."SUPD=$UPD". -@@ -990,7 +995,7 @@ +@@ -990,7 +997,7 @@ $ps.$USR.$LIB. $ps.$USR_LOCAL.$BIN; } @@ -69,7 +85,7 @@ { $PATH = $cur_dir. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN. $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. -@@ -1004,6 +1009,22 @@ +@@ -1004,6 +1011,22 @@ $ps.$USR.$BIN.$ds."X11". $ps.$USR.$LIB; } @@ -92,7 +108,7 @@ elsif ($platform eq "$Winnt") { $COMPATH_ROOT = $COMPATH; $COMPATH_ROOT =~ s/\/vc98$//; -@@ -1107,21 +1128,14 @@ +@@ -1107,21 +1130,14 @@ $SOLARINC .= $I.$USR.$INCLUDE; } $SOLARINC .= $STLPORT_stlport; @@ -117,8 +133,12 @@ { # This simply adds an include path, so even cases that break the FHS work $SOLARINC .= $STLPORT_inc_stlport; -@@ -1313,6 +1327,9 @@ +@@ -1311,8 +1327,13 @@ + ToFile( "GLIBC", $GLIBC, "e" ); + ToFile( "GUIBASE", $GUIBASE, "e" ); ToFile( "GUIENV", $GUIENV, "e" ); ++ToFile( "CC", $CC, "e" ); ++ToFile( "CXX", $CXX, "e" ); ToFile( "GVER", $GVER, "e" ); ToFile( "OS", $OS, "e" ); +ToFile( "OSVERSION", $OSVERSION, "e" ); 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 ab5e980366fb..3a9f86bb8d2f 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 @@ -1,5 +1,5 @@ --- ../solenv/inc/unxfbsdi.mk.orig Wed Oct 24 19:21:47 2001 -+++ ../solenv/inc/unxfbsdi.mk Sat Mar 9 23:28:50 2002 ++++ ../solenv/inc/unxfbsdi.mk Wed Mar 13 19:13:59 2002 @@ -1,84 +1,145 @@ - # mak file fuer unxfbsdi @@ -17,10 +17,10 @@ LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" +# name of C Compiler -+cc=gcc ++cc=$(CC) + +# name of C++ Compiler -+CC=g++ ++CC=$(CXX) + +# options for C and C++ Compiler +CDEFS+=-D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 -DOSVERSION=$(OSVERSION) diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile index 0d27392347bc..5556075829d7 100644 --- a/editors/openoffice.org-2-devel/Makefile +++ b/editors/openoffice.org-2-devel/Makefile @@ -18,6 +18,7 @@ EXTRACT_ONLY= oo_${PORTVERSION}_src.tar.bz2 MAINTAINER= mbr@FreeBSD.org BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport +BUILD_DEPENDS+= ${LOCALBASE}/bin/gcc295:${PORTSDIR}/lang/gcc295 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 LIB_DEPENDS+= pth.14:${PORTSDIR}/devel/pth @@ -46,7 +47,9 @@ CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \ --with-os-version=${OSVERSION} CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ - PTHREAD_LIBS=${PTHREAD_LIBS} + PTHREAD_LIBS=${PTHREAD_LIBS} \ + CC=gcc295 \ + CXX=g++295 .include <bsd.port.pre.mk> diff --git a/editors/openoffice.org-2-devel/files/patch-set_soenv.1 b/editors/openoffice.org-2-devel/files/patch-set_soenv.1 index d3d34f896e88..bb2dccced07b 100644 --- a/editors/openoffice.org-2-devel/files/patch-set_soenv.1 +++ b/editors/openoffice.org-2-devel/files/patch-set_soenv.1 @@ -1,15 +1,22 @@ --- set_soenv.1.orig Wed Feb 27 10:46:41 2002 -+++ set_soenv.1 Mon Mar 11 13:46:57 2002 ++++ set_soenv.1 Wed Mar 13 19:13:01 2002 @@ -40,7 +40,7 @@ # # Set this value equal to the corresponding amount of # command line arguments. -my $numArgs = 19; -+my $numArgs = 22; ++my $numArgs = 24; # Determining the amount of arguments in the call. my $numEnter = $#ARGV + 1; if ( $numEnter != $numArgs ) -@@ -72,8 +72,9 @@ +@@ -66,14 +66,15 @@ + my ( $CALL_CDECL, $COMMON_OUTDIR, $NO_SRS_PATCH, $PROFULLSWITCH, $BIG_GOODIES, $BMP_WRITES_FLAG, + $common_build, $MK_UNROLL, $NO_REC_RES, $PROEXT, $SO3, $SOLAR_JAVA, + $SOLAR_PLUGIN, $TF_PACKAGES, $TF_SDBAPI, $TF_FILEURL, $UPDATER, $BUILD_DELIVER, $USE_NEWCHARSET, $USE_NEW_RSC, $VCL, +- $TF_CFGDATA, $TF_SVDATA, ++ $TF_CFGDATA, $TF_SVDATA, $CC, $CXX, + $USE_NAMESPACE, $BUILD_SOSL, $LOCAL_SOLENV, $ENABLEUNICODE, $NEW_JAR_PACK, $NO_BSYMBOLIC, + $USE_XPRINT, $BUILD_SOSL_RELEASE ); # # Platform dependent constant values. my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV, @@ -21,7 +28,16 @@ # #------------------------------------------- # IIc. Declaring the environment variables. -@@ -303,7 +304,7 @@ +@@ -145,6 +146,8 @@ + $STLPORT4 = $ARGV [ 12 ]; # Location of STLport4 + $MINGWIN32 = $ARGV [ 17 ]; # use MINGWIN32 + $USE_GCC3 = $ARGV [ 18 ]; # use gcc3 (only for unxlngi4 at the moment) ++$CC = $ARGV [ 22 ]; # get cc from environment ++$CXX = $ARGV [ 23 ]; # use c++ from environment + # + #--------------------------------------------------------------- + # IIIb. Initialising the variables for the system commands, etc. +@@ -303,7 +306,7 @@ $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; $SOLAR_JAVA = "TRUE"; @@ -30,7 +46,7 @@ } elsif ( $platform eq "$FreeBSD" ) { print "Setting FreeBSD specific values... "; -@@ -326,6 +327,9 @@ +@@ -326,6 +329,9 @@ $PATH_SEPERATOR = $ps; $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; @@ -40,7 +56,7 @@ } elsif ( $platform eq "$Linux" ) { -@@ -889,15 +893,16 @@ +@@ -889,15 +895,16 @@ $D.$COM. $D.$CVER. $D.$GVER. @@ -60,7 +76,7 @@ { $SOLARDEF .= $D."GLIBC=".$GLIBC; } $SOLARDEF .= $D."SUPD=$UPD". -@@ -990,7 +995,7 @@ +@@ -990,7 +997,7 @@ $ps.$USR.$LIB. $ps.$USR_LOCAL.$BIN; } @@ -69,7 +85,7 @@ { $PATH = $cur_dir. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN. $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. -@@ -1004,6 +1009,22 @@ +@@ -1004,6 +1011,22 @@ $ps.$USR.$BIN.$ds."X11". $ps.$USR.$LIB; } @@ -92,7 +108,7 @@ elsif ($platform eq "$Winnt") { $COMPATH_ROOT = $COMPATH; $COMPATH_ROOT =~ s/\/vc98$//; -@@ -1107,21 +1128,14 @@ +@@ -1107,21 +1130,14 @@ $SOLARINC .= $I.$USR.$INCLUDE; } $SOLARINC .= $STLPORT_stlport; @@ -117,8 +133,12 @@ { # This simply adds an include path, so even cases that break the FHS work $SOLARINC .= $STLPORT_inc_stlport; -@@ -1313,6 +1327,9 @@ +@@ -1311,8 +1327,13 @@ + ToFile( "GLIBC", $GLIBC, "e" ); + ToFile( "GUIBASE", $GUIBASE, "e" ); ToFile( "GUIENV", $GUIENV, "e" ); ++ToFile( "CC", $CC, "e" ); ++ToFile( "CXX", $CXX, "e" ); ToFile( "GVER", $GVER, "e" ); ToFile( "OS", $OS, "e" ); +ToFile( "OSVERSION", $OSVERSION, "e" ); 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 ab5e980366fb..3a9f86bb8d2f 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 @@ -1,5 +1,5 @@ --- ../solenv/inc/unxfbsdi.mk.orig Wed Oct 24 19:21:47 2001 -+++ ../solenv/inc/unxfbsdi.mk Sat Mar 9 23:28:50 2002 ++++ ../solenv/inc/unxfbsdi.mk Wed Mar 13 19:13:59 2002 @@ -1,84 +1,145 @@ - # mak file fuer unxfbsdi @@ -17,10 +17,10 @@ LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" +# name of C Compiler -+cc=gcc ++cc=$(CC) + +# name of C++ Compiler -+CC=g++ ++CC=$(CXX) + +# options for C and C++ Compiler +CDEFS+=-D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 -DOSVERSION=$(OSVERSION) diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile index 0d27392347bc..5556075829d7 100644 --- a/editors/openoffice.org-2.0-devel/Makefile +++ b/editors/openoffice.org-2.0-devel/Makefile @@ -18,6 +18,7 @@ EXTRACT_ONLY= oo_${PORTVERSION}_src.tar.bz2 MAINTAINER= mbr@FreeBSD.org BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport +BUILD_DEPENDS+= ${LOCALBASE}/bin/gcc295:${PORTSDIR}/lang/gcc295 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 LIB_DEPENDS+= pth.14:${PORTSDIR}/devel/pth @@ -46,7 +47,9 @@ CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \ --with-os-version=${OSVERSION} CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ - PTHREAD_LIBS=${PTHREAD_LIBS} + PTHREAD_LIBS=${PTHREAD_LIBS} \ + CC=gcc295 \ + CXX=g++295 .include <bsd.port.pre.mk> diff --git a/editors/openoffice.org-2.0-devel/files/patch-set_soenv.1 b/editors/openoffice.org-2.0-devel/files/patch-set_soenv.1 index d3d34f896e88..bb2dccced07b 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-set_soenv.1 +++ b/editors/openoffice.org-2.0-devel/files/patch-set_soenv.1 @@ -1,15 +1,22 @@ --- set_soenv.1.orig Wed Feb 27 10:46:41 2002 -+++ set_soenv.1 Mon Mar 11 13:46:57 2002 ++++ set_soenv.1 Wed Mar 13 19:13:01 2002 @@ -40,7 +40,7 @@ # # Set this value equal to the corresponding amount of # command line arguments. -my $numArgs = 19; -+my $numArgs = 22; ++my $numArgs = 24; # Determining the amount of arguments in the call. my $numEnter = $#ARGV + 1; if ( $numEnter != $numArgs ) -@@ -72,8 +72,9 @@ +@@ -66,14 +66,15 @@ + my ( $CALL_CDECL, $COMMON_OUTDIR, $NO_SRS_PATCH, $PROFULLSWITCH, $BIG_GOODIES, $BMP_WRITES_FLAG, + $common_build, $MK_UNROLL, $NO_REC_RES, $PROEXT, $SO3, $SOLAR_JAVA, + $SOLAR_PLUGIN, $TF_PACKAGES, $TF_SDBAPI, $TF_FILEURL, $UPDATER, $BUILD_DELIVER, $USE_NEWCHARSET, $USE_NEW_RSC, $VCL, +- $TF_CFGDATA, $TF_SVDATA, ++ $TF_CFGDATA, $TF_SVDATA, $CC, $CXX, + $USE_NAMESPACE, $BUILD_SOSL, $LOCAL_SOLENV, $ENABLEUNICODE, $NEW_JAR_PACK, $NO_BSYMBOLIC, + $USE_XPRINT, $BUILD_SOSL_RELEASE ); # # Platform dependent constant values. my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV, @@ -21,7 +28,16 @@ # #------------------------------------------- # IIc. Declaring the environment variables. -@@ -303,7 +304,7 @@ +@@ -145,6 +146,8 @@ + $STLPORT4 = $ARGV [ 12 ]; # Location of STLport4 + $MINGWIN32 = $ARGV [ 17 ]; # use MINGWIN32 + $USE_GCC3 = $ARGV [ 18 ]; # use gcc3 (only for unxlngi4 at the moment) ++$CC = $ARGV [ 22 ]; # get cc from environment ++$CXX = $ARGV [ 23 ]; # use c++ from environment + # + #--------------------------------------------------------------- + # IIIb. Initialising the variables for the system commands, etc. +@@ -303,7 +306,7 @@ $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; $SOLAR_JAVA = "TRUE"; @@ -30,7 +46,7 @@ } elsif ( $platform eq "$FreeBSD" ) { print "Setting FreeBSD specific values... "; -@@ -326,6 +327,9 @@ +@@ -326,6 +329,9 @@ $PATH_SEPERATOR = $ps; $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; @@ -40,7 +56,7 @@ } elsif ( $platform eq "$Linux" ) { -@@ -889,15 +893,16 @@ +@@ -889,15 +895,16 @@ $D.$COM. $D.$CVER. $D.$GVER. @@ -60,7 +76,7 @@ { $SOLARDEF .= $D."GLIBC=".$GLIBC; } $SOLARDEF .= $D."SUPD=$UPD". -@@ -990,7 +995,7 @@ +@@ -990,7 +997,7 @@ $ps.$USR.$LIB. $ps.$USR_LOCAL.$BIN; } @@ -69,7 +85,7 @@ { $PATH = $cur_dir. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN. $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. -@@ -1004,6 +1009,22 @@ +@@ -1004,6 +1011,22 @@ $ps.$USR.$BIN.$ds."X11". $ps.$USR.$LIB; } @@ -92,7 +108,7 @@ elsif ($platform eq "$Winnt") { $COMPATH_ROOT = $COMPATH; $COMPATH_ROOT =~ s/\/vc98$//; -@@ -1107,21 +1128,14 @@ +@@ -1107,21 +1130,14 @@ $SOLARINC .= $I.$USR.$INCLUDE; } $SOLARINC .= $STLPORT_stlport; @@ -117,8 +133,12 @@ { # This simply adds an include path, so even cases that break the FHS work $SOLARINC .= $STLPORT_inc_stlport; -@@ -1313,6 +1327,9 @@ +@@ -1311,8 +1327,13 @@ + ToFile( "GLIBC", $GLIBC, "e" ); + ToFile( "GUIBASE", $GUIBASE, "e" ); ToFile( "GUIENV", $GUIENV, "e" ); ++ToFile( "CC", $CC, "e" ); ++ToFile( "CXX", $CXX, "e" ); ToFile( "GVER", $GVER, "e" ); ToFile( "OS", $OS, "e" ); +ToFile( "OSVERSION", $OSVERSION, "e" ); 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 ab5e980366fb..3a9f86bb8d2f 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 @@ -1,5 +1,5 @@ --- ../solenv/inc/unxfbsdi.mk.orig Wed Oct 24 19:21:47 2001 -+++ ../solenv/inc/unxfbsdi.mk Sat Mar 9 23:28:50 2002 ++++ ../solenv/inc/unxfbsdi.mk Wed Mar 13 19:13:59 2002 @@ -1,84 +1,145 @@ - # mak file fuer unxfbsdi @@ -17,10 +17,10 @@ LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" +# name of C Compiler -+cc=gcc ++cc=$(CC) + +# name of C++ Compiler -+CC=g++ ++CC=$(CXX) + +# options for C and C++ Compiler +CDEFS+=-D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 -DOSVERSION=$(OSVERSION) diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile index 0d27392347bc..5556075829d7 100644 --- a/editors/openoffice.org-2.0/Makefile +++ b/editors/openoffice.org-2.0/Makefile @@ -18,6 +18,7 @@ EXTRACT_ONLY= oo_${PORTVERSION}_src.tar.bz2 MAINTAINER= mbr@FreeBSD.org BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport +BUILD_DEPENDS+= ${LOCALBASE}/bin/gcc295:${PORTSDIR}/lang/gcc295 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 LIB_DEPENDS+= pth.14:${PORTSDIR}/devel/pth @@ -46,7 +47,9 @@ CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \ --with-os-version=${OSVERSION} CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ - PTHREAD_LIBS=${PTHREAD_LIBS} + PTHREAD_LIBS=${PTHREAD_LIBS} \ + CC=gcc295 \ + CXX=g++295 .include <bsd.port.pre.mk> diff --git a/editors/openoffice.org-2.0/files/patch-set_soenv.1 b/editors/openoffice.org-2.0/files/patch-set_soenv.1 index d3d34f896e88..bb2dccced07b 100644 --- a/editors/openoffice.org-2.0/files/patch-set_soenv.1 +++ b/editors/openoffice.org-2.0/files/patch-set_soenv.1 @@ -1,15 +1,22 @@ --- set_soenv.1.orig Wed Feb 27 10:46:41 2002 -+++ set_soenv.1 Mon Mar 11 13:46:57 2002 ++++ set_soenv.1 Wed Mar 13 19:13:01 2002 @@ -40,7 +40,7 @@ # # Set this value equal to the corresponding amount of # command line arguments. -my $numArgs = 19; -+my $numArgs = 22; ++my $numArgs = 24; # Determining the amount of arguments in the call. my $numEnter = $#ARGV + 1; if ( $numEnter != $numArgs ) -@@ -72,8 +72,9 @@ +@@ -66,14 +66,15 @@ + my ( $CALL_CDECL, $COMMON_OUTDIR, $NO_SRS_PATCH, $PROFULLSWITCH, $BIG_GOODIES, $BMP_WRITES_FLAG, + $common_build, $MK_UNROLL, $NO_REC_RES, $PROEXT, $SO3, $SOLAR_JAVA, + $SOLAR_PLUGIN, $TF_PACKAGES, $TF_SDBAPI, $TF_FILEURL, $UPDATER, $BUILD_DELIVER, $USE_NEWCHARSET, $USE_NEW_RSC, $VCL, +- $TF_CFGDATA, $TF_SVDATA, ++ $TF_CFGDATA, $TF_SVDATA, $CC, $CXX, + $USE_NAMESPACE, $BUILD_SOSL, $LOCAL_SOLENV, $ENABLEUNICODE, $NEW_JAR_PACK, $NO_BSYMBOLIC, + $USE_XPRINT, $BUILD_SOSL_RELEASE ); # # Platform dependent constant values. my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV, @@ -21,7 +28,16 @@ # #------------------------------------------- # IIc. Declaring the environment variables. -@@ -303,7 +304,7 @@ +@@ -145,6 +146,8 @@ + $STLPORT4 = $ARGV [ 12 ]; # Location of STLport4 + $MINGWIN32 = $ARGV [ 17 ]; # use MINGWIN32 + $USE_GCC3 = $ARGV [ 18 ]; # use gcc3 (only for unxlngi4 at the moment) ++$CC = $ARGV [ 22 ]; # get cc from environment ++$CXX = $ARGV [ 23 ]; # use c++ from environment + # + #--------------------------------------------------------------- + # IIIb. Initialising the variables for the system commands, etc. +@@ -303,7 +306,7 @@ $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; $SOLAR_JAVA = "TRUE"; @@ -30,7 +46,7 @@ } elsif ( $platform eq "$FreeBSD" ) { print "Setting FreeBSD specific values... "; -@@ -326,6 +327,9 @@ +@@ -326,6 +329,9 @@ $PATH_SEPERATOR = $ps; $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; @@ -40,7 +56,7 @@ } elsif ( $platform eq "$Linux" ) { -@@ -889,15 +893,16 @@ +@@ -889,15 +895,16 @@ $D.$COM. $D.$CVER. $D.$GVER. @@ -60,7 +76,7 @@ { $SOLARDEF .= $D."GLIBC=".$GLIBC; } $SOLARDEF .= $D."SUPD=$UPD". -@@ -990,7 +995,7 @@ +@@ -990,7 +997,7 @@ $ps.$USR.$LIB. $ps.$USR_LOCAL.$BIN; } @@ -69,7 +85,7 @@ { $PATH = $cur_dir. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN. $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. -@@ -1004,6 +1009,22 @@ +@@ -1004,6 +1011,22 @@ $ps.$USR.$BIN.$ds."X11". $ps.$USR.$LIB; } @@ -92,7 +108,7 @@ elsif ($platform eq "$Winnt") { $COMPATH_ROOT = $COMPATH; $COMPATH_ROOT =~ s/\/vc98$//; -@@ -1107,21 +1128,14 @@ +@@ -1107,21 +1130,14 @@ $SOLARINC .= $I.$USR.$INCLUDE; } $SOLARINC .= $STLPORT_stlport; @@ -117,8 +133,12 @@ { # This simply adds an include path, so even cases that break the FHS work $SOLARINC .= $STLPORT_inc_stlport; -@@ -1313,6 +1327,9 @@ +@@ -1311,8 +1327,13 @@ + ToFile( "GLIBC", $GLIBC, "e" ); + ToFile( "GUIBASE", $GUIBASE, "e" ); ToFile( "GUIENV", $GUIENV, "e" ); ++ToFile( "CC", $CC, "e" ); ++ToFile( "CXX", $CXX, "e" ); ToFile( "GVER", $GVER, "e" ); ToFile( "OS", $OS, "e" ); +ToFile( "OSVERSION", $OSVERSION, "e" ); 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 ab5e980366fb..3a9f86bb8d2f 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 @@ -1,5 +1,5 @@ --- ../solenv/inc/unxfbsdi.mk.orig Wed Oct 24 19:21:47 2001 -+++ ../solenv/inc/unxfbsdi.mk Sat Mar 9 23:28:50 2002 ++++ ../solenv/inc/unxfbsdi.mk Wed Mar 13 19:13:59 2002 @@ -1,84 +1,145 @@ - # mak file fuer unxfbsdi @@ -17,10 +17,10 @@ LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" +# name of C Compiler -+cc=gcc ++cc=$(CC) + +# name of C++ Compiler -+CC=g++ ++CC=$(CXX) + +# options for C and C++ Compiler +CDEFS+=-D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 -DOSVERSION=$(OSVERSION) diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile index 0d27392347bc..5556075829d7 100644 --- a/editors/openoffice.org-2/Makefile +++ b/editors/openoffice.org-2/Makefile @@ -18,6 +18,7 @@ EXTRACT_ONLY= oo_${PORTVERSION}_src.tar.bz2 MAINTAINER= mbr@FreeBSD.org BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport +BUILD_DEPENDS+= ${LOCALBASE}/bin/gcc295:${PORTSDIR}/lang/gcc295 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 LIB_DEPENDS+= pth.14:${PORTSDIR}/devel/pth @@ -46,7 +47,9 @@ CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \ --with-os-version=${OSVERSION} CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ - PTHREAD_LIBS=${PTHREAD_LIBS} + PTHREAD_LIBS=${PTHREAD_LIBS} \ + CC=gcc295 \ + CXX=g++295 .include <bsd.port.pre.mk> diff --git a/editors/openoffice.org-2/files/patch-set_soenv.1 b/editors/openoffice.org-2/files/patch-set_soenv.1 index d3d34f896e88..bb2dccced07b 100644 --- a/editors/openoffice.org-2/files/patch-set_soenv.1 +++ b/editors/openoffice.org-2/files/patch-set_soenv.1 @@ -1,15 +1,22 @@ --- set_soenv.1.orig Wed Feb 27 10:46:41 2002 -+++ set_soenv.1 Mon Mar 11 13:46:57 2002 ++++ set_soenv.1 Wed Mar 13 19:13:01 2002 @@ -40,7 +40,7 @@ # # Set this value equal to the corresponding amount of # command line arguments. -my $numArgs = 19; -+my $numArgs = 22; ++my $numArgs = 24; # Determining the amount of arguments in the call. my $numEnter = $#ARGV + 1; if ( $numEnter != $numArgs ) -@@ -72,8 +72,9 @@ +@@ -66,14 +66,15 @@ + my ( $CALL_CDECL, $COMMON_OUTDIR, $NO_SRS_PATCH, $PROFULLSWITCH, $BIG_GOODIES, $BMP_WRITES_FLAG, + $common_build, $MK_UNROLL, $NO_REC_RES, $PROEXT, $SO3, $SOLAR_JAVA, + $SOLAR_PLUGIN, $TF_PACKAGES, $TF_SDBAPI, $TF_FILEURL, $UPDATER, $BUILD_DELIVER, $USE_NEWCHARSET, $USE_NEW_RSC, $VCL, +- $TF_CFGDATA, $TF_SVDATA, ++ $TF_CFGDATA, $TF_SVDATA, $CC, $CXX, + $USE_NAMESPACE, $BUILD_SOSL, $LOCAL_SOLENV, $ENABLEUNICODE, $NEW_JAR_PACK, $NO_BSYMBOLIC, + $USE_XPRINT, $BUILD_SOSL_RELEASE ); # # Platform dependent constant values. my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV, @@ -21,7 +28,16 @@ # #------------------------------------------- # IIc. Declaring the environment variables. -@@ -303,7 +304,7 @@ +@@ -145,6 +146,8 @@ + $STLPORT4 = $ARGV [ 12 ]; # Location of STLport4 + $MINGWIN32 = $ARGV [ 17 ]; # use MINGWIN32 + $USE_GCC3 = $ARGV [ 18 ]; # use gcc3 (only for unxlngi4 at the moment) ++$CC = $ARGV [ 22 ]; # get cc from environment ++$CXX = $ARGV [ 23 ]; # use c++ from environment + # + #--------------------------------------------------------------- + # IIIb. Initialising the variables for the system commands, etc. +@@ -303,7 +306,7 @@ $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; $SOLAR_JAVA = "TRUE"; @@ -30,7 +46,7 @@ } elsif ( $platform eq "$FreeBSD" ) { print "Setting FreeBSD specific values... "; -@@ -326,6 +327,9 @@ +@@ -326,6 +329,9 @@ $PATH_SEPERATOR = $ps; $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; @@ -40,7 +56,7 @@ } elsif ( $platform eq "$Linux" ) { -@@ -889,15 +893,16 @@ +@@ -889,15 +895,16 @@ $D.$COM. $D.$CVER. $D.$GVER. @@ -60,7 +76,7 @@ { $SOLARDEF .= $D."GLIBC=".$GLIBC; } $SOLARDEF .= $D."SUPD=$UPD". -@@ -990,7 +995,7 @@ +@@ -990,7 +997,7 @@ $ps.$USR.$LIB. $ps.$USR_LOCAL.$BIN; } @@ -69,7 +85,7 @@ { $PATH = $cur_dir. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN. $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. -@@ -1004,6 +1009,22 @@ +@@ -1004,6 +1011,22 @@ $ps.$USR.$BIN.$ds."X11". $ps.$USR.$LIB; } @@ -92,7 +108,7 @@ elsif ($platform eq "$Winnt") { $COMPATH_ROOT = $COMPATH; $COMPATH_ROOT =~ s/\/vc98$//; -@@ -1107,21 +1128,14 @@ +@@ -1107,21 +1130,14 @@ $SOLARINC .= $I.$USR.$INCLUDE; } $SOLARINC .= $STLPORT_stlport; @@ -117,8 +133,12 @@ { # This simply adds an include path, so even cases that break the FHS work $SOLARINC .= $STLPORT_inc_stlport; -@@ -1313,6 +1327,9 @@ +@@ -1311,8 +1327,13 @@ + ToFile( "GLIBC", $GLIBC, "e" ); + ToFile( "GUIBASE", $GUIBASE, "e" ); ToFile( "GUIENV", $GUIENV, "e" ); ++ToFile( "CC", $CC, "e" ); ++ToFile( "CXX", $CXX, "e" ); ToFile( "GVER", $GVER, "e" ); ToFile( "OS", $OS, "e" ); +ToFile( "OSVERSION", $OSVERSION, "e" ); 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 ab5e980366fb..3a9f86bb8d2f 100644 --- a/editors/openoffice.org-2/files/patch-solenv::inc::unxfbsdi.mk +++ b/editors/openoffice.org-2/files/patch-solenv::inc::unxfbsdi.mk @@ -1,5 +1,5 @@ --- ../solenv/inc/unxfbsdi.mk.orig Wed Oct 24 19:21:47 2001 -+++ ../solenv/inc/unxfbsdi.mk Sat Mar 9 23:28:50 2002 ++++ ../solenv/inc/unxfbsdi.mk Wed Mar 13 19:13:59 2002 @@ -1,84 +1,145 @@ - # mak file fuer unxfbsdi @@ -17,10 +17,10 @@ LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" +# name of C Compiler -+cc=gcc ++cc=$(CC) + +# name of C++ Compiler -+CC=g++ ++CC=$(CXX) + +# options for C and C++ Compiler +CDEFS+=-D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 -DOSVERSION=$(OSVERSION) diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile index 0d27392347bc..5556075829d7 100644 --- a/editors/openoffice.org-3-RC/Makefile +++ b/editors/openoffice.org-3-RC/Makefile @@ -18,6 +18,7 @@ EXTRACT_ONLY= oo_${PORTVERSION}_src.tar.bz2 MAINTAINER= mbr@FreeBSD.org BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport +BUILD_DEPENDS+= ${LOCALBASE}/bin/gcc295:${PORTSDIR}/lang/gcc295 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 LIB_DEPENDS+= pth.14:${PORTSDIR}/devel/pth @@ -46,7 +47,9 @@ CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \ --with-os-version=${OSVERSION} CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ - PTHREAD_LIBS=${PTHREAD_LIBS} + PTHREAD_LIBS=${PTHREAD_LIBS} \ + CC=gcc295 \ + CXX=g++295 .include <bsd.port.pre.mk> diff --git a/editors/openoffice.org-3-RC/files/patch-set_soenv.1 b/editors/openoffice.org-3-RC/files/patch-set_soenv.1 index d3d34f896e88..bb2dccced07b 100644 --- a/editors/openoffice.org-3-RC/files/patch-set_soenv.1 +++ b/editors/openoffice.org-3-RC/files/patch-set_soenv.1 @@ -1,15 +1,22 @@ --- set_soenv.1.orig Wed Feb 27 10:46:41 2002 -+++ set_soenv.1 Mon Mar 11 13:46:57 2002 ++++ set_soenv.1 Wed Mar 13 19:13:01 2002 @@ -40,7 +40,7 @@ # # Set this value equal to the corresponding amount of # command line arguments. -my $numArgs = 19; -+my $numArgs = 22; ++my $numArgs = 24; # Determining the amount of arguments in the call. my $numEnter = $#ARGV + 1; if ( $numEnter != $numArgs ) -@@ -72,8 +72,9 @@ +@@ -66,14 +66,15 @@ + my ( $CALL_CDECL, $COMMON_OUTDIR, $NO_SRS_PATCH, $PROFULLSWITCH, $BIG_GOODIES, $BMP_WRITES_FLAG, + $common_build, $MK_UNROLL, $NO_REC_RES, $PROEXT, $SO3, $SOLAR_JAVA, + $SOLAR_PLUGIN, $TF_PACKAGES, $TF_SDBAPI, $TF_FILEURL, $UPDATER, $BUILD_DELIVER, $USE_NEWCHARSET, $USE_NEW_RSC, $VCL, +- $TF_CFGDATA, $TF_SVDATA, ++ $TF_CFGDATA, $TF_SVDATA, $CC, $CXX, + $USE_NAMESPACE, $BUILD_SOSL, $LOCAL_SOLENV, $ENABLEUNICODE, $NEW_JAR_PACK, $NO_BSYMBOLIC, + $USE_XPRINT, $BUILD_SOSL_RELEASE ); # # Platform dependent constant values. my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV, @@ -21,7 +28,16 @@ # #------------------------------------------- # IIc. Declaring the environment variables. -@@ -303,7 +304,7 @@ +@@ -145,6 +146,8 @@ + $STLPORT4 = $ARGV [ 12 ]; # Location of STLport4 + $MINGWIN32 = $ARGV [ 17 ]; # use MINGWIN32 + $USE_GCC3 = $ARGV [ 18 ]; # use gcc3 (only for unxlngi4 at the moment) ++$CC = $ARGV [ 22 ]; # get cc from environment ++$CXX = $ARGV [ 23 ]; # use c++ from environment + # + #--------------------------------------------------------------- + # IIIb. Initialising the variables for the system commands, etc. +@@ -303,7 +306,7 @@ $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; $SOLAR_JAVA = "TRUE"; @@ -30,7 +46,7 @@ } elsif ( $platform eq "$FreeBSD" ) { print "Setting FreeBSD specific values... "; -@@ -326,6 +327,9 @@ +@@ -326,6 +329,9 @@ $PATH_SEPERATOR = $ps; $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; @@ -40,7 +56,7 @@ } elsif ( $platform eq "$Linux" ) { -@@ -889,15 +893,16 @@ +@@ -889,15 +895,16 @@ $D.$COM. $D.$CVER. $D.$GVER. @@ -60,7 +76,7 @@ { $SOLARDEF .= $D."GLIBC=".$GLIBC; } $SOLARDEF .= $D."SUPD=$UPD". -@@ -990,7 +995,7 @@ +@@ -990,7 +997,7 @@ $ps.$USR.$LIB. $ps.$USR_LOCAL.$BIN; } @@ -69,7 +85,7 @@ { $PATH = $cur_dir. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN. $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. -@@ -1004,6 +1009,22 @@ +@@ -1004,6 +1011,22 @@ $ps.$USR.$BIN.$ds."X11". $ps.$USR.$LIB; } @@ -92,7 +108,7 @@ elsif ($platform eq "$Winnt") { $COMPATH_ROOT = $COMPATH; $COMPATH_ROOT =~ s/\/vc98$//; -@@ -1107,21 +1128,14 @@ +@@ -1107,21 +1130,14 @@ $SOLARINC .= $I.$USR.$INCLUDE; } $SOLARINC .= $STLPORT_stlport; @@ -117,8 +133,12 @@ { # This simply adds an include path, so even cases that break the FHS work $SOLARINC .= $STLPORT_inc_stlport; -@@ -1313,6 +1327,9 @@ +@@ -1311,8 +1327,13 @@ + ToFile( "GLIBC", $GLIBC, "e" ); + ToFile( "GUIBASE", $GUIBASE, "e" ); ToFile( "GUIENV", $GUIENV, "e" ); ++ToFile( "CC", $CC, "e" ); ++ToFile( "CXX", $CXX, "e" ); ToFile( "GVER", $GVER, "e" ); ToFile( "OS", $OS, "e" ); +ToFile( "OSVERSION", $OSVERSION, "e" ); 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 ab5e980366fb..3a9f86bb8d2f 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 @@ -1,5 +1,5 @@ --- ../solenv/inc/unxfbsdi.mk.orig Wed Oct 24 19:21:47 2001 -+++ ../solenv/inc/unxfbsdi.mk Sat Mar 9 23:28:50 2002 ++++ ../solenv/inc/unxfbsdi.mk Wed Mar 13 19:13:59 2002 @@ -1,84 +1,145 @@ - # mak file fuer unxfbsdi @@ -17,10 +17,10 @@ LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" +# name of C Compiler -+cc=gcc ++cc=$(CC) + +# name of C++ Compiler -+CC=g++ ++CC=$(CXX) + +# options for C and C++ Compiler +CDEFS+=-D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 -DOSVERSION=$(OSVERSION) diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile index 0d27392347bc..5556075829d7 100644 --- a/editors/openoffice.org-3-devel/Makefile +++ b/editors/openoffice.org-3-devel/Makefile @@ -18,6 +18,7 @@ EXTRACT_ONLY= oo_${PORTVERSION}_src.tar.bz2 MAINTAINER= mbr@FreeBSD.org BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport +BUILD_DEPENDS+= ${LOCALBASE}/bin/gcc295:${PORTSDIR}/lang/gcc295 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 LIB_DEPENDS+= pth.14:${PORTSDIR}/devel/pth @@ -46,7 +47,9 @@ CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \ --with-os-version=${OSVERSION} CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ - PTHREAD_LIBS=${PTHREAD_LIBS} + PTHREAD_LIBS=${PTHREAD_LIBS} \ + CC=gcc295 \ + CXX=g++295 .include <bsd.port.pre.mk> diff --git a/editors/openoffice.org-3-devel/files/patch-set_soenv.1 b/editors/openoffice.org-3-devel/files/patch-set_soenv.1 index d3d34f896e88..bb2dccced07b 100644 --- a/editors/openoffice.org-3-devel/files/patch-set_soenv.1 +++ b/editors/openoffice.org-3-devel/files/patch-set_soenv.1 @@ -1,15 +1,22 @@ --- set_soenv.1.orig Wed Feb 27 10:46:41 2002 -+++ set_soenv.1 Mon Mar 11 13:46:57 2002 ++++ set_soenv.1 Wed Mar 13 19:13:01 2002 @@ -40,7 +40,7 @@ # # Set this value equal to the corresponding amount of # command line arguments. -my $numArgs = 19; -+my $numArgs = 22; ++my $numArgs = 24; # Determining the amount of arguments in the call. my $numEnter = $#ARGV + 1; if ( $numEnter != $numArgs ) -@@ -72,8 +72,9 @@ +@@ -66,14 +66,15 @@ + my ( $CALL_CDECL, $COMMON_OUTDIR, $NO_SRS_PATCH, $PROFULLSWITCH, $BIG_GOODIES, $BMP_WRITES_FLAG, + $common_build, $MK_UNROLL, $NO_REC_RES, $PROEXT, $SO3, $SOLAR_JAVA, + $SOLAR_PLUGIN, $TF_PACKAGES, $TF_SDBAPI, $TF_FILEURL, $UPDATER, $BUILD_DELIVER, $USE_NEWCHARSET, $USE_NEW_RSC, $VCL, +- $TF_CFGDATA, $TF_SVDATA, ++ $TF_CFGDATA, $TF_SVDATA, $CC, $CXX, + $USE_NAMESPACE, $BUILD_SOSL, $LOCAL_SOLENV, $ENABLEUNICODE, $NEW_JAR_PACK, $NO_BSYMBOLIC, + $USE_XPRINT, $BUILD_SOSL_RELEASE ); # # Platform dependent constant values. my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV, @@ -21,7 +28,16 @@ # #------------------------------------------- # IIc. Declaring the environment variables. -@@ -303,7 +304,7 @@ +@@ -145,6 +146,8 @@ + $STLPORT4 = $ARGV [ 12 ]; # Location of STLport4 + $MINGWIN32 = $ARGV [ 17 ]; # use MINGWIN32 + $USE_GCC3 = $ARGV [ 18 ]; # use gcc3 (only for unxlngi4 at the moment) ++$CC = $ARGV [ 22 ]; # get cc from environment ++$CXX = $ARGV [ 23 ]; # use c++ from environment + # + #--------------------------------------------------------------- + # IIIb. Initialising the variables for the system commands, etc. +@@ -303,7 +306,7 @@ $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; $SOLAR_JAVA = "TRUE"; @@ -30,7 +46,7 @@ } elsif ( $platform eq "$FreeBSD" ) { print "Setting FreeBSD specific values... "; -@@ -326,6 +327,9 @@ +@@ -326,6 +329,9 @@ $PATH_SEPERATOR = $ps; $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; @@ -40,7 +56,7 @@ } elsif ( $platform eq "$Linux" ) { -@@ -889,15 +893,16 @@ +@@ -889,15 +895,16 @@ $D.$COM. $D.$CVER. $D.$GVER. @@ -60,7 +76,7 @@ { $SOLARDEF .= $D."GLIBC=".$GLIBC; } $SOLARDEF .= $D."SUPD=$UPD". -@@ -990,7 +995,7 @@ +@@ -990,7 +997,7 @@ $ps.$USR.$LIB. $ps.$USR_LOCAL.$BIN; } @@ -69,7 +85,7 @@ { $PATH = $cur_dir. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN. $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. -@@ -1004,6 +1009,22 @@ +@@ -1004,6 +1011,22 @@ $ps.$USR.$BIN.$ds."X11". $ps.$USR.$LIB; } @@ -92,7 +108,7 @@ elsif ($platform eq "$Winnt") { $COMPATH_ROOT = $COMPATH; $COMPATH_ROOT =~ s/\/vc98$//; -@@ -1107,21 +1128,14 @@ +@@ -1107,21 +1130,14 @@ $SOLARINC .= $I.$USR.$INCLUDE; } $SOLARINC .= $STLPORT_stlport; @@ -117,8 +133,12 @@ { # This simply adds an include path, so even cases that break the FHS work $SOLARINC .= $STLPORT_inc_stlport; -@@ -1313,6 +1327,9 @@ +@@ -1311,8 +1327,13 @@ + ToFile( "GLIBC", $GLIBC, "e" ); + ToFile( "GUIBASE", $GUIBASE, "e" ); ToFile( "GUIENV", $GUIENV, "e" ); ++ToFile( "CC", $CC, "e" ); ++ToFile( "CXX", $CXX, "e" ); ToFile( "GVER", $GVER, "e" ); ToFile( "OS", $OS, "e" ); +ToFile( "OSVERSION", $OSVERSION, "e" ); 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 ab5e980366fb..3a9f86bb8d2f 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 @@ -1,5 +1,5 @@ --- ../solenv/inc/unxfbsdi.mk.orig Wed Oct 24 19:21:47 2001 -+++ ../solenv/inc/unxfbsdi.mk Sat Mar 9 23:28:50 2002 ++++ ../solenv/inc/unxfbsdi.mk Wed Mar 13 19:13:59 2002 @@ -1,84 +1,145 @@ - # mak file fuer unxfbsdi @@ -17,10 +17,10 @@ LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" +# name of C Compiler -+cc=gcc ++cc=$(CC) + +# name of C++ Compiler -+CC=g++ ++CC=$(CXX) + +# options for C and C++ Compiler +CDEFS+=-D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 -DOSVERSION=$(OSVERSION) diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile index 0d27392347bc..5556075829d7 100644 --- a/editors/openoffice.org-3/Makefile +++ b/editors/openoffice.org-3/Makefile @@ -18,6 +18,7 @@ EXTRACT_ONLY= oo_${PORTVERSION}_src.tar.bz2 MAINTAINER= mbr@FreeBSD.org BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport +BUILD_DEPENDS+= ${LOCALBASE}/bin/gcc295:${PORTSDIR}/lang/gcc295 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 LIB_DEPENDS+= pth.14:${PORTSDIR}/devel/pth @@ -46,7 +47,9 @@ CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \ --with-os-version=${OSVERSION} CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ - PTHREAD_LIBS=${PTHREAD_LIBS} + PTHREAD_LIBS=${PTHREAD_LIBS} \ + CC=gcc295 \ + CXX=g++295 .include <bsd.port.pre.mk> diff --git a/editors/openoffice.org-3/files/patch-set_soenv.1 b/editors/openoffice.org-3/files/patch-set_soenv.1 index d3d34f896e88..bb2dccced07b 100644 --- a/editors/openoffice.org-3/files/patch-set_soenv.1 +++ b/editors/openoffice.org-3/files/patch-set_soenv.1 @@ -1,15 +1,22 @@ --- set_soenv.1.orig Wed Feb 27 10:46:41 2002 -+++ set_soenv.1 Mon Mar 11 13:46:57 2002 ++++ set_soenv.1 Wed Mar 13 19:13:01 2002 @@ -40,7 +40,7 @@ # # Set this value equal to the corresponding amount of # command line arguments. -my $numArgs = 19; -+my $numArgs = 22; ++my $numArgs = 24; # Determining the amount of arguments in the call. my $numEnter = $#ARGV + 1; if ( $numEnter != $numArgs ) -@@ -72,8 +72,9 @@ +@@ -66,14 +66,15 @@ + my ( $CALL_CDECL, $COMMON_OUTDIR, $NO_SRS_PATCH, $PROFULLSWITCH, $BIG_GOODIES, $BMP_WRITES_FLAG, + $common_build, $MK_UNROLL, $NO_REC_RES, $PROEXT, $SO3, $SOLAR_JAVA, + $SOLAR_PLUGIN, $TF_PACKAGES, $TF_SDBAPI, $TF_FILEURL, $UPDATER, $BUILD_DELIVER, $USE_NEWCHARSET, $USE_NEW_RSC, $VCL, +- $TF_CFGDATA, $TF_SVDATA, ++ $TF_CFGDATA, $TF_SVDATA, $CC, $CXX, + $USE_NAMESPACE, $BUILD_SOSL, $LOCAL_SOLENV, $ENABLEUNICODE, $NEW_JAR_PACK, $NO_BSYMBOLIC, + $USE_XPRINT, $BUILD_SOSL_RELEASE ); # # Platform dependent constant values. my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV, @@ -21,7 +28,16 @@ # #------------------------------------------- # IIc. Declaring the environment variables. -@@ -303,7 +304,7 @@ +@@ -145,6 +146,8 @@ + $STLPORT4 = $ARGV [ 12 ]; # Location of STLport4 + $MINGWIN32 = $ARGV [ 17 ]; # use MINGWIN32 + $USE_GCC3 = $ARGV [ 18 ]; # use gcc3 (only for unxlngi4 at the moment) ++$CC = $ARGV [ 22 ]; # get cc from environment ++$CXX = $ARGV [ 23 ]; # use c++ from environment + # + #--------------------------------------------------------------- + # IIIb. Initialising the variables for the system commands, etc. +@@ -303,7 +306,7 @@ $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; $SOLAR_JAVA = "TRUE"; @@ -30,7 +46,7 @@ } elsif ( $platform eq "$FreeBSD" ) { print "Setting FreeBSD specific values... "; -@@ -326,6 +327,9 @@ +@@ -326,6 +329,9 @@ $PATH_SEPERATOR = $ps; $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; @@ -40,7 +56,7 @@ } elsif ( $platform eq "$Linux" ) { -@@ -889,15 +893,16 @@ +@@ -889,15 +895,16 @@ $D.$COM. $D.$CVER. $D.$GVER. @@ -60,7 +76,7 @@ { $SOLARDEF .= $D."GLIBC=".$GLIBC; } $SOLARDEF .= $D."SUPD=$UPD". -@@ -990,7 +995,7 @@ +@@ -990,7 +997,7 @@ $ps.$USR.$LIB. $ps.$USR_LOCAL.$BIN; } @@ -69,7 +85,7 @@ { $PATH = $cur_dir. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN. $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. -@@ -1004,6 +1009,22 @@ +@@ -1004,6 +1011,22 @@ $ps.$USR.$BIN.$ds."X11". $ps.$USR.$LIB; } @@ -92,7 +108,7 @@ elsif ($platform eq "$Winnt") { $COMPATH_ROOT = $COMPATH; $COMPATH_ROOT =~ s/\/vc98$//; -@@ -1107,21 +1128,14 @@ +@@ -1107,21 +1130,14 @@ $SOLARINC .= $I.$USR.$INCLUDE; } $SOLARINC .= $STLPORT_stlport; @@ -117,8 +133,12 @@ { # This simply adds an include path, so even cases that break the FHS work $SOLARINC .= $STLPORT_inc_stlport; -@@ -1313,6 +1327,9 @@ +@@ -1311,8 +1327,13 @@ + ToFile( "GLIBC", $GLIBC, "e" ); + ToFile( "GUIBASE", $GUIBASE, "e" ); ToFile( "GUIENV", $GUIENV, "e" ); ++ToFile( "CC", $CC, "e" ); ++ToFile( "CXX", $CXX, "e" ); ToFile( "GVER", $GVER, "e" ); ToFile( "OS", $OS, "e" ); +ToFile( "OSVERSION", $OSVERSION, "e" ); 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 ab5e980366fb..3a9f86bb8d2f 100644 --- a/editors/openoffice.org-3/files/patch-solenv::inc::unxfbsdi.mk +++ b/editors/openoffice.org-3/files/patch-solenv::inc::unxfbsdi.mk @@ -1,5 +1,5 @@ --- ../solenv/inc/unxfbsdi.mk.orig Wed Oct 24 19:21:47 2001 -+++ ../solenv/inc/unxfbsdi.mk Sat Mar 9 23:28:50 2002 ++++ ../solenv/inc/unxfbsdi.mk Wed Mar 13 19:13:59 2002 @@ -1,84 +1,145 @@ - # mak file fuer unxfbsdi @@ -17,10 +17,10 @@ LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" +# name of C Compiler -+cc=gcc ++cc=$(CC) + +# name of C++ Compiler -+CC=g++ ++CC=$(CXX) + +# options for C and C++ Compiler +CDEFS+=-D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 -DOSVERSION=$(OSVERSION) diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile index 0d27392347bc..5556075829d7 100644 --- a/editors/openoffice.org-vcltesttool/Makefile +++ b/editors/openoffice.org-vcltesttool/Makefile @@ -18,6 +18,7 @@ EXTRACT_ONLY= oo_${PORTVERSION}_src.tar.bz2 MAINTAINER= mbr@FreeBSD.org BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport +BUILD_DEPENDS+= ${LOCALBASE}/bin/gcc295:${PORTSDIR}/lang/gcc295 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 LIB_DEPENDS+= pth.14:${PORTSDIR}/devel/pth @@ -46,7 +47,9 @@ CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \ --with-os-version=${OSVERSION} CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ - PTHREAD_LIBS=${PTHREAD_LIBS} + PTHREAD_LIBS=${PTHREAD_LIBS} \ + CC=gcc295 \ + CXX=g++295 .include <bsd.port.pre.mk> diff --git a/editors/openoffice.org-vcltesttool/files/patch-set_soenv.1 b/editors/openoffice.org-vcltesttool/files/patch-set_soenv.1 index d3d34f896e88..bb2dccced07b 100644 --- a/editors/openoffice.org-vcltesttool/files/patch-set_soenv.1 +++ b/editors/openoffice.org-vcltesttool/files/patch-set_soenv.1 @@ -1,15 +1,22 @@ --- set_soenv.1.orig Wed Feb 27 10:46:41 2002 -+++ set_soenv.1 Mon Mar 11 13:46:57 2002 ++++ set_soenv.1 Wed Mar 13 19:13:01 2002 @@ -40,7 +40,7 @@ # # Set this value equal to the corresponding amount of # command line arguments. -my $numArgs = 19; -+my $numArgs = 22; ++my $numArgs = 24; # Determining the amount of arguments in the call. my $numEnter = $#ARGV + 1; if ( $numEnter != $numArgs ) -@@ -72,8 +72,9 @@ +@@ -66,14 +66,15 @@ + my ( $CALL_CDECL, $COMMON_OUTDIR, $NO_SRS_PATCH, $PROFULLSWITCH, $BIG_GOODIES, $BMP_WRITES_FLAG, + $common_build, $MK_UNROLL, $NO_REC_RES, $PROEXT, $SO3, $SOLAR_JAVA, + $SOLAR_PLUGIN, $TF_PACKAGES, $TF_SDBAPI, $TF_FILEURL, $UPDATER, $BUILD_DELIVER, $USE_NEWCHARSET, $USE_NEW_RSC, $VCL, +- $TF_CFGDATA, $TF_SVDATA, ++ $TF_CFGDATA, $TF_SVDATA, $CC, $CXX, + $USE_NAMESPACE, $BUILD_SOSL, $LOCAL_SOLENV, $ENABLEUNICODE, $NEW_JAR_PACK, $NO_BSYMBOLIC, + $USE_XPRINT, $BUILD_SOSL_RELEASE ); # # Platform dependent constant values. my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV, @@ -21,7 +28,16 @@ # #------------------------------------------- # IIc. Declaring the environment variables. -@@ -303,7 +304,7 @@ +@@ -145,6 +146,8 @@ + $STLPORT4 = $ARGV [ 12 ]; # Location of STLport4 + $MINGWIN32 = $ARGV [ 17 ]; # use MINGWIN32 + $USE_GCC3 = $ARGV [ 18 ]; # use gcc3 (only for unxlngi4 at the moment) ++$CC = $ARGV [ 22 ]; # get cc from environment ++$CXX = $ARGV [ 23 ]; # use c++ from environment + # + #--------------------------------------------------------------- + # IIIb. Initialising the variables for the system commands, etc. +@@ -303,7 +306,7 @@ $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; $SOLAR_JAVA = "TRUE"; @@ -30,7 +46,7 @@ } elsif ( $platform eq "$FreeBSD" ) { print "Setting FreeBSD specific values... "; -@@ -326,6 +327,9 @@ +@@ -326,6 +329,9 @@ $PATH_SEPERATOR = $ps; $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; @@ -40,7 +56,7 @@ } elsif ( $platform eq "$Linux" ) { -@@ -889,15 +893,16 @@ +@@ -889,15 +895,16 @@ $D.$COM. $D.$CVER. $D.$GVER. @@ -60,7 +76,7 @@ { $SOLARDEF .= $D."GLIBC=".$GLIBC; } $SOLARDEF .= $D."SUPD=$UPD". -@@ -990,7 +995,7 @@ +@@ -990,7 +997,7 @@ $ps.$USR.$LIB. $ps.$USR_LOCAL.$BIN; } @@ -69,7 +85,7 @@ { $PATH = $cur_dir. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN. $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. -@@ -1004,6 +1009,22 @@ +@@ -1004,6 +1011,22 @@ $ps.$USR.$BIN.$ds."X11". $ps.$USR.$LIB; } @@ -92,7 +108,7 @@ elsif ($platform eq "$Winnt") { $COMPATH_ROOT = $COMPATH; $COMPATH_ROOT =~ s/\/vc98$//; -@@ -1107,21 +1128,14 @@ +@@ -1107,21 +1130,14 @@ $SOLARINC .= $I.$USR.$INCLUDE; } $SOLARINC .= $STLPORT_stlport; @@ -117,8 +133,12 @@ { # This simply adds an include path, so even cases that break the FHS work $SOLARINC .= $STLPORT_inc_stlport; -@@ -1313,6 +1327,9 @@ +@@ -1311,8 +1327,13 @@ + ToFile( "GLIBC", $GLIBC, "e" ); + ToFile( "GUIBASE", $GUIBASE, "e" ); ToFile( "GUIENV", $GUIENV, "e" ); ++ToFile( "CC", $CC, "e" ); ++ToFile( "CXX", $CXX, "e" ); ToFile( "GVER", $GVER, "e" ); ToFile( "OS", $OS, "e" ); +ToFile( "OSVERSION", $OSVERSION, "e" ); 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 ab5e980366fb..3a9f86bb8d2f 100644 --- a/editors/openoffice.org-vcltesttool/files/patch-solenv::inc::unxfbsdi.mk +++ b/editors/openoffice.org-vcltesttool/files/patch-solenv::inc::unxfbsdi.mk @@ -1,5 +1,5 @@ --- ../solenv/inc/unxfbsdi.mk.orig Wed Oct 24 19:21:47 2001 -+++ ../solenv/inc/unxfbsdi.mk Sat Mar 9 23:28:50 2002 ++++ ../solenv/inc/unxfbsdi.mk Wed Mar 13 19:13:59 2002 @@ -1,84 +1,145 @@ - # mak file fuer unxfbsdi @@ -17,10 +17,10 @@ LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" +# name of C Compiler -+cc=gcc ++cc=$(CC) + +# name of C++ Compiler -+CC=g++ ++CC=$(CXX) + +# options for C and C++ Compiler +CDEFS+=-D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 -DOSVERSION=$(OSVERSION) |