pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/misc/openoffice2 Fix `test =='. Pointed out by wiz@.
details: https://anonhg.NetBSD.org/pkgsrc/rev/568c1182af2b
branches: trunk
changeset: 540870:568c1182af2b
user: hira <hira%pkgsrc.org@localhost>
date: Wed Apr 09 09:03:59 2008 +0000
description:
Fix `test =='. Pointed out by wiz@.
diffstat:
misc/openoffice2/distinfo | 4 ++--
misc/openoffice2/patches/patch-ba | 13 +++++++++++--
2 files changed, 13 insertions(+), 4 deletions(-)
diffs (47 lines):
diff -r ecf5385f3fd1 -r 568c1182af2b misc/openoffice2/distinfo
--- a/misc/openoffice2/distinfo Wed Apr 09 09:02:14 2008 +0000
+++ b/misc/openoffice2/distinfo Wed Apr 09 09:03:59 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.36 2008/04/07 16:24:51 hira Exp $
+$NetBSD: distinfo,v 1.37 2008/04/09 09:03:59 hira Exp $
SHA1 (openoffice-2.4.0/OOo_2.4.0_src_binfilter.tar.bz2) = 6196fd2d2b5b37635d9a08a36f5476d57b14e0d8
RMD160 (openoffice-2.4.0/OOo_2.4.0_src_binfilter.tar.bz2) = fff7a0a61b19881559e4f20ddd36031565f635e1
@@ -26,7 +26,7 @@
SHA1 (patch-ar) = e3592ddc51a311a90d727ef8b595944a0ac3e623
SHA1 (patch-as) = 55e38c869518e673e8554b2645c1adfb28f6faec
SHA1 (patch-aw) = fdd1665c729cd17d8381ab39f2e6672164a058ad
-SHA1 (patch-ba) = 98504f3053540898ffe23c6108c05b2cb029c2d4
+SHA1 (patch-ba) = 0134e4055ebe01134029881c3f4d961f7efe8db6
SHA1 (patch-bb) = a2fe8b7aff8c875bdf15c70619b430f1fdbfa053
SHA1 (patch-bc) = a97ec5574d4ef2f2fbdf411ae2c8d49d9f434077
SHA1 (patch-bd) = f206fef46a0741139ae776f95d2a01f794989fb5
diff -r ecf5385f3fd1 -r 568c1182af2b misc/openoffice2/patches/patch-ba
--- a/misc/openoffice2/patches/patch-ba Wed Apr 09 09:02:14 2008 +0000
+++ b/misc/openoffice2/patches/patch-ba Wed Apr 09 09:03:59 2008 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ba,v 1.11 2008/04/07 16:24:51 hira Exp $
+$NetBSD: patch-ba,v 1.12 2008/04/09 09:03:59 hira Exp $
--- config_office/configure.orig 2008-01-31 20:47:17.000000000 +0900
-+++ config_office/configure 2008-04-07 18:20:56.000000000 +0900
++++ config_office/configure 2008-04-09 17:33:05.000000000 +0900
@@ -3176,11 +3176,11 @@
test_cups=no
_os=OSF1
@@ -43,6 +43,15 @@
# 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
+@@ -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
@@ -13591,13 +13591,14 @@
Home |
Main Index |
Thread Index |
Old Index