mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-22 20:41:26 +00:00
Use autoconf, remove the ugly configure patch. Do the gcc tests and fix them
while we are here (AWK had an endless loop), add a FreeBSD configure variable called with-os-version, so we can check the OSVERSION in the build to support both STABLE and CURRENT (there are different patches needed)
This commit is contained in:
parent
6ecd1db2e7
commit
0a3a57c1f5
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=55747
@ -35,10 +35,12 @@ BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
|
||||
BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USE_AUTOCONF= yes
|
||||
WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office
|
||||
|
||||
CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \
|
||||
--with-jdk-home=${JDK13DIR}
|
||||
--with-jdk-home=${JDK13DIR} \
|
||||
--with-os-version=${OSVERSION}
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
|
@ -0,0 +1,93 @@
|
||||
--- configure.in.orig Mon Nov 12 22:45:53 2001
|
||||
+++ configure.in Fri Mar 8 23:53:42 2002
|
||||
@@ -98,6 +98,12 @@
|
||||
|
||||
Usage: --with-asm-home=<path to ml.exe directory>
|
||||
],,)
|
||||
+AC_ARG_WITH(os-version,
|
||||
+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice
|
||||
+ with the correct OSVERSION.
|
||||
+
|
||||
+ Usage: --with-os-version=<OSVERSION>
|
||||
+],,)
|
||||
AC_ARG_WITH(unzip-home,
|
||||
[ --with-unzip-home For Windows users, please supply the path for
|
||||
unzip.exe.
|
||||
@@ -225,13 +231,13 @@
|
||||
|
||||
if test $GCC; then
|
||||
AC_MSG_CHECKING([the GNU gcc compiler version])
|
||||
- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
if test "$_gcc_releasetype" = "egcs"; then
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler])
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn
|
||||
- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
else
|
||||
- _gcc_version=`$GCC --version`
|
||||
+ _gcc_version=`$CC --version`
|
||||
fi
|
||||
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
|
||||
if test "$_gcc_major" != "2"; then
|
||||
@@ -239,13 +245,13 @@
|
||||
AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
if test "$_gcc_middle" = "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
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
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
|
||||
@@ -306,7 +312,8 @@
|
||||
fi
|
||||
else
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
|
||||
- _gcc_include_path="/usr/include/g++"
|
||||
+ _gcc_include_path="/usr"
|
||||
+ _gxx_include_path="/usr/include/g++"
|
||||
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
|
||||
@@ -740,6 +747,10 @@
|
||||
fi
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
|
||||
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
|
||||
+ _jdk_minor="true"
|
||||
+ fi
|
||||
fi
|
||||
if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
@@ -982,7 +993,7 @@
|
||||
HAVE_GPC_C="yes"
|
||||
fi
|
||||
|
||||
-if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then
|
||||
+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
|
||||
AC_MSG_RESULT([GPC files found])
|
||||
else
|
||||
AC_MSG_ERROR([GPC files not found])
|
||||
@@ -1084,12 +1095,13 @@
|
||||
echo "\$with_lang="$with_lang
|
||||
echo "\$with_asm_home="$with_asm_home
|
||||
echo "\$with_unzip_home="$with_unzip_home
|
||||
+echo "\$with_os_version="$with_os_version
|
||||
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
|
||||
+ './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_os_version
|
||||
else
|
||||
echo
|
||||
echo Test Complete
|
@ -1,6 +1,41 @@
|
||||
--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
|
||||
+++ set_soenv.1 Thu Mar 7 16:24:14 2002
|
||||
@@ -954,7 +954,7 @@
|
||||
--- set_soenv.1.orig Tue Nov 20 18:26:33 2001
|
||||
+++ set_soenv.1 Fri Mar 8 22:33:35 2002
|
||||
@@ -40,7 +40,7 @@
|
||||
#
|
||||
# Set this value equal to the corresponding amount of
|
||||
# command line arguments.
|
||||
-my $numArgs = 17;
|
||||
+my $numArgs = 18;
|
||||
# Determining the amount of arguments in the call.
|
||||
my $numEnter = $#ARGV + 1;
|
||||
if ( $numEnter != $numArgs )
|
||||
@@ -72,7 +72,7 @@
|
||||
#
|
||||
# Platform dependent constant values.
|
||||
my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV,
|
||||
- $GVER, $GVERDIR, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
+ $GVER, $GVERDIR, $OSVERSION, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
$DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx );
|
||||
#
|
||||
#-------------------------------------------
|
||||
@@ -301,7 +301,7 @@
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
$SOLAR_JAVA = "TRUE";
|
||||
- $XPVERSION = "3";
|
||||
+ $XPVERSION = "3";
|
||||
}
|
||||
elsif ( $platform eq "$FreeBSD" )
|
||||
{ print "Setting FreeBSD specific values... ";
|
||||
@@ -324,6 +324,7 @@
|
||||
$PATH_SEPERATOR = $ps;
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
+ $OSVERSION = $ARGV[ 17 ];
|
||||
}
|
||||
elsif ( $platform eq "$Linux" )
|
||||
{
|
||||
@@ -954,7 +955,7 @@
|
||||
$ps.$USR.$LIB.
|
||||
$ps.$USR_LOCAL.$BIN;
|
||||
}
|
||||
@ -9,7 +44,7 @@
|
||||
{ $PATH = $cur_dir.
|
||||
$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
|
||||
$ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
|
||||
@@ -968,6 +968,22 @@
|
||||
@@ -968,6 +969,22 @@
|
||||
$ps.$USR.$BIN.$ds."X11".
|
||||
$ps.$USR.$LIB;
|
||||
}
|
||||
@ -32,7 +67,7 @@
|
||||
elsif ($platform eq "$Winnt")
|
||||
{ $COMPATH_ROOT = $COMPATH;
|
||||
$COMPATH_ROOT =~ s/\/vc98$//;
|
||||
@@ -1067,25 +1083,19 @@
|
||||
@@ -1067,25 +1084,19 @@
|
||||
{
|
||||
$SOLARINC .= $I.$USR.$INCLUDE.
|
||||
$STLPORT_stlport;
|
||||
@ -62,3 +97,11 @@
|
||||
$SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
|
||||
$I.'$JAVA_HOME'.$INCLUDE;
|
||||
|
||||
@@ -1273,6 +1284,7 @@
|
||||
ToFile( "GUIENV", $GUIENV, "e" );
|
||||
ToFile( "GVER", $GVER, "e" );
|
||||
ToFile( "OS", $OS, "e" );
|
||||
+ToFile( "OSVERSION", $OSVERSION, "e" );
|
||||
ToFile( "OUTPATH", $OUTPATH, "e" );
|
||||
ToFile( "INPATH", $INPATH, "e" );
|
||||
ToFile( "GVERDIR", $GVERDIR, "e" );
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,93 @@
|
||||
--- configure.in.orig Mon Nov 12 22:45:53 2001
|
||||
+++ configure.in Fri Mar 8 23:53:42 2002
|
||||
@@ -98,6 +98,12 @@
|
||||
|
||||
Usage: --with-asm-home=<path to ml.exe directory>
|
||||
],,)
|
||||
+AC_ARG_WITH(os-version,
|
||||
+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice
|
||||
+ with the correct OSVERSION.
|
||||
+
|
||||
+ Usage: --with-os-version=<OSVERSION>
|
||||
+],,)
|
||||
AC_ARG_WITH(unzip-home,
|
||||
[ --with-unzip-home For Windows users, please supply the path for
|
||||
unzip.exe.
|
||||
@@ -225,13 +231,13 @@
|
||||
|
||||
if test $GCC; then
|
||||
AC_MSG_CHECKING([the GNU gcc compiler version])
|
||||
- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
if test "$_gcc_releasetype" = "egcs"; then
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler])
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn
|
||||
- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
else
|
||||
- _gcc_version=`$GCC --version`
|
||||
+ _gcc_version=`$CC --version`
|
||||
fi
|
||||
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
|
||||
if test "$_gcc_major" != "2"; then
|
||||
@@ -239,13 +245,13 @@
|
||||
AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
if test "$_gcc_middle" = "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
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
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
|
||||
@@ -306,7 +312,8 @@
|
||||
fi
|
||||
else
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
|
||||
- _gcc_include_path="/usr/include/g++"
|
||||
+ _gcc_include_path="/usr"
|
||||
+ _gxx_include_path="/usr/include/g++"
|
||||
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
|
||||
@@ -740,6 +747,10 @@
|
||||
fi
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
|
||||
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
|
||||
+ _jdk_minor="true"
|
||||
+ fi
|
||||
fi
|
||||
if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
@@ -982,7 +993,7 @@
|
||||
HAVE_GPC_C="yes"
|
||||
fi
|
||||
|
||||
-if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then
|
||||
+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
|
||||
AC_MSG_RESULT([GPC files found])
|
||||
else
|
||||
AC_MSG_ERROR([GPC files not found])
|
||||
@@ -1084,12 +1095,13 @@
|
||||
echo "\$with_lang="$with_lang
|
||||
echo "\$with_asm_home="$with_asm_home
|
||||
echo "\$with_unzip_home="$with_unzip_home
|
||||
+echo "\$with_os_version="$with_os_version
|
||||
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
|
||||
+ './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_os_version
|
||||
else
|
||||
echo
|
||||
echo Test Complete
|
@ -1,6 +1,41 @@
|
||||
--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
|
||||
+++ set_soenv.1 Thu Mar 7 16:24:14 2002
|
||||
@@ -954,7 +954,7 @@
|
||||
--- set_soenv.1.orig Tue Nov 20 18:26:33 2001
|
||||
+++ set_soenv.1 Fri Mar 8 22:33:35 2002
|
||||
@@ -40,7 +40,7 @@
|
||||
#
|
||||
# Set this value equal to the corresponding amount of
|
||||
# command line arguments.
|
||||
-my $numArgs = 17;
|
||||
+my $numArgs = 18;
|
||||
# Determining the amount of arguments in the call.
|
||||
my $numEnter = $#ARGV + 1;
|
||||
if ( $numEnter != $numArgs )
|
||||
@@ -72,7 +72,7 @@
|
||||
#
|
||||
# Platform dependent constant values.
|
||||
my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV,
|
||||
- $GVER, $GVERDIR, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
+ $GVER, $GVERDIR, $OSVERSION, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
$DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx );
|
||||
#
|
||||
#-------------------------------------------
|
||||
@@ -301,7 +301,7 @@
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
$SOLAR_JAVA = "TRUE";
|
||||
- $XPVERSION = "3";
|
||||
+ $XPVERSION = "3";
|
||||
}
|
||||
elsif ( $platform eq "$FreeBSD" )
|
||||
{ print "Setting FreeBSD specific values... ";
|
||||
@@ -324,6 +324,7 @@
|
||||
$PATH_SEPERATOR = $ps;
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
+ $OSVERSION = $ARGV[ 17 ];
|
||||
}
|
||||
elsif ( $platform eq "$Linux" )
|
||||
{
|
||||
@@ -954,7 +955,7 @@
|
||||
$ps.$USR.$LIB.
|
||||
$ps.$USR_LOCAL.$BIN;
|
||||
}
|
||||
@ -9,7 +44,7 @@
|
||||
{ $PATH = $cur_dir.
|
||||
$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
|
||||
$ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
|
||||
@@ -968,6 +968,22 @@
|
||||
@@ -968,6 +969,22 @@
|
||||
$ps.$USR.$BIN.$ds."X11".
|
||||
$ps.$USR.$LIB;
|
||||
}
|
||||
@ -32,7 +67,7 @@
|
||||
elsif ($platform eq "$Winnt")
|
||||
{ $COMPATH_ROOT = $COMPATH;
|
||||
$COMPATH_ROOT =~ s/\/vc98$//;
|
||||
@@ -1067,25 +1083,19 @@
|
||||
@@ -1067,25 +1084,19 @@
|
||||
{
|
||||
$SOLARINC .= $I.$USR.$INCLUDE.
|
||||
$STLPORT_stlport;
|
||||
@ -62,3 +97,11 @@
|
||||
$SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
|
||||
$I.'$JAVA_HOME'.$INCLUDE;
|
||||
|
||||
@@ -1273,6 +1284,7 @@
|
||||
ToFile( "GUIENV", $GUIENV, "e" );
|
||||
ToFile( "GVER", $GVER, "e" );
|
||||
ToFile( "OS", $OS, "e" );
|
||||
+ToFile( "OSVERSION", $OSVERSION, "e" );
|
||||
ToFile( "OUTPATH", $OUTPATH, "e" );
|
||||
ToFile( "INPATH", $INPATH, "e" );
|
||||
ToFile( "GVERDIR", $GVERDIR, "e" );
|
||||
|
@ -35,10 +35,12 @@ BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
|
||||
BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USE_AUTOCONF= yes
|
||||
WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office
|
||||
|
||||
CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \
|
||||
--with-jdk-home=${JDK13DIR}
|
||||
--with-jdk-home=${JDK13DIR} \
|
||||
--with-os-version=${OSVERSION}
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
|
@ -0,0 +1,93 @@
|
||||
--- configure.in.orig Mon Nov 12 22:45:53 2001
|
||||
+++ configure.in Fri Mar 8 23:53:42 2002
|
||||
@@ -98,6 +98,12 @@
|
||||
|
||||
Usage: --with-asm-home=<path to ml.exe directory>
|
||||
],,)
|
||||
+AC_ARG_WITH(os-version,
|
||||
+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice
|
||||
+ with the correct OSVERSION.
|
||||
+
|
||||
+ Usage: --with-os-version=<OSVERSION>
|
||||
+],,)
|
||||
AC_ARG_WITH(unzip-home,
|
||||
[ --with-unzip-home For Windows users, please supply the path for
|
||||
unzip.exe.
|
||||
@@ -225,13 +231,13 @@
|
||||
|
||||
if test $GCC; then
|
||||
AC_MSG_CHECKING([the GNU gcc compiler version])
|
||||
- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
if test "$_gcc_releasetype" = "egcs"; then
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler])
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn
|
||||
- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
else
|
||||
- _gcc_version=`$GCC --version`
|
||||
+ _gcc_version=`$CC --version`
|
||||
fi
|
||||
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
|
||||
if test "$_gcc_major" != "2"; then
|
||||
@@ -239,13 +245,13 @@
|
||||
AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
if test "$_gcc_middle" = "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
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
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
|
||||
@@ -306,7 +312,8 @@
|
||||
fi
|
||||
else
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
|
||||
- _gcc_include_path="/usr/include/g++"
|
||||
+ _gcc_include_path="/usr"
|
||||
+ _gxx_include_path="/usr/include/g++"
|
||||
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
|
||||
@@ -740,6 +747,10 @@
|
||||
fi
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
|
||||
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
|
||||
+ _jdk_minor="true"
|
||||
+ fi
|
||||
fi
|
||||
if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
@@ -982,7 +993,7 @@
|
||||
HAVE_GPC_C="yes"
|
||||
fi
|
||||
|
||||
-if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then
|
||||
+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
|
||||
AC_MSG_RESULT([GPC files found])
|
||||
else
|
||||
AC_MSG_ERROR([GPC files not found])
|
||||
@@ -1084,12 +1095,13 @@
|
||||
echo "\$with_lang="$with_lang
|
||||
echo "\$with_asm_home="$with_asm_home
|
||||
echo "\$with_unzip_home="$with_unzip_home
|
||||
+echo "\$with_os_version="$with_os_version
|
||||
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
|
||||
+ './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_os_version
|
||||
else
|
||||
echo
|
||||
echo Test Complete
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,93 @@
|
||||
--- configure.in.orig Mon Nov 12 22:45:53 2001
|
||||
+++ configure.in Fri Mar 8 23:53:42 2002
|
||||
@@ -98,6 +98,12 @@
|
||||
|
||||
Usage: --with-asm-home=<path to ml.exe directory>
|
||||
],,)
|
||||
+AC_ARG_WITH(os-version,
|
||||
+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice
|
||||
+ with the correct OSVERSION.
|
||||
+
|
||||
+ Usage: --with-os-version=<OSVERSION>
|
||||
+],,)
|
||||
AC_ARG_WITH(unzip-home,
|
||||
[ --with-unzip-home For Windows users, please supply the path for
|
||||
unzip.exe.
|
||||
@@ -225,13 +231,13 @@
|
||||
|
||||
if test $GCC; then
|
||||
AC_MSG_CHECKING([the GNU gcc compiler version])
|
||||
- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
if test "$_gcc_releasetype" = "egcs"; then
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler])
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn
|
||||
- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
else
|
||||
- _gcc_version=`$GCC --version`
|
||||
+ _gcc_version=`$CC --version`
|
||||
fi
|
||||
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
|
||||
if test "$_gcc_major" != "2"; then
|
||||
@@ -239,13 +245,13 @@
|
||||
AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
if test "$_gcc_middle" = "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
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
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
|
||||
@@ -306,7 +312,8 @@
|
||||
fi
|
||||
else
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
|
||||
- _gcc_include_path="/usr/include/g++"
|
||||
+ _gcc_include_path="/usr"
|
||||
+ _gxx_include_path="/usr/include/g++"
|
||||
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
|
||||
@@ -740,6 +747,10 @@
|
||||
fi
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
|
||||
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
|
||||
+ _jdk_minor="true"
|
||||
+ fi
|
||||
fi
|
||||
if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
@@ -982,7 +993,7 @@
|
||||
HAVE_GPC_C="yes"
|
||||
fi
|
||||
|
||||
-if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then
|
||||
+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
|
||||
AC_MSG_RESULT([GPC files found])
|
||||
else
|
||||
AC_MSG_ERROR([GPC files not found])
|
||||
@@ -1084,12 +1095,13 @@
|
||||
echo "\$with_lang="$with_lang
|
||||
echo "\$with_asm_home="$with_asm_home
|
||||
echo "\$with_unzip_home="$with_unzip_home
|
||||
+echo "\$with_os_version="$with_os_version
|
||||
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
|
||||
+ './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_os_version
|
||||
else
|
||||
echo
|
||||
echo Test Complete
|
@ -1,6 +1,41 @@
|
||||
--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
|
||||
+++ set_soenv.1 Thu Mar 7 16:24:14 2002
|
||||
@@ -954,7 +954,7 @@
|
||||
--- set_soenv.1.orig Tue Nov 20 18:26:33 2001
|
||||
+++ set_soenv.1 Fri Mar 8 22:33:35 2002
|
||||
@@ -40,7 +40,7 @@
|
||||
#
|
||||
# Set this value equal to the corresponding amount of
|
||||
# command line arguments.
|
||||
-my $numArgs = 17;
|
||||
+my $numArgs = 18;
|
||||
# Determining the amount of arguments in the call.
|
||||
my $numEnter = $#ARGV + 1;
|
||||
if ( $numEnter != $numArgs )
|
||||
@@ -72,7 +72,7 @@
|
||||
#
|
||||
# Platform dependent constant values.
|
||||
my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV,
|
||||
- $GVER, $GVERDIR, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
+ $GVER, $GVERDIR, $OSVERSION, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
$DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx );
|
||||
#
|
||||
#-------------------------------------------
|
||||
@@ -301,7 +301,7 @@
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
$SOLAR_JAVA = "TRUE";
|
||||
- $XPVERSION = "3";
|
||||
+ $XPVERSION = "3";
|
||||
}
|
||||
elsif ( $platform eq "$FreeBSD" )
|
||||
{ print "Setting FreeBSD specific values... ";
|
||||
@@ -324,6 +324,7 @@
|
||||
$PATH_SEPERATOR = $ps;
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
+ $OSVERSION = $ARGV[ 17 ];
|
||||
}
|
||||
elsif ( $platform eq "$Linux" )
|
||||
{
|
||||
@@ -954,7 +955,7 @@
|
||||
$ps.$USR.$LIB.
|
||||
$ps.$USR_LOCAL.$BIN;
|
||||
}
|
||||
@ -9,7 +44,7 @@
|
||||
{ $PATH = $cur_dir.
|
||||
$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
|
||||
$ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
|
||||
@@ -968,6 +968,22 @@
|
||||
@@ -968,6 +969,22 @@
|
||||
$ps.$USR.$BIN.$ds."X11".
|
||||
$ps.$USR.$LIB;
|
||||
}
|
||||
@ -32,7 +67,7 @@
|
||||
elsif ($platform eq "$Winnt")
|
||||
{ $COMPATH_ROOT = $COMPATH;
|
||||
$COMPATH_ROOT =~ s/\/vc98$//;
|
||||
@@ -1067,25 +1083,19 @@
|
||||
@@ -1067,25 +1084,19 @@
|
||||
{
|
||||
$SOLARINC .= $I.$USR.$INCLUDE.
|
||||
$STLPORT_stlport;
|
||||
@ -62,3 +97,11 @@
|
||||
$SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
|
||||
$I.'$JAVA_HOME'.$INCLUDE;
|
||||
|
||||
@@ -1273,6 +1284,7 @@
|
||||
ToFile( "GUIENV", $GUIENV, "e" );
|
||||
ToFile( "GVER", $GVER, "e" );
|
||||
ToFile( "OS", $OS, "e" );
|
||||
+ToFile( "OSVERSION", $OSVERSION, "e" );
|
||||
ToFile( "OUTPATH", $OUTPATH, "e" );
|
||||
ToFile( "INPATH", $INPATH, "e" );
|
||||
ToFile( "GVERDIR", $GVERDIR, "e" );
|
||||
|
@ -35,10 +35,12 @@ BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
|
||||
BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USE_AUTOCONF= yes
|
||||
WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office
|
||||
|
||||
CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \
|
||||
--with-jdk-home=${JDK13DIR}
|
||||
--with-jdk-home=${JDK13DIR} \
|
||||
--with-os-version=${OSVERSION}
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
|
@ -0,0 +1,93 @@
|
||||
--- configure.in.orig Mon Nov 12 22:45:53 2001
|
||||
+++ configure.in Fri Mar 8 23:53:42 2002
|
||||
@@ -98,6 +98,12 @@
|
||||
|
||||
Usage: --with-asm-home=<path to ml.exe directory>
|
||||
],,)
|
||||
+AC_ARG_WITH(os-version,
|
||||
+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice
|
||||
+ with the correct OSVERSION.
|
||||
+
|
||||
+ Usage: --with-os-version=<OSVERSION>
|
||||
+],,)
|
||||
AC_ARG_WITH(unzip-home,
|
||||
[ --with-unzip-home For Windows users, please supply the path for
|
||||
unzip.exe.
|
||||
@@ -225,13 +231,13 @@
|
||||
|
||||
if test $GCC; then
|
||||
AC_MSG_CHECKING([the GNU gcc compiler version])
|
||||
- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
if test "$_gcc_releasetype" = "egcs"; then
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler])
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn
|
||||
- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
else
|
||||
- _gcc_version=`$GCC --version`
|
||||
+ _gcc_version=`$CC --version`
|
||||
fi
|
||||
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
|
||||
if test "$_gcc_major" != "2"; then
|
||||
@@ -239,13 +245,13 @@
|
||||
AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
if test "$_gcc_middle" = "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
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
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
|
||||
@@ -306,7 +312,8 @@
|
||||
fi
|
||||
else
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
|
||||
- _gcc_include_path="/usr/include/g++"
|
||||
+ _gcc_include_path="/usr"
|
||||
+ _gxx_include_path="/usr/include/g++"
|
||||
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
|
||||
@@ -740,6 +747,10 @@
|
||||
fi
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
|
||||
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
|
||||
+ _jdk_minor="true"
|
||||
+ fi
|
||||
fi
|
||||
if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
@@ -982,7 +993,7 @@
|
||||
HAVE_GPC_C="yes"
|
||||
fi
|
||||
|
||||
-if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then
|
||||
+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
|
||||
AC_MSG_RESULT([GPC files found])
|
||||
else
|
||||
AC_MSG_ERROR([GPC files not found])
|
||||
@@ -1084,12 +1095,13 @@
|
||||
echo "\$with_lang="$with_lang
|
||||
echo "\$with_asm_home="$with_asm_home
|
||||
echo "\$with_unzip_home="$with_unzip_home
|
||||
+echo "\$with_os_version="$with_os_version
|
||||
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
|
||||
+ './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_os_version
|
||||
else
|
||||
echo
|
||||
echo Test Complete
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,93 @@
|
||||
--- configure.in.orig Mon Nov 12 22:45:53 2001
|
||||
+++ configure.in Fri Mar 8 23:53:42 2002
|
||||
@@ -98,6 +98,12 @@
|
||||
|
||||
Usage: --with-asm-home=<path to ml.exe directory>
|
||||
],,)
|
||||
+AC_ARG_WITH(os-version,
|
||||
+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice
|
||||
+ with the correct OSVERSION.
|
||||
+
|
||||
+ Usage: --with-os-version=<OSVERSION>
|
||||
+],,)
|
||||
AC_ARG_WITH(unzip-home,
|
||||
[ --with-unzip-home For Windows users, please supply the path for
|
||||
unzip.exe.
|
||||
@@ -225,13 +231,13 @@
|
||||
|
||||
if test $GCC; then
|
||||
AC_MSG_CHECKING([the GNU gcc compiler version])
|
||||
- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
if test "$_gcc_releasetype" = "egcs"; then
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler])
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn
|
||||
- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
else
|
||||
- _gcc_version=`$GCC --version`
|
||||
+ _gcc_version=`$CC --version`
|
||||
fi
|
||||
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
|
||||
if test "$_gcc_major" != "2"; then
|
||||
@@ -239,13 +245,13 @@
|
||||
AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
if test "$_gcc_middle" = "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
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
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
|
||||
@@ -306,7 +312,8 @@
|
||||
fi
|
||||
else
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
|
||||
- _gcc_include_path="/usr/include/g++"
|
||||
+ _gcc_include_path="/usr"
|
||||
+ _gxx_include_path="/usr/include/g++"
|
||||
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
|
||||
@@ -740,6 +747,10 @@
|
||||
fi
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
|
||||
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
|
||||
+ _jdk_minor="true"
|
||||
+ fi
|
||||
fi
|
||||
if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
@@ -982,7 +993,7 @@
|
||||
HAVE_GPC_C="yes"
|
||||
fi
|
||||
|
||||
-if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then
|
||||
+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
|
||||
AC_MSG_RESULT([GPC files found])
|
||||
else
|
||||
AC_MSG_ERROR([GPC files not found])
|
||||
@@ -1084,12 +1095,13 @@
|
||||
echo "\$with_lang="$with_lang
|
||||
echo "\$with_asm_home="$with_asm_home
|
||||
echo "\$with_unzip_home="$with_unzip_home
|
||||
+echo "\$with_os_version="$with_os_version
|
||||
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
|
||||
+ './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_os_version
|
||||
else
|
||||
echo
|
||||
echo Test Complete
|
@ -1,6 +1,41 @@
|
||||
--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
|
||||
+++ set_soenv.1 Thu Mar 7 16:24:14 2002
|
||||
@@ -954,7 +954,7 @@
|
||||
--- set_soenv.1.orig Tue Nov 20 18:26:33 2001
|
||||
+++ set_soenv.1 Fri Mar 8 22:33:35 2002
|
||||
@@ -40,7 +40,7 @@
|
||||
#
|
||||
# Set this value equal to the corresponding amount of
|
||||
# command line arguments.
|
||||
-my $numArgs = 17;
|
||||
+my $numArgs = 18;
|
||||
# Determining the amount of arguments in the call.
|
||||
my $numEnter = $#ARGV + 1;
|
||||
if ( $numEnter != $numArgs )
|
||||
@@ -72,7 +72,7 @@
|
||||
#
|
||||
# Platform dependent constant values.
|
||||
my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV,
|
||||
- $GVER, $GVERDIR, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
+ $GVER, $GVERDIR, $OSVERSION, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
$DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx );
|
||||
#
|
||||
#-------------------------------------------
|
||||
@@ -301,7 +301,7 @@
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
$SOLAR_JAVA = "TRUE";
|
||||
- $XPVERSION = "3";
|
||||
+ $XPVERSION = "3";
|
||||
}
|
||||
elsif ( $platform eq "$FreeBSD" )
|
||||
{ print "Setting FreeBSD specific values... ";
|
||||
@@ -324,6 +324,7 @@
|
||||
$PATH_SEPERATOR = $ps;
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
+ $OSVERSION = $ARGV[ 17 ];
|
||||
}
|
||||
elsif ( $platform eq "$Linux" )
|
||||
{
|
||||
@@ -954,7 +955,7 @@
|
||||
$ps.$USR.$LIB.
|
||||
$ps.$USR_LOCAL.$BIN;
|
||||
}
|
||||
@ -9,7 +44,7 @@
|
||||
{ $PATH = $cur_dir.
|
||||
$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
|
||||
$ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
|
||||
@@ -968,6 +968,22 @@
|
||||
@@ -968,6 +969,22 @@
|
||||
$ps.$USR.$BIN.$ds."X11".
|
||||
$ps.$USR.$LIB;
|
||||
}
|
||||
@ -32,7 +67,7 @@
|
||||
elsif ($platform eq "$Winnt")
|
||||
{ $COMPATH_ROOT = $COMPATH;
|
||||
$COMPATH_ROOT =~ s/\/vc98$//;
|
||||
@@ -1067,25 +1083,19 @@
|
||||
@@ -1067,25 +1084,19 @@
|
||||
{
|
||||
$SOLARINC .= $I.$USR.$INCLUDE.
|
||||
$STLPORT_stlport;
|
||||
@ -62,3 +97,11 @@
|
||||
$SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
|
||||
$I.'$JAVA_HOME'.$INCLUDE;
|
||||
|
||||
@@ -1273,6 +1284,7 @@
|
||||
ToFile( "GUIENV", $GUIENV, "e" );
|
||||
ToFile( "GVER", $GVER, "e" );
|
||||
ToFile( "OS", $OS, "e" );
|
||||
+ToFile( "OSVERSION", $OSVERSION, "e" );
|
||||
ToFile( "OUTPATH", $OUTPATH, "e" );
|
||||
ToFile( "INPATH", $INPATH, "e" );
|
||||
ToFile( "GVERDIR", $GVERDIR, "e" );
|
||||
|
@ -35,10 +35,12 @@ BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
|
||||
BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USE_AUTOCONF= yes
|
||||
WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office
|
||||
|
||||
CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \
|
||||
--with-jdk-home=${JDK13DIR}
|
||||
--with-jdk-home=${JDK13DIR} \
|
||||
--with-os-version=${OSVERSION}
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
|
@ -0,0 +1,93 @@
|
||||
--- configure.in.orig Mon Nov 12 22:45:53 2001
|
||||
+++ configure.in Fri Mar 8 23:53:42 2002
|
||||
@@ -98,6 +98,12 @@
|
||||
|
||||
Usage: --with-asm-home=<path to ml.exe directory>
|
||||
],,)
|
||||
+AC_ARG_WITH(os-version,
|
||||
+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice
|
||||
+ with the correct OSVERSION.
|
||||
+
|
||||
+ Usage: --with-os-version=<OSVERSION>
|
||||
+],,)
|
||||
AC_ARG_WITH(unzip-home,
|
||||
[ --with-unzip-home For Windows users, please supply the path for
|
||||
unzip.exe.
|
||||
@@ -225,13 +231,13 @@
|
||||
|
||||
if test $GCC; then
|
||||
AC_MSG_CHECKING([the GNU gcc compiler version])
|
||||
- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
if test "$_gcc_releasetype" = "egcs"; then
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler])
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn
|
||||
- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
else
|
||||
- _gcc_version=`$GCC --version`
|
||||
+ _gcc_version=`$CC --version`
|
||||
fi
|
||||
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
|
||||
if test "$_gcc_major" != "2"; then
|
||||
@@ -239,13 +245,13 @@
|
||||
AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
if test "$_gcc_middle" = "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
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
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
|
||||
@@ -306,7 +312,8 @@
|
||||
fi
|
||||
else
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
|
||||
- _gcc_include_path="/usr/include/g++"
|
||||
+ _gcc_include_path="/usr"
|
||||
+ _gxx_include_path="/usr/include/g++"
|
||||
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
|
||||
@@ -740,6 +747,10 @@
|
||||
fi
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
|
||||
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
|
||||
+ _jdk_minor="true"
|
||||
+ fi
|
||||
fi
|
||||
if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
@@ -982,7 +993,7 @@
|
||||
HAVE_GPC_C="yes"
|
||||
fi
|
||||
|
||||
-if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then
|
||||
+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
|
||||
AC_MSG_RESULT([GPC files found])
|
||||
else
|
||||
AC_MSG_ERROR([GPC files not found])
|
||||
@@ -1084,12 +1095,13 @@
|
||||
echo "\$with_lang="$with_lang
|
||||
echo "\$with_asm_home="$with_asm_home
|
||||
echo "\$with_unzip_home="$with_unzip_home
|
||||
+echo "\$with_os_version="$with_os_version
|
||||
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
|
||||
+ './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_os_version
|
||||
else
|
||||
echo
|
||||
echo Test Complete
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,93 @@
|
||||
--- configure.in.orig Mon Nov 12 22:45:53 2001
|
||||
+++ configure.in Fri Mar 8 23:53:42 2002
|
||||
@@ -98,6 +98,12 @@
|
||||
|
||||
Usage: --with-asm-home=<path to ml.exe directory>
|
||||
],,)
|
||||
+AC_ARG_WITH(os-version,
|
||||
+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice
|
||||
+ with the correct OSVERSION.
|
||||
+
|
||||
+ Usage: --with-os-version=<OSVERSION>
|
||||
+],,)
|
||||
AC_ARG_WITH(unzip-home,
|
||||
[ --with-unzip-home For Windows users, please supply the path for
|
||||
unzip.exe.
|
||||
@@ -225,13 +231,13 @@
|
||||
|
||||
if test $GCC; then
|
||||
AC_MSG_CHECKING([the GNU gcc compiler version])
|
||||
- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
if test "$_gcc_releasetype" = "egcs"; then
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler])
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn
|
||||
- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
else
|
||||
- _gcc_version=`$GCC --version`
|
||||
+ _gcc_version=`$CC --version`
|
||||
fi
|
||||
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
|
||||
if test "$_gcc_major" != "2"; then
|
||||
@@ -239,13 +245,13 @@
|
||||
AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
if test "$_gcc_middle" = "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
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
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
|
||||
@@ -306,7 +312,8 @@
|
||||
fi
|
||||
else
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
|
||||
- _gcc_include_path="/usr/include/g++"
|
||||
+ _gcc_include_path="/usr"
|
||||
+ _gxx_include_path="/usr/include/g++"
|
||||
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
|
||||
@@ -740,6 +747,10 @@
|
||||
fi
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
|
||||
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
|
||||
+ _jdk_minor="true"
|
||||
+ fi
|
||||
fi
|
||||
if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
@@ -982,7 +993,7 @@
|
||||
HAVE_GPC_C="yes"
|
||||
fi
|
||||
|
||||
-if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then
|
||||
+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
|
||||
AC_MSG_RESULT([GPC files found])
|
||||
else
|
||||
AC_MSG_ERROR([GPC files not found])
|
||||
@@ -1084,12 +1095,13 @@
|
||||
echo "\$with_lang="$with_lang
|
||||
echo "\$with_asm_home="$with_asm_home
|
||||
echo "\$with_unzip_home="$with_unzip_home
|
||||
+echo "\$with_os_version="$with_os_version
|
||||
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
|
||||
+ './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_os_version
|
||||
else
|
||||
echo
|
||||
echo Test Complete
|
@ -1,6 +1,41 @@
|
||||
--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
|
||||
+++ set_soenv.1 Thu Mar 7 16:24:14 2002
|
||||
@@ -954,7 +954,7 @@
|
||||
--- set_soenv.1.orig Tue Nov 20 18:26:33 2001
|
||||
+++ set_soenv.1 Fri Mar 8 22:33:35 2002
|
||||
@@ -40,7 +40,7 @@
|
||||
#
|
||||
# Set this value equal to the corresponding amount of
|
||||
# command line arguments.
|
||||
-my $numArgs = 17;
|
||||
+my $numArgs = 18;
|
||||
# Determining the amount of arguments in the call.
|
||||
my $numEnter = $#ARGV + 1;
|
||||
if ( $numEnter != $numArgs )
|
||||
@@ -72,7 +72,7 @@
|
||||
#
|
||||
# Platform dependent constant values.
|
||||
my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV,
|
||||
- $GVER, $GVERDIR, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
+ $GVER, $GVERDIR, $OSVERSION, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
$DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx );
|
||||
#
|
||||
#-------------------------------------------
|
||||
@@ -301,7 +301,7 @@
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
$SOLAR_JAVA = "TRUE";
|
||||
- $XPVERSION = "3";
|
||||
+ $XPVERSION = "3";
|
||||
}
|
||||
elsif ( $platform eq "$FreeBSD" )
|
||||
{ print "Setting FreeBSD specific values... ";
|
||||
@@ -324,6 +324,7 @@
|
||||
$PATH_SEPERATOR = $ps;
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
+ $OSVERSION = $ARGV[ 17 ];
|
||||
}
|
||||
elsif ( $platform eq "$Linux" )
|
||||
{
|
||||
@@ -954,7 +955,7 @@
|
||||
$ps.$USR.$LIB.
|
||||
$ps.$USR_LOCAL.$BIN;
|
||||
}
|
||||
@ -9,7 +44,7 @@
|
||||
{ $PATH = $cur_dir.
|
||||
$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
|
||||
$ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
|
||||
@@ -968,6 +968,22 @@
|
||||
@@ -968,6 +969,22 @@
|
||||
$ps.$USR.$BIN.$ds."X11".
|
||||
$ps.$USR.$LIB;
|
||||
}
|
||||
@ -32,7 +67,7 @@
|
||||
elsif ($platform eq "$Winnt")
|
||||
{ $COMPATH_ROOT = $COMPATH;
|
||||
$COMPATH_ROOT =~ s/\/vc98$//;
|
||||
@@ -1067,25 +1083,19 @@
|
||||
@@ -1067,25 +1084,19 @@
|
||||
{
|
||||
$SOLARINC .= $I.$USR.$INCLUDE.
|
||||
$STLPORT_stlport;
|
||||
@ -62,3 +97,11 @@
|
||||
$SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
|
||||
$I.'$JAVA_HOME'.$INCLUDE;
|
||||
|
||||
@@ -1273,6 +1284,7 @@
|
||||
ToFile( "GUIENV", $GUIENV, "e" );
|
||||
ToFile( "GVER", $GVER, "e" );
|
||||
ToFile( "OS", $OS, "e" );
|
||||
+ToFile( "OSVERSION", $OSVERSION, "e" );
|
||||
ToFile( "OUTPATH", $OUTPATH, "e" );
|
||||
ToFile( "INPATH", $INPATH, "e" );
|
||||
ToFile( "GVERDIR", $GVERDIR, "e" );
|
||||
|
@ -35,10 +35,12 @@ BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
|
||||
BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USE_AUTOCONF= yes
|
||||
WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office
|
||||
|
||||
CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \
|
||||
--with-jdk-home=${JDK13DIR}
|
||||
--with-jdk-home=${JDK13DIR} \
|
||||
--with-os-version=${OSVERSION}
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
|
@ -0,0 +1,93 @@
|
||||
--- configure.in.orig Mon Nov 12 22:45:53 2001
|
||||
+++ configure.in Fri Mar 8 23:53:42 2002
|
||||
@@ -98,6 +98,12 @@
|
||||
|
||||
Usage: --with-asm-home=<path to ml.exe directory>
|
||||
],,)
|
||||
+AC_ARG_WITH(os-version,
|
||||
+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice
|
||||
+ with the correct OSVERSION.
|
||||
+
|
||||
+ Usage: --with-os-version=<OSVERSION>
|
||||
+],,)
|
||||
AC_ARG_WITH(unzip-home,
|
||||
[ --with-unzip-home For Windows users, please supply the path for
|
||||
unzip.exe.
|
||||
@@ -225,13 +231,13 @@
|
||||
|
||||
if test $GCC; then
|
||||
AC_MSG_CHECKING([the GNU gcc compiler version])
|
||||
- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
if test "$_gcc_releasetype" = "egcs"; then
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler])
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn
|
||||
- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
else
|
||||
- _gcc_version=`$GCC --version`
|
||||
+ _gcc_version=`$CC --version`
|
||||
fi
|
||||
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
|
||||
if test "$_gcc_major" != "2"; then
|
||||
@@ -239,13 +245,13 @@
|
||||
AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
if test "$_gcc_middle" = "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
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
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
|
||||
@@ -306,7 +312,8 @@
|
||||
fi
|
||||
else
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
|
||||
- _gcc_include_path="/usr/include/g++"
|
||||
+ _gcc_include_path="/usr"
|
||||
+ _gxx_include_path="/usr/include/g++"
|
||||
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
|
||||
@@ -740,6 +747,10 @@
|
||||
fi
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
|
||||
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
|
||||
+ _jdk_minor="true"
|
||||
+ fi
|
||||
fi
|
||||
if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
@@ -982,7 +993,7 @@
|
||||
HAVE_GPC_C="yes"
|
||||
fi
|
||||
|
||||
-if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then
|
||||
+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
|
||||
AC_MSG_RESULT([GPC files found])
|
||||
else
|
||||
AC_MSG_ERROR([GPC files not found])
|
||||
@@ -1084,12 +1095,13 @@
|
||||
echo "\$with_lang="$with_lang
|
||||
echo "\$with_asm_home="$with_asm_home
|
||||
echo "\$with_unzip_home="$with_unzip_home
|
||||
+echo "\$with_os_version="$with_os_version
|
||||
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
|
||||
+ './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_os_version
|
||||
else
|
||||
echo
|
||||
echo Test Complete
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,93 @@
|
||||
--- configure.in.orig Mon Nov 12 22:45:53 2001
|
||||
+++ configure.in Fri Mar 8 23:53:42 2002
|
||||
@@ -98,6 +98,12 @@
|
||||
|
||||
Usage: --with-asm-home=<path to ml.exe directory>
|
||||
],,)
|
||||
+AC_ARG_WITH(os-version,
|
||||
+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice
|
||||
+ with the correct OSVERSION.
|
||||
+
|
||||
+ Usage: --with-os-version=<OSVERSION>
|
||||
+],,)
|
||||
AC_ARG_WITH(unzip-home,
|
||||
[ --with-unzip-home For Windows users, please supply the path for
|
||||
unzip.exe.
|
||||
@@ -225,13 +231,13 @@
|
||||
|
||||
if test $GCC; then
|
||||
AC_MSG_CHECKING([the GNU gcc compiler version])
|
||||
- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
if test "$_gcc_releasetype" = "egcs"; then
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler])
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn
|
||||
- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
else
|
||||
- _gcc_version=`$GCC --version`
|
||||
+ _gcc_version=`$CC --version`
|
||||
fi
|
||||
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
|
||||
if test "$_gcc_major" != "2"; then
|
||||
@@ -239,13 +245,13 @@
|
||||
AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
if test "$_gcc_middle" = "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
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
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
|
||||
@@ -306,7 +312,8 @@
|
||||
fi
|
||||
else
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
|
||||
- _gcc_include_path="/usr/include/g++"
|
||||
+ _gcc_include_path="/usr"
|
||||
+ _gxx_include_path="/usr/include/g++"
|
||||
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
|
||||
@@ -740,6 +747,10 @@
|
||||
fi
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
|
||||
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
|
||||
+ _jdk_minor="true"
|
||||
+ fi
|
||||
fi
|
||||
if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
@@ -982,7 +993,7 @@
|
||||
HAVE_GPC_C="yes"
|
||||
fi
|
||||
|
||||
-if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then
|
||||
+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
|
||||
AC_MSG_RESULT([GPC files found])
|
||||
else
|
||||
AC_MSG_ERROR([GPC files not found])
|
||||
@@ -1084,12 +1095,13 @@
|
||||
echo "\$with_lang="$with_lang
|
||||
echo "\$with_asm_home="$with_asm_home
|
||||
echo "\$with_unzip_home="$with_unzip_home
|
||||
+echo "\$with_os_version="$with_os_version
|
||||
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
|
||||
+ './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_os_version
|
||||
else
|
||||
echo
|
||||
echo Test Complete
|
@ -1,6 +1,41 @@
|
||||
--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
|
||||
+++ set_soenv.1 Thu Mar 7 16:24:14 2002
|
||||
@@ -954,7 +954,7 @@
|
||||
--- set_soenv.1.orig Tue Nov 20 18:26:33 2001
|
||||
+++ set_soenv.1 Fri Mar 8 22:33:35 2002
|
||||
@@ -40,7 +40,7 @@
|
||||
#
|
||||
# Set this value equal to the corresponding amount of
|
||||
# command line arguments.
|
||||
-my $numArgs = 17;
|
||||
+my $numArgs = 18;
|
||||
# Determining the amount of arguments in the call.
|
||||
my $numEnter = $#ARGV + 1;
|
||||
if ( $numEnter != $numArgs )
|
||||
@@ -72,7 +72,7 @@
|
||||
#
|
||||
# Platform dependent constant values.
|
||||
my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV,
|
||||
- $GVER, $GVERDIR, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
+ $GVER, $GVERDIR, $OSVERSION, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
$DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx );
|
||||
#
|
||||
#-------------------------------------------
|
||||
@@ -301,7 +301,7 @@
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
$SOLAR_JAVA = "TRUE";
|
||||
- $XPVERSION = "3";
|
||||
+ $XPVERSION = "3";
|
||||
}
|
||||
elsif ( $platform eq "$FreeBSD" )
|
||||
{ print "Setting FreeBSD specific values... ";
|
||||
@@ -324,6 +324,7 @@
|
||||
$PATH_SEPERATOR = $ps;
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
+ $OSVERSION = $ARGV[ 17 ];
|
||||
}
|
||||
elsif ( $platform eq "$Linux" )
|
||||
{
|
||||
@@ -954,7 +955,7 @@
|
||||
$ps.$USR.$LIB.
|
||||
$ps.$USR_LOCAL.$BIN;
|
||||
}
|
||||
@ -9,7 +44,7 @@
|
||||
{ $PATH = $cur_dir.
|
||||
$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
|
||||
$ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
|
||||
@@ -968,6 +968,22 @@
|
||||
@@ -968,6 +969,22 @@
|
||||
$ps.$USR.$BIN.$ds."X11".
|
||||
$ps.$USR.$LIB;
|
||||
}
|
||||
@ -32,7 +67,7 @@
|
||||
elsif ($platform eq "$Winnt")
|
||||
{ $COMPATH_ROOT = $COMPATH;
|
||||
$COMPATH_ROOT =~ s/\/vc98$//;
|
||||
@@ -1067,25 +1083,19 @@
|
||||
@@ -1067,25 +1084,19 @@
|
||||
{
|
||||
$SOLARINC .= $I.$USR.$INCLUDE.
|
||||
$STLPORT_stlport;
|
||||
@ -62,3 +97,11 @@
|
||||
$SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
|
||||
$I.'$JAVA_HOME'.$INCLUDE;
|
||||
|
||||
@@ -1273,6 +1284,7 @@
|
||||
ToFile( "GUIENV", $GUIENV, "e" );
|
||||
ToFile( "GVER", $GVER, "e" );
|
||||
ToFile( "OS", $OS, "e" );
|
||||
+ToFile( "OSVERSION", $OSVERSION, "e" );
|
||||
ToFile( "OUTPATH", $OUTPATH, "e" );
|
||||
ToFile( "INPATH", $INPATH, "e" );
|
||||
ToFile( "GVERDIR", $GVERDIR, "e" );
|
||||
|
@ -35,10 +35,12 @@ BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
|
||||
BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USE_AUTOCONF= yes
|
||||
WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office
|
||||
|
||||
CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \
|
||||
--with-jdk-home=${JDK13DIR}
|
||||
--with-jdk-home=${JDK13DIR} \
|
||||
--with-os-version=${OSVERSION}
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
|
93
editors/openoffice-3/files/patch-config_office+configure.in
Normal file
93
editors/openoffice-3/files/patch-config_office+configure.in
Normal file
@ -0,0 +1,93 @@
|
||||
--- configure.in.orig Mon Nov 12 22:45:53 2001
|
||||
+++ configure.in Fri Mar 8 23:53:42 2002
|
||||
@@ -98,6 +98,12 @@
|
||||
|
||||
Usage: --with-asm-home=<path to ml.exe directory>
|
||||
],,)
|
||||
+AC_ARG_WITH(os-version,
|
||||
+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice
|
||||
+ with the correct OSVERSION.
|
||||
+
|
||||
+ Usage: --with-os-version=<OSVERSION>
|
||||
+],,)
|
||||
AC_ARG_WITH(unzip-home,
|
||||
[ --with-unzip-home For Windows users, please supply the path for
|
||||
unzip.exe.
|
||||
@@ -225,13 +231,13 @@
|
||||
|
||||
if test $GCC; then
|
||||
AC_MSG_CHECKING([the GNU gcc compiler version])
|
||||
- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
if test "$_gcc_releasetype" = "egcs"; then
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler])
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn
|
||||
- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
else
|
||||
- _gcc_version=`$GCC --version`
|
||||
+ _gcc_version=`$CC --version`
|
||||
fi
|
||||
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
|
||||
if test "$_gcc_major" != "2"; then
|
||||
@@ -239,13 +245,13 @@
|
||||
AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
if test "$_gcc_middle" = "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
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
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
|
||||
@@ -306,7 +312,8 @@
|
||||
fi
|
||||
else
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
|
||||
- _gcc_include_path="/usr/include/g++"
|
||||
+ _gcc_include_path="/usr"
|
||||
+ _gxx_include_path="/usr/include/g++"
|
||||
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
|
||||
@@ -740,6 +747,10 @@
|
||||
fi
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
|
||||
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
|
||||
+ _jdk_minor="true"
|
||||
+ fi
|
||||
fi
|
||||
if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
@@ -982,7 +993,7 @@
|
||||
HAVE_GPC_C="yes"
|
||||
fi
|
||||
|
||||
-if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then
|
||||
+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
|
||||
AC_MSG_RESULT([GPC files found])
|
||||
else
|
||||
AC_MSG_ERROR([GPC files not found])
|
||||
@@ -1084,12 +1095,13 @@
|
||||
echo "\$with_lang="$with_lang
|
||||
echo "\$with_asm_home="$with_asm_home
|
||||
echo "\$with_unzip_home="$with_unzip_home
|
||||
+echo "\$with_os_version="$with_os_version
|
||||
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
|
||||
+ './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_os_version
|
||||
else
|
||||
echo
|
||||
echo Test Complete
|
File diff suppressed because it is too large
Load Diff
93
editors/openoffice-3/files/patch-config_office::configure.in
Normal file
93
editors/openoffice-3/files/patch-config_office::configure.in
Normal file
@ -0,0 +1,93 @@
|
||||
--- configure.in.orig Mon Nov 12 22:45:53 2001
|
||||
+++ configure.in Fri Mar 8 23:53:42 2002
|
||||
@@ -98,6 +98,12 @@
|
||||
|
||||
Usage: --with-asm-home=<path to ml.exe directory>
|
||||
],,)
|
||||
+AC_ARG_WITH(os-version,
|
||||
+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice
|
||||
+ with the correct OSVERSION.
|
||||
+
|
||||
+ Usage: --with-os-version=<OSVERSION>
|
||||
+],,)
|
||||
AC_ARG_WITH(unzip-home,
|
||||
[ --with-unzip-home For Windows users, please supply the path for
|
||||
unzip.exe.
|
||||
@@ -225,13 +231,13 @@
|
||||
|
||||
if test $GCC; then
|
||||
AC_MSG_CHECKING([the GNU gcc compiler version])
|
||||
- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
if test "$_gcc_releasetype" = "egcs"; then
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler])
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn
|
||||
- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
else
|
||||
- _gcc_version=`$GCC --version`
|
||||
+ _gcc_version=`$CC --version`
|
||||
fi
|
||||
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
|
||||
if test "$_gcc_major" != "2"; then
|
||||
@@ -239,13 +245,13 @@
|
||||
AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
if test "$_gcc_middle" = "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
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
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
|
||||
@@ -306,7 +312,8 @@
|
||||
fi
|
||||
else
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
|
||||
- _gcc_include_path="/usr/include/g++"
|
||||
+ _gcc_include_path="/usr"
|
||||
+ _gxx_include_path="/usr/include/g++"
|
||||
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
|
||||
@@ -740,6 +747,10 @@
|
||||
fi
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
|
||||
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
|
||||
+ _jdk_minor="true"
|
||||
+ fi
|
||||
fi
|
||||
if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
@@ -982,7 +993,7 @@
|
||||
HAVE_GPC_C="yes"
|
||||
fi
|
||||
|
||||
-if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then
|
||||
+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
|
||||
AC_MSG_RESULT([GPC files found])
|
||||
else
|
||||
AC_MSG_ERROR([GPC files not found])
|
||||
@@ -1084,12 +1095,13 @@
|
||||
echo "\$with_lang="$with_lang
|
||||
echo "\$with_asm_home="$with_asm_home
|
||||
echo "\$with_unzip_home="$with_unzip_home
|
||||
+echo "\$with_os_version="$with_os_version
|
||||
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
|
||||
+ './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_os_version
|
||||
else
|
||||
echo
|
||||
echo Test Complete
|
@ -1,6 +1,41 @@
|
||||
--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
|
||||
+++ set_soenv.1 Thu Mar 7 16:24:14 2002
|
||||
@@ -954,7 +954,7 @@
|
||||
--- set_soenv.1.orig Tue Nov 20 18:26:33 2001
|
||||
+++ set_soenv.1 Fri Mar 8 22:33:35 2002
|
||||
@@ -40,7 +40,7 @@
|
||||
#
|
||||
# Set this value equal to the corresponding amount of
|
||||
# command line arguments.
|
||||
-my $numArgs = 17;
|
||||
+my $numArgs = 18;
|
||||
# Determining the amount of arguments in the call.
|
||||
my $numEnter = $#ARGV + 1;
|
||||
if ( $numEnter != $numArgs )
|
||||
@@ -72,7 +72,7 @@
|
||||
#
|
||||
# Platform dependent constant values.
|
||||
my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV,
|
||||
- $GVER, $GVERDIR, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
+ $GVER, $GVERDIR, $OSVERSION, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
$DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx );
|
||||
#
|
||||
#-------------------------------------------
|
||||
@@ -301,7 +301,7 @@
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
$SOLAR_JAVA = "TRUE";
|
||||
- $XPVERSION = "3";
|
||||
+ $XPVERSION = "3";
|
||||
}
|
||||
elsif ( $platform eq "$FreeBSD" )
|
||||
{ print "Setting FreeBSD specific values... ";
|
||||
@@ -324,6 +324,7 @@
|
||||
$PATH_SEPERATOR = $ps;
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
+ $OSVERSION = $ARGV[ 17 ];
|
||||
}
|
||||
elsif ( $platform eq "$Linux" )
|
||||
{
|
||||
@@ -954,7 +955,7 @@
|
||||
$ps.$USR.$LIB.
|
||||
$ps.$USR_LOCAL.$BIN;
|
||||
}
|
||||
@ -9,7 +44,7 @@
|
||||
{ $PATH = $cur_dir.
|
||||
$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
|
||||
$ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
|
||||
@@ -968,6 +968,22 @@
|
||||
@@ -968,6 +969,22 @@
|
||||
$ps.$USR.$BIN.$ds."X11".
|
||||
$ps.$USR.$LIB;
|
||||
}
|
||||
@ -32,7 +67,7 @@
|
||||
elsif ($platform eq "$Winnt")
|
||||
{ $COMPATH_ROOT = $COMPATH;
|
||||
$COMPATH_ROOT =~ s/\/vc98$//;
|
||||
@@ -1067,25 +1083,19 @@
|
||||
@@ -1067,25 +1084,19 @@
|
||||
{
|
||||
$SOLARINC .= $I.$USR.$INCLUDE.
|
||||
$STLPORT_stlport;
|
||||
@ -62,3 +97,11 @@
|
||||
$SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
|
||||
$I.'$JAVA_HOME'.$INCLUDE;
|
||||
|
||||
@@ -1273,6 +1284,7 @@
|
||||
ToFile( "GUIENV", $GUIENV, "e" );
|
||||
ToFile( "GVER", $GVER, "e" );
|
||||
ToFile( "OS", $OS, "e" );
|
||||
+ToFile( "OSVERSION", $OSVERSION, "e" );
|
||||
ToFile( "OUTPATH", $OUTPATH, "e" );
|
||||
ToFile( "INPATH", $INPATH, "e" );
|
||||
ToFile( "GVERDIR", $GVERDIR, "e" );
|
||||
|
@ -35,10 +35,12 @@ BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
|
||||
BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USE_AUTOCONF= yes
|
||||
WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office
|
||||
|
||||
CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \
|
||||
--with-jdk-home=${JDK13DIR}
|
||||
--with-jdk-home=${JDK13DIR} \
|
||||
--with-os-version=${OSVERSION}
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
|
@ -0,0 +1,93 @@
|
||||
--- configure.in.orig Mon Nov 12 22:45:53 2001
|
||||
+++ configure.in Fri Mar 8 23:53:42 2002
|
||||
@@ -98,6 +98,12 @@
|
||||
|
||||
Usage: --with-asm-home=<path to ml.exe directory>
|
||||
],,)
|
||||
+AC_ARG_WITH(os-version,
|
||||
+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice
|
||||
+ with the correct OSVERSION.
|
||||
+
|
||||
+ Usage: --with-os-version=<OSVERSION>
|
||||
+],,)
|
||||
AC_ARG_WITH(unzip-home,
|
||||
[ --with-unzip-home For Windows users, please supply the path for
|
||||
unzip.exe.
|
||||
@@ -225,13 +231,13 @@
|
||||
|
||||
if test $GCC; then
|
||||
AC_MSG_CHECKING([the GNU gcc compiler version])
|
||||
- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
if test "$_gcc_releasetype" = "egcs"; then
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler])
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn
|
||||
- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
else
|
||||
- _gcc_version=`$GCC --version`
|
||||
+ _gcc_version=`$CC --version`
|
||||
fi
|
||||
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
|
||||
if test "$_gcc_major" != "2"; then
|
||||
@@ -239,13 +245,13 @@
|
||||
AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
if test "$_gcc_middle" = "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
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
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
|
||||
@@ -306,7 +312,8 @@
|
||||
fi
|
||||
else
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
|
||||
- _gcc_include_path="/usr/include/g++"
|
||||
+ _gcc_include_path="/usr"
|
||||
+ _gxx_include_path="/usr/include/g++"
|
||||
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
|
||||
@@ -740,6 +747,10 @@
|
||||
fi
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
|
||||
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
|
||||
+ _jdk_minor="true"
|
||||
+ fi
|
||||
fi
|
||||
if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
@@ -982,7 +993,7 @@
|
||||
HAVE_GPC_C="yes"
|
||||
fi
|
||||
|
||||
-if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then
|
||||
+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
|
||||
AC_MSG_RESULT([GPC files found])
|
||||
else
|
||||
AC_MSG_ERROR([GPC files not found])
|
||||
@@ -1084,12 +1095,13 @@
|
||||
echo "\$with_lang="$with_lang
|
||||
echo "\$with_asm_home="$with_asm_home
|
||||
echo "\$with_unzip_home="$with_unzip_home
|
||||
+echo "\$with_os_version="$with_os_version
|
||||
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
|
||||
+ './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_os_version
|
||||
else
|
||||
echo
|
||||
echo Test Complete
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,93 @@
|
||||
--- configure.in.orig Mon Nov 12 22:45:53 2001
|
||||
+++ configure.in Fri Mar 8 23:53:42 2002
|
||||
@@ -98,6 +98,12 @@
|
||||
|
||||
Usage: --with-asm-home=<path to ml.exe directory>
|
||||
],,)
|
||||
+AC_ARG_WITH(os-version,
|
||||
+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice
|
||||
+ with the correct OSVERSION.
|
||||
+
|
||||
+ Usage: --with-os-version=<OSVERSION>
|
||||
+],,)
|
||||
AC_ARG_WITH(unzip-home,
|
||||
[ --with-unzip-home For Windows users, please supply the path for
|
||||
unzip.exe.
|
||||
@@ -225,13 +231,13 @@
|
||||
|
||||
if test $GCC; then
|
||||
AC_MSG_CHECKING([the GNU gcc compiler version])
|
||||
- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
if test "$_gcc_releasetype" = "egcs"; then
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler])
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn
|
||||
- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
else
|
||||
- _gcc_version=`$GCC --version`
|
||||
+ _gcc_version=`$CC --version`
|
||||
fi
|
||||
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
|
||||
if test "$_gcc_major" != "2"; then
|
||||
@@ -239,13 +245,13 @@
|
||||
AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
if test "$_gcc_middle" = "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
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
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
|
||||
@@ -306,7 +312,8 @@
|
||||
fi
|
||||
else
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
|
||||
- _gcc_include_path="/usr/include/g++"
|
||||
+ _gcc_include_path="/usr"
|
||||
+ _gxx_include_path="/usr/include/g++"
|
||||
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
|
||||
@@ -740,6 +747,10 @@
|
||||
fi
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
|
||||
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
|
||||
+ _jdk_minor="true"
|
||||
+ fi
|
||||
fi
|
||||
if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
@@ -982,7 +993,7 @@
|
||||
HAVE_GPC_C="yes"
|
||||
fi
|
||||
|
||||
-if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then
|
||||
+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
|
||||
AC_MSG_RESULT([GPC files found])
|
||||
else
|
||||
AC_MSG_ERROR([GPC files not found])
|
||||
@@ -1084,12 +1095,13 @@
|
||||
echo "\$with_lang="$with_lang
|
||||
echo "\$with_asm_home="$with_asm_home
|
||||
echo "\$with_unzip_home="$with_unzip_home
|
||||
+echo "\$with_os_version="$with_os_version
|
||||
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
|
||||
+ './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_os_version
|
||||
else
|
||||
echo
|
||||
echo Test Complete
|
@ -1,6 +1,41 @@
|
||||
--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
|
||||
+++ set_soenv.1 Thu Mar 7 16:24:14 2002
|
||||
@@ -954,7 +954,7 @@
|
||||
--- set_soenv.1.orig Tue Nov 20 18:26:33 2001
|
||||
+++ set_soenv.1 Fri Mar 8 22:33:35 2002
|
||||
@@ -40,7 +40,7 @@
|
||||
#
|
||||
# Set this value equal to the corresponding amount of
|
||||
# command line arguments.
|
||||
-my $numArgs = 17;
|
||||
+my $numArgs = 18;
|
||||
# Determining the amount of arguments in the call.
|
||||
my $numEnter = $#ARGV + 1;
|
||||
if ( $numEnter != $numArgs )
|
||||
@@ -72,7 +72,7 @@
|
||||
#
|
||||
# Platform dependent constant values.
|
||||
my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV,
|
||||
- $GVER, $GVERDIR, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
+ $GVER, $GVERDIR, $OSVERSION, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
$DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx );
|
||||
#
|
||||
#-------------------------------------------
|
||||
@@ -301,7 +301,7 @@
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
$SOLAR_JAVA = "TRUE";
|
||||
- $XPVERSION = "3";
|
||||
+ $XPVERSION = "3";
|
||||
}
|
||||
elsif ( $platform eq "$FreeBSD" )
|
||||
{ print "Setting FreeBSD specific values... ";
|
||||
@@ -324,6 +324,7 @@
|
||||
$PATH_SEPERATOR = $ps;
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
+ $OSVERSION = $ARGV[ 17 ];
|
||||
}
|
||||
elsif ( $platform eq "$Linux" )
|
||||
{
|
||||
@@ -954,7 +955,7 @@
|
||||
$ps.$USR.$LIB.
|
||||
$ps.$USR_LOCAL.$BIN;
|
||||
}
|
||||
@ -9,7 +44,7 @@
|
||||
{ $PATH = $cur_dir.
|
||||
$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
|
||||
$ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
|
||||
@@ -968,6 +968,22 @@
|
||||
@@ -968,6 +969,22 @@
|
||||
$ps.$USR.$BIN.$ds."X11".
|
||||
$ps.$USR.$LIB;
|
||||
}
|
||||
@ -32,7 +67,7 @@
|
||||
elsif ($platform eq "$Winnt")
|
||||
{ $COMPATH_ROOT = $COMPATH;
|
||||
$COMPATH_ROOT =~ s/\/vc98$//;
|
||||
@@ -1067,25 +1083,19 @@
|
||||
@@ -1067,25 +1084,19 @@
|
||||
{
|
||||
$SOLARINC .= $I.$USR.$INCLUDE.
|
||||
$STLPORT_stlport;
|
||||
@ -62,3 +97,11 @@
|
||||
$SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
|
||||
$I.'$JAVA_HOME'.$INCLUDE;
|
||||
|
||||
@@ -1273,6 +1284,7 @@
|
||||
ToFile( "GUIENV", $GUIENV, "e" );
|
||||
ToFile( "GVER", $GVER, "e" );
|
||||
ToFile( "OS", $OS, "e" );
|
||||
+ToFile( "OSVERSION", $OSVERSION, "e" );
|
||||
ToFile( "OUTPATH", $OUTPATH, "e" );
|
||||
ToFile( "INPATH", $INPATH, "e" );
|
||||
ToFile( "GVERDIR", $GVERDIR, "e" );
|
||||
|
@ -35,10 +35,12 @@ BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
|
||||
BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USE_AUTOCONF= yes
|
||||
WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office
|
||||
|
||||
CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \
|
||||
--with-jdk-home=${JDK13DIR}
|
||||
--with-jdk-home=${JDK13DIR} \
|
||||
--with-os-version=${OSVERSION}
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
|
@ -0,0 +1,93 @@
|
||||
--- configure.in.orig Mon Nov 12 22:45:53 2001
|
||||
+++ configure.in Fri Mar 8 23:53:42 2002
|
||||
@@ -98,6 +98,12 @@
|
||||
|
||||
Usage: --with-asm-home=<path to ml.exe directory>
|
||||
],,)
|
||||
+AC_ARG_WITH(os-version,
|
||||
+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice
|
||||
+ with the correct OSVERSION.
|
||||
+
|
||||
+ Usage: --with-os-version=<OSVERSION>
|
||||
+],,)
|
||||
AC_ARG_WITH(unzip-home,
|
||||
[ --with-unzip-home For Windows users, please supply the path for
|
||||
unzip.exe.
|
||||
@@ -225,13 +231,13 @@
|
||||
|
||||
if test $GCC; then
|
||||
AC_MSG_CHECKING([the GNU gcc compiler version])
|
||||
- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
if test "$_gcc_releasetype" = "egcs"; then
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler])
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn
|
||||
- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
else
|
||||
- _gcc_version=`$GCC --version`
|
||||
+ _gcc_version=`$CC --version`
|
||||
fi
|
||||
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
|
||||
if test "$_gcc_major" != "2"; then
|
||||
@@ -239,13 +245,13 @@
|
||||
AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
if test "$_gcc_middle" = "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
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
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
|
||||
@@ -306,7 +312,8 @@
|
||||
fi
|
||||
else
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
|
||||
- _gcc_include_path="/usr/include/g++"
|
||||
+ _gcc_include_path="/usr"
|
||||
+ _gxx_include_path="/usr/include/g++"
|
||||
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
|
||||
@@ -740,6 +747,10 @@
|
||||
fi
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
|
||||
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
|
||||
+ _jdk_minor="true"
|
||||
+ fi
|
||||
fi
|
||||
if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
@@ -982,7 +993,7 @@
|
||||
HAVE_GPC_C="yes"
|
||||
fi
|
||||
|
||||
-if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then
|
||||
+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
|
||||
AC_MSG_RESULT([GPC files found])
|
||||
else
|
||||
AC_MSG_ERROR([GPC files not found])
|
||||
@@ -1084,12 +1095,13 @@
|
||||
echo "\$with_lang="$with_lang
|
||||
echo "\$with_asm_home="$with_asm_home
|
||||
echo "\$with_unzip_home="$with_unzip_home
|
||||
+echo "\$with_os_version="$with_os_version
|
||||
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
|
||||
+ './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_os_version
|
||||
else
|
||||
echo
|
||||
echo Test Complete
|
@ -1,6 +1,41 @@
|
||||
--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
|
||||
+++ set_soenv.1 Thu Mar 7 16:24:14 2002
|
||||
@@ -954,7 +954,7 @@
|
||||
--- set_soenv.1.orig Tue Nov 20 18:26:33 2001
|
||||
+++ set_soenv.1 Fri Mar 8 22:33:35 2002
|
||||
@@ -40,7 +40,7 @@
|
||||
#
|
||||
# Set this value equal to the corresponding amount of
|
||||
# command line arguments.
|
||||
-my $numArgs = 17;
|
||||
+my $numArgs = 18;
|
||||
# Determining the amount of arguments in the call.
|
||||
my $numEnter = $#ARGV + 1;
|
||||
if ( $numEnter != $numArgs )
|
||||
@@ -72,7 +72,7 @@
|
||||
#
|
||||
# Platform dependent constant values.
|
||||
my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV,
|
||||
- $GVER, $GVERDIR, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
+ $GVER, $GVERDIR, $OSVERSION, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
$DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx );
|
||||
#
|
||||
#-------------------------------------------
|
||||
@@ -301,7 +301,7 @@
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
$SOLAR_JAVA = "TRUE";
|
||||
- $XPVERSION = "3";
|
||||
+ $XPVERSION = "3";
|
||||
}
|
||||
elsif ( $platform eq "$FreeBSD" )
|
||||
{ print "Setting FreeBSD specific values... ";
|
||||
@@ -324,6 +324,7 @@
|
||||
$PATH_SEPERATOR = $ps;
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
+ $OSVERSION = $ARGV[ 17 ];
|
||||
}
|
||||
elsif ( $platform eq "$Linux" )
|
||||
{
|
||||
@@ -954,7 +955,7 @@
|
||||
$ps.$USR.$LIB.
|
||||
$ps.$USR_LOCAL.$BIN;
|
||||
}
|
||||
@ -9,7 +44,7 @@
|
||||
{ $PATH = $cur_dir.
|
||||
$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
|
||||
$ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
|
||||
@@ -968,6 +968,22 @@
|
||||
@@ -968,6 +969,22 @@
|
||||
$ps.$USR.$BIN.$ds."X11".
|
||||
$ps.$USR.$LIB;
|
||||
}
|
||||
@ -32,7 +67,7 @@
|
||||
elsif ($platform eq "$Winnt")
|
||||
{ $COMPATH_ROOT = $COMPATH;
|
||||
$COMPATH_ROOT =~ s/\/vc98$//;
|
||||
@@ -1067,25 +1083,19 @@
|
||||
@@ -1067,25 +1084,19 @@
|
||||
{
|
||||
$SOLARINC .= $I.$USR.$INCLUDE.
|
||||
$STLPORT_stlport;
|
||||
@ -62,3 +97,11 @@
|
||||
$SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
|
||||
$I.'$JAVA_HOME'.$INCLUDE;
|
||||
|
||||
@@ -1273,6 +1284,7 @@
|
||||
ToFile( "GUIENV", $GUIENV, "e" );
|
||||
ToFile( "GVER", $GVER, "e" );
|
||||
ToFile( "OS", $OS, "e" );
|
||||
+ToFile( "OSVERSION", $OSVERSION, "e" );
|
||||
ToFile( "OUTPATH", $OUTPATH, "e" );
|
||||
ToFile( "INPATH", $INPATH, "e" );
|
||||
ToFile( "GVERDIR", $GVERDIR, "e" );
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,93 @@
|
||||
--- configure.in.orig Mon Nov 12 22:45:53 2001
|
||||
+++ configure.in Fri Mar 8 23:53:42 2002
|
||||
@@ -98,6 +98,12 @@
|
||||
|
||||
Usage: --with-asm-home=<path to ml.exe directory>
|
||||
],,)
|
||||
+AC_ARG_WITH(os-version,
|
||||
+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice
|
||||
+ with the correct OSVERSION.
|
||||
+
|
||||
+ Usage: --with-os-version=<OSVERSION>
|
||||
+],,)
|
||||
AC_ARG_WITH(unzip-home,
|
||||
[ --with-unzip-home For Windows users, please supply the path for
|
||||
unzip.exe.
|
||||
@@ -225,13 +231,13 @@
|
||||
|
||||
if test $GCC; then
|
||||
AC_MSG_CHECKING([the GNU gcc compiler version])
|
||||
- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
if test "$_gcc_releasetype" = "egcs"; then
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler])
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn
|
||||
- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
else
|
||||
- _gcc_version=`$GCC --version`
|
||||
+ _gcc_version=`$CC --version`
|
||||
fi
|
||||
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
|
||||
if test "$_gcc_major" != "2"; then
|
||||
@@ -239,13 +245,13 @@
|
||||
AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
if test "$_gcc_middle" = "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
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
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
|
||||
@@ -306,7 +312,8 @@
|
||||
fi
|
||||
else
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
|
||||
- _gcc_include_path="/usr/include/g++"
|
||||
+ _gcc_include_path="/usr"
|
||||
+ _gxx_include_path="/usr/include/g++"
|
||||
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
|
||||
@@ -740,6 +747,10 @@
|
||||
fi
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
|
||||
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
|
||||
+ _jdk_minor="true"
|
||||
+ fi
|
||||
fi
|
||||
if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
@@ -982,7 +993,7 @@
|
||||
HAVE_GPC_C="yes"
|
||||
fi
|
||||
|
||||
-if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then
|
||||
+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
|
||||
AC_MSG_RESULT([GPC files found])
|
||||
else
|
||||
AC_MSG_ERROR([GPC files not found])
|
||||
@@ -1084,12 +1095,13 @@
|
||||
echo "\$with_lang="$with_lang
|
||||
echo "\$with_asm_home="$with_asm_home
|
||||
echo "\$with_unzip_home="$with_unzip_home
|
||||
+echo "\$with_os_version="$with_os_version
|
||||
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
|
||||
+ './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_os_version
|
||||
else
|
||||
echo
|
||||
echo Test Complete
|
@ -1,6 +1,41 @@
|
||||
--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
|
||||
+++ set_soenv.1 Thu Mar 7 16:24:14 2002
|
||||
@@ -954,7 +954,7 @@
|
||||
--- set_soenv.1.orig Tue Nov 20 18:26:33 2001
|
||||
+++ set_soenv.1 Fri Mar 8 22:33:35 2002
|
||||
@@ -40,7 +40,7 @@
|
||||
#
|
||||
# Set this value equal to the corresponding amount of
|
||||
# command line arguments.
|
||||
-my $numArgs = 17;
|
||||
+my $numArgs = 18;
|
||||
# Determining the amount of arguments in the call.
|
||||
my $numEnter = $#ARGV + 1;
|
||||
if ( $numEnter != $numArgs )
|
||||
@@ -72,7 +72,7 @@
|
||||
#
|
||||
# Platform dependent constant values.
|
||||
my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV,
|
||||
- $GVER, $GVERDIR, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
+ $GVER, $GVERDIR, $OSVERSION, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
$DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx );
|
||||
#
|
||||
#-------------------------------------------
|
||||
@@ -301,7 +301,7 @@
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
$SOLAR_JAVA = "TRUE";
|
||||
- $XPVERSION = "3";
|
||||
+ $XPVERSION = "3";
|
||||
}
|
||||
elsif ( $platform eq "$FreeBSD" )
|
||||
{ print "Setting FreeBSD specific values... ";
|
||||
@@ -324,6 +324,7 @@
|
||||
$PATH_SEPERATOR = $ps;
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
+ $OSVERSION = $ARGV[ 17 ];
|
||||
}
|
||||
elsif ( $platform eq "$Linux" )
|
||||
{
|
||||
@@ -954,7 +955,7 @@
|
||||
$ps.$USR.$LIB.
|
||||
$ps.$USR_LOCAL.$BIN;
|
||||
}
|
||||
@ -9,7 +44,7 @@
|
||||
{ $PATH = $cur_dir.
|
||||
$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
|
||||
$ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
|
||||
@@ -968,6 +968,22 @@
|
||||
@@ -968,6 +969,22 @@
|
||||
$ps.$USR.$BIN.$ds."X11".
|
||||
$ps.$USR.$LIB;
|
||||
}
|
||||
@ -32,7 +67,7 @@
|
||||
elsif ($platform eq "$Winnt")
|
||||
{ $COMPATH_ROOT = $COMPATH;
|
||||
$COMPATH_ROOT =~ s/\/vc98$//;
|
||||
@@ -1067,25 +1083,19 @@
|
||||
@@ -1067,25 +1084,19 @@
|
||||
{
|
||||
$SOLARINC .= $I.$USR.$INCLUDE.
|
||||
$STLPORT_stlport;
|
||||
@ -62,3 +97,11 @@
|
||||
$SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
|
||||
$I.'$JAVA_HOME'.$INCLUDE;
|
||||
|
||||
@@ -1273,6 +1284,7 @@
|
||||
ToFile( "GUIENV", $GUIENV, "e" );
|
||||
ToFile( "GVER", $GVER, "e" );
|
||||
ToFile( "OS", $OS, "e" );
|
||||
+ToFile( "OSVERSION", $OSVERSION, "e" );
|
||||
ToFile( "OUTPATH", $OUTPATH, "e" );
|
||||
ToFile( "INPATH", $INPATH, "e" );
|
||||
ToFile( "GVERDIR", $GVERDIR, "e" );
|
||||
|
@ -35,10 +35,12 @@ BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
|
||||
BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USE_AUTOCONF= yes
|
||||
WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office
|
||||
|
||||
CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \
|
||||
--with-jdk-home=${JDK13DIR}
|
||||
--with-jdk-home=${JDK13DIR} \
|
||||
--with-os-version=${OSVERSION}
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
|
@ -0,0 +1,93 @@
|
||||
--- configure.in.orig Mon Nov 12 22:45:53 2001
|
||||
+++ configure.in Fri Mar 8 23:53:42 2002
|
||||
@@ -98,6 +98,12 @@
|
||||
|
||||
Usage: --with-asm-home=<path to ml.exe directory>
|
||||
],,)
|
||||
+AC_ARG_WITH(os-version,
|
||||
+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice
|
||||
+ with the correct OSVERSION.
|
||||
+
|
||||
+ Usage: --with-os-version=<OSVERSION>
|
||||
+],,)
|
||||
AC_ARG_WITH(unzip-home,
|
||||
[ --with-unzip-home For Windows users, please supply the path for
|
||||
unzip.exe.
|
||||
@@ -225,13 +231,13 @@
|
||||
|
||||
if test $GCC; then
|
||||
AC_MSG_CHECKING([the GNU gcc compiler version])
|
||||
- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
if test "$_gcc_releasetype" = "egcs"; then
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler])
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn
|
||||
- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
else
|
||||
- _gcc_version=`$GCC --version`
|
||||
+ _gcc_version=`$CC --version`
|
||||
fi
|
||||
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
|
||||
if test "$_gcc_major" != "2"; then
|
||||
@@ -239,13 +245,13 @@
|
||||
AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
if test "$_gcc_middle" = "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
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
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
|
||||
@@ -306,7 +312,8 @@
|
||||
fi
|
||||
else
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
|
||||
- _gcc_include_path="/usr/include/g++"
|
||||
+ _gcc_include_path="/usr"
|
||||
+ _gxx_include_path="/usr/include/g++"
|
||||
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
|
||||
@@ -740,6 +747,10 @@
|
||||
fi
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
|
||||
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
|
||||
+ _jdk_minor="true"
|
||||
+ fi
|
||||
fi
|
||||
if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
@@ -982,7 +993,7 @@
|
||||
HAVE_GPC_C="yes"
|
||||
fi
|
||||
|
||||
-if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then
|
||||
+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
|
||||
AC_MSG_RESULT([GPC files found])
|
||||
else
|
||||
AC_MSG_ERROR([GPC files not found])
|
||||
@@ -1084,12 +1095,13 @@
|
||||
echo "\$with_lang="$with_lang
|
||||
echo "\$with_asm_home="$with_asm_home
|
||||
echo "\$with_unzip_home="$with_unzip_home
|
||||
+echo "\$with_os_version="$with_os_version
|
||||
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
|
||||
+ './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_os_version
|
||||
else
|
||||
echo
|
||||
echo Test Complete
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,93 @@
|
||||
--- configure.in.orig Mon Nov 12 22:45:53 2001
|
||||
+++ configure.in Fri Mar 8 23:53:42 2002
|
||||
@@ -98,6 +98,12 @@
|
||||
|
||||
Usage: --with-asm-home=<path to ml.exe directory>
|
||||
],,)
|
||||
+AC_ARG_WITH(os-version,
|
||||
+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice
|
||||
+ with the correct OSVERSION.
|
||||
+
|
||||
+ Usage: --with-os-version=<OSVERSION>
|
||||
+],,)
|
||||
AC_ARG_WITH(unzip-home,
|
||||
[ --with-unzip-home For Windows users, please supply the path for
|
||||
unzip.exe.
|
||||
@@ -225,13 +231,13 @@
|
||||
|
||||
if test $GCC; then
|
||||
AC_MSG_CHECKING([the GNU gcc compiler version])
|
||||
- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
if test "$_gcc_releasetype" = "egcs"; then
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler])
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn
|
||||
- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
else
|
||||
- _gcc_version=`$GCC --version`
|
||||
+ _gcc_version=`$CC --version`
|
||||
fi
|
||||
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
|
||||
if test "$_gcc_major" != "2"; then
|
||||
@@ -239,13 +245,13 @@
|
||||
AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
if test "$_gcc_middle" = "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
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
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
|
||||
@@ -306,7 +312,8 @@
|
||||
fi
|
||||
else
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
|
||||
- _gcc_include_path="/usr/include/g++"
|
||||
+ _gcc_include_path="/usr"
|
||||
+ _gxx_include_path="/usr/include/g++"
|
||||
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
|
||||
@@ -740,6 +747,10 @@
|
||||
fi
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
|
||||
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
|
||||
+ _jdk_minor="true"
|
||||
+ fi
|
||||
fi
|
||||
if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
@@ -982,7 +993,7 @@
|
||||
HAVE_GPC_C="yes"
|
||||
fi
|
||||
|
||||
-if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then
|
||||
+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
|
||||
AC_MSG_RESULT([GPC files found])
|
||||
else
|
||||
AC_MSG_ERROR([GPC files not found])
|
||||
@@ -1084,12 +1095,13 @@
|
||||
echo "\$with_lang="$with_lang
|
||||
echo "\$with_asm_home="$with_asm_home
|
||||
echo "\$with_unzip_home="$with_unzip_home
|
||||
+echo "\$with_os_version="$with_os_version
|
||||
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
|
||||
+ './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_os_version
|
||||
else
|
||||
echo
|
||||
echo Test Complete
|
@ -1,6 +1,41 @@
|
||||
--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
|
||||
+++ set_soenv.1 Thu Mar 7 16:24:14 2002
|
||||
@@ -954,7 +954,7 @@
|
||||
--- set_soenv.1.orig Tue Nov 20 18:26:33 2001
|
||||
+++ set_soenv.1 Fri Mar 8 22:33:35 2002
|
||||
@@ -40,7 +40,7 @@
|
||||
#
|
||||
# Set this value equal to the corresponding amount of
|
||||
# command line arguments.
|
||||
-my $numArgs = 17;
|
||||
+my $numArgs = 18;
|
||||
# Determining the amount of arguments in the call.
|
||||
my $numEnter = $#ARGV + 1;
|
||||
if ( $numEnter != $numArgs )
|
||||
@@ -72,7 +72,7 @@
|
||||
#
|
||||
# Platform dependent constant values.
|
||||
my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV,
|
||||
- $GVER, $GVERDIR, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
+ $GVER, $GVERDIR, $OSVERSION, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
$DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx );
|
||||
#
|
||||
#-------------------------------------------
|
||||
@@ -301,7 +301,7 @@
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
$SOLAR_JAVA = "TRUE";
|
||||
- $XPVERSION = "3";
|
||||
+ $XPVERSION = "3";
|
||||
}
|
||||
elsif ( $platform eq "$FreeBSD" )
|
||||
{ print "Setting FreeBSD specific values... ";
|
||||
@@ -324,6 +324,7 @@
|
||||
$PATH_SEPERATOR = $ps;
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
+ $OSVERSION = $ARGV[ 17 ];
|
||||
}
|
||||
elsif ( $platform eq "$Linux" )
|
||||
{
|
||||
@@ -954,7 +955,7 @@
|
||||
$ps.$USR.$LIB.
|
||||
$ps.$USR_LOCAL.$BIN;
|
||||
}
|
||||
@ -9,7 +44,7 @@
|
||||
{ $PATH = $cur_dir.
|
||||
$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
|
||||
$ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
|
||||
@@ -968,6 +968,22 @@
|
||||
@@ -968,6 +969,22 @@
|
||||
$ps.$USR.$BIN.$ds."X11".
|
||||
$ps.$USR.$LIB;
|
||||
}
|
||||
@ -32,7 +67,7 @@
|
||||
elsif ($platform eq "$Winnt")
|
||||
{ $COMPATH_ROOT = $COMPATH;
|
||||
$COMPATH_ROOT =~ s/\/vc98$//;
|
||||
@@ -1067,25 +1083,19 @@
|
||||
@@ -1067,25 +1084,19 @@
|
||||
{
|
||||
$SOLARINC .= $I.$USR.$INCLUDE.
|
||||
$STLPORT_stlport;
|
||||
@ -62,3 +97,11 @@
|
||||
$SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
|
||||
$I.'$JAVA_HOME'.$INCLUDE;
|
||||
|
||||
@@ -1273,6 +1284,7 @@
|
||||
ToFile( "GUIENV", $GUIENV, "e" );
|
||||
ToFile( "GVER", $GVER, "e" );
|
||||
ToFile( "OS", $OS, "e" );
|
||||
+ToFile( "OSVERSION", $OSVERSION, "e" );
|
||||
ToFile( "OUTPATH", $OUTPATH, "e" );
|
||||
ToFile( "INPATH", $INPATH, "e" );
|
||||
ToFile( "GVERDIR", $GVERDIR, "e" );
|
||||
|
@ -35,10 +35,12 @@ BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
|
||||
BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USE_AUTOCONF= yes
|
||||
WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office
|
||||
|
||||
CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \
|
||||
--with-jdk-home=${JDK13DIR}
|
||||
--with-jdk-home=${JDK13DIR} \
|
||||
--with-os-version=${OSVERSION}
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
|
@ -0,0 +1,93 @@
|
||||
--- configure.in.orig Mon Nov 12 22:45:53 2001
|
||||
+++ configure.in Fri Mar 8 23:53:42 2002
|
||||
@@ -98,6 +98,12 @@
|
||||
|
||||
Usage: --with-asm-home=<path to ml.exe directory>
|
||||
],,)
|
||||
+AC_ARG_WITH(os-version,
|
||||
+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice
|
||||
+ with the correct OSVERSION.
|
||||
+
|
||||
+ Usage: --with-os-version=<OSVERSION>
|
||||
+],,)
|
||||
AC_ARG_WITH(unzip-home,
|
||||
[ --with-unzip-home For Windows users, please supply the path for
|
||||
unzip.exe.
|
||||
@@ -225,13 +231,13 @@
|
||||
|
||||
if test $GCC; then
|
||||
AC_MSG_CHECKING([the GNU gcc compiler version])
|
||||
- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
if test "$_gcc_releasetype" = "egcs"; then
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler])
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn
|
||||
- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
else
|
||||
- _gcc_version=`$GCC --version`
|
||||
+ _gcc_version=`$CC --version`
|
||||
fi
|
||||
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
|
||||
if test "$_gcc_major" != "2"; then
|
||||
@@ -239,13 +245,13 @@
|
||||
AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
if test "$_gcc_middle" = "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
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
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
|
||||
@@ -306,7 +312,8 @@
|
||||
fi
|
||||
else
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
|
||||
- _gcc_include_path="/usr/include/g++"
|
||||
+ _gcc_include_path="/usr"
|
||||
+ _gxx_include_path="/usr/include/g++"
|
||||
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
|
||||
@@ -740,6 +747,10 @@
|
||||
fi
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
|
||||
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
|
||||
+ _jdk_minor="true"
|
||||
+ fi
|
||||
fi
|
||||
if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
@@ -982,7 +993,7 @@
|
||||
HAVE_GPC_C="yes"
|
||||
fi
|
||||
|
||||
-if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then
|
||||
+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
|
||||
AC_MSG_RESULT([GPC files found])
|
||||
else
|
||||
AC_MSG_ERROR([GPC files not found])
|
||||
@@ -1084,12 +1095,13 @@
|
||||
echo "\$with_lang="$with_lang
|
||||
echo "\$with_asm_home="$with_asm_home
|
||||
echo "\$with_unzip_home="$with_unzip_home
|
||||
+echo "\$with_os_version="$with_os_version
|
||||
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
|
||||
+ './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_os_version
|
||||
else
|
||||
echo
|
||||
echo Test Complete
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,93 @@
|
||||
--- configure.in.orig Mon Nov 12 22:45:53 2001
|
||||
+++ configure.in Fri Mar 8 23:53:42 2002
|
||||
@@ -98,6 +98,12 @@
|
||||
|
||||
Usage: --with-asm-home=<path to ml.exe directory>
|
||||
],,)
|
||||
+AC_ARG_WITH(os-version,
|
||||
+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice
|
||||
+ with the correct OSVERSION.
|
||||
+
|
||||
+ Usage: --with-os-version=<OSVERSION>
|
||||
+],,)
|
||||
AC_ARG_WITH(unzip-home,
|
||||
[ --with-unzip-home For Windows users, please supply the path for
|
||||
unzip.exe.
|
||||
@@ -225,13 +231,13 @@
|
||||
|
||||
if test $GCC; then
|
||||
AC_MSG_CHECKING([the GNU gcc compiler version])
|
||||
- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
if test "$_gcc_releasetype" = "egcs"; then
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler])
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn
|
||||
- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
else
|
||||
- _gcc_version=`$GCC --version`
|
||||
+ _gcc_version=`$CC --version`
|
||||
fi
|
||||
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
|
||||
if test "$_gcc_major" != "2"; then
|
||||
@@ -239,13 +245,13 @@
|
||||
AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
if test "$_gcc_middle" = "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
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
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
|
||||
@@ -306,7 +312,8 @@
|
||||
fi
|
||||
else
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
|
||||
- _gcc_include_path="/usr/include/g++"
|
||||
+ _gcc_include_path="/usr"
|
||||
+ _gxx_include_path="/usr/include/g++"
|
||||
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
|
||||
@@ -740,6 +747,10 @@
|
||||
fi
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
|
||||
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
|
||||
+ _jdk_minor="true"
|
||||
+ fi
|
||||
fi
|
||||
if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
@@ -982,7 +993,7 @@
|
||||
HAVE_GPC_C="yes"
|
||||
fi
|
||||
|
||||
-if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then
|
||||
+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
|
||||
AC_MSG_RESULT([GPC files found])
|
||||
else
|
||||
AC_MSG_ERROR([GPC files not found])
|
||||
@@ -1084,12 +1095,13 @@
|
||||
echo "\$with_lang="$with_lang
|
||||
echo "\$with_asm_home="$with_asm_home
|
||||
echo "\$with_unzip_home="$with_unzip_home
|
||||
+echo "\$with_os_version="$with_os_version
|
||||
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
|
||||
+ './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_os_version
|
||||
else
|
||||
echo
|
||||
echo Test Complete
|
@ -1,6 +1,41 @@
|
||||
--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
|
||||
+++ set_soenv.1 Thu Mar 7 16:24:14 2002
|
||||
@@ -954,7 +954,7 @@
|
||||
--- set_soenv.1.orig Tue Nov 20 18:26:33 2001
|
||||
+++ set_soenv.1 Fri Mar 8 22:33:35 2002
|
||||
@@ -40,7 +40,7 @@
|
||||
#
|
||||
# Set this value equal to the corresponding amount of
|
||||
# command line arguments.
|
||||
-my $numArgs = 17;
|
||||
+my $numArgs = 18;
|
||||
# Determining the amount of arguments in the call.
|
||||
my $numEnter = $#ARGV + 1;
|
||||
if ( $numEnter != $numArgs )
|
||||
@@ -72,7 +72,7 @@
|
||||
#
|
||||
# Platform dependent constant values.
|
||||
my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV,
|
||||
- $GVER, $GVERDIR, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
+ $GVER, $GVERDIR, $OSVERSION, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
$DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx );
|
||||
#
|
||||
#-------------------------------------------
|
||||
@@ -301,7 +301,7 @@
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
$SOLAR_JAVA = "TRUE";
|
||||
- $XPVERSION = "3";
|
||||
+ $XPVERSION = "3";
|
||||
}
|
||||
elsif ( $platform eq "$FreeBSD" )
|
||||
{ print "Setting FreeBSD specific values... ";
|
||||
@@ -324,6 +324,7 @@
|
||||
$PATH_SEPERATOR = $ps;
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
+ $OSVERSION = $ARGV[ 17 ];
|
||||
}
|
||||
elsif ( $platform eq "$Linux" )
|
||||
{
|
||||
@@ -954,7 +955,7 @@
|
||||
$ps.$USR.$LIB.
|
||||
$ps.$USR_LOCAL.$BIN;
|
||||
}
|
||||
@ -9,7 +44,7 @@
|
||||
{ $PATH = $cur_dir.
|
||||
$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
|
||||
$ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
|
||||
@@ -968,6 +968,22 @@
|
||||
@@ -968,6 +969,22 @@
|
||||
$ps.$USR.$BIN.$ds."X11".
|
||||
$ps.$USR.$LIB;
|
||||
}
|
||||
@ -32,7 +67,7 @@
|
||||
elsif ($platform eq "$Winnt")
|
||||
{ $COMPATH_ROOT = $COMPATH;
|
||||
$COMPATH_ROOT =~ s/\/vc98$//;
|
||||
@@ -1067,25 +1083,19 @@
|
||||
@@ -1067,25 +1084,19 @@
|
||||
{
|
||||
$SOLARINC .= $I.$USR.$INCLUDE.
|
||||
$STLPORT_stlport;
|
||||
@ -62,3 +97,11 @@
|
||||
$SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
|
||||
$I.'$JAVA_HOME'.$INCLUDE;
|
||||
|
||||
@@ -1273,6 +1284,7 @@
|
||||
ToFile( "GUIENV", $GUIENV, "e" );
|
||||
ToFile( "GVER", $GVER, "e" );
|
||||
ToFile( "OS", $OS, "e" );
|
||||
+ToFile( "OSVERSION", $OSVERSION, "e" );
|
||||
ToFile( "OUTPATH", $OUTPATH, "e" );
|
||||
ToFile( "INPATH", $INPATH, "e" );
|
||||
ToFile( "GVERDIR", $GVERDIR, "e" );
|
||||
|
@ -35,10 +35,12 @@ BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
|
||||
BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USE_AUTOCONF= yes
|
||||
WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office
|
||||
|
||||
CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \
|
||||
--with-jdk-home=${JDK13DIR}
|
||||
--with-jdk-home=${JDK13DIR} \
|
||||
--with-os-version=${OSVERSION}
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
|
@ -0,0 +1,93 @@
|
||||
--- configure.in.orig Mon Nov 12 22:45:53 2001
|
||||
+++ configure.in Fri Mar 8 23:53:42 2002
|
||||
@@ -98,6 +98,12 @@
|
||||
|
||||
Usage: --with-asm-home=<path to ml.exe directory>
|
||||
],,)
|
||||
+AC_ARG_WITH(os-version,
|
||||
+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice
|
||||
+ with the correct OSVERSION.
|
||||
+
|
||||
+ Usage: --with-os-version=<OSVERSION>
|
||||
+],,)
|
||||
AC_ARG_WITH(unzip-home,
|
||||
[ --with-unzip-home For Windows users, please supply the path for
|
||||
unzip.exe.
|
||||
@@ -225,13 +231,13 @@
|
||||
|
||||
if test $GCC; then
|
||||
AC_MSG_CHECKING([the GNU gcc compiler version])
|
||||
- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
if test "$_gcc_releasetype" = "egcs"; then
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler])
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn
|
||||
- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
else
|
||||
- _gcc_version=`$GCC --version`
|
||||
+ _gcc_version=`$CC --version`
|
||||
fi
|
||||
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
|
||||
if test "$_gcc_major" != "2"; then
|
||||
@@ -239,13 +245,13 @@
|
||||
AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
if test "$_gcc_middle" = "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
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
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
|
||||
@@ -306,7 +312,8 @@
|
||||
fi
|
||||
else
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
|
||||
- _gcc_include_path="/usr/include/g++"
|
||||
+ _gcc_include_path="/usr"
|
||||
+ _gxx_include_path="/usr/include/g++"
|
||||
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
|
||||
@@ -740,6 +747,10 @@
|
||||
fi
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
|
||||
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
|
||||
+ _jdk_minor="true"
|
||||
+ fi
|
||||
fi
|
||||
if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
@@ -982,7 +993,7 @@
|
||||
HAVE_GPC_C="yes"
|
||||
fi
|
||||
|
||||
-if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then
|
||||
+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
|
||||
AC_MSG_RESULT([GPC files found])
|
||||
else
|
||||
AC_MSG_ERROR([GPC files not found])
|
||||
@@ -1084,12 +1095,13 @@
|
||||
echo "\$with_lang="$with_lang
|
||||
echo "\$with_asm_home="$with_asm_home
|
||||
echo "\$with_unzip_home="$with_unzip_home
|
||||
+echo "\$with_os_version="$with_os_version
|
||||
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
|
||||
+ './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_os_version
|
||||
else
|
||||
echo
|
||||
echo Test Complete
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,93 @@
|
||||
--- configure.in.orig Mon Nov 12 22:45:53 2001
|
||||
+++ configure.in Fri Mar 8 23:53:42 2002
|
||||
@@ -98,6 +98,12 @@
|
||||
|
||||
Usage: --with-asm-home=<path to ml.exe directory>
|
||||
],,)
|
||||
+AC_ARG_WITH(os-version,
|
||||
+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice
|
||||
+ with the correct OSVERSION.
|
||||
+
|
||||
+ Usage: --with-os-version=<OSVERSION>
|
||||
+],,)
|
||||
AC_ARG_WITH(unzip-home,
|
||||
[ --with-unzip-home For Windows users, please supply the path for
|
||||
unzip.exe.
|
||||
@@ -225,13 +231,13 @@
|
||||
|
||||
if test $GCC; then
|
||||
AC_MSG_CHECKING([the GNU gcc compiler version])
|
||||
- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
if test "$_gcc_releasetype" = "egcs"; then
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler])
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn
|
||||
- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
else
|
||||
- _gcc_version=`$GCC --version`
|
||||
+ _gcc_version=`$CC --version`
|
||||
fi
|
||||
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
|
||||
if test "$_gcc_major" != "2"; then
|
||||
@@ -239,13 +245,13 @@
|
||||
AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
if test "$_gcc_middle" = "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
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
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
|
||||
@@ -306,7 +312,8 @@
|
||||
fi
|
||||
else
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
|
||||
- _gcc_include_path="/usr/include/g++"
|
||||
+ _gcc_include_path="/usr"
|
||||
+ _gxx_include_path="/usr/include/g++"
|
||||
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
|
||||
@@ -740,6 +747,10 @@
|
||||
fi
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
|
||||
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
|
||||
+ _jdk_minor="true"
|
||||
+ fi
|
||||
fi
|
||||
if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
@@ -982,7 +993,7 @@
|
||||
HAVE_GPC_C="yes"
|
||||
fi
|
||||
|
||||
-if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then
|
||||
+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
|
||||
AC_MSG_RESULT([GPC files found])
|
||||
else
|
||||
AC_MSG_ERROR([GPC files not found])
|
||||
@@ -1084,12 +1095,13 @@
|
||||
echo "\$with_lang="$with_lang
|
||||
echo "\$with_asm_home="$with_asm_home
|
||||
echo "\$with_unzip_home="$with_unzip_home
|
||||
+echo "\$with_os_version="$with_os_version
|
||||
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
|
||||
+ './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_os_version
|
||||
else
|
||||
echo
|
||||
echo Test Complete
|
@ -1,6 +1,41 @@
|
||||
--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
|
||||
+++ set_soenv.1 Thu Mar 7 16:24:14 2002
|
||||
@@ -954,7 +954,7 @@
|
||||
--- set_soenv.1.orig Tue Nov 20 18:26:33 2001
|
||||
+++ set_soenv.1 Fri Mar 8 22:33:35 2002
|
||||
@@ -40,7 +40,7 @@
|
||||
#
|
||||
# Set this value equal to the corresponding amount of
|
||||
# command line arguments.
|
||||
-my $numArgs = 17;
|
||||
+my $numArgs = 18;
|
||||
# Determining the amount of arguments in the call.
|
||||
my $numEnter = $#ARGV + 1;
|
||||
if ( $numEnter != $numArgs )
|
||||
@@ -72,7 +72,7 @@
|
||||
#
|
||||
# Platform dependent constant values.
|
||||
my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV,
|
||||
- $GVER, $GVERDIR, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
+ $GVER, $GVERDIR, $OSVERSION, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
$DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx );
|
||||
#
|
||||
#-------------------------------------------
|
||||
@@ -301,7 +301,7 @@
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
$SOLAR_JAVA = "TRUE";
|
||||
- $XPVERSION = "3";
|
||||
+ $XPVERSION = "3";
|
||||
}
|
||||
elsif ( $platform eq "$FreeBSD" )
|
||||
{ print "Setting FreeBSD specific values... ";
|
||||
@@ -324,6 +324,7 @@
|
||||
$PATH_SEPERATOR = $ps;
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
+ $OSVERSION = $ARGV[ 17 ];
|
||||
}
|
||||
elsif ( $platform eq "$Linux" )
|
||||
{
|
||||
@@ -954,7 +955,7 @@
|
||||
$ps.$USR.$LIB.
|
||||
$ps.$USR_LOCAL.$BIN;
|
||||
}
|
||||
@ -9,7 +44,7 @@
|
||||
{ $PATH = $cur_dir.
|
||||
$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
|
||||
$ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
|
||||
@@ -968,6 +968,22 @@
|
||||
@@ -968,6 +969,22 @@
|
||||
$ps.$USR.$BIN.$ds."X11".
|
||||
$ps.$USR.$LIB;
|
||||
}
|
||||
@ -32,7 +67,7 @@
|
||||
elsif ($platform eq "$Winnt")
|
||||
{ $COMPATH_ROOT = $COMPATH;
|
||||
$COMPATH_ROOT =~ s/\/vc98$//;
|
||||
@@ -1067,25 +1083,19 @@
|
||||
@@ -1067,25 +1084,19 @@
|
||||
{
|
||||
$SOLARINC .= $I.$USR.$INCLUDE.
|
||||
$STLPORT_stlport;
|
||||
@ -62,3 +97,11 @@
|
||||
$SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
|
||||
$I.'$JAVA_HOME'.$INCLUDE;
|
||||
|
||||
@@ -1273,6 +1284,7 @@
|
||||
ToFile( "GUIENV", $GUIENV, "e" );
|
||||
ToFile( "GVER", $GVER, "e" );
|
||||
ToFile( "OS", $OS, "e" );
|
||||
+ToFile( "OSVERSION", $OSVERSION, "e" );
|
||||
ToFile( "OUTPATH", $OUTPATH, "e" );
|
||||
ToFile( "INPATH", $INPATH, "e" );
|
||||
ToFile( "GVERDIR", $GVERDIR, "e" );
|
||||
|
@ -35,10 +35,12 @@ BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
|
||||
BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USE_AUTOCONF= yes
|
||||
WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office
|
||||
|
||||
CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \
|
||||
--with-jdk-home=${JDK13DIR}
|
||||
--with-jdk-home=${JDK13DIR} \
|
||||
--with-os-version=${OSVERSION}
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
|
@ -0,0 +1,93 @@
|
||||
--- configure.in.orig Mon Nov 12 22:45:53 2001
|
||||
+++ configure.in Fri Mar 8 23:53:42 2002
|
||||
@@ -98,6 +98,12 @@
|
||||
|
||||
Usage: --with-asm-home=<path to ml.exe directory>
|
||||
],,)
|
||||
+AC_ARG_WITH(os-version,
|
||||
+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice
|
||||
+ with the correct OSVERSION.
|
||||
+
|
||||
+ Usage: --with-os-version=<OSVERSION>
|
||||
+],,)
|
||||
AC_ARG_WITH(unzip-home,
|
||||
[ --with-unzip-home For Windows users, please supply the path for
|
||||
unzip.exe.
|
||||
@@ -225,13 +231,13 @@
|
||||
|
||||
if test $GCC; then
|
||||
AC_MSG_CHECKING([the GNU gcc compiler version])
|
||||
- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
if test "$_gcc_releasetype" = "egcs"; then
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler])
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn
|
||||
- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
else
|
||||
- _gcc_version=`$GCC --version`
|
||||
+ _gcc_version=`$CC --version`
|
||||
fi
|
||||
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
|
||||
if test "$_gcc_major" != "2"; then
|
||||
@@ -239,13 +245,13 @@
|
||||
AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
if test "$_gcc_middle" = "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
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
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
|
||||
@@ -306,7 +312,8 @@
|
||||
fi
|
||||
else
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
|
||||
- _gcc_include_path="/usr/include/g++"
|
||||
+ _gcc_include_path="/usr"
|
||||
+ _gxx_include_path="/usr/include/g++"
|
||||
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
|
||||
@@ -740,6 +747,10 @@
|
||||
fi
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
|
||||
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
|
||||
+ _jdk_minor="true"
|
||||
+ fi
|
||||
fi
|
||||
if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
@@ -982,7 +993,7 @@
|
||||
HAVE_GPC_C="yes"
|
||||
fi
|
||||
|
||||
-if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then
|
||||
+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
|
||||
AC_MSG_RESULT([GPC files found])
|
||||
else
|
||||
AC_MSG_ERROR([GPC files not found])
|
||||
@@ -1084,12 +1095,13 @@
|
||||
echo "\$with_lang="$with_lang
|
||||
echo "\$with_asm_home="$with_asm_home
|
||||
echo "\$with_unzip_home="$with_unzip_home
|
||||
+echo "\$with_os_version="$with_os_version
|
||||
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
|
||||
+ './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_os_version
|
||||
else
|
||||
echo
|
||||
echo Test Complete
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,93 @@
|
||||
--- configure.in.orig Mon Nov 12 22:45:53 2001
|
||||
+++ configure.in Fri Mar 8 23:53:42 2002
|
||||
@@ -98,6 +98,12 @@
|
||||
|
||||
Usage: --with-asm-home=<path to ml.exe directory>
|
||||
],,)
|
||||
+AC_ARG_WITH(os-version,
|
||||
+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice
|
||||
+ with the correct OSVERSION.
|
||||
+
|
||||
+ Usage: --with-os-version=<OSVERSION>
|
||||
+],,)
|
||||
AC_ARG_WITH(unzip-home,
|
||||
[ --with-unzip-home For Windows users, please supply the path for
|
||||
unzip.exe.
|
||||
@@ -225,13 +231,13 @@
|
||||
|
||||
if test $GCC; then
|
||||
AC_MSG_CHECKING([the GNU gcc compiler version])
|
||||
- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
if test "$_gcc_releasetype" = "egcs"; then
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler])
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn
|
||||
- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
else
|
||||
- _gcc_version=`$GCC --version`
|
||||
+ _gcc_version=`$CC --version`
|
||||
fi
|
||||
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
|
||||
if test "$_gcc_major" != "2"; then
|
||||
@@ -239,13 +245,13 @@
|
||||
AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
if test "$_gcc_middle" = "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
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
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
|
||||
@@ -306,7 +312,8 @@
|
||||
fi
|
||||
else
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
|
||||
- _gcc_include_path="/usr/include/g++"
|
||||
+ _gcc_include_path="/usr"
|
||||
+ _gxx_include_path="/usr/include/g++"
|
||||
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
|
||||
@@ -740,6 +747,10 @@
|
||||
fi
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
|
||||
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
|
||||
+ _jdk_minor="true"
|
||||
+ fi
|
||||
fi
|
||||
if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
@@ -982,7 +993,7 @@
|
||||
HAVE_GPC_C="yes"
|
||||
fi
|
||||
|
||||
-if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then
|
||||
+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
|
||||
AC_MSG_RESULT([GPC files found])
|
||||
else
|
||||
AC_MSG_ERROR([GPC files not found])
|
||||
@@ -1084,12 +1095,13 @@
|
||||
echo "\$with_lang="$with_lang
|
||||
echo "\$with_asm_home="$with_asm_home
|
||||
echo "\$with_unzip_home="$with_unzip_home
|
||||
+echo "\$with_os_version="$with_os_version
|
||||
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
|
||||
+ './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_os_version
|
||||
else
|
||||
echo
|
||||
echo Test Complete
|
@ -1,6 +1,41 @@
|
||||
--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
|
||||
+++ set_soenv.1 Thu Mar 7 16:24:14 2002
|
||||
@@ -954,7 +954,7 @@
|
||||
--- set_soenv.1.orig Tue Nov 20 18:26:33 2001
|
||||
+++ set_soenv.1 Fri Mar 8 22:33:35 2002
|
||||
@@ -40,7 +40,7 @@
|
||||
#
|
||||
# Set this value equal to the corresponding amount of
|
||||
# command line arguments.
|
||||
-my $numArgs = 17;
|
||||
+my $numArgs = 18;
|
||||
# Determining the amount of arguments in the call.
|
||||
my $numEnter = $#ARGV + 1;
|
||||
if ( $numEnter != $numArgs )
|
||||
@@ -72,7 +72,7 @@
|
||||
#
|
||||
# Platform dependent constant values.
|
||||
my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV,
|
||||
- $GVER, $GVERDIR, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
+ $GVER, $GVERDIR, $OSVERSION, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
$DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx );
|
||||
#
|
||||
#-------------------------------------------
|
||||
@@ -301,7 +301,7 @@
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
$SOLAR_JAVA = "TRUE";
|
||||
- $XPVERSION = "3";
|
||||
+ $XPVERSION = "3";
|
||||
}
|
||||
elsif ( $platform eq "$FreeBSD" )
|
||||
{ print "Setting FreeBSD specific values... ";
|
||||
@@ -324,6 +324,7 @@
|
||||
$PATH_SEPERATOR = $ps;
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
+ $OSVERSION = $ARGV[ 17 ];
|
||||
}
|
||||
elsif ( $platform eq "$Linux" )
|
||||
{
|
||||
@@ -954,7 +955,7 @@
|
||||
$ps.$USR.$LIB.
|
||||
$ps.$USR_LOCAL.$BIN;
|
||||
}
|
||||
@ -9,7 +44,7 @@
|
||||
{ $PATH = $cur_dir.
|
||||
$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
|
||||
$ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
|
||||
@@ -968,6 +968,22 @@
|
||||
@@ -968,6 +969,22 @@
|
||||
$ps.$USR.$BIN.$ds."X11".
|
||||
$ps.$USR.$LIB;
|
||||
}
|
||||
@ -32,7 +67,7 @@
|
||||
elsif ($platform eq "$Winnt")
|
||||
{ $COMPATH_ROOT = $COMPATH;
|
||||
$COMPATH_ROOT =~ s/\/vc98$//;
|
||||
@@ -1067,25 +1083,19 @@
|
||||
@@ -1067,25 +1084,19 @@
|
||||
{
|
||||
$SOLARINC .= $I.$USR.$INCLUDE.
|
||||
$STLPORT_stlport;
|
||||
@ -62,3 +97,11 @@
|
||||
$SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
|
||||
$I.'$JAVA_HOME'.$INCLUDE;
|
||||
|
||||
@@ -1273,6 +1284,7 @@
|
||||
ToFile( "GUIENV", $GUIENV, "e" );
|
||||
ToFile( "GVER", $GVER, "e" );
|
||||
ToFile( "OS", $OS, "e" );
|
||||
+ToFile( "OSVERSION", $OSVERSION, "e" );
|
||||
ToFile( "OUTPATH", $OUTPATH, "e" );
|
||||
ToFile( "INPATH", $INPATH, "e" );
|
||||
ToFile( "GVERDIR", $GVERDIR, "e" );
|
||||
|
@ -35,10 +35,12 @@ BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
|
||||
BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USE_AUTOCONF= yes
|
||||
WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office
|
||||
|
||||
CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \
|
||||
--with-jdk-home=${JDK13DIR}
|
||||
--with-jdk-home=${JDK13DIR} \
|
||||
--with-os-version=${OSVERSION}
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
|
@ -0,0 +1,93 @@
|
||||
--- configure.in.orig Mon Nov 12 22:45:53 2001
|
||||
+++ configure.in Fri Mar 8 23:53:42 2002
|
||||
@@ -98,6 +98,12 @@
|
||||
|
||||
Usage: --with-asm-home=<path to ml.exe directory>
|
||||
],,)
|
||||
+AC_ARG_WITH(os-version,
|
||||
+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice
|
||||
+ with the correct OSVERSION.
|
||||
+
|
||||
+ Usage: --with-os-version=<OSVERSION>
|
||||
+],,)
|
||||
AC_ARG_WITH(unzip-home,
|
||||
[ --with-unzip-home For Windows users, please supply the path for
|
||||
unzip.exe.
|
||||
@@ -225,13 +231,13 @@
|
||||
|
||||
if test $GCC; then
|
||||
AC_MSG_CHECKING([the GNU gcc compiler version])
|
||||
- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
if test "$_gcc_releasetype" = "egcs"; then
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler])
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn
|
||||
- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
else
|
||||
- _gcc_version=`$GCC --version`
|
||||
+ _gcc_version=`$CC --version`
|
||||
fi
|
||||
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
|
||||
if test "$_gcc_major" != "2"; then
|
||||
@@ -239,13 +245,13 @@
|
||||
AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
if test "$_gcc_middle" = "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
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
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
|
||||
@@ -306,7 +312,8 @@
|
||||
fi
|
||||
else
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
|
||||
- _gcc_include_path="/usr/include/g++"
|
||||
+ _gcc_include_path="/usr"
|
||||
+ _gxx_include_path="/usr/include/g++"
|
||||
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
|
||||
@@ -740,6 +747,10 @@
|
||||
fi
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
|
||||
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
|
||||
+ _jdk_minor="true"
|
||||
+ fi
|
||||
fi
|
||||
if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
@@ -982,7 +993,7 @@
|
||||
HAVE_GPC_C="yes"
|
||||
fi
|
||||
|
||||
-if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then
|
||||
+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
|
||||
AC_MSG_RESULT([GPC files found])
|
||||
else
|
||||
AC_MSG_ERROR([GPC files not found])
|
||||
@@ -1084,12 +1095,13 @@
|
||||
echo "\$with_lang="$with_lang
|
||||
echo "\$with_asm_home="$with_asm_home
|
||||
echo "\$with_unzip_home="$with_unzip_home
|
||||
+echo "\$with_os_version="$with_os_version
|
||||
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
|
||||
+ './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_os_version
|
||||
else
|
||||
echo
|
||||
echo Test Complete
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,93 @@
|
||||
--- configure.in.orig Mon Nov 12 22:45:53 2001
|
||||
+++ configure.in Fri Mar 8 23:53:42 2002
|
||||
@@ -98,6 +98,12 @@
|
||||
|
||||
Usage: --with-asm-home=<path to ml.exe directory>
|
||||
],,)
|
||||
+AC_ARG_WITH(os-version,
|
||||
+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice
|
||||
+ with the correct OSVERSION.
|
||||
+
|
||||
+ Usage: --with-os-version=<OSVERSION>
|
||||
+],,)
|
||||
AC_ARG_WITH(unzip-home,
|
||||
[ --with-unzip-home For Windows users, please supply the path for
|
||||
unzip.exe.
|
||||
@@ -225,13 +231,13 @@
|
||||
|
||||
if test $GCC; then
|
||||
AC_MSG_CHECKING([the GNU gcc compiler version])
|
||||
- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
if test "$_gcc_releasetype" = "egcs"; then
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler])
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn
|
||||
- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
else
|
||||
- _gcc_version=`$GCC --version`
|
||||
+ _gcc_version=`$CC --version`
|
||||
fi
|
||||
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
|
||||
if test "$_gcc_major" != "2"; then
|
||||
@@ -239,13 +245,13 @@
|
||||
AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
if test "$_gcc_middle" = "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
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
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
|
||||
@@ -306,7 +312,8 @@
|
||||
fi
|
||||
else
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
|
||||
- _gcc_include_path="/usr/include/g++"
|
||||
+ _gcc_include_path="/usr"
|
||||
+ _gxx_include_path="/usr/include/g++"
|
||||
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
|
||||
@@ -740,6 +747,10 @@
|
||||
fi
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
|
||||
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
|
||||
+ _jdk_minor="true"
|
||||
+ fi
|
||||
fi
|
||||
if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
@@ -982,7 +993,7 @@
|
||||
HAVE_GPC_C="yes"
|
||||
fi
|
||||
|
||||
-if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then
|
||||
+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
|
||||
AC_MSG_RESULT([GPC files found])
|
||||
else
|
||||
AC_MSG_ERROR([GPC files not found])
|
||||
@@ -1084,12 +1095,13 @@
|
||||
echo "\$with_lang="$with_lang
|
||||
echo "\$with_asm_home="$with_asm_home
|
||||
echo "\$with_unzip_home="$with_unzip_home
|
||||
+echo "\$with_os_version="$with_os_version
|
||||
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
|
||||
+ './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_os_version
|
||||
else
|
||||
echo
|
||||
echo Test Complete
|
@ -1,6 +1,41 @@
|
||||
--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
|
||||
+++ set_soenv.1 Thu Mar 7 16:24:14 2002
|
||||
@@ -954,7 +954,7 @@
|
||||
--- set_soenv.1.orig Tue Nov 20 18:26:33 2001
|
||||
+++ set_soenv.1 Fri Mar 8 22:33:35 2002
|
||||
@@ -40,7 +40,7 @@
|
||||
#
|
||||
# Set this value equal to the corresponding amount of
|
||||
# command line arguments.
|
||||
-my $numArgs = 17;
|
||||
+my $numArgs = 18;
|
||||
# Determining the amount of arguments in the call.
|
||||
my $numEnter = $#ARGV + 1;
|
||||
if ( $numEnter != $numArgs )
|
||||
@@ -72,7 +72,7 @@
|
||||
#
|
||||
# Platform dependent constant values.
|
||||
my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV,
|
||||
- $GVER, $GVERDIR, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
+ $GVER, $GVERDIR, $OSVERSION, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
$DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx );
|
||||
#
|
||||
#-------------------------------------------
|
||||
@@ -301,7 +301,7 @@
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
$SOLAR_JAVA = "TRUE";
|
||||
- $XPVERSION = "3";
|
||||
+ $XPVERSION = "3";
|
||||
}
|
||||
elsif ( $platform eq "$FreeBSD" )
|
||||
{ print "Setting FreeBSD specific values... ";
|
||||
@@ -324,6 +324,7 @@
|
||||
$PATH_SEPERATOR = $ps;
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
+ $OSVERSION = $ARGV[ 17 ];
|
||||
}
|
||||
elsif ( $platform eq "$Linux" )
|
||||
{
|
||||
@@ -954,7 +955,7 @@
|
||||
$ps.$USR.$LIB.
|
||||
$ps.$USR_LOCAL.$BIN;
|
||||
}
|
||||
@ -9,7 +44,7 @@
|
||||
{ $PATH = $cur_dir.
|
||||
$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
|
||||
$ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
|
||||
@@ -968,6 +968,22 @@
|
||||
@@ -968,6 +969,22 @@
|
||||
$ps.$USR.$BIN.$ds."X11".
|
||||
$ps.$USR.$LIB;
|
||||
}
|
||||
@ -32,7 +67,7 @@
|
||||
elsif ($platform eq "$Winnt")
|
||||
{ $COMPATH_ROOT = $COMPATH;
|
||||
$COMPATH_ROOT =~ s/\/vc98$//;
|
||||
@@ -1067,25 +1083,19 @@
|
||||
@@ -1067,25 +1084,19 @@
|
||||
{
|
||||
$SOLARINC .= $I.$USR.$INCLUDE.
|
||||
$STLPORT_stlport;
|
||||
@ -62,3 +97,11 @@
|
||||
$SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
|
||||
$I.'$JAVA_HOME'.$INCLUDE;
|
||||
|
||||
@@ -1273,6 +1284,7 @@
|
||||
ToFile( "GUIENV", $GUIENV, "e" );
|
||||
ToFile( "GVER", $GVER, "e" );
|
||||
ToFile( "OS", $OS, "e" );
|
||||
+ToFile( "OSVERSION", $OSVERSION, "e" );
|
||||
ToFile( "OUTPATH", $OUTPATH, "e" );
|
||||
ToFile( "INPATH", $INPATH, "e" );
|
||||
ToFile( "GVERDIR", $GVERDIR, "e" );
|
||||
|
@ -35,10 +35,12 @@ BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
|
||||
BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USE_AUTOCONF= yes
|
||||
WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office
|
||||
|
||||
CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \
|
||||
--with-jdk-home=${JDK13DIR}
|
||||
--with-jdk-home=${JDK13DIR} \
|
||||
--with-os-version=${OSVERSION}
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
|
@ -0,0 +1,93 @@
|
||||
--- configure.in.orig Mon Nov 12 22:45:53 2001
|
||||
+++ configure.in Fri Mar 8 23:53:42 2002
|
||||
@@ -98,6 +98,12 @@
|
||||
|
||||
Usage: --with-asm-home=<path to ml.exe directory>
|
||||
],,)
|
||||
+AC_ARG_WITH(os-version,
|
||||
+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice
|
||||
+ with the correct OSVERSION.
|
||||
+
|
||||
+ Usage: --with-os-version=<OSVERSION>
|
||||
+],,)
|
||||
AC_ARG_WITH(unzip-home,
|
||||
[ --with-unzip-home For Windows users, please supply the path for
|
||||
unzip.exe.
|
||||
@@ -225,13 +231,13 @@
|
||||
|
||||
if test $GCC; then
|
||||
AC_MSG_CHECKING([the GNU gcc compiler version])
|
||||
- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
if test "$_gcc_releasetype" = "egcs"; then
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler])
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn
|
||||
- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
else
|
||||
- _gcc_version=`$GCC --version`
|
||||
+ _gcc_version=`$CC --version`
|
||||
fi
|
||||
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
|
||||
if test "$_gcc_major" != "2"; then
|
||||
@@ -239,13 +245,13 @@
|
||||
AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
if test "$_gcc_middle" = "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
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
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
|
||||
@@ -306,7 +312,8 @@
|
||||
fi
|
||||
else
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
|
||||
- _gcc_include_path="/usr/include/g++"
|
||||
+ _gcc_include_path="/usr"
|
||||
+ _gxx_include_path="/usr/include/g++"
|
||||
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
|
||||
@@ -740,6 +747,10 @@
|
||||
fi
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
|
||||
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
|
||||
+ _jdk_minor="true"
|
||||
+ fi
|
||||
fi
|
||||
if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
@@ -982,7 +993,7 @@
|
||||
HAVE_GPC_C="yes"
|
||||
fi
|
||||
|
||||
-if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then
|
||||
+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
|
||||
AC_MSG_RESULT([GPC files found])
|
||||
else
|
||||
AC_MSG_ERROR([GPC files not found])
|
||||
@@ -1084,12 +1095,13 @@
|
||||
echo "\$with_lang="$with_lang
|
||||
echo "\$with_asm_home="$with_asm_home
|
||||
echo "\$with_unzip_home="$with_unzip_home
|
||||
+echo "\$with_os_version="$with_os_version
|
||||
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
|
||||
+ './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_os_version
|
||||
else
|
||||
echo
|
||||
echo Test Complete
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,93 @@
|
||||
--- configure.in.orig Mon Nov 12 22:45:53 2001
|
||||
+++ configure.in Fri Mar 8 23:53:42 2002
|
||||
@@ -98,6 +98,12 @@
|
||||
|
||||
Usage: --with-asm-home=<path to ml.exe directory>
|
||||
],,)
|
||||
+AC_ARG_WITH(os-version,
|
||||
+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice
|
||||
+ with the correct OSVERSION.
|
||||
+
|
||||
+ Usage: --with-os-version=<OSVERSION>
|
||||
+],,)
|
||||
AC_ARG_WITH(unzip-home,
|
||||
[ --with-unzip-home For Windows users, please supply the path for
|
||||
unzip.exe.
|
||||
@@ -225,13 +231,13 @@
|
||||
|
||||
if test $GCC; then
|
||||
AC_MSG_CHECKING([the GNU gcc compiler version])
|
||||
- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
if test "$_gcc_releasetype" = "egcs"; then
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler])
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn
|
||||
- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
else
|
||||
- _gcc_version=`$GCC --version`
|
||||
+ _gcc_version=`$CC --version`
|
||||
fi
|
||||
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
|
||||
if test "$_gcc_major" != "2"; then
|
||||
@@ -239,13 +245,13 @@
|
||||
AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
if test "$_gcc_middle" = "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
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
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
|
||||
@@ -306,7 +312,8 @@
|
||||
fi
|
||||
else
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
|
||||
- _gcc_include_path="/usr/include/g++"
|
||||
+ _gcc_include_path="/usr"
|
||||
+ _gxx_include_path="/usr/include/g++"
|
||||
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
|
||||
@@ -740,6 +747,10 @@
|
||||
fi
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
|
||||
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
|
||||
+ _jdk_minor="true"
|
||||
+ fi
|
||||
fi
|
||||
if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
@@ -982,7 +993,7 @@
|
||||
HAVE_GPC_C="yes"
|
||||
fi
|
||||
|
||||
-if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then
|
||||
+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
|
||||
AC_MSG_RESULT([GPC files found])
|
||||
else
|
||||
AC_MSG_ERROR([GPC files not found])
|
||||
@@ -1084,12 +1095,13 @@
|
||||
echo "\$with_lang="$with_lang
|
||||
echo "\$with_asm_home="$with_asm_home
|
||||
echo "\$with_unzip_home="$with_unzip_home
|
||||
+echo "\$with_os_version="$with_os_version
|
||||
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
|
||||
+ './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_os_version
|
||||
else
|
||||
echo
|
||||
echo Test Complete
|
@ -1,6 +1,41 @@
|
||||
--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
|
||||
+++ set_soenv.1 Thu Mar 7 16:24:14 2002
|
||||
@@ -954,7 +954,7 @@
|
||||
--- set_soenv.1.orig Tue Nov 20 18:26:33 2001
|
||||
+++ set_soenv.1 Fri Mar 8 22:33:35 2002
|
||||
@@ -40,7 +40,7 @@
|
||||
#
|
||||
# Set this value equal to the corresponding amount of
|
||||
# command line arguments.
|
||||
-my $numArgs = 17;
|
||||
+my $numArgs = 18;
|
||||
# Determining the amount of arguments in the call.
|
||||
my $numEnter = $#ARGV + 1;
|
||||
if ( $numEnter != $numArgs )
|
||||
@@ -72,7 +72,7 @@
|
||||
#
|
||||
# Platform dependent constant values.
|
||||
my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV,
|
||||
- $GVER, $GVERDIR, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
+ $GVER, $GVERDIR, $OSVERSION, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
$DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx );
|
||||
#
|
||||
#-------------------------------------------
|
||||
@@ -301,7 +301,7 @@
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
$SOLAR_JAVA = "TRUE";
|
||||
- $XPVERSION = "3";
|
||||
+ $XPVERSION = "3";
|
||||
}
|
||||
elsif ( $platform eq "$FreeBSD" )
|
||||
{ print "Setting FreeBSD specific values... ";
|
||||
@@ -324,6 +324,7 @@
|
||||
$PATH_SEPERATOR = $ps;
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
+ $OSVERSION = $ARGV[ 17 ];
|
||||
}
|
||||
elsif ( $platform eq "$Linux" )
|
||||
{
|
||||
@@ -954,7 +955,7 @@
|
||||
$ps.$USR.$LIB.
|
||||
$ps.$USR_LOCAL.$BIN;
|
||||
}
|
||||
@ -9,7 +44,7 @@
|
||||
{ $PATH = $cur_dir.
|
||||
$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
|
||||
$ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
|
||||
@@ -968,6 +968,22 @@
|
||||
@@ -968,6 +969,22 @@
|
||||
$ps.$USR.$BIN.$ds."X11".
|
||||
$ps.$USR.$LIB;
|
||||
}
|
||||
@ -32,7 +67,7 @@
|
||||
elsif ($platform eq "$Winnt")
|
||||
{ $COMPATH_ROOT = $COMPATH;
|
||||
$COMPATH_ROOT =~ s/\/vc98$//;
|
||||
@@ -1067,25 +1083,19 @@
|
||||
@@ -1067,25 +1084,19 @@
|
||||
{
|
||||
$SOLARINC .= $I.$USR.$INCLUDE.
|
||||
$STLPORT_stlport;
|
||||
@ -62,3 +97,11 @@
|
||||
$SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
|
||||
$I.'$JAVA_HOME'.$INCLUDE;
|
||||
|
||||
@@ -1273,6 +1284,7 @@
|
||||
ToFile( "GUIENV", $GUIENV, "e" );
|
||||
ToFile( "GVER", $GVER, "e" );
|
||||
ToFile( "OS", $OS, "e" );
|
||||
+ToFile( "OSVERSION", $OSVERSION, "e" );
|
||||
ToFile( "OUTPATH", $OUTPATH, "e" );
|
||||
ToFile( "INPATH", $INPATH, "e" );
|
||||
ToFile( "GVERDIR", $GVERDIR, "e" );
|
||||
|
@ -35,10 +35,12 @@ BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
|
||||
BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USE_AUTOCONF= yes
|
||||
WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office
|
||||
|
||||
CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \
|
||||
--with-jdk-home=${JDK13DIR}
|
||||
--with-jdk-home=${JDK13DIR} \
|
||||
--with-os-version=${OSVERSION}
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
|
@ -0,0 +1,93 @@
|
||||
--- configure.in.orig Mon Nov 12 22:45:53 2001
|
||||
+++ configure.in Fri Mar 8 23:53:42 2002
|
||||
@@ -98,6 +98,12 @@
|
||||
|
||||
Usage: --with-asm-home=<path to ml.exe directory>
|
||||
],,)
|
||||
+AC_ARG_WITH(os-version,
|
||||
+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice
|
||||
+ with the correct OSVERSION.
|
||||
+
|
||||
+ Usage: --with-os-version=<OSVERSION>
|
||||
+],,)
|
||||
AC_ARG_WITH(unzip-home,
|
||||
[ --with-unzip-home For Windows users, please supply the path for
|
||||
unzip.exe.
|
||||
@@ -225,13 +231,13 @@
|
||||
|
||||
if test $GCC; then
|
||||
AC_MSG_CHECKING([the GNU gcc compiler version])
|
||||
- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
if test "$_gcc_releasetype" = "egcs"; then
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler])
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn
|
||||
- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
else
|
||||
- _gcc_version=`$GCC --version`
|
||||
+ _gcc_version=`$CC --version`
|
||||
fi
|
||||
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
|
||||
if test "$_gcc_major" != "2"; then
|
||||
@@ -239,13 +245,13 @@
|
||||
AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
if test "$_gcc_middle" = "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
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
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
|
||||
@@ -306,7 +312,8 @@
|
||||
fi
|
||||
else
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
|
||||
- _gcc_include_path="/usr/include/g++"
|
||||
+ _gcc_include_path="/usr"
|
||||
+ _gxx_include_path="/usr/include/g++"
|
||||
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
|
||||
@@ -740,6 +747,10 @@
|
||||
fi
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
|
||||
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
|
||||
+ _jdk_minor="true"
|
||||
+ fi
|
||||
fi
|
||||
if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
@@ -982,7 +993,7 @@
|
||||
HAVE_GPC_C="yes"
|
||||
fi
|
||||
|
||||
-if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then
|
||||
+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
|
||||
AC_MSG_RESULT([GPC files found])
|
||||
else
|
||||
AC_MSG_ERROR([GPC files not found])
|
||||
@@ -1084,12 +1095,13 @@
|
||||
echo "\$with_lang="$with_lang
|
||||
echo "\$with_asm_home="$with_asm_home
|
||||
echo "\$with_unzip_home="$with_unzip_home
|
||||
+echo "\$with_os_version="$with_os_version
|
||||
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
|
||||
+ './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_os_version
|
||||
else
|
||||
echo
|
||||
echo Test Complete
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,93 @@
|
||||
--- configure.in.orig Mon Nov 12 22:45:53 2001
|
||||
+++ configure.in Fri Mar 8 23:53:42 2002
|
||||
@@ -98,6 +98,12 @@
|
||||
|
||||
Usage: --with-asm-home=<path to ml.exe directory>
|
||||
],,)
|
||||
+AC_ARG_WITH(os-version,
|
||||
+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice
|
||||
+ with the correct OSVERSION.
|
||||
+
|
||||
+ Usage: --with-os-version=<OSVERSION>
|
||||
+],,)
|
||||
AC_ARG_WITH(unzip-home,
|
||||
[ --with-unzip-home For Windows users, please supply the path for
|
||||
unzip.exe.
|
||||
@@ -225,13 +231,13 @@
|
||||
|
||||
if test $GCC; then
|
||||
AC_MSG_CHECKING([the GNU gcc compiler version])
|
||||
- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
if test "$_gcc_releasetype" = "egcs"; then
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler])
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn
|
||||
- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
else
|
||||
- _gcc_version=`$GCC --version`
|
||||
+ _gcc_version=`$CC --version`
|
||||
fi
|
||||
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
|
||||
if test "$_gcc_major" != "2"; then
|
||||
@@ -239,13 +245,13 @@
|
||||
AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
if test "$_gcc_middle" = "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
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
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
|
||||
@@ -306,7 +312,8 @@
|
||||
fi
|
||||
else
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
|
||||
- _gcc_include_path="/usr/include/g++"
|
||||
+ _gcc_include_path="/usr"
|
||||
+ _gxx_include_path="/usr/include/g++"
|
||||
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
|
||||
@@ -740,6 +747,10 @@
|
||||
fi
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
|
||||
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
|
||||
+ _jdk_minor="true"
|
||||
+ fi
|
||||
fi
|
||||
if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
@@ -982,7 +993,7 @@
|
||||
HAVE_GPC_C="yes"
|
||||
fi
|
||||
|
||||
-if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then
|
||||
+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
|
||||
AC_MSG_RESULT([GPC files found])
|
||||
else
|
||||
AC_MSG_ERROR([GPC files not found])
|
||||
@@ -1084,12 +1095,13 @@
|
||||
echo "\$with_lang="$with_lang
|
||||
echo "\$with_asm_home="$with_asm_home
|
||||
echo "\$with_unzip_home="$with_unzip_home
|
||||
+echo "\$with_os_version="$with_os_version
|
||||
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
|
||||
+ './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_os_version
|
||||
else
|
||||
echo
|
||||
echo Test Complete
|
@ -1,6 +1,41 @@
|
||||
--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
|
||||
+++ set_soenv.1 Thu Mar 7 16:24:14 2002
|
||||
@@ -954,7 +954,7 @@
|
||||
--- set_soenv.1.orig Tue Nov 20 18:26:33 2001
|
||||
+++ set_soenv.1 Fri Mar 8 22:33:35 2002
|
||||
@@ -40,7 +40,7 @@
|
||||
#
|
||||
# Set this value equal to the corresponding amount of
|
||||
# command line arguments.
|
||||
-my $numArgs = 17;
|
||||
+my $numArgs = 18;
|
||||
# Determining the amount of arguments in the call.
|
||||
my $numEnter = $#ARGV + 1;
|
||||
if ( $numEnter != $numArgs )
|
||||
@@ -72,7 +72,7 @@
|
||||
#
|
||||
# Platform dependent constant values.
|
||||
my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV,
|
||||
- $GVER, $GVERDIR, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
+ $GVER, $GVERDIR, $OSVERSION, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
$DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx );
|
||||
#
|
||||
#-------------------------------------------
|
||||
@@ -301,7 +301,7 @@
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
$SOLAR_JAVA = "TRUE";
|
||||
- $XPVERSION = "3";
|
||||
+ $XPVERSION = "3";
|
||||
}
|
||||
elsif ( $platform eq "$FreeBSD" )
|
||||
{ print "Setting FreeBSD specific values... ";
|
||||
@@ -324,6 +324,7 @@
|
||||
$PATH_SEPERATOR = $ps;
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
+ $OSVERSION = $ARGV[ 17 ];
|
||||
}
|
||||
elsif ( $platform eq "$Linux" )
|
||||
{
|
||||
@@ -954,7 +955,7 @@
|
||||
$ps.$USR.$LIB.
|
||||
$ps.$USR_LOCAL.$BIN;
|
||||
}
|
||||
@ -9,7 +44,7 @@
|
||||
{ $PATH = $cur_dir.
|
||||
$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
|
||||
$ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
|
||||
@@ -968,6 +968,22 @@
|
||||
@@ -968,6 +969,22 @@
|
||||
$ps.$USR.$BIN.$ds."X11".
|
||||
$ps.$USR.$LIB;
|
||||
}
|
||||
@ -32,7 +67,7 @@
|
||||
elsif ($platform eq "$Winnt")
|
||||
{ $COMPATH_ROOT = $COMPATH;
|
||||
$COMPATH_ROOT =~ s/\/vc98$//;
|
||||
@@ -1067,25 +1083,19 @@
|
||||
@@ -1067,25 +1084,19 @@
|
||||
{
|
||||
$SOLARINC .= $I.$USR.$INCLUDE.
|
||||
$STLPORT_stlport;
|
||||
@ -62,3 +97,11 @@
|
||||
$SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
|
||||
$I.'$JAVA_HOME'.$INCLUDE;
|
||||
|
||||
@@ -1273,6 +1284,7 @@
|
||||
ToFile( "GUIENV", $GUIENV, "e" );
|
||||
ToFile( "GVER", $GVER, "e" );
|
||||
ToFile( "OS", $OS, "e" );
|
||||
+ToFile( "OSVERSION", $OSVERSION, "e" );
|
||||
ToFile( "OUTPATH", $OUTPATH, "e" );
|
||||
ToFile( "INPATH", $INPATH, "e" );
|
||||
ToFile( "GVERDIR", $GVERDIR, "e" );
|
||||
|
@ -35,10 +35,12 @@ BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
|
||||
BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USE_AUTOCONF= yes
|
||||
WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office
|
||||
|
||||
CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \
|
||||
--with-jdk-home=${JDK13DIR}
|
||||
--with-jdk-home=${JDK13DIR} \
|
||||
--with-os-version=${OSVERSION}
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
|
@ -0,0 +1,93 @@
|
||||
--- configure.in.orig Mon Nov 12 22:45:53 2001
|
||||
+++ configure.in Fri Mar 8 23:53:42 2002
|
||||
@@ -98,6 +98,12 @@
|
||||
|
||||
Usage: --with-asm-home=<path to ml.exe directory>
|
||||
],,)
|
||||
+AC_ARG_WITH(os-version,
|
||||
+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice
|
||||
+ with the correct OSVERSION.
|
||||
+
|
||||
+ Usage: --with-os-version=<OSVERSION>
|
||||
+],,)
|
||||
AC_ARG_WITH(unzip-home,
|
||||
[ --with-unzip-home For Windows users, please supply the path for
|
||||
unzip.exe.
|
||||
@@ -225,13 +231,13 @@
|
||||
|
||||
if test $GCC; then
|
||||
AC_MSG_CHECKING([the GNU gcc compiler version])
|
||||
- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
if test "$_gcc_releasetype" = "egcs"; then
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler])
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn
|
||||
- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
else
|
||||
- _gcc_version=`$GCC --version`
|
||||
+ _gcc_version=`$CC --version`
|
||||
fi
|
||||
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
|
||||
if test "$_gcc_major" != "2"; then
|
||||
@@ -239,13 +245,13 @@
|
||||
AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
if test "$_gcc_middle" = "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
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
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
|
||||
@@ -306,7 +312,8 @@
|
||||
fi
|
||||
else
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
|
||||
- _gcc_include_path="/usr/include/g++"
|
||||
+ _gcc_include_path="/usr"
|
||||
+ _gxx_include_path="/usr/include/g++"
|
||||
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
|
||||
@@ -740,6 +747,10 @@
|
||||
fi
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
|
||||
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
|
||||
+ _jdk_minor="true"
|
||||
+ fi
|
||||
fi
|
||||
if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
@@ -982,7 +993,7 @@
|
||||
HAVE_GPC_C="yes"
|
||||
fi
|
||||
|
||||
-if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then
|
||||
+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
|
||||
AC_MSG_RESULT([GPC files found])
|
||||
else
|
||||
AC_MSG_ERROR([GPC files not found])
|
||||
@@ -1084,12 +1095,13 @@
|
||||
echo "\$with_lang="$with_lang
|
||||
echo "\$with_asm_home="$with_asm_home
|
||||
echo "\$with_unzip_home="$with_unzip_home
|
||||
+echo "\$with_os_version="$with_os_version
|
||||
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
|
||||
+ './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_os_version
|
||||
else
|
||||
echo
|
||||
echo Test Complete
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,93 @@
|
||||
--- configure.in.orig Mon Nov 12 22:45:53 2001
|
||||
+++ configure.in Fri Mar 8 23:53:42 2002
|
||||
@@ -98,6 +98,12 @@
|
||||
|
||||
Usage: --with-asm-home=<path to ml.exe directory>
|
||||
],,)
|
||||
+AC_ARG_WITH(os-version,
|
||||
+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice
|
||||
+ with the correct OSVERSION.
|
||||
+
|
||||
+ Usage: --with-os-version=<OSVERSION>
|
||||
+],,)
|
||||
AC_ARG_WITH(unzip-home,
|
||||
[ --with-unzip-home For Windows users, please supply the path for
|
||||
unzip.exe.
|
||||
@@ -225,13 +231,13 @@
|
||||
|
||||
if test $GCC; then
|
||||
AC_MSG_CHECKING([the GNU gcc compiler version])
|
||||
- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
if test "$_gcc_releasetype" = "egcs"; then
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler])
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn
|
||||
- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
else
|
||||
- _gcc_version=`$GCC --version`
|
||||
+ _gcc_version=`$CC --version`
|
||||
fi
|
||||
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
|
||||
if test "$_gcc_major" != "2"; then
|
||||
@@ -239,13 +245,13 @@
|
||||
AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
if test "$_gcc_middle" = "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
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
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
|
||||
@@ -306,7 +312,8 @@
|
||||
fi
|
||||
else
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
|
||||
- _gcc_include_path="/usr/include/g++"
|
||||
+ _gcc_include_path="/usr"
|
||||
+ _gxx_include_path="/usr/include/g++"
|
||||
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
|
||||
@@ -740,6 +747,10 @@
|
||||
fi
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
|
||||
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
|
||||
+ _jdk_minor="true"
|
||||
+ fi
|
||||
fi
|
||||
if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
@@ -982,7 +993,7 @@
|
||||
HAVE_GPC_C="yes"
|
||||
fi
|
||||
|
||||
-if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then
|
||||
+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
|
||||
AC_MSG_RESULT([GPC files found])
|
||||
else
|
||||
AC_MSG_ERROR([GPC files not found])
|
||||
@@ -1084,12 +1095,13 @@
|
||||
echo "\$with_lang="$with_lang
|
||||
echo "\$with_asm_home="$with_asm_home
|
||||
echo "\$with_unzip_home="$with_unzip_home
|
||||
+echo "\$with_os_version="$with_os_version
|
||||
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
|
||||
+ './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_os_version
|
||||
else
|
||||
echo
|
||||
echo Test Complete
|
@ -1,6 +1,41 @@
|
||||
--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
|
||||
+++ set_soenv.1 Thu Mar 7 16:24:14 2002
|
||||
@@ -954,7 +954,7 @@
|
||||
--- set_soenv.1.orig Tue Nov 20 18:26:33 2001
|
||||
+++ set_soenv.1 Fri Mar 8 22:33:35 2002
|
||||
@@ -40,7 +40,7 @@
|
||||
#
|
||||
# Set this value equal to the corresponding amount of
|
||||
# command line arguments.
|
||||
-my $numArgs = 17;
|
||||
+my $numArgs = 18;
|
||||
# Determining the amount of arguments in the call.
|
||||
my $numEnter = $#ARGV + 1;
|
||||
if ( $numEnter != $numArgs )
|
||||
@@ -72,7 +72,7 @@
|
||||
#
|
||||
# Platform dependent constant values.
|
||||
my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV,
|
||||
- $GVER, $GVERDIR, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
+ $GVER, $GVERDIR, $OSVERSION, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
$DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx );
|
||||
#
|
||||
#-------------------------------------------
|
||||
@@ -301,7 +301,7 @@
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
$SOLAR_JAVA = "TRUE";
|
||||
- $XPVERSION = "3";
|
||||
+ $XPVERSION = "3";
|
||||
}
|
||||
elsif ( $platform eq "$FreeBSD" )
|
||||
{ print "Setting FreeBSD specific values... ";
|
||||
@@ -324,6 +324,7 @@
|
||||
$PATH_SEPERATOR = $ps;
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
+ $OSVERSION = $ARGV[ 17 ];
|
||||
}
|
||||
elsif ( $platform eq "$Linux" )
|
||||
{
|
||||
@@ -954,7 +955,7 @@
|
||||
$ps.$USR.$LIB.
|
||||
$ps.$USR_LOCAL.$BIN;
|
||||
}
|
||||
@ -9,7 +44,7 @@
|
||||
{ $PATH = $cur_dir.
|
||||
$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
|
||||
$ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
|
||||
@@ -968,6 +968,22 @@
|
||||
@@ -968,6 +969,22 @@
|
||||
$ps.$USR.$BIN.$ds."X11".
|
||||
$ps.$USR.$LIB;
|
||||
}
|
||||
@ -32,7 +67,7 @@
|
||||
elsif ($platform eq "$Winnt")
|
||||
{ $COMPATH_ROOT = $COMPATH;
|
||||
$COMPATH_ROOT =~ s/\/vc98$//;
|
||||
@@ -1067,25 +1083,19 @@
|
||||
@@ -1067,25 +1084,19 @@
|
||||
{
|
||||
$SOLARINC .= $I.$USR.$INCLUDE.
|
||||
$STLPORT_stlport;
|
||||
@ -62,3 +97,11 @@
|
||||
$SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
|
||||
$I.'$JAVA_HOME'.$INCLUDE;
|
||||
|
||||
@@ -1273,6 +1284,7 @@
|
||||
ToFile( "GUIENV", $GUIENV, "e" );
|
||||
ToFile( "GVER", $GVER, "e" );
|
||||
ToFile( "OS", $OS, "e" );
|
||||
+ToFile( "OSVERSION", $OSVERSION, "e" );
|
||||
ToFile( "OUTPATH", $OUTPATH, "e" );
|
||||
ToFile( "INPATH", $INPATH, "e" );
|
||||
ToFile( "GVERDIR", $GVERDIR, "e" );
|
||||
|
@ -35,10 +35,12 @@ BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
|
||||
BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USE_AUTOCONF= yes
|
||||
WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office
|
||||
|
||||
CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \
|
||||
--with-jdk-home=${JDK13DIR}
|
||||
--with-jdk-home=${JDK13DIR} \
|
||||
--with-os-version=${OSVERSION}
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
|
@ -0,0 +1,93 @@
|
||||
--- configure.in.orig Mon Nov 12 22:45:53 2001
|
||||
+++ configure.in Fri Mar 8 23:53:42 2002
|
||||
@@ -98,6 +98,12 @@
|
||||
|
||||
Usage: --with-asm-home=<path to ml.exe directory>
|
||||
],,)
|
||||
+AC_ARG_WITH(os-version,
|
||||
+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice
|
||||
+ with the correct OSVERSION.
|
||||
+
|
||||
+ Usage: --with-os-version=<OSVERSION>
|
||||
+],,)
|
||||
AC_ARG_WITH(unzip-home,
|
||||
[ --with-unzip-home For Windows users, please supply the path for
|
||||
unzip.exe.
|
||||
@@ -225,13 +231,13 @@
|
||||
|
||||
if test $GCC; then
|
||||
AC_MSG_CHECKING([the GNU gcc compiler version])
|
||||
- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
if test "$_gcc_releasetype" = "egcs"; then
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler])
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn
|
||||
- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
else
|
||||
- _gcc_version=`$GCC --version`
|
||||
+ _gcc_version=`$CC --version`
|
||||
fi
|
||||
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
|
||||
if test "$_gcc_major" != "2"; then
|
||||
@@ -239,13 +245,13 @@
|
||||
AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
if test "$_gcc_middle" = "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
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
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
|
||||
@@ -306,7 +312,8 @@
|
||||
fi
|
||||
else
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
|
||||
- _gcc_include_path="/usr/include/g++"
|
||||
+ _gcc_include_path="/usr"
|
||||
+ _gxx_include_path="/usr/include/g++"
|
||||
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
|
||||
@@ -740,6 +747,10 @@
|
||||
fi
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
|
||||
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
|
||||
+ _jdk_minor="true"
|
||||
+ fi
|
||||
fi
|
||||
if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
@@ -982,7 +993,7 @@
|
||||
HAVE_GPC_C="yes"
|
||||
fi
|
||||
|
||||
-if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then
|
||||
+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
|
||||
AC_MSG_RESULT([GPC files found])
|
||||
else
|
||||
AC_MSG_ERROR([GPC files not found])
|
||||
@@ -1084,12 +1095,13 @@
|
||||
echo "\$with_lang="$with_lang
|
||||
echo "\$with_asm_home="$with_asm_home
|
||||
echo "\$with_unzip_home="$with_unzip_home
|
||||
+echo "\$with_os_version="$with_os_version
|
||||
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
|
||||
+ './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_os_version
|
||||
else
|
||||
echo
|
||||
echo Test Complete
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,93 @@
|
||||
--- configure.in.orig Mon Nov 12 22:45:53 2001
|
||||
+++ configure.in Fri Mar 8 23:53:42 2002
|
||||
@@ -98,6 +98,12 @@
|
||||
|
||||
Usage: --with-asm-home=<path to ml.exe directory>
|
||||
],,)
|
||||
+AC_ARG_WITH(os-version,
|
||||
+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice
|
||||
+ with the correct OSVERSION.
|
||||
+
|
||||
+ Usage: --with-os-version=<OSVERSION>
|
||||
+],,)
|
||||
AC_ARG_WITH(unzip-home,
|
||||
[ --with-unzip-home For Windows users, please supply the path for
|
||||
unzip.exe.
|
||||
@@ -225,13 +231,13 @@
|
||||
|
||||
if test $GCC; then
|
||||
AC_MSG_CHECKING([the GNU gcc compiler version])
|
||||
- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
if test "$_gcc_releasetype" = "egcs"; then
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler])
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn
|
||||
- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
else
|
||||
- _gcc_version=`$GCC --version`
|
||||
+ _gcc_version=`$CC --version`
|
||||
fi
|
||||
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
|
||||
if test "$_gcc_major" != "2"; then
|
||||
@@ -239,13 +245,13 @@
|
||||
AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
if test "$_gcc_middle" = "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
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
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
|
||||
@@ -306,7 +312,8 @@
|
||||
fi
|
||||
else
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
|
||||
- _gcc_include_path="/usr/include/g++"
|
||||
+ _gcc_include_path="/usr"
|
||||
+ _gxx_include_path="/usr/include/g++"
|
||||
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
|
||||
@@ -740,6 +747,10 @@
|
||||
fi
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
|
||||
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
|
||||
+ _jdk_minor="true"
|
||||
+ fi
|
||||
fi
|
||||
if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
@@ -982,7 +993,7 @@
|
||||
HAVE_GPC_C="yes"
|
||||
fi
|
||||
|
||||
-if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then
|
||||
+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
|
||||
AC_MSG_RESULT([GPC files found])
|
||||
else
|
||||
AC_MSG_ERROR([GPC files not found])
|
||||
@@ -1084,12 +1095,13 @@
|
||||
echo "\$with_lang="$with_lang
|
||||
echo "\$with_asm_home="$with_asm_home
|
||||
echo "\$with_unzip_home="$with_unzip_home
|
||||
+echo "\$with_os_version="$with_os_version
|
||||
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
|
||||
+ './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_os_version
|
||||
else
|
||||
echo
|
||||
echo Test Complete
|
@ -1,6 +1,41 @@
|
||||
--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
|
||||
+++ set_soenv.1 Thu Mar 7 16:24:14 2002
|
||||
@@ -954,7 +954,7 @@
|
||||
--- set_soenv.1.orig Tue Nov 20 18:26:33 2001
|
||||
+++ set_soenv.1 Fri Mar 8 22:33:35 2002
|
||||
@@ -40,7 +40,7 @@
|
||||
#
|
||||
# Set this value equal to the corresponding amount of
|
||||
# command line arguments.
|
||||
-my $numArgs = 17;
|
||||
+my $numArgs = 18;
|
||||
# Determining the amount of arguments in the call.
|
||||
my $numEnter = $#ARGV + 1;
|
||||
if ( $numEnter != $numArgs )
|
||||
@@ -72,7 +72,7 @@
|
||||
#
|
||||
# Platform dependent constant values.
|
||||
my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV,
|
||||
- $GVER, $GVERDIR, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
+ $GVER, $GVERDIR, $OSVERSION, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
$DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx );
|
||||
#
|
||||
#-------------------------------------------
|
||||
@@ -301,7 +301,7 @@
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
$SOLAR_JAVA = "TRUE";
|
||||
- $XPVERSION = "3";
|
||||
+ $XPVERSION = "3";
|
||||
}
|
||||
elsif ( $platform eq "$FreeBSD" )
|
||||
{ print "Setting FreeBSD specific values... ";
|
||||
@@ -324,6 +324,7 @@
|
||||
$PATH_SEPERATOR = $ps;
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
+ $OSVERSION = $ARGV[ 17 ];
|
||||
}
|
||||
elsif ( $platform eq "$Linux" )
|
||||
{
|
||||
@@ -954,7 +955,7 @@
|
||||
$ps.$USR.$LIB.
|
||||
$ps.$USR_LOCAL.$BIN;
|
||||
}
|
||||
@ -9,7 +44,7 @@
|
||||
{ $PATH = $cur_dir.
|
||||
$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
|
||||
$ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
|
||||
@@ -968,6 +968,22 @@
|
||||
@@ -968,6 +969,22 @@
|
||||
$ps.$USR.$BIN.$ds."X11".
|
||||
$ps.$USR.$LIB;
|
||||
}
|
||||
@ -32,7 +67,7 @@
|
||||
elsif ($platform eq "$Winnt")
|
||||
{ $COMPATH_ROOT = $COMPATH;
|
||||
$COMPATH_ROOT =~ s/\/vc98$//;
|
||||
@@ -1067,25 +1083,19 @@
|
||||
@@ -1067,25 +1084,19 @@
|
||||
{
|
||||
$SOLARINC .= $I.$USR.$INCLUDE.
|
||||
$STLPORT_stlport;
|
||||
@ -62,3 +97,11 @@
|
||||
$SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
|
||||
$I.'$JAVA_HOME'.$INCLUDE;
|
||||
|
||||
@@ -1273,6 +1284,7 @@
|
||||
ToFile( "GUIENV", $GUIENV, "e" );
|
||||
ToFile( "GVER", $GVER, "e" );
|
||||
ToFile( "OS", $OS, "e" );
|
||||
+ToFile( "OSVERSION", $OSVERSION, "e" );
|
||||
ToFile( "OUTPATH", $OUTPATH, "e" );
|
||||
ToFile( "INPATH", $INPATH, "e" );
|
||||
ToFile( "GVERDIR", $GVERDIR, "e" );
|
||||
|
@ -35,10 +35,12 @@ BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
|
||||
BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USE_AUTOCONF= yes
|
||||
WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office
|
||||
|
||||
CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \
|
||||
--with-jdk-home=${JDK13DIR}
|
||||
--with-jdk-home=${JDK13DIR} \
|
||||
--with-os-version=${OSVERSION}
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
|
@ -0,0 +1,93 @@
|
||||
--- configure.in.orig Mon Nov 12 22:45:53 2001
|
||||
+++ configure.in Fri Mar 8 23:53:42 2002
|
||||
@@ -98,6 +98,12 @@
|
||||
|
||||
Usage: --with-asm-home=<path to ml.exe directory>
|
||||
],,)
|
||||
+AC_ARG_WITH(os-version,
|
||||
+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice
|
||||
+ with the correct OSVERSION.
|
||||
+
|
||||
+ Usage: --with-os-version=<OSVERSION>
|
||||
+],,)
|
||||
AC_ARG_WITH(unzip-home,
|
||||
[ --with-unzip-home For Windows users, please supply the path for
|
||||
unzip.exe.
|
||||
@@ -225,13 +231,13 @@
|
||||
|
||||
if test $GCC; then
|
||||
AC_MSG_CHECKING([the GNU gcc compiler version])
|
||||
- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
if test "$_gcc_releasetype" = "egcs"; then
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler])
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn
|
||||
- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
else
|
||||
- _gcc_version=`$GCC --version`
|
||||
+ _gcc_version=`$CC --version`
|
||||
fi
|
||||
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
|
||||
if test "$_gcc_major" != "2"; then
|
||||
@@ -239,13 +245,13 @@
|
||||
AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
if test "$_gcc_middle" = "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
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
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
|
||||
@@ -306,7 +312,8 @@
|
||||
fi
|
||||
else
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
|
||||
- _gcc_include_path="/usr/include/g++"
|
||||
+ _gcc_include_path="/usr"
|
||||
+ _gxx_include_path="/usr/include/g++"
|
||||
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
|
||||
@@ -740,6 +747,10 @@
|
||||
fi
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
|
||||
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
|
||||
+ _jdk_minor="true"
|
||||
+ fi
|
||||
fi
|
||||
if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
@@ -982,7 +993,7 @@
|
||||
HAVE_GPC_C="yes"
|
||||
fi
|
||||
|
||||
-if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then
|
||||
+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
|
||||
AC_MSG_RESULT([GPC files found])
|
||||
else
|
||||
AC_MSG_ERROR([GPC files not found])
|
||||
@@ -1084,12 +1095,13 @@
|
||||
echo "\$with_lang="$with_lang
|
||||
echo "\$with_asm_home="$with_asm_home
|
||||
echo "\$with_unzip_home="$with_unzip_home
|
||||
+echo "\$with_os_version="$with_os_version
|
||||
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
|
||||
+ './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_os_version
|
||||
else
|
||||
echo
|
||||
echo Test Complete
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,93 @@
|
||||
--- configure.in.orig Mon Nov 12 22:45:53 2001
|
||||
+++ configure.in Fri Mar 8 23:53:42 2002
|
||||
@@ -98,6 +98,12 @@
|
||||
|
||||
Usage: --with-asm-home=<path to ml.exe directory>
|
||||
],,)
|
||||
+AC_ARG_WITH(os-version,
|
||||
+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice
|
||||
+ with the correct OSVERSION.
|
||||
+
|
||||
+ Usage: --with-os-version=<OSVERSION>
|
||||
+],,)
|
||||
AC_ARG_WITH(unzip-home,
|
||||
[ --with-unzip-home For Windows users, please supply the path for
|
||||
unzip.exe.
|
||||
@@ -225,13 +231,13 @@
|
||||
|
||||
if test $GCC; then
|
||||
AC_MSG_CHECKING([the GNU gcc compiler version])
|
||||
- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
if test "$_gcc_releasetype" = "egcs"; then
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler])
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn
|
||||
- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
else
|
||||
- _gcc_version=`$GCC --version`
|
||||
+ _gcc_version=`$CC --version`
|
||||
fi
|
||||
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
|
||||
if test "$_gcc_major" != "2"; then
|
||||
@@ -239,13 +245,13 @@
|
||||
AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
if test "$_gcc_middle" = "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
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
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
|
||||
@@ -306,7 +312,8 @@
|
||||
fi
|
||||
else
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
|
||||
- _gcc_include_path="/usr/include/g++"
|
||||
+ _gcc_include_path="/usr"
|
||||
+ _gxx_include_path="/usr/include/g++"
|
||||
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
|
||||
@@ -740,6 +747,10 @@
|
||||
fi
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
|
||||
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
|
||||
+ _jdk_minor="true"
|
||||
+ fi
|
||||
fi
|
||||
if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
@@ -982,7 +993,7 @@
|
||||
HAVE_GPC_C="yes"
|
||||
fi
|
||||
|
||||
-if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then
|
||||
+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
|
||||
AC_MSG_RESULT([GPC files found])
|
||||
else
|
||||
AC_MSG_ERROR([GPC files not found])
|
||||
@@ -1084,12 +1095,13 @@
|
||||
echo "\$with_lang="$with_lang
|
||||
echo "\$with_asm_home="$with_asm_home
|
||||
echo "\$with_unzip_home="$with_unzip_home
|
||||
+echo "\$with_os_version="$with_os_version
|
||||
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
|
||||
+ './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_os_version
|
||||
else
|
||||
echo
|
||||
echo Test Complete
|
@ -1,6 +1,41 @@
|
||||
--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
|
||||
+++ set_soenv.1 Thu Mar 7 16:24:14 2002
|
||||
@@ -954,7 +954,7 @@
|
||||
--- set_soenv.1.orig Tue Nov 20 18:26:33 2001
|
||||
+++ set_soenv.1 Fri Mar 8 22:33:35 2002
|
||||
@@ -40,7 +40,7 @@
|
||||
#
|
||||
# Set this value equal to the corresponding amount of
|
||||
# command line arguments.
|
||||
-my $numArgs = 17;
|
||||
+my $numArgs = 18;
|
||||
# Determining the amount of arguments in the call.
|
||||
my $numEnter = $#ARGV + 1;
|
||||
if ( $numEnter != $numArgs )
|
||||
@@ -72,7 +72,7 @@
|
||||
#
|
||||
# Platform dependent constant values.
|
||||
my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV,
|
||||
- $GVER, $GVERDIR, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
+ $GVER, $GVERDIR, $OSVERSION, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
$DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx );
|
||||
#
|
||||
#-------------------------------------------
|
||||
@@ -301,7 +301,7 @@
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
$SOLAR_JAVA = "TRUE";
|
||||
- $XPVERSION = "3";
|
||||
+ $XPVERSION = "3";
|
||||
}
|
||||
elsif ( $platform eq "$FreeBSD" )
|
||||
{ print "Setting FreeBSD specific values... ";
|
||||
@@ -324,6 +324,7 @@
|
||||
$PATH_SEPERATOR = $ps;
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
+ $OSVERSION = $ARGV[ 17 ];
|
||||
}
|
||||
elsif ( $platform eq "$Linux" )
|
||||
{
|
||||
@@ -954,7 +955,7 @@
|
||||
$ps.$USR.$LIB.
|
||||
$ps.$USR_LOCAL.$BIN;
|
||||
}
|
||||
@ -9,7 +44,7 @@
|
||||
{ $PATH = $cur_dir.
|
||||
$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
|
||||
$ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
|
||||
@@ -968,6 +968,22 @@
|
||||
@@ -968,6 +969,22 @@
|
||||
$ps.$USR.$BIN.$ds."X11".
|
||||
$ps.$USR.$LIB;
|
||||
}
|
||||
@ -32,7 +67,7 @@
|
||||
elsif ($platform eq "$Winnt")
|
||||
{ $COMPATH_ROOT = $COMPATH;
|
||||
$COMPATH_ROOT =~ s/\/vc98$//;
|
||||
@@ -1067,25 +1083,19 @@
|
||||
@@ -1067,25 +1084,19 @@
|
||||
{
|
||||
$SOLARINC .= $I.$USR.$INCLUDE.
|
||||
$STLPORT_stlport;
|
||||
@ -62,3 +97,11 @@
|
||||
$SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
|
||||
$I.'$JAVA_HOME'.$INCLUDE;
|
||||
|
||||
@@ -1273,6 +1284,7 @@
|
||||
ToFile( "GUIENV", $GUIENV, "e" );
|
||||
ToFile( "GVER", $GVER, "e" );
|
||||
ToFile( "OS", $OS, "e" );
|
||||
+ToFile( "OSVERSION", $OSVERSION, "e" );
|
||||
ToFile( "OUTPATH", $OUTPATH, "e" );
|
||||
ToFile( "INPATH", $INPATH, "e" );
|
||||
ToFile( "GVERDIR", $GVERDIR, "e" );
|
||||
|
@ -35,10 +35,12 @@ BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
|
||||
BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USE_AUTOCONF= yes
|
||||
WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office
|
||||
|
||||
CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \
|
||||
--with-jdk-home=${JDK13DIR}
|
||||
--with-jdk-home=${JDK13DIR} \
|
||||
--with-os-version=${OSVERSION}
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
|
@ -0,0 +1,93 @@
|
||||
--- configure.in.orig Mon Nov 12 22:45:53 2001
|
||||
+++ configure.in Fri Mar 8 23:53:42 2002
|
||||
@@ -98,6 +98,12 @@
|
||||
|
||||
Usage: --with-asm-home=<path to ml.exe directory>
|
||||
],,)
|
||||
+AC_ARG_WITH(os-version,
|
||||
+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice
|
||||
+ with the correct OSVERSION.
|
||||
+
|
||||
+ Usage: --with-os-version=<OSVERSION>
|
||||
+],,)
|
||||
AC_ARG_WITH(unzip-home,
|
||||
[ --with-unzip-home For Windows users, please supply the path for
|
||||
unzip.exe.
|
||||
@@ -225,13 +231,13 @@
|
||||
|
||||
if test $GCC; then
|
||||
AC_MSG_CHECKING([the GNU gcc compiler version])
|
||||
- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
if test "$_gcc_releasetype" = "egcs"; then
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler])
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn
|
||||
- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
else
|
||||
- _gcc_version=`$GCC --version`
|
||||
+ _gcc_version=`$CC --version`
|
||||
fi
|
||||
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
|
||||
if test "$_gcc_major" != "2"; then
|
||||
@@ -239,13 +245,13 @@
|
||||
AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
if test "$_gcc_middle" = "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
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
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
|
||||
@@ -306,7 +312,8 @@
|
||||
fi
|
||||
else
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
|
||||
- _gcc_include_path="/usr/include/g++"
|
||||
+ _gcc_include_path="/usr"
|
||||
+ _gxx_include_path="/usr/include/g++"
|
||||
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
|
||||
@@ -740,6 +747,10 @@
|
||||
fi
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
|
||||
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
|
||||
+ _jdk_minor="true"
|
||||
+ fi
|
||||
fi
|
||||
if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
@@ -982,7 +993,7 @@
|
||||
HAVE_GPC_C="yes"
|
||||
fi
|
||||
|
||||
-if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then
|
||||
+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
|
||||
AC_MSG_RESULT([GPC files found])
|
||||
else
|
||||
AC_MSG_ERROR([GPC files not found])
|
||||
@@ -1084,12 +1095,13 @@
|
||||
echo "\$with_lang="$with_lang
|
||||
echo "\$with_asm_home="$with_asm_home
|
||||
echo "\$with_unzip_home="$with_unzip_home
|
||||
+echo "\$with_os_version="$with_os_version
|
||||
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
|
||||
+ './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_os_version
|
||||
else
|
||||
echo
|
||||
echo Test Complete
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,93 @@
|
||||
--- configure.in.orig Mon Nov 12 22:45:53 2001
|
||||
+++ configure.in Fri Mar 8 23:53:42 2002
|
||||
@@ -98,6 +98,12 @@
|
||||
|
||||
Usage: --with-asm-home=<path to ml.exe directory>
|
||||
],,)
|
||||
+AC_ARG_WITH(os-version,
|
||||
+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice
|
||||
+ with the correct OSVERSION.
|
||||
+
|
||||
+ Usage: --with-os-version=<OSVERSION>
|
||||
+],,)
|
||||
AC_ARG_WITH(unzip-home,
|
||||
[ --with-unzip-home For Windows users, please supply the path for
|
||||
unzip.exe.
|
||||
@@ -225,13 +231,13 @@
|
||||
|
||||
if test $GCC; then
|
||||
AC_MSG_CHECKING([the GNU gcc compiler version])
|
||||
- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
if test "$_gcc_releasetype" = "egcs"; then
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler])
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn
|
||||
- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
else
|
||||
- _gcc_version=`$GCC --version`
|
||||
+ _gcc_version=`$CC --version`
|
||||
fi
|
||||
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
|
||||
if test "$_gcc_major" != "2"; then
|
||||
@@ -239,13 +245,13 @@
|
||||
AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
if test "$_gcc_middle" = "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
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
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
|
||||
@@ -306,7 +312,8 @@
|
||||
fi
|
||||
else
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
|
||||
- _gcc_include_path="/usr/include/g++"
|
||||
+ _gcc_include_path="/usr"
|
||||
+ _gxx_include_path="/usr/include/g++"
|
||||
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
|
||||
@@ -740,6 +747,10 @@
|
||||
fi
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
|
||||
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
|
||||
+ _jdk_minor="true"
|
||||
+ fi
|
||||
fi
|
||||
if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
@@ -982,7 +993,7 @@
|
||||
HAVE_GPC_C="yes"
|
||||
fi
|
||||
|
||||
-if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then
|
||||
+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
|
||||
AC_MSG_RESULT([GPC files found])
|
||||
else
|
||||
AC_MSG_ERROR([GPC files not found])
|
||||
@@ -1084,12 +1095,13 @@
|
||||
echo "\$with_lang="$with_lang
|
||||
echo "\$with_asm_home="$with_asm_home
|
||||
echo "\$with_unzip_home="$with_unzip_home
|
||||
+echo "\$with_os_version="$with_os_version
|
||||
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
|
||||
+ './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_os_version
|
||||
else
|
||||
echo
|
||||
echo Test Complete
|
@ -1,6 +1,41 @@
|
||||
--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
|
||||
+++ set_soenv.1 Thu Mar 7 16:24:14 2002
|
||||
@@ -954,7 +954,7 @@
|
||||
--- set_soenv.1.orig Tue Nov 20 18:26:33 2001
|
||||
+++ set_soenv.1 Fri Mar 8 22:33:35 2002
|
||||
@@ -40,7 +40,7 @@
|
||||
#
|
||||
# Set this value equal to the corresponding amount of
|
||||
# command line arguments.
|
||||
-my $numArgs = 17;
|
||||
+my $numArgs = 18;
|
||||
# Determining the amount of arguments in the call.
|
||||
my $numEnter = $#ARGV + 1;
|
||||
if ( $numEnter != $numArgs )
|
||||
@@ -72,7 +72,7 @@
|
||||
#
|
||||
# Platform dependent constant values.
|
||||
my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV,
|
||||
- $GVER, $GVERDIR, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
+ $GVER, $GVERDIR, $OSVERSION, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
$DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx );
|
||||
#
|
||||
#-------------------------------------------
|
||||
@@ -301,7 +301,7 @@
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
$SOLAR_JAVA = "TRUE";
|
||||
- $XPVERSION = "3";
|
||||
+ $XPVERSION = "3";
|
||||
}
|
||||
elsif ( $platform eq "$FreeBSD" )
|
||||
{ print "Setting FreeBSD specific values... ";
|
||||
@@ -324,6 +324,7 @@
|
||||
$PATH_SEPERATOR = $ps;
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
+ $OSVERSION = $ARGV[ 17 ];
|
||||
}
|
||||
elsif ( $platform eq "$Linux" )
|
||||
{
|
||||
@@ -954,7 +955,7 @@
|
||||
$ps.$USR.$LIB.
|
||||
$ps.$USR_LOCAL.$BIN;
|
||||
}
|
||||
@ -9,7 +44,7 @@
|
||||
{ $PATH = $cur_dir.
|
||||
$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
|
||||
$ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
|
||||
@@ -968,6 +968,22 @@
|
||||
@@ -968,6 +969,22 @@
|
||||
$ps.$USR.$BIN.$ds."X11".
|
||||
$ps.$USR.$LIB;
|
||||
}
|
||||
@ -32,7 +67,7 @@
|
||||
elsif ($platform eq "$Winnt")
|
||||
{ $COMPATH_ROOT = $COMPATH;
|
||||
$COMPATH_ROOT =~ s/\/vc98$//;
|
||||
@@ -1067,25 +1083,19 @@
|
||||
@@ -1067,25 +1084,19 @@
|
||||
{
|
||||
$SOLARINC .= $I.$USR.$INCLUDE.
|
||||
$STLPORT_stlport;
|
||||
@ -62,3 +97,11 @@
|
||||
$SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
|
||||
$I.'$JAVA_HOME'.$INCLUDE;
|
||||
|
||||
@@ -1273,6 +1284,7 @@
|
||||
ToFile( "GUIENV", $GUIENV, "e" );
|
||||
ToFile( "GVER", $GVER, "e" );
|
||||
ToFile( "OS", $OS, "e" );
|
||||
+ToFile( "OSVERSION", $OSVERSION, "e" );
|
||||
ToFile( "OUTPATH", $OUTPATH, "e" );
|
||||
ToFile( "INPATH", $INPATH, "e" );
|
||||
ToFile( "GVERDIR", $GVERDIR, "e" );
|
||||
|
@ -35,10 +35,12 @@ BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
|
||||
BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USE_AUTOCONF= yes
|
||||
WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office
|
||||
|
||||
CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \
|
||||
--with-jdk-home=${JDK13DIR}
|
||||
--with-jdk-home=${JDK13DIR} \
|
||||
--with-os-version=${OSVERSION}
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
|
93
editors/openoffice/files/patch-config_office+configure.in
Normal file
93
editors/openoffice/files/patch-config_office+configure.in
Normal file
@ -0,0 +1,93 @@
|
||||
--- configure.in.orig Mon Nov 12 22:45:53 2001
|
||||
+++ configure.in Fri Mar 8 23:53:42 2002
|
||||
@@ -98,6 +98,12 @@
|
||||
|
||||
Usage: --with-asm-home=<path to ml.exe directory>
|
||||
],,)
|
||||
+AC_ARG_WITH(os-version,
|
||||
+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice
|
||||
+ with the correct OSVERSION.
|
||||
+
|
||||
+ Usage: --with-os-version=<OSVERSION>
|
||||
+],,)
|
||||
AC_ARG_WITH(unzip-home,
|
||||
[ --with-unzip-home For Windows users, please supply the path for
|
||||
unzip.exe.
|
||||
@@ -225,13 +231,13 @@
|
||||
|
||||
if test $GCC; then
|
||||
AC_MSG_CHECKING([the GNU gcc compiler version])
|
||||
- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'`
|
||||
if test "$_gcc_releasetype" = "egcs"; then
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler])
|
||||
AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn
|
||||
- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'`
|
||||
else
|
||||
- _gcc_version=`$GCC --version`
|
||||
+ _gcc_version=`$CC --version`
|
||||
fi
|
||||
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
|
||||
if test "$_gcc_major" != "2"; then
|
||||
@@ -239,13 +245,13 @@
|
||||
AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
|
||||
if test "$_gcc_middle" = "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
|
||||
COMPATH="NO_GCC"
|
||||
else
|
||||
- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
|
||||
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
|
||||
@@ -306,7 +312,8 @@
|
||||
fi
|
||||
else
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
|
||||
- _gcc_include_path="/usr/include/g++"
|
||||
+ _gcc_include_path="/usr"
|
||||
+ _gxx_include_path="/usr/include/g++"
|
||||
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
|
||||
@@ -740,6 +747,10 @@
|
||||
fi
|
||||
if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
|
||||
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
|
||||
+ _jdk_minor="true"
|
||||
+ fi
|
||||
fi
|
||||
if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
|
||||
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
|
||||
@@ -982,7 +993,7 @@
|
||||
HAVE_GPC_C="yes"
|
||||
fi
|
||||
|
||||
-if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then
|
||||
+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
|
||||
AC_MSG_RESULT([GPC files found])
|
||||
else
|
||||
AC_MSG_ERROR([GPC files not found])
|
||||
@@ -1084,12 +1095,13 @@
|
||||
echo "\$with_lang="$with_lang
|
||||
echo "\$with_asm_home="$with_asm_home
|
||||
echo "\$with_unzip_home="$with_unzip_home
|
||||
+echo "\$with_os_version="$with_os_version
|
||||
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
|
||||
+ './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_os_version
|
||||
else
|
||||
echo
|
||||
echo Test Complete
|
@ -1,6 +1,41 @@
|
||||
--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
|
||||
+++ set_soenv.1 Thu Mar 7 16:24:14 2002
|
||||
@@ -954,7 +954,7 @@
|
||||
--- set_soenv.1.orig Tue Nov 20 18:26:33 2001
|
||||
+++ set_soenv.1 Fri Mar 8 22:33:35 2002
|
||||
@@ -40,7 +40,7 @@
|
||||
#
|
||||
# Set this value equal to the corresponding amount of
|
||||
# command line arguments.
|
||||
-my $numArgs = 17;
|
||||
+my $numArgs = 18;
|
||||
# Determining the amount of arguments in the call.
|
||||
my $numEnter = $#ARGV + 1;
|
||||
if ( $numEnter != $numArgs )
|
||||
@@ -72,7 +72,7 @@
|
||||
#
|
||||
# Platform dependent constant values.
|
||||
my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV,
|
||||
- $GVER, $GVERDIR, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
+ $GVER, $GVERDIR, $OSVERSION, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
|
||||
$DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx );
|
||||
#
|
||||
#-------------------------------------------
|
||||
@@ -301,7 +301,7 @@
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
$SOLAR_JAVA = "TRUE";
|
||||
- $XPVERSION = "3";
|
||||
+ $XPVERSION = "3";
|
||||
}
|
||||
elsif ( $platform eq "$FreeBSD" )
|
||||
{ print "Setting FreeBSD specific values... ";
|
||||
@@ -324,6 +324,7 @@
|
||||
$PATH_SEPERATOR = $ps;
|
||||
$PROSWITCH = "-DPRODUCT";
|
||||
$XPVERSION = "3";
|
||||
+ $OSVERSION = $ARGV[ 17 ];
|
||||
}
|
||||
elsif ( $platform eq "$Linux" )
|
||||
{
|
||||
@@ -954,7 +955,7 @@
|
||||
$ps.$USR.$LIB.
|
||||
$ps.$USR_LOCAL.$BIN;
|
||||
}
|
||||
@ -9,7 +44,7 @@
|
||||
{ $PATH = $cur_dir.
|
||||
$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
|
||||
$ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
|
||||
@@ -968,6 +968,22 @@
|
||||
@@ -968,6 +969,22 @@
|
||||
$ps.$USR.$BIN.$ds."X11".
|
||||
$ps.$USR.$LIB;
|
||||
}
|
||||
@ -32,7 +67,7 @@
|
||||
elsif ($platform eq "$Winnt")
|
||||
{ $COMPATH_ROOT = $COMPATH;
|
||||
$COMPATH_ROOT =~ s/\/vc98$//;
|
||||
@@ -1067,25 +1083,19 @@
|
||||
@@ -1067,25 +1084,19 @@
|
||||
{
|
||||
$SOLARINC .= $I.$USR.$INCLUDE.
|
||||
$STLPORT_stlport;
|
||||
@ -62,3 +97,11 @@
|
||||
$SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
|
||||
$I.'$JAVA_HOME'.$INCLUDE;
|
||||
|
||||
@@ -1273,6 +1284,7 @@
|
||||
ToFile( "GUIENV", $GUIENV, "e" );
|
||||
ToFile( "GVER", $GVER, "e" );
|
||||
ToFile( "OS", $OS, "e" );
|
||||
+ToFile( "OSVERSION", $OSVERSION, "e" );
|
||||
ToFile( "OUTPATH", $OUTPATH, "e" );
|
||||
ToFile( "INPATH", $INPATH, "e" );
|
||||
ToFile( "GVERDIR", $GVERDIR, "e" );
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user