summaryrefslogtreecommitdiff
path: root/misc/openoffice2/patches/patch-cr
diff options
context:
space:
mode:
Diffstat (limited to 'misc/openoffice2/patches/patch-cr')
-rw-r--r--misc/openoffice2/patches/patch-cr17
1 files changed, 13 insertions, 4 deletions
diff --git a/misc/openoffice2/patches/patch-cr b/misc/openoffice2/patches/patch-cr
index 81bda971dc6..bf14c9b3509 100644
--- a/misc/openoffice2/patches/patch-cr
+++ b/misc/openoffice2/patches/patch-cr
@@ -1,13 +1,22 @@
-$NetBSD: patch-cr,v 1.1 2007/10/09 10:04:00 hira Exp $
+$NetBSD: patch-cr,v 1.2 2008/04/07 16:24:51 hira Exp $
---- setup_native/scripts/linuxpatchscript.sh.orig 2007-10-09 18:55:08.000000000 +0900
-+++ setup_native/scripts/linuxpatchscript.sh 2007-10-09 18:55:25.000000000 +0900
+--- setup_native/scripts/linuxpatchscript.sh.orig 2008-04-07 17:55:52.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