diff options
Diffstat (limited to 'misc/openoffice2/patches/patch-bq')
| -rw-r--r-- | misc/openoffice2/patches/patch-bq | 36 |
1 files changed, 32 insertions, 4 deletions
diff --git a/misc/openoffice2/patches/patch-bq b/misc/openoffice2/patches/patch-bq index c2d3af6baa3..18d5f39d05d 100644 --- a/misc/openoffice2/patches/patch-bq +++ b/misc/openoffice2/patches/patch-bq @@ -1,7 +1,7 @@ -$NetBSD: patch-bq,v 1.4 2007/10/06 20:02:23 hira Exp $ +$NetBSD: patch-bq,v 1.5 2008/10/31 11:02:55 hira Exp $ ---- instsetoo_native/util/makefile.mk.orig 2007-08-03 20:23:21.000000000 +0900 -+++ instsetoo_native/util/makefile.mk 2007-09-26 17:40:48.000000000 +0900 +--- instsetoo_native/util/makefile.mk.orig 2008-10-31 19:34:16.000000000 +0900 ++++ instsetoo_native/util/makefile.mk 2008-10-31 19:36:17.000000000 +0900 @@ -61,6 +61,9 @@ ENABLE_DOWNLOADSETS=TRUE .ENDIF # "$(FORCE_DOWNLOADSETS)"!="" @@ -12,7 +12,35 @@ $NetBSD: patch-bq,v 1.4 2007/10/06 20:02:23 hira Exp $ .EXPORT: ENABLE_DOWNLOADSETS .EXPORT: LAST_MINOR .EXPORT: PRJ -@@ -511,11 +514,11 @@ +@@ -131,7 +134,8 @@ + + .IF "$(alllangiso)"!="" + +-openoffice: $(foreach,i,$(alllangiso) openoffice_$i) ++openoffice: ++ @echo -n "" + + openofficedev: $(foreach,i,$(alllangiso) openofficedev_$i) + +@@ -236,7 +240,7 @@ + .ELSE # "$(PKGFORMAT)"!="" + openoffice_% : + .ENDIF # "$(PKGFORMAT)"!="" +- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH)) ++ $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -i . -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH)) + $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml + + .IF "$(PKGFORMAT)"!="" +@@ -265,7 +269,7 @@ + .ELSE # "$(PKGFORMAT)"!="" + ooolanguagepack_% : + .ENDIF # "$(PKGFORMAT)"!="" +- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH)) ++ $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -i . -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH)) + + .IF "$(PKGFORMAT)"!="" + $(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $$@{$(PKGFORMAT:^".")} +@@ -403,11 +407,11 @@ -$(MKDIRHIER) $(MSIURETEMPLATEDIR) -$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR) -$(MKDIRHIER) $(MSIURETEMPLATEDIR) |