[pkgsrc/trunk]: pkgsrc/misc/openoffice2 Update to 2.2.0. OK'd by wiz@ for up...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/misc/openoffice2 Update to 2.2.0. OK'd by wiz@ for up...
From: hira <hira%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 04:45:03 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/4fde3eca078b
branches:  trunk
changeset: 527321:4fde3eca078b
user:      hira <hira%pkgsrc.org@localhost>
date:      Thu Apr 05 23:24:01 2007 +0000

description:
Update to 2.2.0.  OK'd by wiz@ for update during freeze.

Release Notes:
 http://development.openoffice.org/releases/2.2.0.html

Changes:
 - Fix CVE-2007-0002, CVE-2007-0238, CVE-2007-0239.
 - field lengths of bibliography database changed.
 - UTF-8 encoding for dBase databases.
 - "Edit in SQL View..." command for database queries.
 - forms: date and time fields do not default to "Today" and "Now" anymore.
 - query/relation design: visual marker indicating the type of table/query.
 - advanced database setting: "Use keyword AS before table alias names".
 - Annoying focus behavior of OOo was fixed.
 - scaling in spadmin page property page deleted.
 - Additional options for pdf export.
 - Desktop-Integration package for slackware.
 - Show/Hide Slide menu entry split into two entries.
 - Support for NetBSD, Linux 64 bit, Linux SPARC in TestTool Environment.
 - New behavior of "Insert - Sheet From File".
 - Import MS Excel files with PivotTables based on external data.
 - Insert/Delete Note in cell context menu.
 - some UNO Remote Protocol (URP) changes.
 - Extension Dependency OpenOffice.org-minimal-version.
 - Export COT, ACOT, COTH, and ACOTH to MS Excel files.
 - System integration for extensions.
 - Online Update for Extensions.
 - Localization of UNO Dialogs.
 - OOo no longer generates sensitive UUIDs.
 - Autokerning enabled by default.
 - CVS import dialog for unformatted clipboard text.
 - Ordinal suffix in AutoFill.
 - simple protocolhandler add-on support in uno-skeletonmaker.
 - Autokerning enabled by default.
 - Create Tango icon set for OO.o.
 - Add localisation support to UNO dialogs and IDE Dialog Editor.
 - extend add-on support in the uno-skeletonmaker.
 - Upgrade icu to latest version.
 - Implement an optional help section in the ObjectInspector.
 - additional PDF export features
 - makes localize.sdf files optional.
 - Add/update Slovenian templates for 2.1.
 - update of icons.
 - changes for soffice script.
 - implement shaped system windows.
 - Updates of OOo <-> ATK bridge.
 - #139464# use #REF! errors in formulas using cells from missing
   external linked sheets.
 - Tooling fixes for CWS and MWS handling.
 - Remove SISSL from module filter.
 - make the 'automatic update check' more consistent.
 - code only cws, adds infrastructure for vba interop project.
 - Prepare framework code to support inplace active objects that are
   not UIactive.
 - Some bugs, some very minor UNO runtime features.
 - Changed context menu (insert/delete note) for Calc cells.
 - new buildsystem features.
 - Improve line height compatibility on UNX platforms while keeping
   the layout backwards compatible.
 - Preparing installation of extensions in installation sets.
 - osl[in|de]crementInterlockedCount(): don't use "lock" prefix on
   single processor, single core, non HT machines.
 - Clean up obsolete files in binfilter.
 - Bug fixes.

