[pkgsrc/trunk]: pkgsrc/misc/openoffice2 Apply some fixes and improvements fro...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dfeed7218fd1
branches:  trunk
changeset: 549319:dfeed7218fd1
user:      hira <hira%pkgsrc.org@localhost>
date:      Fri Oct 31 11:02:55 2008 +0000

description:
Apply some fixes and improvements from misc/openoffice3.
  - Change installation directory.
  - Reduce usage of ${WRKDIR}.
  - Use language packs to install multiple languages.
  - Install desktop files as symbolic links.
  - Pass MAKE_JOBS to dmake.
  - Fix build with PKG_DEVELOPER=yes (add missing rpath flag).
  - Fix PLIST without gtk2 option.
  - Fix browser plugin.
  - Fix open-url with firefox3 and seamonkey.
  - Shut up tar warning (remove leading /).
  - Use system openssl.
  - Use system icu.
  - Add lang-all option.

diffstat:

 misc/openoffice2/MESSAGE          |    6 +-
 misc/openoffice2/Makefile         |   74 ++++++++++++++-----------
 misc/openoffice2/PLIST            |    6 +-
 misc/openoffice2/distinfo         |   20 +++---
 misc/openoffice2/options.mk       |   27 +++++++-
 misc/openoffice2/patches/patch-ba |   22 +++++++-
 misc/openoffice2/patches/patch-bq |   36 +++++++++++-
 misc/openoffice2/patches/patch-br |   31 -----------
 misc/openoffice2/patches/patch-ch |    6 +-
 misc/openoffice2/patches/patch-cs |    6 +-
 misc/openoffice2/patches/patch-cx |   43 +-------------
 misc/openoffice2/patches/patch-da |   17 ------
 misc/openoffice2/patches/patch-dt |   13 ++++
 misc/openoffice2/patches/patch-du |   35 ++++++++++++
 misc/openoffice2/patches/patch-dy |  106 ++++++++++++++++++++++++++++++++++++-
 misc/openoffice2/patches/patch-ec |   13 ++++
 misc/openoffice2/patches/patch-ed |   26 +++++++++
 17 files changed, 331 insertions(+), 156 deletions(-)

diffs (truncated from 776 to 300 lines):

diff -r e369314123c1 -r dfeed7218fd1 misc/openoffice2/MESSAGE
--- a/misc/openoffice2/MESSAGE  Fri Oct 31 11:00:50 2008 +0000
+++ b/misc/openoffice2/MESSAGE  Fri Oct 31 11:02:55 2008 +0000
@@ -1,10 +1,10 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2007/04/21 05:40:27 hira Exp $
+$NetBSD: MESSAGE,v 1.2 2008/10/31 11:02:55 hira Exp $
 
-  OpenOffice has now been installed in ${PREFIX}/${OO_RELEASE}.
+  OpenOffice has now been installed in ${OO_PREFIX}.
 
   Before using this package for the first time, each user has to run
   a setup program, which is automatically invoked at the first start.
   Thereafter, OpenOffice can be started using the
-  ${PREFIX}/bin/soffice command.
+  ${DESTDIR}${PREFIX}/bin/soffice command.
 ===========================================================================
diff -r e369314123c1 -r dfeed7218fd1 misc/openoffice2/Makefile
--- a/misc/openoffice2/Makefile Fri Oct 31 11:00:50 2008 +0000
+++ b/misc/openoffice2/Makefile Fri Oct 31 11:02:55 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2008/10/31 11:00:50 hira Exp $
+# $NetBSD: Makefile,v 1.55 2008/10/31 11:02:55 hira Exp $
 #
 
 OO_VER=                        2.4.2
@@ -64,17 +64,21 @@
 SUBST_CLASSES+=                lib
 SUBST_STAGE.lib=       post-patch
 SUBST_MESSAGE.lib=     Adding library paths
