[pkgsrc/pkgsrc-2005Q3]: pkgsrc/misc/openoffice Pullup ticket 800 - requested ...

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d67835c8b331
branches:  pkgsrc-2005Q3
changeset: 499558:d67835c8b331
user:      salo <salo%pkgsrc.org@localhost>
date:      Wed Oct 05 12:18:35 2005 +0000

description:
Pullup ticket 800 - requested by Michael Rauch
build fix for openoffice

Revisions pulled up:
- pkgsrc/misc/openoffice/distinfo               1.33
- pkgsrc/misc/openoffice/patches/patch-av       1.4

   Module Name:         pkgsrc
   Committed By:        mrauch
   Date:                Sat Oct  1 07:00:08 UTC 2005

   Modified Files:
        pkgsrc/misc/openoffice: distinfo
        pkgsrc/misc/openoffice/patches: patch-av

   Log Message:
   Add patch for the xsl compilation problem in officecfg, which occured
   after the update to libxslt-1.1.15.
   Fixes PR pkg/31401 .

diffstat:

 misc/openoffice/distinfo         |   4 ++--
 misc/openoffice/patches/patch-av |  13 +++++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diffs (43 lines):

diff -r aef21cdfcad6 -r d67835c8b331 misc/openoffice/distinfo
--- a/misc/openoffice/distinfo  Mon Oct 03 19:00:55 2005 +0000
+++ b/misc/openoffice/distinfo  Wed Oct 05 12:18:35 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.32 2005/09/06 08:10:58 abs Exp $
+$NetBSD: distinfo,v 1.32.2.1 2005/10/05 12:18:35 salo Exp $
 
 SHA1 (openoffice-1.1.4/OOo_1.1.4_source.tar.gz) = 3161dbe53f6ec0b0d5a65790a2b1dd3d7331b430
 RMD160 (openoffice-1.1.4/OOo_1.1.4_source.tar.gz) = 0e218792bb72106cd494532de373d0f40a5a9587
@@ -51,7 +51,7 @@
 SHA1 (patch-as) = 81cd7e2a6ff24729a0276d397b285b07c9694205
 SHA1 (patch-at) = d208593e5fd37687c4be0b2735fdcc57760f7f3a
 SHA1 (patch-au) = 3fd383266f24c4a0c5e6f0cd00d419e1fe20cafa
-SHA1 (patch-av) = f6f0aa984f7d975c721d616b348a69cff6173ff8
+SHA1 (patch-av) = fa1910700a104347bf29ba19851f47eca34c8be1
 SHA1 (patch-aw) = f0decfe7d1bac881ec83b09328a6b863a9bed7b1
 SHA1 (patch-ax) = 4a918df6dfd058fd6abecfc4c9b85a21bfc18364
 SHA1 (patch-ay) = f548c8c79d6ef9b1a0d1e521d295bf03cd8f8849
diff -r aef21cdfcad6 -r d67835c8b331 misc/openoffice/patches/patch-av
--- a/misc/openoffice/patches/patch-av  Mon Oct 03 19:00:55 2005 +0000
+++ b/misc/openoffice/patches/patch-av  Wed Oct 05 12:18:35 2005 +0000
@@ -1,12 +1,17 @@
-$NetBSD: patch-av,v 1.3 2004/06/03 18:48:17 mrauch Exp $
+$NetBSD: patch-av,v 1.3.12.1 2005/10/05 12:18:35 salo Exp $
 
 --- ../officecfg/util/makefile.pmk.orig        2004-01-09 19:06:41.000000000 +0100
 +++ ../officecfg/util/makefile.pmk
-@@ -103,6 +103,7 @@ $(MISC)$/registry$/res$/{$(alliso)}$/%.p
+@@ -100,9 +100,11 @@ $(MISC)$/registry$/res$/{$(alliso)}$/%.p
+ .IF "$(SOLAR_JAVA)"!=""
+       $(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< 
$(PRJ)$/util$/resource.xsl $(@:d)$(<:b).properties locale={$(subst,$/$<, $(subst,$(MISC)$/registry$/res$/, $(subst,.properties,.xcs $@)))}
+ .ELSE
++      $(SED) 's|$$locale|'"'"'{$(subst,$/$<, $(subst,$(MISC)$/registry$/res$/, $(subst,.properties,.xcs $@)))}'"'"'|g' <$(PRJ)$/util$/resource.xsl >$(MISC)/resource.{$(subst,$/$<, 
$(subst,$(MISC)$/registry$/res$/, $(subst,.properties,.xcs $@)))}.xsl
        $(XSLTPROC) -o $(@:d)$(<:b).properties \
                    --stringparam locale {$(subst,$/$<, $(subst,$(MISC)$/registry$/res$/, $(subst,.properties,.xcs $@)))} \
-                   $(PRJ)$/util$/resource.xsl $<
-+      $(TOUCH) $(@:d)$(<:b).properties
+-                  $(PRJ)$/util$/resource.xsl $<
++                  $(MISC)/resource.{$(subst,$/$<, $(subst,$(MISC)$/registry$/res$/, $(subst,.properties,.xcs $@)))}.xsl $<
++      $(TOUCH) $(@:d)$(<:b).properties
  .ENDIF
  
  # --- XCU ---