diff options
author | hira <hira@pkgsrc.org> | 2008-10-14 11:02:24 +0000 |
---|---|---|
committer | hira <hira@pkgsrc.org> | 2008-10-14 11:02:24 +0000 |
commit | 59230131f35d5b9e38cff8596a061660efcd1fa6 (patch) | |
tree | 768a221595539e52131066858dda381b7c10e1e0 /misc/openoffice3/patches/patch-ak | |
parent | cb9875277de8caa2cf2cdd064aae3a53e74d98e0 (diff) | |
download | pkgsrc-59230131f35d5b9e38cff8596a061660efcd1fa6.tar.gz |
Initial import of OpenOffice.org 3.0.0 as misc/openoffice3.
Release note (will be available):
http://development.openoffice.org/releases/3.0.0.html
Diffstat (limited to 'misc/openoffice3/patches/patch-ak')
-rw-r--r-- | misc/openoffice3/patches/patch-ak | 106 |
1 files changed, 106 insertions, 0 deletions
diff --git a/misc/openoffice3/patches/patch-ak b/misc/openoffice3/patches/patch-ak new file mode 100644 index 00000000000..5f43c13eb0e --- /dev/null +++ b/misc/openoffice3/patches/patch-ak @@ -0,0 +1,106 @@ +$NetBSD: patch-ak,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $ + +--- config_office/set_soenv.in.orig 2008-04-09 00:16:24.000000000 +0900 ++++ config_office/set_soenv.in 2008-05-17 18:36:31.000000000 +0900 +@@ -40,7 +40,7 @@ + # + my ( $outfile, $outfile_sh, $outfile_bat, $bootfile, $newline, $comment, + $comment4nt, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, +- $wps, $cur_dir, $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $MINGW, ++ $wps, $cur_dir, $par_dir, $I, $L, $R, $D, $buildenv, $answer, $tmp, $MINGW, + $USE_MINGW, $platform, + $cygwinver, $empty, $no_ant, $no_stl, $no_gcc_include, + $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $unsetvarssh, $unsetvarsbat, $exportvars, $win_format_var, $perl_os, @mingw_lib_include_paths, $mingw_lib_include_path); +@@ -90,7 +90,7 @@ + $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS, + $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB, + $PROEXT, +- $SYSTEM_PYTHON, $PYTHONPATH, $PYTHONHOME, $SYSTEM_MOZILLA, $EPM_FLAGS); ++ $PYTHON, $SYSTEM_PYTHON, $PYTHONPATH, $PYTHONHOME, $SYSTEM_MOZILLA, $EPM_FLAGS); + # + #------------------------------------------- + # IId. Declaring the aliases. +@@ -126,6 +126,7 @@ + $par_dir = ".."; # parrent directory + $I = " -I"; # include search path + $L = " -L"; # library search path ++$R = " -R"; # library search path + $D = " -D"; # define search path + $empty = ""; # used as argument + $no_stl = "NO_STLPORT4"; # possible argument +@@ -274,6 +275,16 @@ + $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client"; + $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads"; + } ++ elsif ($platform =~ m/^x86_64/) ++ { print "Setting NetBSD x86-64 specific values... "; ++ $outfile = "NetBSDX86-64Env.Set"; ++ $CPU = "X"; ++ $CPUNAME = "X86_64"; ++ $OUTPATH = "unxbsdx"; ++ $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386"; ++ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client"; ++ $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads"; ++ } + elsif ($platform =~ m/^sparc/) + { print "Setting NetBSD Sparc specific values... "; + $outfile = "NetBSDSparcEnv.Set"; +@@ -299,8 +310,14 @@ + exit 1; + } + #Conditional setting depending on gcc3: +- $CVER = "C300"; +- $OUTPATH = $OUTPATH."2"; ++ if (@GCCVER@ >= 30401) { ++ $CVER = "C341"; ++ $OUTPATH = $OUTPATH."3"; ++ } ++ else { ++ $CVER = "C300"; ++ $OUTPATH = $OUTPATH."2"; ++ } + # General NetBSD settings: + $BIG_SVX = "TRUE"; + $COM = "GCC"; +@@ -1361,7 +1378,8 @@ + $L.$JRETOOLKITDIR. + $L.$JRETHREADDIR. + $L_STLPORT_LIB. +- $L.$XLIB; ++ $L.$XLIB. ++ $R.$XLIB; + } + elsif ($platform =~ m/linux|netbasd|osf1|irix|aix|freebsd/) + { $SOLARLIB = $L.$par_dir.$LIB. +@@ -1524,6 +1542,7 @@ + } + + if ($SYSTEM_PYTHON eq "NO") { ++ $PYTHON = python + $PYTHONPATH = '.'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$ds.'python'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$ds.'python'.$ds.'lib-dynload'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$ds.'pyuno'.$wps.$SOLARVER.$ds.$INPATH.$ds.'bin'.$ds.'pyuno'; + $PYTHONHOME = $SOLARVER.$ds.$INPATH; + if ($GUIBASE eq "WIN") { +@@ -1664,6 +1683,7 @@ + ToFile( "JITC_PROCESSOR_TYPE","6", "e" ); + } + ToFile( "DEFAULT_TO_ENGLISH_FOR_PACKING", "yes", "e" ); ++ToFile( "X11_LDFLAGS", "@X_LIBS@", "e" ); + ToFile( "ENABLE_GTK", "@ENABLE_GTK@", "e" ); + ToFile( "GTK_CFLAGS", "@GTK_CFLAGS@", "e" ); + ToFile( "GTK_LIBS", "@GTK_LIBS@", "e" ); +@@ -1918,6 +1938,7 @@ + ToFile( "MOZ_LIB_XPCOM", "@MOZ_LIB_XPCOM@", "e" ); + ToFile( "MOZ_NSPR_CFLAGS", "@MOZ_NSPR_CFLAGS@", "e" ); + ToFile( "MOZ_NSS_CFLAGS", "@MOZ_NSS_CFLAGS@", "e" ); ++ToFile( "MOZ_NSS_LIBS", "@MOZ_NSS_LIBS@", "e" ); + ToFile( "MOZ_LDAP_CFLAGS", "@MOZ_LDAP_CFLAGS@", "e" ); + ToFile( "WITH_WRITER2LATEX", "@WITH_WRITER2LATEX@", "e" ); + ToFile( "WITH_FONTS", "@WITH_FONTS@", "e" ); +@@ -1943,6 +1964,7 @@ + ToFile( "OPENSSL_CFLAGS", "@OPENSSL_CFLAGS@", "e" ); + ToFile( "OPENSSL_LIBS", "@OPENSSL_LIBS@", "e" ); + ToFile( "SYSTEM_PYTHON", "@SYSTEM_PYTHON@", "e" ); ++ToFile( "PYTHON", "@PYTHON@", "e" ); + ToFile( "PYTHON_CFLAGS", "@PYTHON_CFLAGS@", "e" ); + ToFile( "PYTHON_LIBS", "@PYTHON_LIBS@", "e" ); + if ($SYSTEM_PYTHON eq "NO") { |