diffstat:

 misc/openoffice2/Makefile             |   19 +--
 misc/openoffice2/Makefile.NetBSD.i386 |    6 +-
 misc/openoffice2/distinfo             |   61 +++++------
 misc/openoffice2/patches/patch-ah     |  164 +++++++++++++++++-----------------
 misc/openoffice2/patches/patch-ai     |   20 ++--
 misc/openoffice2/patches/patch-ak     |   25 ++++-
 misc/openoffice2/patches/patch-ba     |    9 +-
 misc/openoffice2/patches/patch-bg     |   63 +------------
 misc/openoffice2/patches/patch-bo     |   20 ++--
 misc/openoffice2/patches/patch-bq     |   28 +----
 misc/openoffice2/patches/patch-bw     |   10 +-
 misc/openoffice2/patches/patch-by     |    4 +-
 misc/openoffice2/patches/patch-bz     |   25 -----
 misc/openoffice2/patches/patch-ca     |   13 --
 misc/openoffice2/patches/patch-cb     |   14 --
 misc/openoffice2/patches/patch-cc     |   18 ---
 misc/openoffice2/patches/patch-cd     |   44 ---------
 misc/openoffice2/patches/patch-ce     |   24 ----
 misc/openoffice2/patches/patch-cf     |   26 -----
 misc/openoffice2/patches/patch-cg     |   75 ---------------
 20 files changed, 182 insertions(+), 486 deletions(-)

diffs (truncated from 885 to 300 lines):

diff -r d586dfb9fd28 -r 4fde3eca078b misc/openoffice2/Makefile
--- a/misc/openoffice2/Makefile Thu Apr 05 20:47:10 2007 +0000
+++ b/misc/openoffice2/Makefile Thu Apr 05 23:24:01 2007 +0000
@@ -1,19 +1,18 @@
-# $NetBSD: Makefile,v 1.13 2007/04/01 23:50:59 hira Exp $
+# $NetBSD: Makefile,v 1.14 2007/04/05 23:24:01 hira Exp $
 #
 
-OO_VER=                        2.1.0
+OO_VER=                        2.2.0
 DISTNAME=              openoffice-${OO_VER}
 PKGNAME=               openoffice2-${OO_VER}
-PKGREVISION=           5
 CATEGORIES=            misc
 MASTER_SITES=          ${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/}
 DIST_SUBDIR=           ${DISTNAME}
 
-DISTFILES=             OOo_${OO_VER}_src.tar.bz2
+DISTFILES=             OOo_${OO_VER}_src_core.tar.bz2
 DISTFILES+=            OOo_${OO_VER}_src_binfilter.tar.bz2
+DISTFILES+=            OOo_${OO_VER}_src_l10n.tar.bz2
 #DISTFILES+=           OOo_${OO_VER}_src_sdk.tar.bz2
 DISTFILES+=            OOo_${OO_VER}_src_system.tar.bz2
-DISTFILES+=            OOo_${OO_VER}_src_l10n.tar.bz2
 # Missing file from tarball...
 DISTFILES+=            bridge.h
 SITES.bridge.h=                http://www.openoffice.org/source/browse/%2Acheckout%2A/udk/bridges/inc/bridges/cpp_uno/Attic/
@@ -29,14 +28,12 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-WRKSRC=                        ${WRKDIR}/OOE680_m6
+WRKSRC=                        ${WRKDIR}/OOF680_m14
 CONFIGURE_DIRS=                config_office
 
+# Cannot compile with 3.3.x (GCC Bugzilla Bug 16879).
+GCC_REQD+=             3.4
 USE_LANGUAGES+=                c c++
-GCC_REQD+=             3.0
-.if !empty(MACHINE_PLATFORM:MNetBSD-4*)
-USE_PKGSRC_GCC=                YES
-.endif
 
 USE_TOOLS+=            bash gmake imake perl pkg-config tar
 PTHREAD_OPTS+=         require
@@ -87,7 +84,7 @@
 SUBST_SED.X11_LDFLAGS=         -e 's|@X11_LDFLAGS@|${X11_LDFLAGS}|g'
 
 OO_PKGPATH=    ${WRKSRC}/instsetoo_native/${OPENOFFICE_OUTPATH}.pro/OpenOffice/portable/install/${OPENOFFICE_LANGUAGE}
-OO_PKGROOT=    /opt/openoffice.org2.1
+OO_PKGROOT=    /opt/openoffice.org2.2
 OO_PROGRAMS=   scalc sdraw simpress soffice swriter
 
 post-extract:
