diff options
-rw-r--r-- | misc/openoffice3/Makefile | 17 | ||||
-rw-r--r-- | misc/openoffice3/distinfo | 55 | ||||
-rw-r--r-- | misc/openoffice3/options.mk | 21 | ||||
-rw-r--r-- | misc/openoffice3/patches/patch-ad | 52 | ||||
-rw-r--r-- | misc/openoffice3/patches/patch-ak | 30 | ||||
-rw-r--r-- | misc/openoffice3/patches/patch-ap | 8 | ||||
-rw-r--r-- | misc/openoffice3/patches/patch-aq | 21 | ||||
-rw-r--r-- | misc/openoffice3/patches/patch-as | 32 | ||||
-rw-r--r-- | misc/openoffice3/patches/patch-aw | 10 | ||||
-rw-r--r-- | misc/openoffice3/patches/patch-ba | 59 | ||||
-rw-r--r-- | misc/openoffice3/patches/patch-bs | 24 | ||||
-rw-r--r-- | misc/openoffice3/patches/patch-de | 29 | ||||
-rw-r--r-- | misc/openoffice3/patches/patch-dy | 202 | ||||
-rw-r--r-- | misc/openoffice3/patches/patch-ed | 26 | ||||
-rw-r--r-- | misc/openoffice3/patches/patch-ee | 10 |
15 files changed, 241 insertions, 355 deletions
diff --git a/misc/openoffice3/Makefile b/misc/openoffice3/Makefile index b474dd039c5..00075e20470 100644 --- a/misc/openoffice3/Makefile +++ b/misc/openoffice3/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.30 2009/04/16 21:42:43 wiz Exp $ +# $NetBSD: Makefile,v 1.31 2009/05/09 18:43:41 hira Exp $ # -OO_VER= 3.0.1 -OO_TAG= OOO300_m15 +OO_VER= 3.1.0 +OO_TAG= OOO310_m11 DISTNAME= openoffice-${OO_VER} PKGNAME= openoffice3-${OO_VER} -PKGREVISION= 4 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/} DIST_SUBDIR= ${DISTNAME} @@ -32,7 +31,6 @@ DEPENDS+= libpaper-[0-9]*:../../print/libpaper .include "../../mk/bsd.prefs.mk" WRKSRC= ${WRKDIR}/${OO_TAG} -CONFIGURE_DIRS= config_office # Cannot compile with 3.3.x (GCC Bugzilla Bug 16879). GCC_REQD+= 3.4 @@ -116,6 +114,13 @@ CONFIGURE_ARGS+= --with-system-python CONFIGURE_ARGS+= --with-system-zlib CONFIGURE_ARGS+= --with-dynamic-xinerama +# Dictionaries +CONFIGURE_ARGS+= --without-myspell-dicts +CONFIGURE_ARGS+= --with-system-dicts +CONFIGURE_ARGS+= --with-external-dict-dir=${PREFIX}/share/hunspell +#CONFIGURE_ARGS+= --with-external-hyph-dir=${PREFIX}/share/hyphen +#CONFIGURE_ARGS+= --with-external-thes-dir=${PREFIX}/share/mythes + # Extensions CONFIGURE_ARGS+= --enable-minimizer CONFIGURE_ARGS+= --enable-presenter-console @@ -177,7 +182,7 @@ do-install: ln -sf ${DESTDIR}${OO_PREFIX}/${OO_UNXNAME}/program/$$f \ ${DESTDIR}${PREFIX}/bin/$$f; \ done - cd ${WRKSRC}/solver/300/${OPENOFFICE_OUTPATH}.pro/bin && \ + cd ${WRKSRC}/solver/310/${OPENOFFICE_OUTPATH}.pro/bin && \ ${INSTALL_DATA} ${OO_EXTENSIONS} ${DESTDIR}${OO_PREFIX}/extensions cd ${WRKSRC}/sysui/${OPENOFFICE_OUTPATH}.pro/misc/openoffice.org && \ ${SETENV} ${MAKE_ENV} DESTDIR=${DESTDIR} _PREFIX=${PREFIX} \ diff --git a/misc/openoffice3/distinfo b/misc/openoffice3/distinfo index 956bbaad479..1130d92720b 100644 --- a/misc/openoffice3/distinfo +++ b/misc/openoffice3/distinfo @@ -1,35 +1,35 @@ -$NetBSD: distinfo,v 1.18 2009/01/31 16:54:30 hira Exp $ +$NetBSD: distinfo,v 1.19 2009/05/09 18:43:41 hira Exp $ -SHA1 (openoffice-3.0.1/OOo_3.0.1_src_binfilter.tar.bz2) = d84518159538ef736271177b7ebe4697fc4b811d -RMD160 (openoffice-3.0.1/OOo_3.0.1_src_binfilter.tar.bz2) = c6859a376c55cd453be214dbfa2d56f1b845a32b -Size (openoffice-3.0.1/OOo_3.0.1_src_binfilter.tar.bz2) = 6595398 bytes -SHA1 (openoffice-3.0.1/OOo_3.0.1_src_core.tar.bz2) = 2da6b2cf0b75873477f22cc9d69a4f0c8b43b435 -RMD160 (openoffice-3.0.1/OOo_3.0.1_src_core.tar.bz2) = 9c4f18779a03cdabb0204d8eb1b661b4d9cc1369 -Size (openoffice-3.0.1/OOo_3.0.1_src_core.tar.bz2) = 182573274 bytes -SHA1 (openoffice-3.0.1/OOo_3.0.1_src_extensions.tar.bz2) = c695982d166422a838560ef7b134a5665bc61198 -RMD160 (openoffice-3.0.1/OOo_3.0.1_src_extensions.tar.bz2) = e89c7594f642147a95e85612d5646bc3edc869db -Size (openoffice-3.0.1/OOo_3.0.1_src_extensions.tar.bz2) = 13941829 bytes -SHA1 (openoffice-3.0.1/OOo_3.0.1_src_l10n.tar.bz2) = 13f1bf0989a09c52c57dbc1d6cf1feaec369a085 -RMD160 (openoffice-3.0.1/OOo_3.0.1_src_l10n.tar.bz2) = a02e8c06c67ac7b2833afa4a54993d81674e8b9b -Size (openoffice-3.0.1/OOo_3.0.1_src_l10n.tar.bz2) = 86008240 bytes -SHA1 (openoffice-3.0.1/OOo_3.0.1_src_system.tar.bz2) = 8c73821b542c9c96b071550fe0e3e813e21a1246 -RMD160 (openoffice-3.0.1/OOo_3.0.1_src_system.tar.bz2) = 35f1822f3e3aa2f6af0c268dd51534568473e636 -Size (openoffice-3.0.1/OOo_3.0.1_src_system.tar.bz2) = 45625279 bytes +SHA1 (openoffice-3.1.0/OOo_3.1.0_src_binfilter.tar.bz2) = 7128a2f8af0b0f1163a2f03331057242ec254f34 +RMD160 (openoffice-3.1.0/OOo_3.1.0_src_binfilter.tar.bz2) = e7ff15bd78713dcdbfd0df0ca499727cd412b070 +Size (openoffice-3.1.0/OOo_3.1.0_src_binfilter.tar.bz2) = 6543459 bytes +SHA1 (openoffice-3.1.0/OOo_3.1.0_src_core.tar.bz2) = 7a2812823376c028d81c4d3aeaac56e00f89636c +RMD160 (openoffice-3.1.0/OOo_3.1.0_src_core.tar.bz2) = 3395799874fd376fa82827f4b1b2d7af193748f8 +Size (openoffice-3.1.0/OOo_3.1.0_src_core.tar.bz2) = 186059913 bytes +SHA1 (openoffice-3.1.0/OOo_3.1.0_src_extensions.tar.bz2) = fd6dff089f722c9d647f2ee5dd0e818b1a7e6576 +RMD160 (openoffice-3.1.0/OOo_3.1.0_src_extensions.tar.bz2) = d66bc267f92291ec0cc1b1530d95c8d9cfac7f62 +Size (openoffice-3.1.0/OOo_3.1.0_src_extensions.tar.bz2) = 14867603 bytes +SHA1 (openoffice-3.1.0/OOo_3.1.0_src_l10n.tar.bz2) = 3ba93e779492bc6cf4955394a211462529057f03 +RMD160 (openoffice-3.1.0/OOo_3.1.0_src_l10n.tar.bz2) = 35ea76f926342a8bfa8b6b30edd08f048bb06811 +Size (openoffice-3.1.0/OOo_3.1.0_src_l10n.tar.bz2) = 96360273 bytes +SHA1 (openoffice-3.1.0/OOo_3.1.0_src_system.tar.bz2) = a73c6aa867b7686d33611694e33d6351110d2a0a +RMD160 (openoffice-3.1.0/OOo_3.1.0_src_system.tar.bz2) = 9ffd6694d4cdd7d3f4f8fd6aaf1ffa6c64b39d27 +Size (openoffice-3.1.0/OOo_3.1.0_src_system.tar.bz2) = 53314585 bytes SHA1 (patch-ac) = ed6d84d40c3543eed754d74a5e65caf137f31c3d -SHA1 (patch-ad) = 9513865551837a69202f4595232c36a656f200ca +SHA1 (patch-ad) = 8f7afec29d927db694bf511ffd615fe903cc46dc SHA1 (patch-ag) = 6c2f17424cfc85b5bc923a650167f14b7acabfd4 SHA1 (patch-ah) = e0a7dd2bf36e5009b5b8a5ddc593a5a78c01a012 SHA1 (patch-ai) = 268c8107052d2650a78d8048513f4acb2a1ee0f1 -SHA1 (patch-ak) = a121e98afdc1e22a5579cb0c70759e8a16d57662 +SHA1 (patch-ak) = e8d2f5c8b7ff997b2aa83452f73b59420d01eb6b SHA1 (patch-am) = 8e497298dd5534bd0ef438c22595c1c0f63912a5 SHA1 (patch-an) = cdf677a8e135fd4b447eef006558c7fea4df0be6 SHA1 (patch-ao) = a83178adec44571ebcf7a4dd66bda52d004d465c -SHA1 (patch-ap) = 806668c47374d46cc28ef41b17bf3632b9a81020 -SHA1 (patch-aq) = 651dad01336dce6901f1aacebe438b565a321be0 +SHA1 (patch-ap) = d9445a00083b7e847bf54b948f699a89b811d2da +SHA1 (patch-aq) = 3e9a156887e108126c76f0735abb4dce177efa4b SHA1 (patch-ar) = e3592ddc51a311a90d727ef8b595944a0ac3e623 -SHA1 (patch-as) = 6f6992430e3cea8a914ad3dcbe9ebcdf288ddc2a -SHA1 (patch-aw) = fdd1665c729cd17d8381ab39f2e6672164a058ad -SHA1 (patch-ba) = f7fc5e04a5af2f6ee8bdb4689b8b5b897eb43912 +SHA1 (patch-as) = c8a532c2b8a4dd676f09aba8d42677349f58c0a9 +SHA1 (patch-aw) = a331b0130b0b6bac0b81ee6a1aeeb7b216d5f511 +SHA1 (patch-ba) = 1f006516f7773407206a54001ef43f46db743646 SHA1 (patch-bb) = a2fe8b7aff8c875bdf15c70619b430f1fdbfa053 SHA1 (patch-bd) = 8faf878760e476ed13a4506f0615f8b544a2abd4 SHA1 (patch-bf) = d2e2363e7e08d675e3a6b9356d1ffac6d10148de @@ -43,7 +43,7 @@ SHA1 (patch-bm) = 0f7367782155c1d0f0459912aac69a1c759ad7fa SHA1 (patch-bn) = 6f21ecf499135b5b47ed191eca79848b4c404447 SHA1 (patch-bo) = 3e4bcccd0a7cea535e443d750039fa844380f8bc SHA1 (patch-bq) = 2321d806bff054932f249a8b9445d790aa9eafbe -SHA1 (patch-bs) = ede4ffcb762e89efbf95b6e4b644eb268534f1ca +SHA1 (patch-bs) = bea7e5fddee7056558747a6801816e2955dd0657 SHA1 (patch-bv) = b254cdb889bf5335aafe2b35982fc5cf370207cb SHA1 (patch-bw) = 223963fe59b71468420a697d8ea27c153b9f37ce SHA1 (patch-bx) = 157878e1fb4297f118ed0bbf06009506666fbc1c @@ -64,7 +64,7 @@ SHA1 (patch-cx) = db69e17d908e82cedd8cc28208fc7afec0cb3e47 SHA1 (patch-cy) = 8d47bcf1da6f351f4f0cbf6a8355903094b0baee SHA1 (patch-dc) = 2a6b826ca2849110f33c612a4c4beba8f7e27e67 SHA1 (patch-dd) = d733d6e54db93bbb7be5382ddf96cf83731a6176 -SHA1 (patch-de) = e594e9a7a4bb442adc33757c71d9d875abafd24d +SHA1 (patch-de) = cf7f1f160345bcbc2c0ba00c272da3b2a98a2b21 SHA1 (patch-dh) = 25d1c64a9531daf4a4f1d4fa616607b3eacfd4e0 SHA1 (patch-di) = 571b3fb1c65ab76e8bdace418654fff2d45406cf SHA1 (patch-dj) = ca003c7964ad239fdd2406b0a3a76ae5e855d8d7 @@ -75,13 +75,12 @@ SHA1 (patch-dt) = 59964a31a8abbb324029653609b0decadbe03a75 SHA1 (patch-du) = 093482d2847014fa894fe7e8d515c762723344b0 SHA1 (patch-dw) = 0737b08aafee1796dd83cd52b04a4fa589309f1b SHA1 (patch-dx) = 272daa1f31af090f5aa1c99d17a63470c60fe3b5 -SHA1 (patch-dy) = 4af56ef04180ab3dec7d0051e4075e84b62c8405 +SHA1 (patch-dy) = 517a3b55418daf6639c7b42d157347efff38cfbc SHA1 (patch-dz) = 3932f59e8f78c8a641e52d5284ccc0395c7ee172 SHA1 (patch-ea) = 8c54345a53bd49d9c4c3b206d43778a56df0b292 SHA1 (patch-eb) = 34562ae59bc67ab6ced1d63b39594a1b44ca3834 SHA1 (patch-ec) = 4cfdda3d07972329de9d5e1c5ea7db2b4ab47247 -SHA1 (patch-ed) = 235cd96522e8fec1cd3cc2f49f410cf832a07604 -SHA1 (patch-ee) = 6a77e56645484367a96660e7f9a3ac402bad9f2a +SHA1 (patch-ee) = fb6711c4c4ab53b6c213feed13883af7ffde1a16 SHA1 (patch-ef) = e53a75d497bc661467ca19fd0d00fa6dac17579d SHA1 (patch-eg) = 970dae007766bea5c76c2312cfa7b35d44d3cb70 SHA1 (patch-eh) = 4f4b2cebe22e83ca6acd2b226281bf756fbc9083 diff --git a/misc/openoffice3/options.mk b/misc/openoffice3/options.mk index f707b1a9fef..aaabe267f9c 100644 --- a/misc/openoffice3/options.mk +++ b/misc/openoffice3/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.14 2009/04/21 16:47:48 tnn Exp $ +# $NetBSD: options.mk,v 1.15 2009/05/09 18:43:41 hira Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.openoffice3 @@ -6,14 +6,15 @@ PKG_SUPPORTED_OPTIONS= cups gnome gtk2 kde ooo-external-libwpd PKG_OPTIONS_OPTIONAL_GROUPS= browser PKG_OPTIONS_GROUP.browser= firefox firefox3 seamonkey # 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 by \ - ca cs cy da de dz el en-GB en-US en-ZA eo es \ - et eu fa fi fr ga gd gl gu gu-IN he hi-IN hr \ - hu it ja ka km kn ko ku lo lt lv mk mn ms \ - ml-IN mr-IN my ne nb nl nn nr ns oc or-IN \ - pa-IN pl pt pt-BR ru rw sk sl sh sr ss st sv \ - sw sw-TZ te-IN ti-ER ta-IN th tn tr ts tg \ - ur-IN uk uz ve vi xh zh-CN zh-TW zu all +OO_SUPPORTED_LANGUAGES= af ar as-IN be-BY bg br brx bn bn-BD bn-IN bs \ + by ca cs cy da de dgo dz el en-GB en-US en-ZA \ + eo es et eu fa fi fr ga gd gl gu gu-IN he \ + hi-IN hr hu it ja ka kk km kn kn-IN ko kok ks \ + ku lo lt lv mai mk mn mni ms ml-IN mr-IN my \ + ne nb nl nn nr ns oc or-IN pa-IN pl pt pt-BR \ + ru rw sat sa-IN sc sd sk sl sh sr ss st sv sw \ + sw-TZ te-IN ti-ER ta-IN th tn tr ts tg ur-IN \ + uk uz ve vi xh zh-CN zh-TW zu all .for l in ${OO_SUPPORTED_LANGUAGES} PKG_SUPPORTED_OPTIONS+= lang-${l} .endfor @@ -89,7 +90,7 @@ CONFIGURE_ARGS+= --enable-gnome-vfs --enable-evolution2 .include "../../graphics/gnome-icon-theme/buildlink3.mk" .include "../../sysutils/gnome-vfs/buildlink3.mk" .else -CONFIGURE_ARGS+= --disable-gnome-vfs --disable-evolution2 +CONFIGURE_ARGS+= --disable-gnome-vfs --disable-evolution2 --disable-gconf .endif .if !empty(PKG_OPTIONS:Mgtk2) diff --git a/misc/openoffice3/patches/patch-ad b/misc/openoffice3/patches/patch-ad index cbe5cf29ff4..98f42acb955 100644 --- a/misc/openoffice3/patches/patch-ad +++ b/misc/openoffice3/patches/patch-ad @@ -1,47 +1,13 @@ -$NetBSD: patch-ad,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $ +$NetBSD: patch-ad,v 1.2 2009/05/09 18:43:41 hira Exp $ ---- sal/osl/unx/system.c.orig 2008-04-10 20:13:33.000000000 +0900 -+++ sal/osl/unx/system.c 2008-08-23 12:45:39.000000000 +0900 -@@ -66,8 +66,11 @@ +--- sal/osl/unx/system.c.orig 2008-10-01 18:19:55.000000000 +0900 ++++ sal/osl/unx/system.c 2009-05-09 13:52:08.000000000 +0900 +@@ -35,7 +35,7 @@ + static pthread_mutex_t getrtl_mutex = PTHREAD_MUTEX_INITIALIZER; + + /* struct passwd differs on some platforms */ +-#if defined NETBSD ++#if defined NETBSD && (__NetBSD_Version__ < 299001000) struct passwd *getpwnam_r(const char* name, struct passwd* s, char* buffer, int size ) - #endif /* BUILD_OS_APPLEOSX */ - #else /* MACOSX */ -+#if defined (NETBSD) && (__NetBSD_Version__ < 299001000) - struct passwd *getpwnam_r(const char* name, struct passwd* s, char* buffer, int size ) -+#endif /* (NETBSD) && (__NetBSD_Version__ < 299001000) */ - #endif /* MACOSX */ -+#if defined (NETBSD) && (__NetBSD_Version__ < 299001000) { struct passwd* res; - -@@ -133,8 +136,9 @@ - return(res); - #endif /* MACOSX */ - } -+#endif /* (NETBSD) && (__NetBSD_Version__ < 299001000) */ - --#if defined(NETBSD) || defined(MACOSX) -+#if (defined(NETBSD) && (__NetBSD_Version__ < 299001000)) || defined(MACOSX) - int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer, - size_t buflen, struct passwd **result) - { -@@ -427,7 +431,7 @@ - } - #endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */ - --#if defined(MACOSX) -+#if defined(MACOSX) || defined(NETBSD) - /* - * This section works around calls that are missing or broken - * in MacOS X 10.1.x and earlier. -@@ -471,6 +475,10 @@ - return nRet; - } - -+#endif /* defined(MACOSX) || defined(NETBSD) */ -+ -+#if defined(MACOSX) -+ - /* No reentrant asctime() either... */ - - /*******************************************************************************/ 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" ); diff --git a/misc/openoffice3/patches/patch-ap b/misc/openoffice3/patches/patch-ap index b48d8dc7228..326a4aeb629 100644 --- a/misc/openoffice3/patches/patch-ap +++ b/misc/openoffice3/patches/patch-ap @@ -1,8 +1,8 @@ -$NetBSD: patch-ap,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $ +$NetBSD: patch-ap,v 1.2 2009/05/09 18:43:41 hira Exp $ ---- stlport/STLport-4.5.patch.orig 2008-07-23 01:55:11.000000000 +0900 -+++ stlport/STLport-4.5.patch 2008-07-26 06:44:43.000000000 +0900 -@@ -1138,3 +1138,74 @@ +--- stlport/STLport-4.5.patch.orig 2008-12-30 23:32:01.000000000 +0900 ++++ stlport/STLport-4.5.patch 2009-05-09 23:08:06.000000000 +0900 +@@ -1045,3 +1045,74 @@ # elif defined (__FreeBSD__) # define _Locale_CNTRL _CTYPE_C diff --git a/misc/openoffice3/patches/patch-aq b/misc/openoffice3/patches/patch-aq index 601165a0b65..747259b6e55 100644 --- a/misc/openoffice3/patches/patch-aq +++ b/misc/openoffice3/patches/patch-aq @@ -1,22 +1,13 @@ -$NetBSD: patch-aq,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $ +$NetBSD: patch-aq,v 1.2 2009/05/09 18:43:41 hira Exp $ ---- stlport/makefile.mk.orig 2008-07-23 01:55:24.000000000 +0900 -+++ stlport/makefile.mk 2008-07-26 06:02:45.000000000 +0900 -@@ -117,7 +117,7 @@ - TAR_EXCLUDES=*/SC5/* - .ENDIF # "$(USE_SHELL)"=="4nt" - --ADDITIONAL_FILES=src$/gcc-3.0.mak src$/gcc-3.0-macosx.mak src$/gcc-3.0-freebsd.mak src$/sunpro8.mak src$/sunpro11.mak src$/gcc-3.0-mingw.mak \ -+ADDITIONAL_FILES=src$/gcc-3.0.mak src$/gcc-3.0-macosx.mak src$/gcc-3.0-freebsd.mak src$/gcc-3.0-netbsd.mak src$/sunpro8.mak src$/sunpro11.mak src$/gcc-3.0-mingw.mak \ - src$/gcc-3.0-os2.mak src$/gcc-3.0-os2.def src$/common_macros_os2.mak - - -@@ -140,6 +140,8 @@ +--- stlport/makefile.mk.orig 2008-12-09 18:43:20.000000000 +0900 ++++ stlport/makefile.mk 2009-05-09 12:34:55.000000000 +0900 +@@ -129,6 +129,8 @@ # FreeBSD needs a special makefile .IF "$(OS)"=="FREEBSD" BUILD_FLAGS=-f gcc-3.0-freebsd.mak + .ELIF "$(OS)"=="NETBSD" + BUILD_FLAGS=-f gcc-3.0-netbsd.mak - .ELIF "$(OS)"=="MACOSX" - BUILD_FLAGS=-f gcc-3.0-macosx.mak .ELIF "$(OS)"=="OS2" + BUILD_FLAGS=-f gcc-3.0-os2.mak + .ELIF "$(GUI)"=="WNT" diff --git a/misc/openoffice3/patches/patch-as b/misc/openoffice3/patches/patch-as index 58aa1e633bc..b2650152b31 100644 --- a/misc/openoffice3/patches/patch-as +++ b/misc/openoffice3/patches/patch-as @@ -1,8 +1,8 @@ -$NetBSD: patch-as,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $ +$NetBSD: patch-as,v 1.2 2009/05/09 18:43:41 hira Exp $ ---- sal/osl/unx/file.cxx.orig 2008-04-28 22:46:10.000000000 +0900 -+++ sal/osl/unx/file.cxx 2008-08-23 12:06:31.000000000 +0900 -@@ -1418,7 +1418,7 @@ +--- sal/osl/unx/file.cxx.orig 2009-02-19 00:18:51.000000000 +0900 ++++ sal/osl/unx/file.cxx 2009-05-09 12:40:10.000000000 +0900 +@@ -1447,7 +1447,7 @@ #ifdef HAVE_STATFS_H @@ -11,11 +11,11 @@ $NetBSD: patch-as,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $ # define __OSL_STATFS_STRUCT struct statfs # define __OSL_STATFS(dir, sfs) statfs((dir), (sfs)) # define __OSL_STATFS_BLKSIZ(a) ((sal_uInt64)((a).f_bsize)) -@@ -1430,7 +1430,33 @@ +@@ -1459,7 +1459,33 @@ of the target platforms fix it!!!! */ # define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a) (1) # define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (1) --#endif /* FREEBSD || NETBSD */ +-#endif /* FREEBSD || NETBSD || MACOSX */ +#endif /* FREEBSD || MACOSX */ + +#if defined(NETBSD) @@ -25,23 +25,23 @@ $NetBSD: patch-as,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $ +/* statvfs() replaced statfs() in 2.99.9 */ +# if __NetBSD_Version__ >= 299000900 + /* 2.0D or later */ -+# define __OSL_STATFS_STRUCT struct statvfs -+# define __OSL_STATFS(dir, sfs) statvfs((dir), (sfs)) -+# define __OSL_STATFS_ISREMOTE(a) (((a).f_flag & ST_LOCAL) == 0) ++# define __OSL_STATFS_STRUCT struct statvfs ++# define __OSL_STATFS(dir, sfs) statvfs((dir), (sfs)) ++# define __OSL_STATFS_ISREMOTE(a) (((a).f_flag & ST_LOCAL) == 0) + +# else + /* version before 2.0D */ -+# define __OSL_STATFS_STRUCT struct statfs -+# define __OSL_STATFS(dir, sfs) statfs((dir), (sfs)) -+# define __OSL_STATFS_ISREMOTE(a) (((a).f_type & MNT_LOCAL) == 0) ++# define __OSL_STATFS_STRUCT struct statfs ++# define __OSL_STATFS(dir, sfs) statfs((dir), (sfs)) ++# define __OSL_STATFS_ISREMOTE(a) (((a).f_type & MNT_LOCAL) == 0) + +# endif /* >2.0D */ + -+# define __OSL_STATFS_BLKSIZ(a) ((sal_uInt64)((a).f_bsize)) -+# define __OSL_STATFS_TYPENAME(a) ((a).f_fstypename) ++# define __OSL_STATFS_BLKSIZ(a) ((sal_uInt64)((a).f_bsize)) ++# define __OSL_STATFS_TYPENAME(a) ((a).f_fstypename) + -+# define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a) (strcmp((a).f_fstypename, "msdos") != 0 && strcmp((a).f_fstypename, "ntfs") != 0 && strcmp((a).f_fstypename, "smbfs") != 0) -+# define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (strcmp((a).f_fstypename, "msdos") != 0) ++# define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a) (strcmp((a).f_fstypename, "msdos") != 0 && strcmp((a).f_fstypename, "ntfs") != 0 && strcmp((a).f_fstypename, "smbfs") != 0) ++# define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (strcmp((a).f_fstypename, "msdos") != 0) +#endif /* NETBSD */ #if defined(LINUX) diff --git a/misc/openoffice3/patches/patch-aw b/misc/openoffice3/patches/patch-aw index c235ddeb9e3..66135f15bed 100644 --- a/misc/openoffice3/patches/patch-aw +++ b/misc/openoffice3/patches/patch-aw @@ -1,8 +1,8 @@ -$NetBSD: patch-aw,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $ +$NetBSD: patch-aw,v 1.2 2009/05/09 18:43:41 hira Exp $ ---- sal/osl/unx/system.h.orig 2007-02-17 23:26:16.000000000 +0900 -+++ sal/osl/unx/system.h 2007-02-17 22:59:36.000000000 +0900 -@@ -136,7 +136,10 @@ +--- sal/osl/unx/system.h.orig 2008-10-01 18:19:55.000000000 +0900 ++++ sal/osl/unx/system.h 2009-05-09 23:08:19.000000000 +0900 +@@ -129,7 +129,10 @@ #endif #ifdef NETBSD @@ -13,7 +13,7 @@ $NetBSD: patch-aw,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $ # define _POSIX_THREAD_SYSCALL_SOFT 1 # include <pthread.h> # include <netdb.h> -@@ -530,7 +533,6 @@ +@@ -505,7 +508,6 @@ #ifdef NO_PTHREAD_RTL #if !defined FREEBSD || (__FreeBSD_version < 500112) diff --git a/misc/openoffice3/patches/patch-ba b/misc/openoffice3/patches/patch-ba index 3325076f7a8..17e9041d513 100644 --- a/misc/openoffice3/patches/patch-ba +++ b/misc/openoffice3/patches/patch-ba @@ -1,22 +1,22 @@ -$NetBSD: patch-ba,v 1.3 2008/10/31 09:40:58 hira Exp $ +$NetBSD: patch-ba,v 1.4 2009/05/09 18:43:41 hira Exp $ ---- config_office/configure.orig 2008-09-01 20:50:01.000000000 +0900 -+++ config_office/configure 2008-10-31 18:07:22.000000000 +0900 -@@ -4183,11 +4183,11 @@ +--- configure.orig 2009-04-22 23:54:40.000000000 +0900 ++++ configure 2009-05-09 12:42:15.000000000 +0900 +@@ -4222,11 +4222,11 @@ test_randr=no _os=OSF1 ;; - netbsd) + *netbsd*) test_gtk=yes - build_cairo=yes + test_cairo=yes test_kde=yes - test_cups=no + test_cups=yes test_randr=yes test_freetype=yes PTHREAD_CFLAGS="-pthread" -@@ -11429,7 +11429,7 @@ +@@ -11414,7 +11414,7 @@ fi if test "$SOLAR_JAVA" != ""; then @@ -25,7 +25,7 @@ $NetBSD: patch-ba,v 1.3 2008/10/31 09:40:58 hira Exp $ if test "x$with_jdk_home" = "x" -a "$_gij_longver" -ge "50000"; then cat > findhome.java <<_ACEOF import java.io.File; -@@ -11530,7 +11530,7 @@ +@@ -11515,7 +11515,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 @@ -34,7 +34,7 @@ $NetBSD: patch-ba,v 1.3 2008/10/31 09:40:58 hira Exp $ # 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 -@@ -14208,7 +14208,7 @@ +@@ -14196,7 +14196,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" || \ @@ -43,7 +43,7 @@ $NetBSD: patch-ba,v 1.3 2008/10/31 09:40:58 hira Exp $ # 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 -@@ -14218,7 +14218,7 @@ +@@ -14206,7 +14206,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" || \ @@ -52,7 +52,7 @@ $NetBSD: patch-ba,v 1.3 2008/10/31 09:40:58 hira Exp $ # 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 -@@ -14740,13 +14740,14 @@ +@@ -14728,13 +14728,14 @@ python_include=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('INCLUDEPY');"` @@ -68,7 +68,7 @@ $NetBSD: patch-ba,v 1.3 2008/10/31 09:40:58 hira Exp $ fi save_CPPFLAGS="$CPPFLAGS" -@@ -15003,7 +15004,7 @@ +@@ -14991,7 +14992,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 @@ -77,7 +77,7 @@ $NetBSD: patch-ba,v 1.3 2008/10/31 09:40:58 hira Exp $ else CFLAGS=-I/usr/include/db4 -@@ -15133,13 +15134,13 @@ +@@ -15122,13 +15123,13 @@ #AC_CHECK_LIB(db, db_create, [], # [AC_MSG_ERROR([db library not installed or functional])], []) @@ -94,7 +94,7 @@ $NetBSD: patch-ba,v 1.3 2008/10/31 09:40:58 hira Exp $ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -15193,7 +15194,7 @@ +@@ -15182,7 +15183,7 @@ #define HAVE_LIBDB 1 _ACEOF @@ -103,7 +103,7 @@ $NetBSD: patch-ba,v 1.3 2008/10/31 09:40:58 hira Exp $ else { { echo "$as_me:$LINENO: error: db not installed or functional" >&5 -@@ -16642,6 +16643,8 @@ +@@ -16734,6 +16735,8 @@ MOZ_FLAVOUR=seamonkey elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "firefox"; then MOZ_FLAVOUR=firefox @@ -112,7 +112,7 @@ $NetBSD: patch-ba,v 1.3 2008/10/31 09:40:58 hira Exp $ elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "mozilla"; then MOZ_FLAVOUR=mozilla else -@@ -17378,7 +17381,7 @@ +@@ -17470,7 +17473,7 @@ #e.g. http://fedoraproject.org/wiki/Releases/FeatureXULRunnerAPIChanges #the plugin pkg-config etc. reverts to "mozilla-plugin" with libxul @@ -121,7 +121,7 @@ $NetBSD: patch-ba,v 1.3 2008/10/31 09:40:58 hira Exp $ MOZ_FLAVOUR="mozilla" fi -@@ -21084,7 +21087,7 @@ +@@ -21353,7 +21356,7 @@ NEON_CFLAGS= BUILD_TYPE="$BUILD_TYPE NEON" fi @@ -130,7 +130,7 @@ $NetBSD: patch-ba,v 1.3 2008/10/31 09:40:58 hira Exp $ with_system_openssl=yes fi { echo "$as_me:$LINENO: checking which libssl to use" >&5 -@@ -21095,7 +21098,7 @@ +@@ -21364,7 +21367,7 @@ echo "${ECHO_T}external" >&6; } # Mac OS builds should get out without extra stuff is the Mac porters' # wish. And pkg-config is although Xcode ships a .pc for openssl @@ -139,17 +139,8 @@ $NetBSD: patch-ba,v 1.3 2008/10/31 09:40:58 hira Exp $ OPENSSL_CFLAGS= OPENSSL_LIBS="-lssl -lcrypto" else -@@ -25060,7 +25063,7 @@ - ENABLE_MEDIAWIKI=YES - { echo "$as_me:$LINENO: checking which Apache commons-* libs to use" >&5 - echo $ECHO_N "checking which Apache commons-* libs to use... $ECHO_C" >&6; } -- if test "$with_system_apache_commons" == "yes"; then -+ if test "$with_system_apache_commons" = "yes"; then - SYSTEM_APACHE_COMMONS=YES - { echo "$as_me:$LINENO: result: external" >&5 - echo "${ECHO_T}external" >&6; } -@@ -25203,7 +25206,7 @@ - +@@ -25460,7 +25463,7 @@ + fi -if test "$ENABLE_MEDIAWIKI" == "YES"; then @@ -157,16 +148,16 @@ $NetBSD: patch-ba,v 1.3 2008/10/31 09:40:58 hira Exp $ { echo "$as_me:$LINENO: checking which Servlet API Jar to use" >&5 echo $ECHO_N "checking which Servlet API Jar to use... $ECHO_C" >&6; } if test -n "$with_system_servlet_api"; then -@@ -25268,7 +25271,7 @@ +@@ -25525,7 +25528,7 @@ fi { 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 "$as_me:$LINENO: result: external" >&5 echo "${ECHO_T}external" >&6; } -@@ -25807,7 +25810,7 @@ +@@ -26733,7 +26736,7 @@ fi KDE_CFLAGS="-I$qt_incdir -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT" @@ -175,7 +166,7 @@ $NetBSD: patch-ba,v 1.3 2008/10/31 09:40:58 hira Exp $ fi -@@ -26357,7 +26360,7 @@ +@@ -27269,7 +27272,7 @@ XINERAMA_LINK=dynamic { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } @@ -184,7 +175,7 @@ $NetBSD: patch-ba,v 1.3 2008/10/31 09:40:58 hira Exp $ if test -e "$XLIB/libXinerama.so" -a -e "$XLIB/libXinerama.a"; then # we have both versions, let the user decide but use the dynamic one # per default -@@ -26842,9 +26845,13 @@ +@@ -27754,9 +27757,13 @@ if test -f $ANT_HOME/lib/ant/ant.jar; then ANT_LIB="$ANT_HOME/lib/ant" else @@ -198,7 +189,7 @@ $NetBSD: patch-ba,v 1.3 2008/10/31 09:40:58 hira Exp $ fi fi fi -@@ -27052,12 +27059,12 @@ +@@ -27964,12 +27971,12 @@ { echo "$as_me:$LINENO: checking build verbosity" >&5 echo $ECHO_N "checking build verbosity... $ECHO_C" >&6; } if test -n "$enable_verbose"; then diff --git a/misc/openoffice3/patches/patch-bs b/misc/openoffice3/patches/patch-bs index 4c60f3e028f..2a104026318 100644 --- a/misc/openoffice3/patches/patch-bs +++ b/misc/openoffice3/patches/patch-bs @@ -1,15 +1,15 @@ -$NetBSD: patch-bs,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $ +$NetBSD: patch-bs,v 1.2 2009/05/09 18:43:41 hira Exp $ ---- xmlsecurity/util/makefile.mk.orig 2008-04-14 05:03:09.000000000 +0000 -+++ xmlsecurity/util/makefile.mk 2008-04-14 05:10:23.000000000 +0000 -@@ -101,6 +101,7 @@ +--- xmlsecurity/util/makefile.mk.orig 2008-08-22 18:34:45.000000000 +0900 ++++ xmlsecurity/util/makefile.mk 2009-05-09 04:54:44.000000000 +0900 +@@ -97,6 +97,7 @@ $(TOOLSLIB) \ $(COMPHELPERLIB) \ $(CPPUHELPERLIB) \ -+ $(LIBXML_LIBS) \ - $(XMLOFFLIB) ++ $(LIBXML_LIBS) \ + $(XMLOFFLIB) - .IF "$(SYSTEM_MOZILLA)" == "YES" + .IF "$(OS)"=="SOLARIS" @@ -110,6 +111,9 @@ .IF "$(NSS_LIB)" != "" SHL2STDLIBS += $(NSS_LIB) @@ -20,17 +20,11 @@ $NetBSD: patch-bs,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $ .ENDIF .IF "$(CRYPTO_ENGINE)" == "mscrypto" -@@ -159,11 +163,12 @@ +@@ -155,6 +159,7 @@ $(SOTLIB) \ $(SVLLIB) \ $(SFXLIB) \ -+ $(LIBXML_LIBS) \ ++ $(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= diff --git a/misc/openoffice3/patches/patch-de b/misc/openoffice3/patches/patch-de index f112e26a506..c007a59447a 100644 --- a/misc/openoffice3/patches/patch-de +++ b/misc/openoffice3/patches/patch-de @@ -1,14 +1,12 @@ -$NetBSD: patch-de,v 1.1.1.1 2008/10/14 11:02:25 hira Exp $ +$NetBSD: patch-de,v 1.2 2009/05/09 18:43:41 hira Exp $ ---- lpsolve/lp_solve_5.5.patch.orig 2008-06-16 23:19:46.000000000 +0900 -+++ lpsolve/lp_solve_5.5.patch 2008-06-27 18:23:09.000000000 +0900 -@@ -1,12 +1,33 @@ ----- misc/lp_solve_5.5/lpsolve55/ccc Sat Jun 11 21:27:18 2005 --+++ misc/build/lp_solve_5.5/lpsolve55/ccc Wed May 21 17:19:56 2008 +--- lpsolve/lp_solve_5.5.patch.orig 2009-05-09 15:08:35.000000000 +0900 ++++ lpsolve/lp_solve_5.5.patch 2009-05-09 22:42:55.000000000 +0900 +@@ -1,12 +1,32 @@ + --- misc/lp_solve_5.5/lpsolve55/ccc Sat Jun 11 21:27:18 2005 + +++ misc/build/lp_solve_5.5/lpsolve55/ccc Wed May 21 17:19:56 2008 -@@ -1,5 +1,5 @@ -+--- misc/lp_solve_5.5/lpsolve55/ccc 2005-06-12 04:27:18.000000000 +0900 -++++ misc/build/lp_solve_5.5/lpsolve55/ccc 2008-06-27 18:21:52.000000000 +0900 -+@@ -1,12 +1,16 @@ ++@@ -1,12 +1,15 @@ src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c' -c=cc +c=$CC @@ -19,15 +17,14 @@ $NetBSD: patch-de,v 1.1.1.1 2008/10/14 11:02:25 hira Exp $ + then def='-dy -K PIC -DNOLONGLONG' + dl=-lc +-else dl=-ldl -++else -++ if [ x"$OS" = x"NETBSD" -o x"$OS" = x"FREEBSD" ] +++else if [ x"$OS" = x"NETBSD" -o x"$OS" = x"FREEBSD" ] ++ then dl=-lc ++ else dl=-ldl ++ fi + so=y + fi + -+@@ -19,7 +23,7 @@ ++@@ -19,7 +22,7 @@ + if [ "$so" != "" ] + then + $c -fpic -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src @@ -36,10 +33,10 @@ $NetBSD: patch-de,v 1.1.1.1 2008/10/14 11:02:25 hira Exp $ + fi + + rm *.o 2>/dev/null - --- misc/lp_solve_5.5/lpsolve55/ccc.osx Thu Jun 23 22:53:08 2005 - +++ misc/build/lp_solve_5.5/lpsolve55/ccc.osx Wed May 21 17:19:56 2008 - @@ -3,6 +3,10 @@ -@@ -72,3 +93,53 @@ + --- misc/lp_solve_5.5/lpsolve55/ccc.os2 2008-11-26 12:49:36.000000000 +0100 + +++ misc/build/lp_solve_5.5/lpsolve55/ccc.os2 2008-09-25 17:27:48.000000000 +0200 + @@ -1 +1,13 @@ +@@ -89,3 +109,53 @@ +fi + +rm *.o 2>/dev/null diff --git a/misc/openoffice3/patches/patch-dy b/misc/openoffice3/patches/patch-dy index 9370f0ba88b..0ee557fef85 100644 --- a/misc/openoffice3/patches/patch-dy +++ b/misc/openoffice3/patches/patch-dy @@ -1,118 +1,86 @@ -$NetBSD: patch-dy,v 1.2 2008/10/20 12:30:16 hira Exp $ +$NetBSD: patch-dy,v 1.3 2009/05/09 18:43:41 hira Exp $ ---- libxmlsec/xmlsec1-1.2.6.patch.orig 2008-03-18 23:06:34.000000000 +0900 -+++ libxmlsec/xmlsec1-1.2.6.patch 2008-10-20 03:29:32.000000000 +0900 -@@ -175,6 +175,23 @@ - case $version_type in - freebsd-elf*) - *************** -+*** 7969,7975 **** -+ ;; -+ -+ netbsd*) -+! version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+--- 7970,7976 ---- -+ ;; -+ -+ netbsd*) -+! version_type=freebsd-elf -+ need_lib_prefix=no -+ need_version=no -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+*************** - *** 9046,9052 **** - ;; - esac -@@ -249,6 +266,23 @@ - case $version_type in - freebsd-elf*) - *************** -+*** 11688,11694 **** -+ ;; -+ -+ netbsd*) -+! version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+--- 11689,11695 ---- -+ ;; -+ -+ netbsd*) -+! version_type=freebsd-elf -+ need_lib_prefix=no -+ need_version=no -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+*************** - *** 13259,13269 **** - lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' - ;; -@@ -308,6 +342,23 @@ - case $version_type in - freebsd-elf*) - *************** -+*** 14858,14864 **** -+ ;; -+ -+ netbsd*) -+! version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+--- 14859,14865 ---- -+ ;; -+ -+ netbsd*) -+! version_type=freebsd-elf -+ need_lib_prefix=no -+ need_version=no -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+*************** - *** 15607,15617 **** - lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4' - ;; -@@ -384,6 +435,23 @@ - case $version_type in - freebsd-elf*) - *************** -+*** 17226,17232 **** -+ ;; -+ -+ netbsd*) -+! version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+--- 17227,17233 ---- -+ ;; -+ -+ netbsd*) -+! version_type=freebsd-elf -+ need_lib_prefix=no -+ need_version=no -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+*************** - *** 24598,24604 **** - fi - -@@ -418,7 +486,7 @@ - - XMLSEC_NO_NSS="1" - MOZILLA_MIN_VERSION="1.4" --+ if test "z$MOZ_FLAVOUR" = "zfirefox" ; then -++ if test "z$MOZ_FLAVOUR" = "zfirefox" -o "z$MOZ_FLAVOUR" = "zseamonkey"; then - + MOZILLA_MIN_VERSION="1.0" - + fi - NSS_MIN_VERSION="3.2" -@@ -2705,7 +2773,7 @@ - - XMLSEC_NO_NSS="1" - MOZILLA_MIN_VERSION="1.4" --+ if test "z$MOZ_FLAVOUR" = "zfirefox" ; then -++ if test "z$MOZ_FLAVOUR" = "zfirefox" -o "z$MOZ_FLAVOUR" = "zseamonkey"; then - + MOZILLA_MIN_VERSION="1.0" - + fi - NSS_MIN_VERSION="3.2" +--- libxmlsec/xmlsec1-1.2.6.patch.orig 2009-01-23 03:14:08.000000000 +0900 ++++ libxmlsec/xmlsec1-1.2.6.patch 2009-05-09 14:52:22.000000000 +0900 +@@ -100,6 +100,15 @@ + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) ++@@ -7969,7 +7970,7 @@ ++ ;; ++ ++ netbsd*) ++- version_type=sunos +++ version_type=freebsd-elf ++ need_lib_prefix=no ++ need_version=no ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + @@ -9046,7 +9047,7 @@ + ;; + esac +@@ -140,6 +149,15 @@ + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) ++@@ -11688,7 +11689,7 @@ ++ ;; ++ ++ netbsd*) ++- version_type=sunos +++ version_type=freebsd-elf ++ need_lib_prefix=no ++ need_version=no ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + @@ -13259,11 +13260,11 @@ + lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' + ;; +@@ -172,6 +190,15 @@ + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) ++@@ -14858,7 +14859,7 @@ ++ ;; ++ ++ netbsd*) ++- version_type=sunos +++ version_type=freebsd-elf ++ need_lib_prefix=no ++ need_version=no ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + @@ -15607,11 +15608,11 @@ + lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4' + ;; +@@ -213,6 +240,15 @@ + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) ++@@ -17226,7 +17227,7 @@ ++ ;; ++ ++ netbsd*) ++- version_type=sunos +++ version_type=freebsd-elf ++ need_lib_prefix=no ++ need_version=no ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + @@ -24598,7 +24599,7 @@ + fi + +@@ -226,7 +262,7 @@ + + XMLSEC_NO_NSS="1" + MOZILLA_MIN_VERSION="1.4" +-+if test "z$MOZ_FLAVOUR" = "zfirefox" ; then +++if test "z$MOZ_FLAVOUR" = "zfirefox" -o "z$MOZ_FLAVOUR" = "zseamonkey"; then + + MOZILLA_MIN_VERSION="1.0" + +fi + NSS_MIN_VERSION="3.2" +@@ -2401,7 +2437,7 @@ + + XMLSEC_NO_NSS="1" + MOZILLA_MIN_VERSION="1.4" +-+if test "z$MOZ_FLAVOUR" = "zfirefox" ; then +++if test "z$MOZ_FLAVOUR" = "zfirefox" "z$MOZ_FLAVOUR" = "zseamonkey"; then + + MOZILLA_MIN_VERSION="1.0" + +fi + NSS_MIN_VERSION="3.2" diff --git a/misc/openoffice3/patches/patch-ed b/misc/openoffice3/patches/patch-ed deleted file mode 100644 index 00fd75acce1..00000000000 --- a/misc/openoffice3/patches/patch-ed +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-ed,v 1.1 2008/10/23 09:18:12 hira Exp $ - ---- extensions/source/nsplugin/source/so_main.cxx.orig 2008-10-22 10:41:18.000000000 +0900 -+++ extensions/source/nsplugin/source/so_main.cxx 2008-10-22 20:52:24.000000000 +0900 -@@ -320,6 +320,10 @@ - } - - NSP_Sleep(5); -+#ifdef NETBSD -+ NSP_CloseSocket(my_sock); -+ my_sock=socket(PF_INET, SOCK_STREAM, 0); -+#endif - // try to connect to background SO, thus judge if it is ready - while(0 > connect(my_sock, (struct sockaddr *)&dst_addr, sizeof(dst_addr))) - { -@@ -331,6 +335,10 @@ - return sal_False; - } - debug_fprintf(NSP_LOG_APPEND, "print by nsplugin, Current count: %d\n", count); -+#ifdef NETBSD -+ NSP_CloseSocket(my_sock); -+ my_sock=socket(PF_INET, SOCK_STREAM, 0); -+#endif - } - NSP_CloseSocket(my_sock); - NSP_Sleep(5); diff --git a/misc/openoffice3/patches/patch-ee b/misc/openoffice3/patches/patch-ee index 9beed58ba96..232f431f119 100644 --- a/misc/openoffice3/patches/patch-ee +++ b/misc/openoffice3/patches/patch-ee @@ -1,7 +1,7 @@ -$NetBSD: patch-ee,v 1.1 2008/10/24 11:35:28 hira Exp $ +$NetBSD: patch-ee,v 1.2 2009/05/09 18:43:42 hira Exp $ ---- desktop/source/deployment/misc/dp_platform.cxx.orig 2008-10-24 00:09:00.000000000 +0900 -+++ desktop/source/deployment/misc/dp_platform.cxx 2008-10-24 00:33:34.000000000 +0900 +--- desktop/source/deployment/misc/dp_platform.cxx.orig 2009-05-09 04:49:36.000000000 +0900 ++++ desktop/source/deployment/misc/dp_platform.cxx 2009-05-09 04:49:58.000000000 +0900 @@ -61,6 +61,8 @@ #define PLATFORM_SOLARIS_X86 "solaris_x86" #define PLATFORM_FREEBSD_X86 "freebsd_x86" @@ -10,8 +10,8 @@ $NetBSD: patch-ee,v 1.1 2008/10/24 11:35:28 hira Exp $ +#define PLATFORM_NETBSD_X86_64 "netbsd_x86_64" #define PLATFORM_MACOSX_X86 "macosx_x86" #define PLATFORM_MACOSX_PPC "macosx_powerpc" - #define PLATFORM_OS2_X86 "os/2_x86" -@@ -158,6 +160,10 @@ + #define PLATFORM_OS2_X86 "os2_x86" +@@ -160,6 +162,10 @@ ret = checkOSandCPU(OUSTR("FreeBSD"), OUSTR("x86")); else if (token.equals(OUSTR(PLATFORM_FREEBSD_X86_64))) ret = checkOSandCPU(OUSTR("FreeBSD"), OUSTR("X86_64")); |