-SUBST_FILES.lib=       solenv/inc/libs.mk
-.for pkg in db4 expat jpeg zlib
-SUBST_SED.lib+=                -e 's,@BLNK_PREFIX_${pkg}@,${BUILDLINK_PREFIX.${pkg}},g'
-LIBS+=                 -L${BUILDLINK_PREFIX.${pkg}}/lib
-LIBS+=                 ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.${pkg}}/lib
+SUBST_FILES.lib=       solenv/inc/pkgsrc.mk
+SUBST_SED.lib+=                -e 's|@COMPILER_RPATH_FLAG@|${COMPILER_RPATH_FLAG}|g'
+SUBST_SED.lib+=                -e 's|@OO_LIBDIR@|${OO_PREFIX}/program|g'
+.for pkg in db4 expat icu jpeg zlib
+LIB.${pkg}=            -L${BUILDLINK_PREFIX.${pkg}}/lib
+LIB.${pkg}+=           ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.${pkg}}/lib
+SUBST_SED.lib+=                -e 's|@LIB_${pkg}@|${LIB.${pkg}}|g'
+LIBS+=                 ${LIB.${pkg}}
 .endfor
 
 CONFIGURE_ENV+=                LIBS=${LIBS:O:u:Q}
 CONFIGURE_ENV+=                X_LIBS=${X11_LDFLAGS:M*:Q}
 CONFIGURE_ENV+=                BLNK_PREFIX_db4=${BUILDLINK_PREFIX.db4}
 CONFIGURE_ENV+=                BLNK_PREFIX_nas=${BUILDLINK_PREFIX.nas}
+CONFIGURE_ENV+=                USE_BUILTIN_openssl=${USE_BUILTIN.openssl}
 
 CONFIGURE_ARGS+=       --with-use-shell=bash
 CONFIGURE_ARGS+=       --enable-binfilter
@@ -85,10 +89,12 @@
 CONFIGURE_ARGS+=       --with-system-db
 CONFIGURE_ARGS+=       --with-system-expat
 CONFIGURE_ARGS+=       --with-system-freetype
+CONFIGURE_ARGS+=       --with-system-icu
 CONFIGURE_ARGS+=       --with-system-jpeg
 CONFIGURE_ARGS+=       --with-system-libxml2
 CONFIGURE_ARGS+=       --with-system-libxslt
 CONFIGURE_ARGS+=       --with-system-neon
+CONFIGURE_ARGS+=       --with-system-openssl
 CONFIGURE_ARGS+=       --with-system-python
 CONFIGURE_ARGS+=       --with-system-zlib
 CONFIGURE_ARGS+=       --with-dynamic-xinerama
@@ -113,13 +119,16 @@
 OO_RELEASE=            OpenOffice.org${OO_VER}
 PLIST_SRC=             ${PKGDIR}/PLIST
 PLIST_SRC+=            ${WRKDIR}/PLIST
-MESSAGE_SUBST+=                OO_RELEASE=${OO_RELEASE}
-INSTALLATION_DIRS=     bin ${OO_RELEASE} share/applications
+PLIST_SUBST+=          OO_UNXNAME=${OO_UNXNAME}
+MESSAGE_SUBST+=                DESTDIR=${DESTDIR}
+MESSAGE_SUBST+=                OO_PREFIX=${OO_PREFIX}
+INSTALLATION_DIRS=     bin lib/${OO_RELEASE} share/applications
 
 OO_UNXNAME=    openoffice.org2.4
 OO_PKGPATH=    ${WRKSRC}/instsetoo_native/${OPENOFFICE_OUTPATH}.pro/OpenOffice/portable/install
-OO_PKGROOT=    /opt/${OO_UNXNAME}
+OO_LANGPACKPATH=${WRKSRC}/instsetoo_native/${OPENOFFICE_OUTPATH}.pro/OpenOffice_languagepack/portable/install
 OO_PROGRAMS=   scalc sdraw simpress soffice swriter unopkg
+OO_PREFIX=     ${DESTDIR}${PREFIX}/lib/${OO_RELEASE}
 
 post-extract:
        cd ${WRKSRC}/bridges/source/cpp_uno &&                  \
@@ -128,48 +137,45 @@
        cp -Rp gcc3_freebsd_x86-64 gcc3_netbsd_x86-64
 
 do-build:
