head 1.4; access; symbols pkgsrc-2016Q4:1.3.0.66 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.64 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.62 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.60 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.58 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.56 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.54 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.52 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.50 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.48 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.46 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.44 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.42 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.40 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.38 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.36 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.34 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.32 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.30 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.28 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.26 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.24 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.22 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.20 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.18 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.16 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.14 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.12 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.10 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.8 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.6 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.4 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.2 pkgsrc-2008Q4-base:1.3 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.4 date 2016.12.29.19.10.28; author wiz; state dead; branches; next 1.3; commitid UT4GSflIUbUnEUzz; 1.3 date 2008.10.30.11.30.34; author hira; state Exp; branches; next 1.2; 1.2 date 2008.10.25.15.18.17; author hira; state Exp; branches; next 1.1; 1.1 date 2008.10.14.11.02.24; author hira; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2008.10.14.11.02.24; author hira; state Exp; branches; next ; desc @@ 1.4 log @Remove old openoffice and libreoffice packages. As discussed on pkgsrc-users. @ text @$NetBSD: patch-bq,v 1.3 2008/10/30 11:30:34 hira Exp $ --- instsetoo_native/util/makefile.mk.orig 2008-07-30 22:30:16.000000000 +0900 +++ instsetoo_native/util/makefile.mk 2008-10-30 19:14:17.000000000 +0900 @@@@ -54,6 +54,9 @@@@ ENABLE_DOWNLOADSETS=TRUE .ENDIF # "$(FORCE_DOWNLOADSETS)"!="" +# Don't create download set with pkgsrc. +ENABLE_DOWNLOADSETS= + .EXPORT: ENABLE_DOWNLOADSETS .EXPORT: LAST_MINOR .EXPORT: PRJ @@@@ -135,7 +138,8 @@@@ .IF "$(alllangiso)"!="" -openoffice: $(foreach,i,$(alllangiso) openoffice_$i) +openoffice: + @@echo -n "" openofficedev: $(foreach,i,$(alllangiso) openofficedev_$i) @@@@ -228,7 +232,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) $(VERBOSESWITCH)) + $(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) $(VERBOSESWITCH)) $(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)"!="" @@@@ -254,7 +258,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) $(VERBOSESWITCH)) + $(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) $(VERBOSESWITCH)) .IF "$(PKGFORMAT)"!="" $(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $$@@{$(PKGFORMAT:^".")} @@@@ -380,10 +384,10 @@@@ -$(MKDIRHIER) $(MSIURETEMPLATEDIR) -$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR) # -$(MKDIRHIER) $(MSIURETEMPLATEDIR) - $(GNUCOPY) -ua $(MSIOFFICETEMPLATESOURCE) $(MSIOFFICETEMPLATEDIR:d:d) - $(GNUCOPY) -ua $(MSILANGPACKTEMPLATESOURCE) $(MSILANGPACKTEMPLATEDIR:d:d) - $(GNUCOPY) -ua $(MSIURETEMPLATESOURCE) $(MSIURETEMPLATEDIR:d:d) - $(GNUCOPY) -ua $(MSISDKOOTEMPLATESOURCE) $(MSISDKOOTEMPLATEDIR:d:d) + $(GNUCOPY) -Rp $(MSIOFFICETEMPLATESOURCE) $(MSIOFFICETEMPLATEDIR:d:d) + $(GNUCOPY) -Rp $(MSILANGPACKTEMPLATESOURCE) $(MSILANGPACKTEMPLATEDIR:d:d) + $(GNUCOPY) -Rp $(MSIURETEMPLATESOURCE) $(MSIURETEMPLATEDIR:d:d) + $(GNUCOPY) -Rp $(MSISDKOOTEMPLATESOURCE) $(MSISDKOOTEMPLATEDIR:d:d) # $(GNUCOPY) -ua $(MSIURETEMPLATESOURCE) $(MSIURETEMPLATEDIR:d:d) $(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp $(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp @ 1.3 log @ - Fix build with one lang-* option. - Set JAVA_HOME instead of JAVACMD. - Depend apache-ant as build-time. - Fix one pkglint warning ($_l -> $lang). @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @ - Use languagepacks to install multiple languages. - Reduce disk usage of ${WRKDIR} with multiple languages. - Don't create install set to ${WRKDIR} in post-build stage. - Install desktop files to share/applications as symbolic links. - Shut up tar warning. - Add lang-all option. - Add missing lang-* options (by, gd, gu, ms and my). @ text @d4 2 a5 2 +++ instsetoo_native/util/makefile.mk 2008-10-26 06:58:43.000000000 +0900 @@@@ -54,6 +54,12 @@@@ a11 3 +BASELANG= @@BASELANG@@ +LANGPACKS= @@LANGPACKS@@ + d15 1 a15 1 @@@@ -135,13 +141,13 @@@@ d20 2 a21 1 +openoffice: openoffice_$(BASELANG) d25 1 a25 33 openofficewithjre: $(foreach,i,$(alllangiso) openofficewithjre_$i) -ooolanguagepack : $(foreach,i,$(alllangiso) ooolanguagepack_$i) +ooolanguagepack : $(foreach,i,$(LANGPACKS) ooolanguagepack_$i) ooodevlanguagepack: $(foreach,i,$(alllangiso) ooodevlanguagepack_$i) @@@@ -183,13 +189,13 @@@@ ADDDEPS+=hack_msitemplates .ENDIF -$(foreach,i,$(alllangiso) openoffice_$i) : $(ADDDEPS) +openoffice_$(BASELANG) : $(ADDDEPS) $(foreach,i,$(alllangiso) openofficedev_$i) : $(ADDDEPS) $(foreach,i,$(alllangiso) openofficewithjre_$i) : $(ADDDEPS) -$(foreach,i,$(alllangiso) ooolanguagepack_$i) : $(ADDDEPS) +$(foreach,i,$(LANGPACKS) ooolanguagepack_$i) : $(ADDDEPS) $(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $(ADDDEPS) @@@@ -217,7 +223,7 @@@@ .ENDIF # "$(OS)" == "MACOSX" .IF "$(PKGFORMAT)"!="" -$(foreach,i,$(alllangiso) openoffice_$i) : $$@@{$(PKGFORMAT:^".")} +openoffice_$(BASELANG) : $$@@{$(PKGFORMAT:^".")} .IF "$(MAKETARGETS)"!="" && "$(PKGFORMAT)"!="" .IF "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)" $(MAKETARGETS) : $$@@{$(PKGFORMAT:^".")} @@@@ -228,7 +234,7 @@@@ d34 1 a34 7 @@@@ -249,12 +255,12 @@@@ $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice_Dev --languages $(subst,$(@@:s/_/ /:1)_, $(@@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@@:b)_$(RTL_OS)_$(RTL_ARCH)$(@@:e).update.xml .IF "$(PKGFORMAT)"!="" -$(foreach,i,$(alllangiso) ooolanguagepack_$i) : $$@@{$(PKGFORMAT:^".")} +$(foreach,i,$(LANGPACKS) ooolanguagepack_$i) : $$@@{$(PKGFORMAT:^".")} ooolanguagepack_%{$(PKGFORMAT:^".")} : d43 1 a43 1 @@@@ -380,10 +386,10 @@@@ @ 1.1 log @Initial revision @ text @d3 3 a5 3 --- instsetoo_native/util/makefile.mk.orig 2008-07-26 06:07:21.000000000 +0900 +++ instsetoo_native/util/makefile.mk 2008-07-26 06:08:22.000000000 +0900 @@@@ -54,6 +54,9 @@@@ d12 3 d18 66 a83 1 @@@@ -383,10 +386,10 @@@@ @ 1.1.1.1 log @Initial import of OpenOffice.org 3.0.0 as misc/openoffice3. Release note (will be available): http://development.openoffice.org/releases/3.0.0.html @ text @@