diff -r d586dfb9fd28 -r 4fde3eca078b misc/openoffice2/Makefile.NetBSD.i386
--- a/misc/openoffice2/Makefile.NetBSD.i386     Thu Apr 05 20:47:10 2007 +0000
+++ b/misc/openoffice2/Makefile.NetBSD.i386     Thu Apr 05 23:24:01 2007 +0000
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile.NetBSD.i386,v 1.1.1.1 2007/02/27 11:55:57 hira Exp $
+# $NetBSD: Makefile.NetBSD.i386,v 1.2 2007/04/05 23:24:01 hira Exp $
 
 OPENOFFICE_DLLSUFFIX=  bi
-OPENOFFICE_OUTPATH=    unxbsdi2
-OPENOFFICE_SETFILE=    NetBSDIntel
+OPENOFFICE_OUTPATH=    unxbsdi3
+OPENOFFICE_SETFILE=    NetBSDX86
diff -r d586dfb9fd28 -r 4fde3eca078b misc/openoffice2/distinfo
--- a/misc/openoffice2/distinfo Thu Apr 05 20:47:10 2007 +0000
+++ b/misc/openoffice2/distinfo Thu Apr 05 23:24:01 2007 +0000
@@ -1,29 +1,29 @@
-$NetBSD: distinfo,v 1.11 2007/04/02 01:25:49 hira Exp $
+$NetBSD: distinfo,v 1.12 2007/04/05 23:24:01 hira Exp $
 
