 @@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.40 2008/03/21 09:20:55 hira Exp $
+# $NetBSD: Makefile,v 1.40.2.1 2008/04/26 04:29:13 rtr Exp $
+#
-OO_VER=			2.3.1
+OO_VER=			2.4.0
 PKGREVISION=		5
 DISTNAME=		openoffice-${OO_VER}
 PKGNAME=		openoffice2-${OO_VER}
 CATEGORIES=		misc
 MASTER_SITES=		${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/}
 DIST_SUBDIR=		${DISTNAME}
 DISTFILES=		OOo_${OO_VER}_src_core.tar.bz2
 DISTFILES+=		OOo_${OO_VER}_src_binfilter.tar.bz2
 DISTFILES+=		OOo_${OO_VER}_src_l10n.tar.bz2
 #DISTFILES+=		OOo_${OO_VER}_src_sdk.tar.bz2
 DISTFILES+=		OOo_${OO_VER}_src_system.tar.bz2
 MAINTAINER=		hira@NetBSD.org
 @@ -20,27 +19,27 @@ HOMEPAGE=		http://www.openoffice.org/
 COMMENT=		Integrated office productivity suite (version 2)
 PKG_DESTDIR_SUPPORT=	user-destdir
 BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
 BUILD_DEPENDS+=		zip-[0-9]*:../../archivers/zip
 BUILD_DEPENDS+=		unzip-[0-9]*:../../archivers/unzip
 BUILD_DEPENDS+=		p5-Archive-Zip-[0-9]*:../../archivers/p5-Archive-Zip
 DEPENDS+=		libpaper-[0-9]*:../../print/libpaper
 .include "../../mk/bsd.prefs.mk"
-WRKSRC=			${WRKDIR}/OOG680_m9
+WRKSRC=			${WRKDIR}/OOH680_m12
 CONFIGURE_DIRS=		config_office
 # Cannot compile with 3.3.x (GCC Bugzilla Bug 16879).
 GCC_REQD+=		3.4
 USE_LANGUAGES+=		c c++
 USE_TOOLS+=		bash gmake imake perl pkg-config tar
 PTHREAD_OPTS+=		require
 PTHREAD_AUTO_VARS=	yes
 CONFLICTS+=		staroffice-[0-9]*
 CONFLICTS+=		openoffice-[0-9]*
 CONFLICTS+=		openoffice-bin-[0-9]*
 @@ -103,27 +102,27 @@ CONFIGURE_ARGS+=	--without-java --disabl
 # NOTE: In this version, this value should be separated by space (comma
 #       causes build error).
 CONFIGURE_ARGS+=	--with-lang=${OO_LANGS:Q}
 .include "options.mk"
 UNLIMIT_RESOURCES+=	datasize
 OO_RELEASE=		OpenOffice.org${OO_VER}
 PLIST_SRC+=		${WRKDIR}/.PLIST_SRC
 MESSAGE_SUBST+=		OO_RELEASE=${OO_RELEASE}
 INSTALLATION_DIRS=	bin ${OO_RELEASE}
-OO_UNXNAME=	openoffice.org2.3
+OO_UNXNAME=	openoffice.org2.4
 OO_PKGPATH=	${WRKSRC}/instsetoo_native/${OPENOFFICE_OUTPATH}.pro/OpenOffice/portable/install
 OO_PKGROOT=	/opt/${OO_UNXNAME}
 OO_PROGRAMS=	scalc sdraw simpress soffice swriter unopkg
 post-extract:
 	cd ${WRKSRC}/bridges/source/cpp_uno &&			\
 	mv gcc3_netbsd_intel gcc3_netbsd_intel.orig &&		\
 	cp -Rp gcc3_freebsd_intel gcc3_netbsd_intel &&		\
 	cp -Rp gcc3_freebsd_x86-64 gcc3_netbsd_x86-64
 do-build:
 	${_ULIMIT_CMD} ${SETENV} ${MAKE_ENV} bash -c "cd ${WRKSRC} && ./bootstrap && source ${OPENOFFICE_SETFILE}Env.Set.sh && dmake build_all"

 @@ -1,71 +1,68 @@
