summaryrefslogtreecommitdiff
path: root/misc/openoffice2
diff options
context:
space:
mode:
authorhira <hira>2008-04-09 09:03:59 +0000
committerhira <hira>2008-04-09 09:03:59 +0000
commitca9f2d634b4ca0c75410391f0ce2af3c8a17f246 (patch)
treeef3eda0865ee46db601fd417925405824122c072 /misc/openoffice2
parentd17ecb358e8540d09ea59007304943671a1634c6 (diff)
downloadpkgsrc-ca9f2d634b4ca0c75410391f0ce2af3c8a17f246.tar.gz
Fix `test =='. Pointed out by wiz@.
Diffstat (limited to 'misc/openoffice2')
-rw-r--r--misc/openoffice2/distinfo4
-rw-r--r--misc/openoffice2/patches/patch-ba13
2 files changed, 13 insertions, 4 deletions
diff --git a/misc/openoffice2/distinfo b/misc/openoffice2/distinfo
index a5ab911120b..be23316952c 100644
--- a/misc/openoffice2/distinfo
+++ b/misc/openoffice2/distinfo
@@ -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-aq) = e4f2a84598a6a09b4bedc430cd24921f87f822e5
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 --git a/misc/openoffice2/patches/patch-ba b/misc/openoffice2/patches/patch-ba
index 4f7099d08ee..23fe10cddf8 100644
--- a/misc/openoffice2/patches/patch-ba
+++ b/misc/openoffice2/patches/patch-ba
@@ -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 @@ $NetBSD: patch-ba,v 1.11 2008/04/07 16:24:51 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
+@@ -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 @@