-SHA1 (openoffice-2.1.0/OOo_2.1.0_src.tar.bz2) = 9513216ae71267addf3625f5a41c3a43564da3bc
-RMD160 (openoffice-2.1.0/OOo_2.1.0_src.tar.bz2) = 11256b125fdc412480d90983b0f80f35d4833e9a
-Size (openoffice-2.1.0/OOo_2.1.0_src.tar.bz2) = 122566860 bytes
-SHA1 (openoffice-2.1.0/OOo_2.1.0_src_binfilter.tar.bz2) = 7c3c9ea5217f7cd5ee46dee90ce71f4e8fab3137
-RMD160 (openoffice-2.1.0/OOo_2.1.0_src_binfilter.tar.bz2) = 69625f4ac6e1c72bf901b69173195009a78d33ba
-Size (openoffice-2.1.0/OOo_2.1.0_src_binfilter.tar.bz2) = 16349604 bytes
-SHA1 (openoffice-2.1.0/OOo_2.1.0_src_l10n.tar.bz2) = dd50756610e277f2886f6d423d57c084f0bee18a
-RMD160 (openoffice-2.1.0/OOo_2.1.0_src_l10n.tar.bz2) = 4b8e95a35f2222330790a442aa1a9a4988d9d37e
-Size (openoffice-2.1.0/OOo_2.1.0_src_l10n.tar.bz2) = 73603380 bytes
-SHA1 (openoffice-2.1.0/OOo_2.1.0_src_system.tar.bz2) = 77e97d1ed8eb3276e36ac54e4e021f703e40a587
-RMD160 (openoffice-2.1.0/OOo_2.1.0_src_system.tar.bz2) = 936ca8997780a3f53d1226b6b1058ff6ef15a4a5
-Size (openoffice-2.1.0/OOo_2.1.0_src_system.tar.bz2) = 29761970 bytes
-SHA1 (openoffice-2.1.0/bridge.h) = c6db3e96432f27f15a753a65c6bf2e97e64f566a
-RMD160 (openoffice-2.1.0/bridge.h) = 191fb56e56df85d49651988290d20db914670951
-Size (openoffice-2.1.0/bridge.h) = 6734 bytes
+SHA1 (openoffice-2.2.0/OOo_2.2.0_src_binfilter.tar.bz2) = d1fa827e2c08d7e3d67b2588b1136ed9e774ef42
+RMD160 (openoffice-2.2.0/OOo_2.2.0_src_binfilter.tar.bz2) = 1bb07f01e872ed003dbac3e11bc5732904076ae1
+Size (openoffice-2.2.0/OOo_2.2.0_src_binfilter.tar.bz2) = 7763249 bytes
+SHA1 (openoffice-2.2.0/OOo_2.2.0_src_core.tar.bz2) = a3b334c6a855366944e9e1e441a5fbe2f2d7bcb1
+RMD160 (openoffice-2.2.0/OOo_2.2.0_src_core.tar.bz2) = 84e2bfaad21760c5a92a73aac46765ed01638ffa
+Size (openoffice-2.2.0/OOo_2.2.0_src_core.tar.bz2) = 123160673 bytes
+SHA1 (openoffice-2.2.0/OOo_2.2.0_src_l10n.tar.bz2) = fdb120f18310efb95938cdf30a0855ef8456d346
+RMD160 (openoffice-2.2.0/OOo_2.2.0_src_l10n.tar.bz2) = 8b66d4e05ebfbc673eac3a5326f88d5ba0a3e7b2
+Size (openoffice-2.2.0/OOo_2.2.0_src_l10n.tar.bz2) = 76592096 bytes
+SHA1 (openoffice-2.2.0/OOo_2.2.0_src_system.tar.bz2) = 311331016cbc6112e0cf9829d6ef6782acccc01b
+RMD160 (openoffice-2.2.0/OOo_2.2.0_src_system.tar.bz2) = 90ef3a39896a15afc75094c5366f72a0a3237916
+Size (openoffice-2.2.0/OOo_2.2.0_src_system.tar.bz2) = 30976956 bytes
+SHA1 (openoffice-2.2.0/bridge.h) = c6db3e96432f27f15a753a65c6bf2e97e64f566a
+RMD160 (openoffice-2.2.0/bridge.h) = 191fb56e56df85d49651988290d20db914670951
+Size (openoffice-2.2.0/bridge.h) = 6734 bytes
 SHA1 (patch-aa) = 352774b0e509f41787573594b8f8f8bbe72d6824
 SHA1 (patch-ac) = ed6d84d40c3543eed754d74a5e65caf137f31c3d
 SHA1 (patch-ad) = 10d348282a4e5e6907e4e2cd828997f4549be58c
 SHA1 (patch-ae) = eec39a887ad19d3a8ff0a26fab7ea6981915eadd
 SHA1 (patch-ag) = 6c2f17424cfc85b5bc923a650167f14b7acabfd4
-SHA1 (patch-ah) = eec95ecb6833fb7b791b13c54d991f06a40207f1
-SHA1 (patch-ai) = 6a70a013243a5585651d5acebcc3bb8c883885f5
+SHA1 (patch-ah) = 1d54fe3fd237ff053d14626f9a45ef393c90323f
+SHA1 (patch-ai) = eb985085a36647675e3f436e192847f67b5dec8c
 SHA1 (patch-aj) = 740b8829c4f480db0989302231b5c031e2c141e7
-SHA1 (patch-ak) = 227423f0c8303cc5f5ac6f99a0338504bf234c20
+SHA1 (patch-ak) = 2e356501dac8ace8932f4648ca4073cc41188dea
 SHA1 (patch-am) = 8e497298dd5534bd0ef438c22595c1c0f63912a5
 SHA1 (patch-an) = cdf677a8e135fd4b447eef006558c7fea4df0be6
 SHA1 (patch-ao) = a83178adec44571ebcf7a4dd66bda52d004d465c
@@ -32,13 +32,13 @@
 SHA1 (patch-ar) = e3592ddc51a311a90d727ef8b595944a0ac3e623
 SHA1 (patch-as) = 55e38c869518e673e8554b2645c1adfb28f6faec
 SHA1 (patch-aw) = fdd1665c729cd17d8381ab39f2e6672164a058ad