-$NetBSD: distinfo,v 1.35 2008/03/21 09:20:56 hira Exp $
+$NetBSD: distinfo,v 1.35.2.1 2008/04/26 04:29:13 rtr Exp $
-SHA1 (openoffice-2.3.1/OOo_2.3.1_src_binfilter.tar.bz2) = 0643c52da3850a164928342e7651897b7a76ca1f
+SHA1 (openoffice-2.4.0/OOo_2.4.0_src_binfilter.tar.bz2) = 6196fd2d2b5b37635d9a08a36f5476d57b14e0d8
-RMD160 (openoffice-2.3.1/OOo_2.3.1_src_binfilter.tar.bz2) = 497aec1de49ea941ab8305331a9fc9e8e04a5162
+RMD160 (openoffice-2.4.0/OOo_2.4.0_src_binfilter.tar.bz2) = fff7a0a61b19881559e4f20ddd36031565f635e1
-Size (openoffice-2.3.1/OOo_2.3.1_src_binfilter.tar.bz2) = 6476673 bytes
+Size (openoffice-2.4.0/OOo_2.4.0_src_binfilter.tar.bz2) = 6675120 bytes
-SHA1 (openoffice-2.3.1/OOo_2.3.1_src_core.tar.bz2) = de189e03a329cdd334823a52b800fad0c033ab4d
+SHA1 (openoffice-2.4.0/OOo_2.4.0_src_core.tar.bz2) = 1f775a0f2b755ad1c4cb7d14df93d86948424e7f
-RMD160 (openoffice-2.3.1/OOo_2.3.1_src_core.tar.bz2) = ab75c022d00ed6269eb9437f9c022e44181c6d3a
+RMD160 (openoffice-2.4.0/OOo_2.4.0_src_core.tar.bz2) = f8be874225a4f8a90bf20d563db175f3381e224e
-Size (openoffice-2.3.1/OOo_2.3.1_src_core.tar.bz2) = 144156134 bytes
+Size (openoffice-2.4.0/OOo_2.4.0_src_core.tar.bz2) = 153590855 bytes
-SHA1 (openoffice-2.3.1/OOo_2.3.1_src_l10n.tar.bz2) = 004defae1496cf4b953a233abb20fd4c7e162423
+SHA1 (openoffice-2.4.0/OOo_2.4.0_src_l10n.tar.bz2) = 3ef13fbaa6c41ab920ba9a9f4494f6c4f805c28e
-RMD160 (openoffice-2.3.1/OOo_2.3.1_src_l10n.tar.bz2) = bc10b1e05574aced79532fbef316e66dcb810fbf
+RMD160 (openoffice-2.4.0/OOo_2.4.0_src_l10n.tar.bz2) = a52ed9e7a7511ad12cf6cef98e64a3ef384dd383
-Size (openoffice-2.3.1/OOo_2.3.1_src_l10n.tar.bz2) = 79077332 bytes
+Size (openoffice-2.4.0/OOo_2.4.0_src_l10n.tar.bz2) = 81193819 bytes
-SHA1 (openoffice-2.3.1/OOo_2.3.1_src_system.tar.bz2) = ebc835f9c00ef60b9d8da1004a8f31f8a88aef6f
+SHA1 (openoffice-2.4.0/OOo_2.4.0_src_system.tar.bz2) = cbefb4655987fb70b929b6922c2b27beb1e5db18
-RMD160 (openoffice-2.3.1/OOo_2.3.1_src_system.tar.bz2) = f93b0fc523a39d29e73466be4d592d5a9fcde68e
+RMD160 (openoffice-2.4.0/OOo_2.4.0_src_system.tar.bz2) = ad25cb334f59154db36da8346c47805013f0f6fe
-Size (openoffice-2.3.1/OOo_2.3.1_src_system.tar.bz2) = 36879908 bytes
+Size (openoffice-2.4.0/OOo_2.4.0_src_system.tar.bz2) = 44072779 bytes
 SHA1 (patch-aa) = bbbd684c158cddb8aabf9c232257a997950f6119
 SHA1 (patch-ac) = ed6d84d40c3543eed754d74a5e65caf137f31c3d
 SHA1 (patch-ad) = f26b60c05bf061c9d1f245826954cb642861dd98
 SHA1 (patch-ae) = 6fb03e29c5368f26e7187516354858df127d388b
 SHA1 (patch-ag) = 6c2f17424cfc85b5bc923a650167f14b7acabfd4
 SHA1 (patch-ah) = e0a7dd2bf36e5009b5b8a5ddc593a5a78c01a012
 SHA1 (patch-ai) = 268c8107052d2650a78d8048513f4acb2a1ee0f1
-SHA1 (patch-aj) = f0a38928938ba18d32b1e9007dbb8e36e54381bc
+SHA1 (patch-ak) = 3bb19e2c8e606a66609024a49ec311161b375f10
 SHA1 (patch-ak) = 23c202e81b47a415a0762aa5f30e8ed4e64017ad
 SHA1 (patch-am) = 8e497298dd5534bd0ef438c22595c1c0f63912a5
 SHA1 (patch-an) = cdf677a8e135fd4b447eef006558c7fea4df0be6
 SHA1 (patch-ao) = a83178adec44571ebcf7a4dd66bda52d004d465c
 SHA1 (patch-ap) = cf32f3205e7f8f6ff90518f262374b6c7260b431
 SHA1 (patch-aq) = e4f2a84598a6a09b4bedc430cd24921f87f822e5
 SHA1 (patch-ar) = e3592ddc51a311a90d727ef8b595944a0ac3e623
 SHA1 (patch-as) = 55e38c869518e673e8554b2645c1adfb28f6faec
 SHA1 (patch-aw) = fdd1665c729cd17d8381ab39f2e6672164a058ad
-SHA1 (patch-ba) = e1cc1c4dd80c3151c9f43d1030d89404f0537b47
+SHA1 (patch-ba) = 0134e4055ebe01134029881c3f4d961f7efe8db6
 SHA1 (patch-bb) = a2fe8b7aff8c875bdf15c70619b430f1fdbfa053
 SHA1 (patch-bc) = a97ec5574d4ef2f2fbdf411ae2c8d49d9f434077
 SHA1 (patch-bd) = f206fef46a0741139ae776f95d2a01f794989fb5
 SHA1 (patch-bf) = d2e2363e7e08d675e3a6b9356d1ffac6d10148de
