[pkgsrc/trunk]: pkgsrc/misc/openoffice3 - Fix build with one lang-* option.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/misc/openoffice3 - Fix build with one lang-* option.
From: hira <hira%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 06:48:10 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/4924b61b4ce5
branches:  trunk
changeset: 549241:4924b61b4ce5
user:      hira <hira%pkgsrc.org@localhost>
date:      Thu Oct 30 11:30:34 2008 +0000

description:
- Fix build with one lang-* option.
 - Set JAVA_HOME instead of JAVACMD.
 - Depend apache-ant as build-time.
 - Fix one pkglint warning ($_l -> $lang).

diffstat:

 misc/openoffice3/Makefile         |   4 +-
 misc/openoffice3/distinfo         |   4 +-
 misc/openoffice3/options.mk       |  22 ++++----------
 misc/openoffice3/patches/patch-bq |  58 ++++++--------------------------------
 4 files changed, 20 insertions(+), 68 deletions(-)

diffs (189 lines):

diff -r c716cf0dcf6b -r 4924b61b4ce5 misc/openoffice3/Makefile
--- a/misc/openoffice3/Makefile Thu Oct 30 11:28:32 2008 +0000
+++ b/misc/openoffice3/Makefile Thu Oct 30 11:30:34 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/10/25 15:18:17 hira Exp $
+# $NetBSD: Makefile,v 1.13 2008/10/30 11:30:34 hira Exp $
 #
 
 OO_VER=                        3.0.0
@@ -148,7 +148,7 @@
 
 do-build:
        @${_ULIMIT_CMD} ${SETENV} ${MAKE_ENV} bash -c   \
-       "cd ${WRKSRC} && ./bootstrap && source ${OPENOFFICE_SETFILE}Env.Set.sh && cd instsetoo_native && build.pl --checkmodules && build.pl -P${MAKE_JOBS:U1} --all product=full && cd util && dmake 
ooolanguagepack"
+       "cd ${WRKSRC} && ./bootstrap && source ${OPENOFFICE_SETFILE}Env.Set.sh && cd instsetoo_native && build.pl --checkmodules && build.pl -P${MAKE_JOBS:U1} --all product=full && cd util && dmake 
openoffice_${OO_BASELANG} && dmake ooolanguagepack"
 
 post-build:
        ${ECHO} "#!${SH}" > ${WRKDIR}/${OO_UNXNAME}
diff -r c716cf0dcf6b -r 4924b61b4ce5 misc/openoffice3/distinfo
--- a/misc/openoffice3/distinfo Thu Oct 30 11:28:32 2008 +0000
+++ b/misc/openoffice3/distinfo Thu Oct 30 11:30:34 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2008/10/25 15:18:17 hira Exp $
+$NetBSD: distinfo,v 1.13 2008/10/30 11:30:34 hira Exp $
 
 SHA1 (openoffice-3.0.0/OOo_3.0.0_src_binfilter.tar.bz2) = 09ff91fd871f00c696befa8064fe04d7a88a3c8a
 RMD160 (openoffice-3.0.0/OOo_3.0.0_src_binfilter.tar.bz2) = edc71b8b0596d63e60431c7266140bf5188abc6d
@@ -42,7 +42,7 @@
 SHA1 (patch-bm) = 0f7367782155c1d0f0459912aac69a1c759ad7fa
 SHA1 (patch-bn) = 6f21ecf499135b5b47ed191eca79848b4c404447
 SHA1 (patch-bo) = 3e4bcccd0a7cea535e443d750039fa844380f8bc
-SHA1 (patch-bq) = 7fc0395707e5735f35a1154bfe431cca50fad3f2
+SHA1 (patch-bq) = 2321d806bff054932f249a8b9445d790aa9eafbe
 SHA1 (patch-bs) = ede4ffcb762e89efbf95b6e4b644eb268534f1ca
 SHA1 (patch-bv) = bc035bdbc8420666a52417f2226e3e687d199e33
 SHA1 (patch-bw) = 223963fe59b71468420a697d8ea27c153b9f37ce