-SHA1 (patch-ba) = 4ab5d321f84a1026660be92f7b1050059099a0cb
+SHA1 (patch-ba) = c98bb40ec9b3cfc1402b1aa86c695d28569f8383
 SHA1 (patch-bb) = a2fe8b7aff8c875bdf15c70619b430f1fdbfa053
 SHA1 (patch-bc) = a97ec5574d4ef2f2fbdf411ae2c8d49d9f434077
 SHA1 (patch-bd) = f206fef46a0741139ae776f95d2a01f794989fb5
 SHA1 (patch-be) = 0aaa31523743f5cc9339c125fc93f32902b90151
 SHA1 (patch-bf) = d2e2363e7e08d675e3a6b9356d1ffac6d10148de
-SHA1 (patch-bg) = 06b12ec243ee3222d444178235cee0f383a2e58f
+SHA1 (patch-bg) = c050b8fa384a187fbf846f78c884c98840046a86
 SHA1 (patch-bh) = 25546cd8fb636a9e0fb0983b83b667567be415e6
 SHA1 (patch-bi) = f9d286d8dd93c7ba99fd0ca809c6dfac5e763464
 SHA1 (patch-bj) = 80685500062b9a17e16732a9a6da7a7d1d1ed1f6
@@ -46,22 +46,17 @@
 SHA1 (patch-bl) = d9d6860e4491863dd5b2f09eeff97e4023dbd23d
 SHA1 (patch-bm) = 0f7367782155c1d0f0459912aac69a1c759ad7fa
 SHA1 (patch-bn) = a891c1620a53d9c25cf414232a80a4cdb54e0e27
-SHA1 (patch-bo) = 276093206a06a66e46f156ef9f7ff360b31b532b
+SHA1 (patch-bo) = 3e4bcccd0a7cea535e443d750039fa844380f8bc
 SHA1 (patch-bp) = 9005edd4a24bfa32b5e5a731ed626fb35d0b675e
-SHA1 (patch-bq) = 90b064150ec3cda4fce4e08f5bdd4504d19218ef
+SHA1 (patch-bq) = dedb5791d5246408d6dfcc4565e75b54666fb1b6
 SHA1 (patch-br) = 5ffb7dd1e313ef0e6fc65da7c4380244840d80ca
 SHA1 (patch-bs) = c6e47b0154a3569b3cb466c7af55e2d2e7a80a12
 SHA1 (patch-bt) = f52b0fa4453a580ac256accf221aef0f2c059661
 SHA1 (patch-bu) = 246771afac29432adbe479e5be3b3c032ad49413
 SHA1 (patch-bv) = bc035bdbc8420666a52417f2226e3e687d199e33
-SHA1 (patch-bw) = aa286260f21820a8c39812fe82ef62e56921a950
+SHA1 (patch-bw) = e0d438f886e97c0342f56ba155ebb6a7e9414093
 SHA1 (patch-bx) = 9d01592c69f0ba734ff488980c475a1b768bc229
-SHA1 (patch-by) = 01ee243687c11a63a53f33d6230ad9cc5a5912ba
-SHA1 (patch-bz) = 1def87419d6d23756ae7ebe743d58599f2e5eddb
-SHA1 (patch-ca) = 0a037963deba73b3611d28441713ae01b83e6380
-SHA1 (patch-cb) = 219dc174e27b7240eabbeb137b6587e9f6983ea4
-SHA1 (patch-cc) = abe48ee14c5ee74ce9a21a727498b50178bec3a3
-SHA1 (patch-cd) = 9b4078f7837e3d40bcc42b0ea1a6544c390058c1
-SHA1 (patch-ce) = 2ff26e78cad7cf534441cc02d58934e44c534330
-SHA1 (patch-cf) = dc2390d6d9b14eaa556b48cda44975e8c0ca5efa
-SHA1 (patch-cg) = cfcb2193044ef7836397b7b1550d6ca4af12a93c
+SHA1 (patch-by) = 1612b765467e51ca7498497d38a0bb6ac694f9a6
+SHA1 (patch-ch) = 4a305872dc6f0e88ebd421232b566fc4c1fa0e3d
+SHA1 (patch-ci) = 2861e8a4b21977cbc8abeabe4581093e966cdfa7
+SHA1 (patch-cj) = c54fd98e5302a86ec849b90c617ebfcf339c936d
diff -r d586dfb9fd28 -r 4fde3eca078b misc/openoffice2/patches/patch-ah
--- a/misc/openoffice2/patches/patch-ah Thu Apr 05 20:47:10 2007 +0000
+++ b/misc/openoffice2/patches/patch-ah Thu Apr 05 23:24:01 2007 +0000
@@ -1,94 +1,94 @@
-$NetBSD: patch-ah,v 1.2 2007/03/04 13:11:18 hira Exp $
+$NetBSD: patch-ah,v 1.3 2007/04/05 23:24:01 hira Exp $
 