-SHA1 (patch-bg) = c050b8fa384a187fbf846f78c884c98840046a86
+SHA1 (patch-bg) = 0eeb3e521b3d7c47efa67bf38a1ec598056ab32a
 SHA1 (patch-bh) = c5fdc5597895c6ea4034355dc225f9e72ed1d218
 SHA1 (patch-bi) = f9d286d8dd93c7ba99fd0ca809c6dfac5e763464
 SHA1 (patch-bj) = 80685500062b9a17e16732a9a6da7a7d1d1ed1f6
 SHA1 (patch-bk) = 5a5c03a0c965edb32e95ad342f330e2b0eaf3d9c
 SHA1 (patch-bl) = d9d6860e4491863dd5b2f09eeff97e4023dbd23d
 SHA1 (patch-bm) = 0f7367782155c1d0f0459912aac69a1c759ad7fa
 SHA1 (patch-bn) = a891c1620a53d9c25cf414232a80a4cdb54e0e27
 SHA1 (patch-bo) = 3e4bcccd0a7cea535e443d750039fa844380f8bc
 SHA1 (patch-bp) = 9005edd4a24bfa32b5e5a731ed626fb35d0b675e
 SHA1 (patch-bq) = b2402ee86620726d5628f4bd5ebaec2c2a29726b
 SHA1 (patch-br) = 5ffb7dd1e313ef0e6fc65da7c4380244840d80ca
-SHA1 (patch-bs) = c6e47b0154a3569b3cb466c7af55e2d2e7a80a12
+SHA1 (patch-bs) = ede4ffcb762e89efbf95b6e4b644eb268534f1ca
 SHA1 (patch-bt) = f52b0fa4453a580ac256accf221aef0f2c059661
 SHA1 (patch-bv) = bc035bdbc8420666a52417f2226e3e687d199e33
 SHA1 (patch-bw) = e0d438f886e97c0342f56ba155ebb6a7e9414093
 SHA1 (patch-bx) = 157878e1fb4297f118ed0bbf06009506666fbc1c
 SHA1 (patch-by) = 1612b765467e51ca7498497d38a0bb6ac694f9a6
 SHA1 (patch-ch) = 5785607cff893f32b16bb5bcd30dc6c3942633e0
 SHA1 (patch-ci) = 4743cee1c391e04a53bd83f6ae7e58e737d08d1e
 SHA1 (patch-cj) = 45ff359ec795e5ef5c692e954d88912c74017162
 SHA1 (patch-cn) = 67afccde1d7bfa42ec4082067189da23ada97190
-SHA1 (patch-cp) = 7c6007d18cc4f1b5d1c8e16c9170ec0e8211a040
+SHA1 (patch-cp) = 35151ba658859c9d116ccdf44ec372c9e66435b1
 SHA1 (patch-cq) = 6691fd7fa330db000ec5a9319bf9030b83aa593d
-SHA1 (patch-cr) = 9cf96627d480714d62109bb3a7d67777a1a2b796
+SHA1 (patch-cr) = aa797461919635c3e6aaa30678a7585d5640dedd
 SHA1 (patch-cs) = 76c55cd6150076022d9b773486232417ed069643
-SHA1 (patch-ct) = f895442c141fb7cc172adca4903bbf784dbe3594
+SHA1 (patch-ct) = a06c5cbc543acecb4f18e858cd844302bbdb50b4
 SHA1 (patch-cu) = b930fd94413c2bdf23ea94b074e3bb5e93784009
 SHA1 (patch-cv) = 2e14a54d369a255ee39fcec7d4f1d2b11a8f4d2e
-SHA1 (patch-cw) = 48545a27326abbfc464cae877262bc8735bb5c01
+SHA1 (patch-cw) = 9c122919fed1b77bfc2edeb5297a7f6bdf4d45ae
 SHA1 (patch-cx) = 1c2efe192b0535ff6b2dc59e6a138c9931e6e946
 SHA1 (patch-cy) = 8d47bcf1da6f351f4f0cbf6a8355903094b0baee
 SHA1 (patch-cz) = e9850759fccff68914b104f4075e79c61b1010eb
 SHA1 (patch-da) = c2c9332dcf22d2d201215813ac9fc7e7ac401c6d
-SHA1 (patch-db) = 2760f1dd5a19afb7e329796318beedfc6972f039
+SHA1 (patch-dc) = 125ae2e943946cb96c6f7513dccced0c9d8797af
 SHA1 (patch-dd) = 6f791b6be13e37a59b3115ab338587489079b89d

 @@ -1,28 +1,28 @@
