diff options
Diffstat (limited to 'misc/openoffice3/patches/patch-ak')
| -rw-r--r-- | misc/openoffice3/patches/patch-ak | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/misc/openoffice3/patches/patch-ak b/misc/openoffice3/patches/patch-ak index 5f43c13eb0e..907e3fd5620 100644 --- a/misc/openoffice3/patches/patch-ak +++ b/misc/openoffice3/patches/patch-ak @@ -1,7 +1,7 @@ -$NetBSD: patch-ak,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $ +$NetBSD: patch-ak,v 1.2 2009/05/09 18:43:41 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 +--- set_soenv.in.orig 2009-04-22 23:54:40.000000000 +0900 ++++ set_soenv.in 2009-05-09 12:33:40.000000000 +0900 @@ -40,7 +40,7 @@ # my ( $outfile, $outfile_sh, $outfile_bat, $bootfile, $newline, $comment, @@ -15,12 +15,12 @@ $NetBSD: patch-ak,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $ $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); +- $SYSTEM_PYTHON, $PYTHONPATH, $SYSTEM_MOZILLA, $EPM_FLAGS); ++ $PYTHON, $SYSTEM_PYTHON, $PYTHONPATH, $SYSTEM_MOZILLA, $EPM_FLAGS); # #------------------------------------------- # IId. Declaring the aliases. -@@ -126,6 +126,7 @@ +@@ -121,6 +121,7 @@ $par_dir = ".."; # parrent directory $I = " -I"; # include search path $L = " -L"; # library search path @@ -28,7 +28,7 @@ $NetBSD: patch-ak,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $ $D = " -D"; # define search path $empty = ""; # used as argument $no_stl = "NO_STLPORT4"; # possible argument -@@ -274,6 +275,16 @@ +@@ -268,6 +269,16 @@ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client"; $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads"; } @@ -45,7 +45,7 @@ $NetBSD: patch-ak,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $ elsif ($platform =~ m/^sparc/) { print "Setting NetBSD Sparc specific values... "; $outfile = "NetBSDSparcEnv.Set"; -@@ -299,8 +310,14 @@ +@@ -293,8 +304,14 @@ exit 1; } #Conditional setting depending on gcc3: @@ -62,7 +62,7 @@ $NetBSD: patch-ak,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $ # General NetBSD settings: $BIG_SVX = "TRUE"; $COM = "GCC"; -@@ -1361,7 +1378,8 @@ +@@ -1415,7 +1432,8 @@ $L.$JRETOOLKITDIR. $L.$JRETHREADDIR. $L_STLPORT_LIB. @@ -72,15 +72,15 @@ $NetBSD: patch-ak,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $ } elsif ($platform =~ m/linux|netbasd|osf1|irix|aix|freebsd/) { $SOLARLIB = $L.$par_dir.$LIB. -@@ -1524,6 +1542,7 @@ +@@ -1579,6 +1597,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 @@ + # PYTHONPATH need to use '\' directory seperators; +@@ -1717,6 +1736,7 @@ ToFile( "JITC_PROCESSOR_TYPE","6", "e" ); } ToFile( "DEFAULT_TO_ENGLISH_FOR_PACKING", "yes", "e" ); @@ -88,15 +88,15 @@ $NetBSD: patch-ak,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $ ToFile( "ENABLE_GTK", "@ENABLE_GTK@", "e" ); ToFile( "GTK_CFLAGS", "@GTK_CFLAGS@", "e" ); ToFile( "GTK_LIBS", "@GTK_LIBS@", "e" ); -@@ -1918,6 +1938,7 @@ +@@ -1908,6 +1928,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( "WITHOUT_AFMS", "@WITHOUT_AFMS@", "e" ); +@@ -1933,6 +1954,7 @@ ToFile( "OPENSSL_CFLAGS", "@OPENSSL_CFLAGS@", "e" ); ToFile( "OPENSSL_LIBS", "@OPENSSL_LIBS@", "e" ); ToFile( "SYSTEM_PYTHON", "@SYSTEM_PYTHON@", "e" ); |