svn commit: r554693 - in head/editors/openoffice-4: . files
Don Lewis
truckman at FreeBSD.org
Mon Nov 9 09:23:57 UTC 2020
Author: truckman
Date: Mon Nov 9 09:23:56 2020
New Revision: 554693
URL: https://svnweb.freebsd.org/changeset/ports/554693
Log:
Upgrade editors/openoffice-4 to version 4.1.8.
Fix bugs in LICENSE_FILE extraction.
Don't pass LD_FLAGS to the inner make. It can cause problems.
Many of our local patches have been upstreamed.
Added:
head/editors/openoffice-4/files/patch-configure.ac
- copied, changed from r554692, head/editors/openoffice-4/files/patch-configure.in
Deleted:
head/editors/openoffice-4/files/patch-basebmp_inc_basebmp_packedpixeliterator.hxx
head/editors/openoffice-4/files/patch-boost1.67
head/editors/openoffice-4/files/patch-boost_boost__1__55__0.patch
head/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_uno2cpp.cxx
head/editors/openoffice-4/files/patch-clang40
head/editors/openoffice-4/files/patch-configure.in
head/editors/openoffice-4/files/patch-gmake43
head/editors/openoffice-4/files/patch-icu_makefile.mk
head/editors/openoffice-4/files/patch-l10ntools_source_inireader.cxx
head/editors/openoffice-4/files/patch-lingucomponent_source_spellcheck_spell_sspellimp.cxx
head/editors/openoffice-4/files/patch-nss
head/editors/openoffice-4/files/patch-openjdk8
head/editors/openoffice-4/files/patch-openoffice4_powerpc64
head/editors/openoffice-4/files/patch-r1728872
head/editors/openoffice-4/files/patch-scaddins_source_analysis_analysishelper.hxx
head/editors/openoffice-4/files/patch-solenv_gbuild_platform_freebsd.mk
head/editors/openoffice-4/files/patch-solenv_inc_unxfbsd.mk
head/editors/openoffice-4/files/patch-vcl_source_glyphs_graphite__layout.cxx
Modified:
head/editors/openoffice-4/Makefile
head/editors/openoffice-4/distinfo
Modified: head/editors/openoffice-4/Makefile
==============================================================================
--- head/editors/openoffice-4/Makefile Mon Nov 9 08:58:30 2020 (r554692)
+++ head/editors/openoffice-4/Makefile Mon Nov 9 09:23:56 2020 (r554693)
@@ -3,7 +3,6 @@
PORTNAME= apache-openoffice
PORTVERSION= ${AOOVERSION}
-PORTREVISION= 4
CATEGORIES= editors java
MASTER_SITES= APACHE/openoffice/${PORTVERSION}/source \
http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \
@@ -112,10 +111,10 @@ CONFLICTS_INSTALL= apache-openoffice-devel-*
AOOVERSION1= 4
AOOVERSION2= 1
-AOOVERSION3= 7
+AOOVERSION3= 8
# From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD
-AOOTAG= AOO417m1\(Build:9800\)
-GITREVISION= 46059c9192
+AOOTAG= AOO418m3\(Build:9803\)
+GITREVISION= 18848f57b6
EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz
AOOVERSION= ${AOOVERSION1}.${AOOVERSION2}.${AOOVERSION3}
@@ -199,7 +198,7 @@ CONFIGURE_ARGS+= --enable-symbols
.include <${FILESDIR}/Makefile.localized>
-PYTHON_DISTFILE= 1d8728eb0dfcac72a0fd99c17ec7f386-Python-2.7.6.tgz
+PYTHON_DISTFILE= 38c84292658ed4456157195f1c9bcbe1-Python-2.7.18.tgz
GCC_EXTRA_DISTFILES= d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 \
d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz
@@ -234,7 +233,7 @@ PACKAGE_PREFIX= Apache_OpenOffice
LOCALIZED_LANG?= en-US
-AOO_MAKE_ENV= ${MAKE_ENV:NCPPFLAGS=*:NCFLAGS=*:NCXXFLAGS=*}
+AOO_MAKE_ENV= ${MAKE_ENV:NCPPFLAGS=*:NCFLAGS=*:NCXXFLAGS=*:NLDFLAGS=*}
GNU_CONFIGURE= yes
WRKSUBDIR= ${WRKDIR}/aoo-${AOOVERSION}
@@ -363,10 +362,14 @@ post-extract:
-e d ${WRKSRC}/LICENSE_category_b >> ${LICENSE_FILE_MIT}
${SED} -e '\|^For Saxon|,/^__/p' \
-e d ${WRKSRC}/LICENSE_category_b > ${LICENSE_FILE_MPL10}
- ${SED} -e '\|^For Saxon|,$$d' \
- ${WRKSRC}/LICENSE_category_b > ${LICENSE_FILE_MPL11}
+ ${SED} -e '\|^The following Licenses have some restrictions|,/^- For Network/p' \
+ -e d ${WRKSRC}/LICENSE_category_b | \
+ ${SED} -e :a -e '$d;N;2,3ba' -e 'P;D' > ${LICENSE_FILE_MPL11}
${SED} -e '\|^For main/filter/source/config/tools/merge/pyAltFCFGMerge|,/^__/p' \
-e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_PSFL}
+ ${ECHO} '' >> ${LICENSE_FILE_PSFL}
+ ${SED} -e '\|^For Python|,/^__/p' \
+ -e d ${WRKSRC}/LICENSE >> ${LICENSE_FILE_PSFL}
${SED} -e '\|^For main/twain|,/^__/p' \
-e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_TWAIN}
${SED} -e '\|^For main/MathMLDTD|,/^__/p' \
@@ -377,8 +380,6 @@ post-patch:
${WRKSRC}/sysui/desktop/productversion.mk
${REINPLACE_CMD} -e "s|%%JAVA_HOME%%|${JAVA_HOME}|" \
${WRKSRC}/desktop/scripts/soffice.sh
- ${REINPLACE_CMD} -e "/#test/i\\${.newline} return '${GITREVISION}';" \
- ${WRKSRC}/solenv/bin/modules/SvnRevision.pm
${REINPLACE_CMD} -e '/^mkdir -p/,$$d' ${CREATE_TREE}
.if ${CHOSEN_COMPILER_TYPE} == gcc
# g++49 -Os sometimes leaves inline class methods undefined,
Modified: head/editors/openoffice-4/distinfo
==============================================================================
--- head/editors/openoffice-4/distinfo Mon Nov 9 08:58:30 2020 (r554692)
+++ head/editors/openoffice-4/distinfo Mon Nov 9 09:23:56 2020 (r554693)
@@ -1,10 +1,10 @@
-TIMESTAMP = 1589749652
-SHA256 (openoffice/apache-openoffice-4.1.7-46059c9192-src.tar.bz2) = 512952c78b3ec22b15bc1a444b4fa7e7c76c25c985a75b6977e62c6ddae2e3ed
-SIZE (openoffice/apache-openoffice-4.1.7-46059c9192-src.tar.bz2) = 220014716
+TIMESTAMP = 1604092476
+SHA256 (openoffice/apache-openoffice-4.1.8-18848f57b6-src.tar.bz2) = 7ae5ef30dd931f369fff6d9d33a089ba749d019dce94403a1a7c9aeb4a100098
+SIZE (openoffice/apache-openoffice-4.1.8-18848f57b6-src.tar.bz2) = 228610492
SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 966a8333c83a18ddd84401389006d6e0b52b8175924b808b54b88211669985fa
SIZE (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 28957004
-SHA256 (openoffice/1d8728eb0dfcac72a0fd99c17ec7f386-Python-2.7.6.tgz) = 99c6860b70977befa1590029fae092ddb18db1d69ae67e8b9385b66ed104ba58
-SIZE (openoffice/1d8728eb0dfcac72a0fd99c17ec7f386-Python-2.7.6.tgz) = 14725931
+SHA256 (openoffice/38c84292658ed4456157195f1c9bcbe1-Python-2.7.18.tgz) = da3080e3b488f648a3d7a4560ddee895284c3380b11d6de75edb986526b9a814
+SIZE (openoffice/38c84292658ed4456157195f1c9bcbe1-Python-2.7.18.tgz) = 17539408
SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice/unowinreg.dll) = 6144
SHA256 (openoffice/d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2) = fff00023dd79486d444c8e29922f4072e1d451fc5a4d2b6075852ead7f2b7b52
Copied and modified: head/editors/openoffice-4/files/patch-configure.ac (from r554692, head/editors/openoffice-4/files/patch-configure.in)
==============================================================================
--- head/editors/openoffice-4/files/patch-configure.in Mon Nov 9 08:58:30 2020 (r554692, copy source)
+++ head/editors/openoffice-4/files/patch-configure.ac Mon Nov 9 09:23:56 2020 (r554693)
@@ -1,5 +1,5 @@
---- configure.in.orig 2019-11-12 05:10:21 UTC
-+++ configure.in
+--- configure.ac.orig 2019-11-12 05:10:21 UTC
++++ configure.ac
@@ -367,11 +367,11 @@ AC_ARG_WITH(bundled-extension-blobs,
and comply with their distribution requirements by updating the
files LICENSE_aggregated and NOTICE_aggregated accordingly
More information about the svn-ports-head
mailing list