-# $NetBSD: options.mk,v 1.17 2007/12/18 22:24:29 hira Exp $
+# $NetBSD: options.mk,v 1.17.4.1 2008/04/26 04:29:13 rtr Exp $
 PKG_OPTIONS_VAR=		PKG_OPTIONS.openoffice2
 PKG_SUPPORTED_OPTIONS=		cups gnome gtk2 kde nas ooo-external-libwpd
 PKG_OPTIONS_OPTIONAL_GROUPS=	browser
 PKG_OPTIONS_GROUP.browser=	firefox seamonkey # firefox-gtk1 seamonkey-gtk1
 # The list from completelangiso in solenv/inc/postset.mk.
 OO_SUPPORTED_LANGUAGES=		af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca \
 				cs cy da de dz el en-GB en-US en-ZA eo es et \
 				eu fa fi fr ga gl gu-IN he hi-IN hr hu it ja \
-				ka km kn-IN ko ku lo lt lv mk ms ml-IN mr-IN \
+				ka km kn ko ku lo lt lv mk ms ml-IN mr-IN ne \
-				ne nb nl nn nr ns or-IN pa-IN pl pt pt-BR ru \
+				nb nl nn nr ns oc or-IN pa-IN pl pt pt-BR ru \
-				rw sk sl sh-YU sr-CS ss st sv sw sw-TZ sx    \
+				rw sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER \
-				te-IN ti-ER ta-IN th tn tr ts tg ur-IN uk ve \
+				ta-IN th tn tr ts tg ur-IN uk ve vi xh zh-CN \
-				vi xh zh-CN zh-TW zu
+				zh-TW zu
 .for l in ${OO_SUPPORTED_LANGUAGES}
 PKG_SUPPORTED_OPTIONS+=		lang-${l}
 .endfor
 PKG_SUGGESTED_OPTIONS=		gtk2 lang-en-US firefox
 PKG_OPTIONS_LEGACY_OPTS+=	gnome-vfs:gnome
 .include "../../mk/bsd.options.mk"
 .include "../../mk/bsd.prefs.mk"
 .for l in ${PKG_OPTIONS:Mlang-*}
 OO_LANGS+=	${l:S/^lang-//1}
 .endfor
 OO_LANGS?=	en-US

 @@ -1,99 +1,105 @@
-$NetBSD: patch-ak,v 1.6 2007/10/12 15:41:43 hira Exp $
+$NetBSD: patch-ak,v 1.6.4.1 2008/04/26 04:29:13 rtr Exp $
---- config_office/set_soenv.in.orig	2007-08-03 13:09:48.000000000 +0000
+--- config_office/set_soenv.in.orig	2008-01-23 17:07:28.000000000 +0000
-+++ config_office/set_soenv.in	2007-10-12 01:59:21.000000000 +0000
++++ config_office/set_soenv.in	2008-04-14 04:39:32.000000000 +0000
-@@ -39,7 +39,7 @@
+@@ -40,7 +40,7 @@
  #--------------------------------------------------------
+ #
- my ( $outfile, $outfile_sh, $outfile_bat, $bootfile, $newline, $comment, $comment4nt, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, $cur_dir,
+ my ( $outfile, $outfile_sh, $outfile_bat, $bootfile, $newline, $comment,
--     $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $MINGW, $USE_MINGW, $platform,
+      $comment4nt, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps,
-+     $par_dir, $I, $L, $R, $D, $buildenv, $answer, $tmp, $MINGW, $USE_MINGW, $platform,
+-     $wps, $wps2, $cur_dir, $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $MINGW,
 +     $wps, $wps2, $cur_dir, $par_dir, $I, $L, $R, $D, $buildenv, $answer, $tmp, $MINGW,
       $USE_MINGW, $platform, $NOWRAPCMD,
       $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 @@
-@@ -86,7 +86,7 @@
+      $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
       $ATL_LIB, $ATL_INCLUDE, $MFC_LIB, $MFC_INCLUDE, $NO_HIDS, $TEMP, $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);
+-     $SYSTEM_PYTHON, $PYTHONPATH, $PYTHONHOME, $SYSTEM_MOZILLA, $EPM_FLAGS);
-+     $PYTHON, $SYSTEM_PYTHON, $PYTHONPATH, $PYTHONHOME, $SYSTEM_MOZILLA);
++     $PYTHON, $SYSTEM_PYTHON, $PYTHONPATH, $PYTHONHOME, $SYSTEM_MOZILLA, $EPM_FLAGS);
+ #
  #-------------------------------------------
  # IId. Declaring the aliases.
-@@ -111,6 +111,7 @@
+@@ -132,6 +132,7 @@
  $par_dir        = "..";             # parrent directory
  $I              = " -I";            # include search path
  $L              = " -L";            # library search path
-+$R              = " -R";            # library runtime path
++$R              = " -R";            # library search path
  $D              = " -D";            # define search path
  $empty          = "";               # used as argument
  $no_stl         = "NO_STLPORT4";    # possible argument
-@@ -271,6 +272,16 @@
+@@ -284,6 +285,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";
-@@ -296,8 +307,14 @@
+@@ -310,7 +321,14 @@
       exit 1;
+    }
     #Conditional setting depending on gcc3:
--      $CVER           = "C300";
+       $CVER           = "C300";
 -      $OUTPATH        = $OUTPATH."2";