-       ${_ULIMIT_CMD} ${SETENV} ${MAKE_ENV} bash -c "cd ${WRKSRC} && ./bootstrap && source ${OPENOFFICE_SETFILE}Env.Set.sh && dmake build_all"
+       ${_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 openoffice_${OO_BASELANG} && dmake ooolanguagepack"
 
 post-build:
-       cd ${WRKDIR} &&                                         \
-       rm -fr opt &&                                           \
-       for l in ${OO_LANGS}; do                                \
-               for f in ${OO_PKGPATH:Q}/$${l}/*/*.sw; do       \
-                       tar xpfk $$f;                           \
-               done;                                           \
-       done
-       cd ${WRKDIR} &&                                         \
-       rm -fr xdg &&                                           \
-       mv opt/${OO_UNXNAME}/share/xdg .
-       cd ${WRKDIR}${OO_PKGROOT} &&                            \
-       chmod ${SHAREMODE} program/hid.lst program/testtoolrc
        ${ECHO} "#!${SH}" > ${WRKDIR}/${OO_UNXNAME}
-       ${ECHO} "exec ${PREFIX}/${OO_RELEASE}/program/soffice \"\$$@\"" \
+       ${ECHO} "exec ${OO_PREFIX}/program/soffice \"\$$@\""    \
                >> ${WRKDIR}/${OO_UNXNAME}
        ${ECHO} "#!${SH}" > ${WRKDIR}/${OO_UNXNAME}-printeradmin
-       ${ECHO} "exec ${PREFIX}/${OO_RELEASE}/program/spadmin"  \
+       ${ECHO} "exec ${OO_PREFIX}/program/spadmin"             \
                >> ${WRKDIR}/${OO_UNXNAME}-printeradmin
 
 do-install:
-       cd ${WRKDIR}${OO_PKGROOT} &&                            \
-       tar cf - . | tar Cxpf ${DESTDIR}${PREFIX}/${OO_RELEASE} -
+       cd ${OO_PREFIX} &&                                      \
+       for f in ${OO_PKGPATH:Q}/${OO_BASELANG}/*/*.sw; do      \
+               tar xpf $$f;                                    \
+       done;
+       for lang in ${OO_LANGPACKS}; do                         \
+               for f in ${OO_LANGPACKPATH:Q}/$$lang/*/*.sw; do \
+                       tar xpf $$f;                            \
+               done;                                           \
+       done
+       for d in ${OO_PREFIX}/share/xdg/*; do                   \
+               ln -s $$d ${DESTDIR}${PREFIX}/share/applications;       \
+       done
+       cd ${OO_PREFIX}/program &&                              \
+       chmod ${SHAREMODE} hid.lst testtoolrc
        for f in ${OO_PROGRAMS}; do                             \
-               ln -sf ${DESTDIR}${PREFIX}/${OO_RELEASE}/program/$$f    \
-                       ${DESTDIR}${PREFIX}/bin/$$f;                    \
+               ln -sf ${OO_PREFIX}/program/$$f                 \
+                       ${DESTDIR}${PREFIX}/bin/$$f;            \
        done
-       ${INSTALL_DATA} ${WRKDIR}/xdg/* ${DESTDIR}${PREFIX}/share/applications
        ${INSTALL_SCRIPT} ${WRKDIR}/${OO_UNXNAME} ${DESTDIR}${PREFIX}/bin
        ${INSTALL_SCRIPT} ${WRKDIR}/${OO_UNXNAME}-printeradmin  \
                ${DESTDIR}${PREFIX}/bin
 
 post-install:
        cd ${DESTDIR}${PREFIX} &&                               \
-       find ${OO_RELEASE} \! -type d -print |                  \
+       find lib/${OO_RELEASE} \! -type d -print |              \
        sort > ${WRKDIR}/PLIST &&                               \
-       find ${OO_RELEASE} -type d -print | sort -r |           \
+       find lib/${OO_RELEASE} -type d -print | sort -r |       \
        awk '{print("@dirrm "$$1)}' >> ${WRKDIR}/PLIST
-       ${ECHO} bin/${OO_UNXNAME} >> ${WRKDIR}/PLIST
-       ${ECHO} bin/${OO_UNXNAME}-printeradmin >> ${WRKDIR}/PLIST
 
 # OS specific Makefile
 .if exists(Makefile.${OPSYS})
@@ -187,7 +193,9 @@
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
+.include "../../textproc/icu/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
diff -r e369314123c1 -r dfeed7218fd1 misc/openoffice2/PLIST
--- a/misc/openoffice2/PLIST    Fri Oct 31 11:00:50 2008 +0000
+++ b/misc/openoffice2/PLIST    Fri Oct 31 11:02:55 2008 +0000
@@ -1,10 +1,12 @@
-@comment $NetBSD: PLIST,v 1.4 2008/09/20 19:01:55 hira Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/10/31 11:02:55 hira Exp $
 bin/scalc
 bin/sdraw
 bin/simpress
 bin/soffice
 bin/swriter
 bin/unopkg
+bin/${OO_UNXNAME}
+bin/${OO_UNXNAME}-printeradmin
 share/applications/base.desktop
 share/applications/calc.desktop
 share/applications/draw.desktop
@@ -12,5 +14,5 @@
 share/applications/impress.desktop
 share/applications/math.desktop
 share/applications/printeradmin.desktop
-share/applications/qstart.desktop
+${PLIST.gtk2}share/applications/qstart.desktop
 share/applications/writer.desktop
diff -r e369314123c1 -r dfeed7218fd1 misc/openoffice2/distinfo
--- a/misc/openoffice2/distinfo Fri Oct 31 11:00:50 2008 +0000
+++ b/misc/openoffice2/distinfo Fri Oct 31 11:02:55 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.47 2008/10/31 11:00:50 hira Exp $
+$NetBSD: distinfo,v 1.48 2008/10/31 11:02:55 hira Exp $
 
 SHA1 (openoffice-2.4.2/OOo_2.4.2_src_binfilter.tar.bz2) = 1c7f652c71ad3364a98d79d4f6751db00c7daa99
 RMD160 (openoffice-2.4.2/OOo_2.4.2_src_binfilter.tar.bz2) = 09662444f359f86bb7eeec0c035ae29360e989e5
@@ -26,7 +26,7 @@
 SHA1 (patch-ar) = e3592ddc51a311a90d727ef8b595944a0ac3e623
 SHA1 (patch-as) = 55e38c869518e673e8554b2645c1adfb28f6faec
 SHA1 (patch-aw) = fdd1665c729cd17d8381ab39f2e6672164a058ad
-SHA1 (patch-ba) = 9abaa68d6d48d69273c5f49c25e646de3abf7658
+SHA1 (patch-ba) = 1cc6fcc5ae1964bab7bf0be281ecc33297aba1c6
 SHA1 (patch-bb) = a2fe8b7aff8c875bdf15c70619b430f1fdbfa053
 SHA1 (patch-bc) = a97ec5574d4ef2f2fbdf411ae2c8d49d9f434077
 SHA1 (patch-bd) = f206fef46a0741139ae776f95d2a01f794989fb5
@@ -41,30 +41,32 @@
 SHA1 (patch-bn) = a891c1620a53d9c25cf414232a80a4cdb54e0e27
 SHA1 (patch-bo) = 3e4bcccd0a7cea535e443d750039fa844380f8bc
 SHA1 (patch-bp) = 9005edd4a24bfa32b5e5a731ed626fb35d0b675e
-SHA1 (patch-bq) = b2402ee86620726d5628f4bd5ebaec2c2a29726b
-SHA1 (patch-br) = 5ffb7dd1e313ef0e6fc65da7c4380244840d80ca
+SHA1 (patch-bq) = 486c7e8198e2d8342e4472871bb31fc0b1321286
 SHA1 (patch-bs) = ede4ffcb762e89efbf95b6e4b644eb268534f1ca
 SHA1 (patch-bt) = f52b0fa4453a580ac256accf221aef0f2c059661
 SHA1 (patch-bv) = bc035bdbc8420666a52417f2226e3e687d199e33
 SHA1 (patch-bw) = e0d438f886e97c0342f56ba155ebb6a7e9414093
 SHA1 (patch-bx) = 157878e1fb4297f118ed0bbf06009506666fbc1c
 SHA1 (patch-by) = 1612b765467e51ca7498497d38a0bb6ac694f9a6
-SHA1 (patch-ch) = be68bf0e05b2d80102fb098f703bf80bb4fa6abc
+SHA1 (patch-ch) = 751f14379d9274690c3f6aa0fe30322af2822e1f
 SHA1 (patch-ci) = 4743cee1c391e04a53bd83f6ae7e58e737d08d1e
 SHA1 (patch-cj) = 45ff359ec795e5ef5c692e954d88912c74017162
 SHA1 (patch-cn) = 67afccde1d7bfa42ec4082067189da23ada97190
 SHA1 (patch-cp) = 35151ba658859c9d116ccdf44ec372c9e66435b1
 SHA1 (patch-cq) = 6691fd7fa330db000ec5a9319bf9030b83aa593d
 SHA1 (patch-cr) = aa797461919635c3e6aaa30678a7585d5640dedd
-SHA1 (patch-cs) = 55f2296e74c80f32ea548d38c4bbd9114e403fd3
+SHA1 (patch-cs) = 01e2cb3ac9eab523540bd6d388081cccc425e204
 SHA1 (patch-ct) = a06c5cbc543acecb4f18e858cd844302bbdb50b4
 SHA1 (patch-cu) = b930fd94413c2bdf23ea94b074e3bb5e93784009
 SHA1 (patch-cv) = 2e14a54d369a255ee39fcec7d4f1d2b11a8f4d2e
 SHA1 (patch-cw) = 9c122919fed1b77bfc2edeb5297a7f6bdf4d45ae
-SHA1 (patch-cx) = 1c2efe192b0535ff6b2dc59e6a138c9931e6e946
+SHA1 (patch-cx) = b718aa55917eaf42d4d4868cab46503e6c8c538d
 SHA1 (patch-cy) = 8d47bcf1da6f351f4f0cbf6a8355903094b0baee
-SHA1 (patch-da) = c2c9332dcf22d2d201215813ac9fc7e7ac401c6d
 SHA1 (patch-dc) = 2a6b826ca2849110f33c612a4c4beba8f7e27e67
 SHA1 (patch-dd) = d733d6e54db93bbb7be5382ddf96cf83731a6176
 SHA1 (patch-de) = 138fbea73fec80c744c3eede57dfe5f1cddef573
-SHA1 (patch-dy) = 12d93711aa31d7deeb50022cc88cc7c243a098dd
+SHA1 (patch-dt) = 0b3c91b128b2b0dbe7492665b44f4383379e2067
+SHA1 (patch-du) = 6aac97b36a36c2200ed56429e7a03b88481c4858
+SHA1 (patch-dy) = 4af56ef04180ab3dec7d0051e4075e84b62c8405
+SHA1 (patch-ec) = 05f45563ab1f27984e81945a4ea2ddd9e40b16ac
+SHA1 (patch-ed) = 37a3a9527c74500dbcd047f90f218f57d059548f
diff -r e369314123c1 -r dfeed7218fd1 misc/openoffice2/options.mk
--- a/misc/openoffice2/options.mk       Fri Oct 31 11:00:50 2008 +0000
+++ b/misc/openoffice2/options.mk       Fri Oct 31 11:02:55 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.20 2008/10/01 22:30:35 hira Exp $
+# $NetBSD: options.mk,v 1.21 2008/10/31 11:02:55 hira Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.openoffice2
 PKG_SUPPORTED_OPTIONS=         cups gnome gtk2 kde nas ooo-external-libwpd
@@ -12,7 +12,7 @@
                                nb nl nn nr ns oc or-IN pa-IN pl pt pt-BR ru \
                                rw sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER \
                                ta-IN th tn tr ts tg ur-IN uk ve vi xh zh-CN \
-                               zh-TW zu
+                               zh-TW zu all
 .for l in ${OO_SUPPORTED_LANGUAGES}
 PKG_SUPPORTED_OPTIONS+=                lang-${l}
 .endfor
@@ -22,10 +22,19 @@
 .include "../../mk/bsd.options.mk"
 .include "../../mk/bsd.prefs.mk"
 
-.for l in ${PKG_OPTIONS:Mlang-*}
-OO_LANGS+=     ${l:S/^lang-//1}
-.endfor
+.if !empty(PKG_OPTIONS:Mlang-all)
+OO_LANGS=      ALL
+OO_BASELANG=   en-US
+OO_LANGPACKS=  ${OO_SUPPORTED_LANGUAGES:S/en-US//1:S/all//1}
+.else
+.  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}
 
 .if !empty(PKG_OPTIONS:Mfirefox)
 CONFIGURE_ARGS+=       --with-system-mozilla=firefox
@@ -47,6 +56,12 @@
 CONFIGURE_ARGS+=       --disable-mozilla
 .endif
 
+SUBST_CLASSES+=                browser
+SUBST_STAGE.browser=   post-patch
+SUBST_MESSAGE.browser= Adding MOZ_FLAVOUR
+SUBST_FILES.browser=   shell/source/unix/misc/open-url.sh
+SUBST_SED.browser+=    -e 's,@MOZ_FLAVOUR@,${MOZ_FLAVOUR},g'
+
 .if !empty(PKG_OPTIONS:Mooo-external-libwpd)