head 1.3; access; symbols pkgsrc-2016Q4:1.2.0.62 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.60 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.58 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.56 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.54 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.52 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.50 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.48 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.46 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.44 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.42 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.40 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.38 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.36 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.34 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.32 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.30 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.28 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.26 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.24 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.22 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.20 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.18 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.16 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.14 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.12 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.10 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.8 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.6 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.4 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.2 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.1.1.1.0.4 pkgsrc-2009Q1-base:1.1.1.1 pkgsrc-2008Q4:1.1.1.1.0.2 pkgsrc-2008Q4-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.3 date 2016.12.29.19.10.28; author wiz; state dead; branches; next 1.2; commitid UT4GSflIUbUnEUzz; 1.2 date 2009.05.09.18.43.41; author hira; state Exp; branches; next 1.1; 1.1 date 2008.10.14.11.02.24; author hira; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2008.10.14.11.02.24; author hira; state Exp; branches; next ; desc @@ 1.3 log @Remove old openoffice and libreoffice packages. As discussed on pkgsrc-users. @ text @$NetBSD: patch-ak,v 1.2 2009/05/09 18:43:41 hira Exp $ --- 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, $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, $SYSTEM_MOZILLA, $EPM_FLAGS); + $PYTHON, $SYSTEM_PYTHON, $PYTHONPATH, $SYSTEM_MOZILLA, $EPM_FLAGS); # #------------------------------------------- # IId. Declaring the aliases. @@@@ -121,6 +121,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 @@@@ -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"; } + 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"; @@@@ -293,8 +304,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"; @@@@ -1415,7 +1432,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. @@@@ -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'; if ($GUIBASE eq "WIN") { # PYTHONPATH need to use '\' directory seperators; @@@@ -1717,6 +1736,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" ); @@@@ -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_FONTS", "@@WITH_FONTS@@", "e" ); 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" ); +ToFile( "PYTHON", "@@PYTHON@@", "e" ); ToFile( "PYTHON_CFLAGS", "@@PYTHON_CFLAGS@@", "e" ); ToFile( "PYTHON_LIBS", "@@PYTHON_LIBS@@", "e" ); if ($SYSTEM_PYTHON eq "NO") { @ 1.2 log @Update to 3.1.0. Bug fixes and improvements (please see the following URLs for details). Release notes: http://development.openoffice.org/releases/3.1.0.html New features : http://www.openoffice.org/dev_docs/features/3.1/index.html Build confirmed on NetBSD 5.99.11/i386. @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Initial revision @ text @d3 2 a4 2 --- 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 d18 2 a19 2 - $SYSTEM_PYTHON, $PYTHONPATH, $PYTHONHOME, $SYSTEM_MOZILLA, $EPM_FLAGS); + $PYTHON, $SYSTEM_PYTHON, $PYTHONPATH, $PYTHONHOME, $SYSTEM_MOZILLA, $EPM_FLAGS); d23 1 a23 1 @@@@ -126,6 +126,7 @@@@ d31 1 a31 1 @@@@ -274,6 +275,16 @@@@ d48 1 a48 1 @@@@ -299,8 +310,14 @@@@ d65 1 a65 1 @@@@ -1361,7 +1378,8 @@@@ d75 1 a75 1 @@@@ -1524,6 +1542,7 @@@@ a80 1 $PYTHONHOME = $SOLARVER.$ds.$INPATH; d82 2 a83 1 @@@@ -1664,6 +1683,7 @@@@ d91 1 a91 1 @@@@ -1918,6 +1938,7 @@@@ a96 1 ToFile( "WITH_WRITER2LATEX", "@@WITH_WRITER2LATEX@@", "e" ); d98 2 a99 1 @@@@ -1943,6 +1964,7 @@@@ @ 1.1.1.1 log @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 @ text @@