-+      if( @GCCVER@ >= 30401 ) {
++      if (@GCCVER@ >= 30401) {
 +         $CVER           = "C341";
 +         $OUTPATH        = $OUTPATH."3";
 +      }
 +      else {
 +         $CVER           = "C300";
 +         $OUTPATH        = $OUTPATH."2";
 +      }
     # General NetBSD settings:
        $BIG_SVX        = "TRUE";
        $COM            = "GCC";
-@@ -1243,7 +1260,8 @@
+@@ -1387,7 +1405,8 @@
                          $L.$JRETOOLKITDIR.
                          $L.$JRETHREADDIR.
                          $L_STLPORT_LIB.
 -                        $L.$XLIB;
 +                        $L.$XLIB.
 +                        $R.$XLIB;
+ }
  elsif ($platform =~ m/linux-gnu|netbasd|osf1|irix|aix|freebsd/)
  {  $SOLARLIB          = $L.$par_dir.$LIB.
-@@ -1400,6 +1418,7 @@
+@@ -1548,6 +1567,7 @@
  if ($SYSTEM_PYTHON eq "NO")
 +	$PYTHON               = python
  	$PYTHONPATH           = '.'.$ps.'$SOLARVER'.$ds.'$INPATH'.$ds.'lib'.$ps.'$SOLARVER'.$ds.'$INPATH'.$ds.'lib'.$ds.'python'.$ps.'$SOLARVER'.$ds.'$INPATH'.$ds.'lib'.$ds.'python'.$ds.'lib-dynload'.$ps.'$SOLARVER'.$ds.'$INPATH'.$ds.'lib'.$ds.'pyuno'.$ps.'$SOLARVER'.$ds.'$INPATH'.$ds.'bin'.$ds.'pyuno';
  	$PYTHONHOME           = '$SOLARVER'.$ds.'$INPATH';
+ }
@@ -1539,6 +1558,8 @@
  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") {
@@ -1693,6 +1713,7 @@
  ToFile( "JITC_PROCESSOR_TYPE","6",                 "e" );
+ }
  ToFile( "DEFAULT_TO_ENGLISH_FOR_PACKING",  "yes", "e" );
 +# Should be renamed?
 +ToFile( "X11_LDFLAGS",       "@X_LIBS@",           "e" );
  ToFile( "ENABLE_GTK",        "@ENABLE_GTK@",       "e" );
  ToFile( "GTK_CFLAGS",        "@GTK_CFLAGS@",       "e" );
  ToFile( "GTK_LIBS",          "@GTK_LIBS@",         "e" );
-@@ -1785,6 +1806,7 @@
+@@ -1942,6 +1963,7 @@
- ToFile( "PKGFORMAT",         "@PKGFORMAT@",        "e" );
+ ToFile( "MOZ_LIB_XPCOM",     "@MOZ_LIB_XPCOM@",    "e" );
- ToFile( "SYSTEM_STDLIBS",    "@SYSTEM_STDLIBS@",   "e" );
+ ToFile( "MOZ_NSPR_CFLAGS",   "@MOZ_NSPR_CFLAGS@",  "e" );
- ToFile( "SYSTEM_ZLIB",       "@SYSTEM_ZLIB@",      "e" );
+ ToFile( "MOZ_NSS_CFLAGS",    "@MOZ_NSS_CFLAGS@",   "e" );
-+ToFile( "PYTHON",            "@PYTHON@",           "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" );
@@ -1967,6 +1989,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,123 +1,141 @@
-$NetBSD: patch-ba,v 1.10 2007/12/24 02:07:10 hira Exp $
+$NetBSD: patch-ba,v 1.10.4.1 2008/04/26 04:29:13 rtr Exp $
---- config_office/configure.orig	2007-11-02 17:30:08.000000000 +0900
+--- config_office/configure.orig	2008-01-31 20:47:17.000000000 +0900
-+++ config_office/configure	2007-12-24 09:04:32.000000000 +0900
++++ config_office/configure	2008-04-09 17:33:05.000000000 +0900
-@@ -3010,11 +3010,11 @@
+@@ -3176,11 +3176,11 @@
  		test_cups=no
  		_os=OSF1
  		;;
 -	netbsd)
 +	*netbsd*)
  		test_gtk=yes
  		build_cairo=yes
  		test_kde=yes
 -		test_cups=no
 +		test_cups=yes
  		PTHREAD_CFLAGS="-pthread"
  		PTHREAD_LIBS="-pthread -lpthread"
  		_os=NetBSD
-@@ -9544,7 +9544,7 @@
+@@ -10304,7 +10304,7 @@
  fi
  if test "$SOLAR_JAVA" != ""; then
 -        if test "$JDK" == "gcj" -a -z "$JAVA_HOME"; then
 +        if test "$JDK" = "gcj" -a -z "$JAVA_HOME"; then
        if test "x$with_jdk_home" = "x" -a "$_gij_longver" -ge "40200"; then
          cat > findhome.java <<_ACEOF
  import java.io.File;
@@ -10404,7 +10404,7 @@
           echo "JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >> warn
           echo "attempted to find JAVA_HOME automatically, but apparently it failed" >> warn
           echo "in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >> warn
 -         if test "$JDK" == "gcj"; then
 +         if test "$JDK" = "gcj"; then
               echo "e.g. install java-1.4.2-gcj-compat-devel and use --with-jdk-home=/usr/lib/jvm/java-1.4.2-gcj" >> warn
           fi
        fi