---- solenv/inc/_tg_app.mk.orig 2007-02-17 17:28:18.000000000 +0900
-+++ solenv/inc/_tg_app.mk      2007-02-17 17:35:58.000000000 +0900
+--- solenv/inc/_tg_app.mk.orig 2007-01-19 21:53:03.000000000 +0900
++++ solenv/inc/_tg_app.mk      2007-04-01 21:51:19.000000000 +0900
 @@ -87,7 +87,7 @@
-       @+-$(RM) $(MISC)$/$(@:b).cmd
+       @+-$(RM) $(MISC)$/$(TARGET).$(@:b)_1.cmd
        @echo $(APP1LINKER) $(APP1LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-       $(APP1OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(@:b).cmd
--      @cat $(mktmp /dev/null $(APP1LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
-+      @cat $(mktmp /dev/null $(APP1LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
-       @echo $(APP1LINKTYPEFLAG) $(APP1LIBSALCPPRT) $(APP1STDLIBS) $(APP1STDLIB) $(STDLIB1) -o $@ >> $(MISC)$/$(@:b).cmd
-       cat $(MISC)$/$(@:b).cmd
-       @source $(MISC)$/$(@:b).cmd
-@@ -255,7 +255,7 @@
-       @+-$(RM) $(MISC)$/$(@:b).cmd
+       $(APP1OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_1.cmd
+-      @cat $(mktmp /dev/null $(APP1LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_1.cmd
++      @cat $(mktmp /dev/null $(APP1LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_1.cmd
+       @echo $(APP1LINKTYPEFLAG) $(APP1LIBSALCPPRT) $(APP1STDLIBS) $(APP1STDLIB) $(STDLIB1) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_1.cmd
+       cat $(MISC)$/$(TARGET).$(@:b)_1.cmd
+       @source $(MISC)$/$(TARGET).$(@:b)_1.cmd
+@@ -256,7 +256,7 @@
+       @+-$(RM) $(MISC)$/$(TARGET).$(@:b)_2.cmd
        @echo $(APP2LINKER) $(APP2LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-       $(APP2OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(@:b).cmd
--      @cat $(mktmp /dev/null $(APP2LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
-+      @cat $(mktmp /dev/null $(APP2LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
-       @echo $(APP2LINKTYPEFLAG) $(APP2LIBSALCPPRT) $(APP2STDLIBS) $(APP2STDLIB) $(STDLIB2) -o $@ >> $(MISC)$/$(@:b).cmd
-       cat $(MISC)$/$(@:b).cmd
-       @source $(MISC)$/$(@:b).cmd
-@@ -423,7 +423,7 @@
-       @+-$(RM) $(MISC)$/$(@:b).cmd
+       $(APP2OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_2.cmd
+-      @cat $(mktmp /dev/null $(APP2LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_2.cmd
++      @cat $(mktmp /dev/null $(APP2LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_2.cmd
+       @echo $(APP2LINKTYPEFLAG) $(APP2LIBSALCPPRT) $(APP2STDLIBS) $(APP2STDLIB) $(STDLIB2) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_2.cmd
+       cat $(MISC)$/$(TARGET).$(@:b)_2.cmd
+       @source $(MISC)$/$(TARGET).$(@:b)_2.cmd
+@@ -425,7 +425,7 @@
+       @+-$(RM) $(MISC)$/$(TARGET).$(@:b)_3.cmd
        @echo $(APP3LINKER) $(APP3LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-       $(APP3OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(@:b).cmd
--      @cat $(mktmp /dev/null $(APP3LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
-+      @cat $(mktmp /dev/null $(APP3LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
-       @echo $(APP3LINKTYPEFLAG) $(APP3LIBSALCPPRT) $(APP3STDLIBS) $(APP3STDLIB) $(STDLIB3) -o $@ >> $(MISC)$/$(@:b).cmd
-       cat $(MISC)$/$(@:b).cmd
-       @source $(MISC)$/$(@:b).cmd
-@@ -591,7 +591,7 @@
-       @+-$(RM) $(MISC)$/$(@:b).cmd
+       $(APP3OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_3.cmd
+-      @cat $(mktmp /dev/null $(APP3LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_3.cmd
++      @cat $(mktmp /dev/null $(APP3LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_3.cmd
+       @echo $(APP3LINKTYPEFLAG) $(APP3LIBSALCPPRT) $(APP3STDLIBS) $(APP3STDLIB) $(STDLIB3) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_3.cmd
+       cat $(MISC)$/$(TARGET).$(@:b)_3.cmd
+       @source $(MISC)$/$(TARGET).$(@:b)_3.cmd
+@@ -594,7 +594,7 @@
+       @+-$(RM) $(MISC)$/$(TARGET).$(@:b)_4.cmd
        @echo $(APP4LINKER) $(APP4LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-       $(APP4OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(@:b).cmd
--      @cat $(mktmp /dev/null $(APP4LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
-+      @cat $(mktmp /dev/null $(APP4LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
-       @echo $(APP4LINKTYPEFLAG) $(APP4LIBSALCPPRT) $(APP4STDLIBS) $(APP4STDLIB) $(STDLIB4) -o $@ >> $(MISC)$/$(@:b).cmd
-       cat $(MISC)$/$(@:b).cmd
-       @source $(MISC)$/$(@:b).cmd
-@@ -759,7 +759,7 @@
-       @+-$(RM) $(MISC)$/$(@:b).cmd
+       $(APP4OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_4.cmd
+-      @cat $(mktmp /dev/null $(APP4LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_4.cmd
++      @cat $(mktmp /dev/null $(APP4LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_4.cmd
+       @echo $(APP4LINKTYPEFLAG) $(APP4LIBSALCPPRT) $(APP4STDLIBS) $(APP4STDLIB) $(STDLIB4) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_4.cmd
+       cat $(MISC)$/$(TARGET).$(@:b)_4.cmd
+       @source $(MISC)$/$(TARGET).$(@:b)_4.cmd
+@@ -763,7 +763,7 @@
+       @+-$(RM) $(MISC)$/$(TARGET).$(@:b)_5.cmd
        @echo $(APP5LINKER) $(APP5LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-       $(APP5OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(@:b).cmd
--      @cat $(mktmp /dev/null $(APP5LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
-+      @cat $(mktmp /dev/null $(APP5LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
-       @echo $(APP5LINKTYPEFLAG) $(APP5LIBSALCPPRT) $(APP5STDLIBS) $(APP5STDLIB) $(STDLIB5) -o $@ >> $(MISC)$/$(@:b).cmd
-       cat $(MISC)$/$(@:b).cmd
-       @source $(MISC)$/$(@:b).cmd
-@@ -927,7 +927,7 @@
-       @+-$(RM) $(MISC)$/$(@:b).cmd
+       $(APP5OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_5.cmd
+-      @cat $(mktmp /dev/null $(APP5LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_5.cmd
++      @cat $(mktmp /dev/null $(APP5LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_5.cmd
+       @echo $(APP5LINKTYPEFLAG) $(APP5LIBSALCPPRT) $(APP5STDLIBS) $(APP5STDLIB) $(STDLIB5) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_5.cmd
+       cat $(MISC)$/$(TARGET).$(@:b)_5.cmd
+       @source $(MISC)$/$(TARGET).$(@:b)_5.cmd
+@@ -932,7 +932,7 @@
+       @+-$(RM) $(MISC)$/$(TARGET).$(@:b)_6.cmd
        @echo $(APP6LINKER) $(APP6LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-       $(APP6OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(@:b).cmd
--      @cat $(mktmp /dev/null $(APP6LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
-+      @cat $(mktmp /dev/null $(APP6LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
-       @echo $(APP6LINKTYPEFLAG) $(APP6LIBSALCPPRT) $(APP6STDLIBS) $(APP6STDLIB) $(STDLIB6) -o $@ >> $(MISC)$/$(@:b).cmd
-       cat $(MISC)$/$(@:b).cmd
-       @source $(MISC)$/$(@:b).cmd
-@@ -1095,7 +1095,7 @@
-       @+-$(RM) $(MISC)$/$(@:b).cmd
+       $(APP6OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_6.cmd
+-      @cat $(mktmp /dev/null $(APP6LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_6.cmd
++      @cat $(mktmp /dev/null $(APP6LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_6.cmd
+       @echo $(APP6LINKTYPEFLAG) $(APP6LIBSALCPPRT) $(APP6STDLIBS) $(APP6STDLIB) $(STDLIB6) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_6.cmd
+       cat $(MISC)$/$(TARGET).$(@:b)_6.cmd
+       @source $(MISC)$/$(TARGET).$(@:b)_6.cmd
+@@ -1101,7 +1101,7 @@
+       @+-$(RM) $(MISC)$/$(TARGET).$(@:b)_7.cmd
        @echo $(APP7LINKER) $(APP7LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-       $(APP7OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(@:b).cmd
--      @cat $(mktmp /dev/null $(APP7LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
-+      @cat $(mktmp /dev/null $(APP7LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
-       @echo $(APP7LINKTYPEFLAG) $(APP7LIBSALCPPRT) $(APP7STDLIBS) $(APP7STDLIB) $(STDLIB7) -o $@ >> $(MISC)$/$(@:b).cmd
-       cat $(MISC)$/$(@:b).cmd
-       @source $(MISC)$/$(@:b).cmd
-@@ -1263,7 +1263,7 @@
-       @+-$(RM) $(MISC)$/$(@:b).cmd
+       $(APP7OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_7.cmd
+-      @cat $(mktmp /dev/null $(APP7LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_7.cmd
++      @cat $(mktmp /dev/null $(APP7LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_7.cmd
+       @echo $(APP7LINKTYPEFLAG) $(APP7LIBSALCPPRT) $(APP7STDLIBS) $(APP7STDLIB) $(STDLIB7) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_7.cmd
+       cat $(MISC)$/$(TARGET).$(@:b)_7.cmd
+       @source $(MISC)$/$(TARGET).$(@:b)_7.cmd
+@@ -1270,7 +1270,7 @@
+       @+-$(RM) $(MISC)$/$(TARGET).$(@:b)_8.cmd
        @echo $(APP8LINKER) $(APP8LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-       $(APP8OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(@:b).cmd
--      @cat $(mktmp /dev/null $(APP8LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Note update of lang/ruby18-base package to 1.8.6nb1.
Next by Date: [pkgsrc/trunk]: pkgsrc/lang/ruby18-base Fix INSTALL script to check proper di...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Note update of lang/ruby18-base package to 1.8.6nb1.
Next by Thread: [pkgsrc/trunk]: pkgsrc/lang/ruby18-base Fix INSTALL script to check proper di...
Indexes:
Home | Main Index | Thread Index | Old Index