diff options
| author | Don Lewis <truckman@FreeBSD.org> | 2020-11-09 09:23:56 +0000 |
|---|---|---|
| committer | Don Lewis <truckman@FreeBSD.org> | 2020-11-09 09:23:56 +0000 |
| commit | ca33ce653223d9123a003ed1249878e2dad175e9 (patch) | |
| tree | b6618a3ad3fd74df8d1b0b2962313bf576f1ea6d /editors/openoffice-4/Makefile | |
| parent | Remove gstreamer 0.10 support (diff) | |
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.
Notes
Notes:
svn path=/head/; revision=554693
Diffstat (limited to 'editors/openoffice-4/Makefile')
| -rw-r--r-- | editors/openoffice-4/Makefile | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile index 9970b4661429..baac7d017e28 100644 --- a/editors/openoffice-4/Makefile +++ b/editors/openoffice-4/Makefile @@ -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, |