-@@ -12477,7 +12477,7 @@
+@@ -13098,7 +13098,7 @@
  if test -n "$with_system_libxslt" -o -n "$with_system_libs" && \
     test "$with_system_libxslt" != "no"; then
      if test -z "$with_system_libxml" -a -z "$with_system_libs" || \
 -      test "$with_system_libxml" == "no"; then
 +      test "$with_system_libxml" = "no"; then
        # somehow AC_MSG_WARN won't work...
         echo "to prevent incompatibilities between internal libxml2 and libxslt, the office will be build with system-libxml"
         echo "to prevent incompatibilities between internal libxml2 and libxslt, the office will be build with system-libxml" >> warn
-@@ -12487,7 +12487,7 @@
+@@ -13108,7 +13108,7 @@
  if test -n "$with_system_libxml" -o -n "$with_system_libs" && \
     test "$with_system_libxml" != "no"; then
      if test -z "$with_system_libxslt" -a -z "$with_system_libs" || \
 -      test "$with_system_libxslt" == "no"; then
 +      test "$with_system_libxslt" = "no"; then
        # somehow AC_MSG_WARN won't work...
         echo "to prevent incompatibilities between internal libxslt and libxml2, the office will be build with system-libxslt"
         echo "to prevent incompatibilities between internal libxslt and libxml2, the office will be build with system-libxslt" >> warn
-@@ -12970,13 +12970,13 @@
+@@ -13591,13 +13591,14 @@
     python_include=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('INCLUDEPY');"`
 +   python_ldflags=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LDFLAGS');"`
     python_version=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('VERSION');"`
     PYTHON_CFLAGS="-I$python_include"
     if test "$_os" = "Darwin"; then
        PYTHON_LIBS="-framework Python"
     else
 -      PYTHON_LIBS="-lpython$python_version"
 +      PYTHON_LIBS="-lpython$python_version $python_ldflags"
     fi
        save_CPPFLAGS="$CPPFLAGS"
-@@ -13200,7 +13200,7 @@
+@@ -13868,7 +13869,7 @@
  echo "$as_me:$LINENO: result: $ac_cv_header_db_h" >&5
  echo "${ECHO_T}$ac_cv_header_db_h" >&6
  if test $ac_cv_header_db_h = yes; then
 -   DB_INCLUDES=/usr/include
 +   DB_INCLUDES=${BLNK_PREFIX_db4}/include/db4
  else
               CFLAGS=-I/usr/include/db4
-@@ -13323,13 +13323,13 @@
+@@ -13991,13 +13992,13 @@
      #AC_CHECK_LIB(db, db_create, [],
      #  [AC_MSG_ERROR([db library not installed or functional])], [])
 -echo "$as_me:$LINENO: checking for main in -ldb" >&5
 -echo $ECHO_N "checking for main in -ldb... $ECHO_C" >&6
 +echo "$as_me:$LINENO: checking for main in -ldb4" >&5
 +echo $ECHO_N "checking for main in -ldb4... $ECHO_C" >&6
  if test "${ac_cv_lib_db_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-ldb  $LIBS"
 +LIBS="-ldb4  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -13386,7 +13386,7 @@
