diff options
| author | salo <salo@pkgsrc.org> | 2007-05-15 23:53:47 +0000 |
|---|---|---|
| committer | salo <salo@pkgsrc.org> | 2007-05-15 23:53:47 +0000 |
| commit | ba972fc3e201597c96afa680f05e975997e47e64 (patch) | |
| tree | 401dd91ccd5e89a12589d3d49c36936a707c6991 | |
| parent | a69261b25ef022853f00f57b6dc347263c5d643b (diff) | |
| download | pkgsrc-ba972fc3e201597c96afa680f05e975997e47e64.tar.gz | |
Pullup ticket 2083 - requested by hira
build fix for openoffice2
Revisions pulled up:
- pkgsrc/misc/openoffice2/distinfo 1.13
- pkgsrc/misc/openoffice2/patches/patch-ba 1.5
Module Name: pkgsrc
Committed By: hira
Date: Thu Apr 12 05:28:08 UTC 2007
Modified Files:
pkgsrc/misc/openoffice2: distinfo
pkgsrc/misc/openoffice2/patches: patch-ba
Log Message:
Fix "test ==". Pointed out by veego@ in private e-mail.
| -rw-r--r-- | misc/openoffice2/distinfo | 4 | ||||
| -rw-r--r-- | misc/openoffice2/patches/patch-ba | 13 |
2 files changed, 13 insertions, 4 deletions
diff --git a/misc/openoffice2/distinfo b/misc/openoffice2/distinfo index f1b95a69134..ea169fd43e1 100644 --- a/misc/openoffice2/distinfo +++ b/misc/openoffice2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2007/04/05 23:24:01 hira Exp $ +$NetBSD: distinfo,v 1.12.2.1 2007/05/15 23:53:47 salo Exp $ SHA1 (openoffice-2.2.0/OOo_2.2.0_src_binfilter.tar.bz2) = d1fa827e2c08d7e3d67b2588b1136ed9e774ef42 RMD160 (openoffice-2.2.0/OOo_2.2.0_src_binfilter.tar.bz2) = 1bb07f01e872ed003dbac3e11bc5732904076ae1 @@ -32,7 +32,7 @@ SHA1 (patch-aq) = 41fab8bdc5bc611fd01623ac222189646e42bf22 SHA1 (patch-ar) = e3592ddc51a311a90d727ef8b595944a0ac3e623 SHA1 (patch-as) = 55e38c869518e673e8554b2645c1adfb28f6faec SHA1 (patch-aw) = fdd1665c729cd17d8381ab39f2e6672164a058ad -SHA1 (patch-ba) = c98bb40ec9b3cfc1402b1aa86c695d28569f8383 +SHA1 (patch-ba) = 7f4c6ccfa21fec9373e9661354657f3d3338a48c 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 9d669d38fdd..e0b5e462f5c 100644 --- a/misc/openoffice2/patches/patch-ba +++ b/misc/openoffice2/patches/patch-ba @@ -1,7 +1,7 @@ -$NetBSD: patch-ba,v 1.4 2007/04/05 23:24:01 hira Exp $ +$NetBSD: patch-ba,v 1.4.2.1 2007/05/15 23:53:48 salo Exp $ --- config_office/configure.orig 2007-01-19 22:01:19.000000000 +0900 -+++ config_office/configure 2007-04-01 21:32:20.000000000 +0900 ++++ config_office/configure 2007-04-12 14:18:58.000000000 +0900 @@ -2975,11 +2975,11 @@ test_cups=no _os=OSF1 @@ -16,3 +16,12 @@ $NetBSD: patch-ba,v 1.4 2007/04/05 23:24:01 hira Exp $ PTHREAD_CFLAGS="-pthread" PTHREAD_LIBS="-pthread -lpthread" _os=NetBSD +@@ -8261,7 +8261,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 |