diff -r c716cf0dcf6b -r 4924b61b4ce5 misc/openoffice3/options.mk
--- a/misc/openoffice3/options.mk       Thu Oct 30 11:28:32 2008 +0000
+++ b/misc/openoffice3/options.mk       Thu Oct 30 11:30:34 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.10 2008/10/25 15:18:17 hira Exp $
+# $NetBSD: options.mk,v 1.11 2008/10/30 11:30:34 hira Exp $
 #
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.openoffice3
@@ -28,22 +28,15 @@
 OO_BASELANG=   en-US
 OO_LANGPACKS=  ${OO_SUPPORTED_LANGUAGES:S/en-US//1:S/all//1}
 .else
-.  for _l in ${PKG_OPTIONS:Mlang-*:S/lang-//g}
-OO_LANGS+=     ${_l}
-OO_BASELANG?=  ${_l}   # Get first one.
+.  for lang in ${PKG_OPTIONS:Mlang-*:S/lang-//g}
+OO_LANGS+=     ${lang}
+OO_BASELANG?=  ${lang} # Get first one.
 .  endfor
 .endif
 OO_LANGS?=     en-US
 OO_BASELANG?=  en-US
 OO_LANGPACKS?= ${OO_LANGS:S/${OO_BASELANG}//1}
 
-SUBST_CLASSES+=                instset
-SUBST_STAGE.instset=   post-patch
-SUBST_MESSAGE.instset= Reduce OOo install sets.
-SUBST_FILES.instset=   instsetoo_native/util/makefile.mk
-SUBST_SED.instset+=    -e 's,@BASELANG@,${OO_BASELANG},g'
-SUBST_SED.instset+=    -e 's,@LANGPACKS@,${OO_LANGPACKS},g'
-
 .if !empty(PKG_OPTIONS:Mfirefox)
 MOZ_FLAVOUR=           firefox
 CONFIGURE_ARGS+=       --with-system-mozilla=firefox
@@ -106,7 +99,7 @@
 
 .if !empty(PKG_OPTIONS:Mjava)
 USE_JAVA2=             yes
-DEPENDS+=              apache-ant>=1.7.0:../../devel/apache-ant
+BUILD_DEPENDS+=                apache-ant>=1.7.0nb1:../../devel/apache-ant
 CONFIGURE_ARGS+=       --with-java
 # Extensions (MI)
 #CONFIGURE_ARGS+=      --enable-report-builder
@@ -119,9 +112,8 @@
 # -rpath is missing from wip/jdk15.
 CONFIGURE_ENV+=        LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${JAVA_LIB_ROOT}:${JAVA_LIB_ROOT}/xawt"
 
-# XXX: devel/apache-ant doesn't setup ${PREFIX}/bin/java.
-CONFIGURE_ENV+=                JAVACMD="${PKG_JAVA_HOME}/bin/java"
-MAKE_ENV+=             JAVACMD="${PKG_JAVA_HOME}/bin/java"
+CONFIGURE_ENV+=                JAVA_HOME=${PKG_JAVA_HOME:Q}
+MAKE_ENV+=             JAVA_HOME=${PKG_JAVA_HOME:Q}
 
 .include "../../mk/java-env.mk"
 .include "../../mk/java-vm.mk"
diff -r c716cf0dcf6b -r 4924b61b4ce5 misc/openoffice3/patches/patch-bq
--- a/misc/openoffice3/patches/patch-bq Thu Oct 30 11:28:32 2008 +0000
+++ b/misc/openoffice3/patches/patch-bq Thu Oct 30 11:30:34 2008 +0000
@@ -1,62 +1,28 @@
-$NetBSD: patch-bq,v 1.2 2008/10/25 15:18:17 hira Exp $
+$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-26 06:58:43.000000000 +0900
-@@ -54,6 +54,12 @@
++++ 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=
 +
-+BASELANG=     @BASELANG@
-+LANGPACKS=    @LANGPACKS@
-+
  .EXPORT: ENABLE_DOWNLOADSETS
  .EXPORT: LAST_MINOR
  .EXPORT: PRJ
-@@ -135,13 +141,13 @@
+@@ -135,7 +138,8 @@
  
  .IF "$(alllangiso)"!=""
  
 -openoffice: $(foreach,i,$(alllangiso) openoffice_$i)
-+openoffice: openoffice_$(BASELANG)
++openoffice:
++      @echo -n ""
  
  openofficedev: $(foreach,i,$(alllangiso) openofficedev_$i)
  
- 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 @@
+@@ -228,7 +232,7 @@
  .ELSE                 # "$(PKGFORMAT)"!=""
  openoffice_% :
  .ENDIF                        # "$(PKGFORMAT)"!=""
@@ -65,13 +31,7 @@
        $(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)"!=""
-@@ -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:^".")} :
+@@ -254,7 +258,7 @@
  .ELSE                 # "$(PKGFORMAT)"!=""
  ooolanguagepack_% :
  .ENDIF                        # "$(PKGFORMAT)"!=""
@@ -80,7 +40,7 @@
  
  .IF "$(PKGFORMAT)"!=""
  $(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
-@@ -380,10 +386,10 @@
+@@ -380,10 +384,10 @@
        -$(MKDIRHIER) $(MSIURETEMPLATEDIR)
        -$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)
  #     -$(MKDIRHIER) $(MSIURETEMPLATEDIR)
Prev by Date: [pkgsrc/trunk]: pkgsrc/mail/nail Remove mail/nail, successor heirloom-mailx i...
Next by Date: [pkgsrc/trunk]: pkgsrc/sysutils/libpciaccess Import libpciaccess-0.10.4 (X.or...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/mail/nail Remove mail/nail, successor heirloom-mailx i...
Next by Thread: [pkgsrc/trunk]: pkgsrc/sysutils/libpciaccess Import libpciaccess-0.10.4 (X.or...
Indexes:
Home | Main Index | Thread Index | Old Index