+@@ -14054,7 +14055,7 @@
  #define HAVE_LIBDB 1
  _ACEOF
 -  LIBS="-ldb $LIBS"
 +  LIBS="-ldb4 $LIBS"
  else
    { { echo "$as_me:$LINENO: error: db not installed or functional" >&5
-@@ -19101,7 +19101,7 @@
+@@ -19781,7 +19782,7 @@
  echo "$as_me:$LINENO: result: $ac_cv_header_audio_audiolib_h" >&5
  echo "${ECHO_T}$ac_cv_header_audio_audiolib_h" >&6
  if test $ac_cv_header_audio_audiolib_h = yes; then
 -   NAS_INCLUDES=/usr/include
 +   NAS_INCLUDES=${BLNK_PREFIX_nas}/include
  else
               CFLAGS=-I/usr/X11R6/include
-@@ -22998,7 +22998,7 @@
+@@ -24012,7 +24013,7 @@
    ENABLE_REPORTDESIGN=YES
    echo "$as_me:$LINENO: checking which jfreereport libs to use" >&5
  echo $ECHO_N "checking which jfreereport libs to use... $ECHO_C" >&6
 -  if test "$with_system_jfreereport" == "yes"; then
 +  if test "$with_system_jfreereport" = "yes"; then
     	SYSTEM_JFREEREPORT=YES
    	echo "$as_me:$LINENO: result: external" >&5
  echo "${ECHO_T}external" >&6
@@ -24529,7 +24530,7 @@
      fi
          KDE_CFLAGS="-I$qt_incdir -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
 -    KDE_LIBS="-L$kde_libdir -L$qt_libdir -lkdeui -lkdecore -lqt-mt"
 +    KDE_LIBS="-L$kde_libdir -Wl,-R$kde_libdir -L$qt_libdir -Wl,-R$qt_libdir -lkdeui -lkdecore -lqt-mt"
  fi
-@@ -23652,7 +23652,7 @@
+@@ -25082,7 +25083,7 @@
     XINERAMA_LINK=dynamic
     echo "$as_me:$LINENO: result: yes" >&5
  echo "${ECHO_T}yes" >&6
 -elif test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then
-+elif test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
++elif test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
     if test -e "$XLIB/libXinerama.so" -a -e "$XLIB/libXinerama.a"; then
-       # we have both versions, let the user decide but use the static one
+       # we have both versions, let the user decide but use the dynamic one
        # per default

 @@ -1,15 +1,15 @@
-$NetBSD: patch-bg,v 1.3 2007/04/05 23:24:01 hira Exp $
+$NetBSD: patch-bg,v 1.3.10.1 2008/04/26 04:29:13 rtr Exp $
---- vcl/util/makefile.mk.orig	2007-01-19 21:56:23.000000000 +0900
+--- vcl/util/makefile.mk.orig	2008-01-24 02:19:40.000000000 +0900
-+++ vcl/util/makefile.mk	2007-04-01 21:30:29.000000000 +0900
++++ vcl/util/makefile.mk	2008-04-07 18:15:43.000000000 +0900
-@@ -300,8 +300,8 @@
+@@ -323,8 +323,8 @@
  SHL2STDLIBS+=$(LIBSN_LIBS)
- .ENDIF
+ .IF "$(GUIBASE)"=="unx"
 -SHL2STDLIBS += -lXext -lSM -lICE -lX11
 -.IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD"
 +SHL2STDLIBS += $(X11_LDFLAGS) -lXext -lSM -lICE -lX11
 +.IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD"
  # needed by salprnpsp.cxx
  SHL2STDLIBS+= -ldl
  .ENDIF

 @@ -1,26 +1,36 @@
-$NetBSD: patch-bs,v 1.2 2007/03/04 13:11:20 hira Exp $
+$NetBSD: patch-bs,v 1.2.10.1 2008/04/26 04:29:13 rtr Exp $
---- xmlsecurity/util/makefile.mk.orig	2007-02-27 08:39:08.000000000 +0900
+--- xmlsecurity/util/makefile.mk.orig	2008-04-14 05:03:09.000000000 +0000
-+++ xmlsecurity/util/makefile.mk	2007-02-27 08:40:08.000000000 +0900
++++ xmlsecurity/util/makefile.mk	2008-04-14 05:10:23.000000000 +0000
-@@ -106,6 +106,7 @@
+@@ -101,6 +101,7 @@
  	$(TOOLSLIB)			\
  	$(COMPHELPERLIB)	\
  	$(CPPUHELPERLIB)	\
 +	$(LIBXML_LIBS)		\
  	$(XMLOFFLIB)
  .IF "$(SYSTEM_MOZILLA)" == "YES"
-@@ -164,11 +165,12 @@
+@@ -110,6 +111,9 @@
  .IF "$(NSS_LIB)" != ""
  SHL2STDLIBS += $(NSS_LIB)
  .ENDIF
 +.IF "$(MOZ_NSS_LIBS)" != ""
 +SHL2STDLIBS += $(MOZ_NSS_LIBS)
 +.ENDIF
  .ENDIF
  .IF "$(CRYPTO_ENGINE)" == "mscrypto"
@@ -159,11 +163,12 @@
  				$(SOTLIB)			\
  				$(SVLLIB)			\
  				$(SFXLIB)			\
 +				$(LIBXML_LIBS)		\
  				$(XMLOFFLIB)		\
  				$(SVXLIB)
  #MT: Remove libxml2 and xs_comm (above) by cerating service for base encodings
 -SHL4STDLIBS+= $(LIBXML2LIB) $(XMLSECLIB)
 +SHL4STDLIBS+= $(LIBXML_LIBS) $(LIBXML2LIB) $(XMLSECLIB)
  SHL4VERSIONMAP = xmlsecurity.map
  SHL4DEPN=

 @@ -1,12 +1,12 @@
-$NetBSD: patch-cp,v 1.1 2007/10/06 20:02:24 hira Exp $
+$NetBSD: patch-cp,v 1.1.6.1 2008/04/26 04:29:13 rtr Exp $
---- pyuno/source/module/makefile.mk.orig	2007-09-27 01:51:03.000000000 +0900
+--- pyuno/source/module/makefile.mk.orig	2008-01-03 02:29:28.000000000 +0900
-+++ pyuno/source/module/makefile.mk	2007-09-27 01:52:52.000000000 +0900
++++ pyuno/source/module/makefile.mk	2008-04-07 18:22:21.000000000 +0900
-@@ -91,6 +91,7 @@
+@@ -96,6 +96,7 @@
  		$(CPPULIB)		\
  		$(CPPUHELPERLIB)	\
  		$(SALLIB)		\
-+		$(PYTHON_LIBS)		\
++		$(PYTHON_LIBS) 		\
- 		$(PYTHONLIB)
+ 		$(PYTHONLIB) 		\
  		$(EXTRA_FRAMEWORK_FLAG)
  SHL1DEPN=

 @@ -1,13 +1,22 @@
-$NetBSD: patch-cr,v 1.1 2007/10/09 10:04:00 hira Exp $
+$NetBSD: patch-cr,v 1.1.6.1 2008/04/26 04:29:13 rtr Exp $
---- setup_native/scripts/linuxpatchscript.sh.orig	2007-10-09 18:55:08.000000000 +0900
+--- setup_native/scripts/linuxpatchscript.sh.orig	2008-04-07 17:55:52.000000000 +0900
-+++ setup_native/scripts/linuxpatchscript.sh	2007-10-09 18:55:25.000000000 +0900
++++ setup_native/scripts/linuxpatchscript.sh	2008-04-07 18:23:25.000000000 +0900
 @@ -49,7 +49,7 @@
    # Check, that $RPMLIST does not contain search toolbar rpm (then it is already installed)
    SEARCHTOOLBARINSTALLED=`grep searchtoolbar ${RPMLIST}`
 -  if [ "x$SEARCHTOOLBARINSTALLED" == "x" ]; then
 +  if [ "x$SEARCHTOOLBARINSTALLED" = "x" ]; then
-     # Install the online update rpm
+     # Install the search toolbar rpm
      RPMLIST="$RPMLIST $SEARCHTOOLBARRPM"
    fi
@@ -62,7 +62,7 @@
    # Check, that $RPMLIST does not contain kde integration rpm (then it is already installed)
    KDERPMINSTALLED=`grep kde-integration ${RPMLIST}`
 -  if [ "x$KDERPMINSTALLED" == "x" ]; then
 +  if [ "x$KDERPMINSTALLED" = "x" ]; then
      # Install the kde integration rpm
      RPMLIST="$RPMLIST $KDERPM"
    fi

 @@ -1,21 +1,21 @@
-$NetBSD: patch-ct,v 1.1 2007/10/12 15:41:43 hira Exp $
+$NetBSD: patch-ct,v 1.1.4.1 2008/04/26 04:29:13 rtr Exp $
---- tools/inc/tools/solar.h.orig	2007-10-10 11:44:00.000000000 +0900
+--- tools/inc/tools/solar.h.orig	2007-11-02 22:00:07.000000000 +0900
-+++ tools/inc/tools/solar.h	2007-10-10 11:44:57.000000000 +0900
++++ tools/inc/tools/solar.h	2008-04-07 18:24:54.000000000 +0900
-@@ -342,6 +342,7 @@
+@@ -343,6 +343,7 @@
  #define SYSTEM_UNXSOGS		31
  #define SYSTEM_UNXSOGI		32
  #define SYSTEM_UNXMACXI		33
-+#define SYSTEM_UNXBSDX		34
+ #define SYSTEM_OS2GCCI		34
 +#define SYSTEM_UNXBSDX		35
  #define SYSTEM_WNTGCCI  	99
  #if defined WNT
-@@ -395,6 +396,8 @@
+@@ -398,6 +399,8 @@
    #define __DLLEXTENSION "mxp.dylib"
  #elif defined MACOSX && defined X86
    #define __DLLEXTENSION "mxi.dylib"
-+elif defined NETBSD && defined X86_64
++#elif defined NETBSD && defined X86_64
 +  #define __DLLEXTENSION "bx.so"
  #else
    #define __DLLEXTENSION ".so"
  #endif

 @@ -1,32 +1,30 @@
-$NetBSD: patch-cw,v 1.1 2007/11/11 03:35:36 hira Exp $
+$NetBSD: patch-cw,v 1.1.4.1 2008/04/26 04:29:13 rtr Exp $
---- i18npool/source/collator/makefile.mk.orig	2007-01-26 00:25:50.000000000 +0900
+--- i18npool/source/collator/makefile.mk.orig	2007-11-07 00:50:57.000000000 +0900
-+++ i18npool/source/collator/makefile.mk	2007-11-09 02:40:37.000000000 +0900
++++ i18npool/source/collator/makefile.mk	2008-04-07 18:28:18.000000000 +0900
-@@ -46,7 +46,26 @@
+@@ -46,7 +46,24 @@
  # --- Files --------------------------------------------------------
--tempvar:=$(shell cd data && ls *.txt)
+-tempvar:=$(shell @cd data && ls *.txt)
 +tempvar= \
 +	dz_charset.txt \
 +	hu_charset.txt \
 +	ja_charset.txt \
 +	ja_phonetic_alphanumeric_first.txt \
 +	ja_phonetic_alphanumeric_last.txt \
 +	km_charset.txt \
 +	ko_charset.txt \
 +	ku_alphanumeric.txt \
 +	ln_charset.txt \
 +	ne_charset.txt \
 +	vi_charset.txt \
 +	zh_TW_charset.txt \
 +	zh_TW_radical.txt \
 +	zh_TW_stroke.txt \
 +	zh_charset.txt \
 +	zh_pinyin.txt \
 +	zh_radical.txt \
 +	zh_stroke.txt \
 +	zh_zhuyin.txt
  LOCAL_RULE_LANGS:=$(uniq $(foreach,i,$(tempvar) $(i:s/-/_/:s/_/ /:1)))
  rules_dependencies:=$(foreach,i,$(tempvar) data$/$i)