svn commit: r551736 - in head/editors/openoffice-devel: . files
Don Lewis
truckman at FreeBSD.org
Thu Oct 8 22:56:47 UTC 2020
Author: truckman
Date: Thu Oct 8 22:56:45 2020
New Revision: 551736
URL: https://svnweb.freebsd.org/changeset/ports/551736
Log:
Upgrade editors/openoffice-devel to a newer snapshot.
patch-gmake43 has been upstreamed.
Fix LICENSE_MPL11 generation.
Deleted:
head/editors/openoffice-devel/files/patch-gmake43
Modified:
head/editors/openoffice-devel/Makefile
head/editors/openoffice-devel/distinfo
head/editors/openoffice-devel/files/patch-connectivity_source_parse_sqlbison.y
Modified: head/editors/openoffice-devel/Makefile
==============================================================================
--- head/editors/openoffice-devel/Makefile Thu Oct 8 21:34:55 2020 (r551735)
+++ head/editors/openoffice-devel/Makefile Thu Oct 8 22:56:45 2020 (r551736)
@@ -3,7 +3,7 @@
PORTNAME= apache-openoffice
PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${TIMESTAMP}
-PORTREVISION= 3
+PORTREVISION= 0
PORTEPOCH= 4
CATEGORIES= editors java
MASTER_SITES= https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-${TIMESTAMP}/source/ \
@@ -117,9 +117,9 @@ AOOVERSION1= 4
AOOVERSION2= 2
AOOVERSION3= 0
# From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD
-AOOTAG= AOO420m1\(Build:9821\)
-GITREVISION= 6fb151b2c8
-TIMESTAMP= 1589199787
+AOOTAG= AOO420m3\(Build:9822\)
+GITREVISION= d92770c00e
+TIMESTAMP= 1602022694
#AOORC=rc3
EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz
@@ -394,8 +394,9 @@ 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}
${SED} -e '\|^For main/twain|,/^__/p' \
Modified: head/editors/openoffice-devel/distinfo
==============================================================================
--- head/editors/openoffice-devel/distinfo Thu Oct 8 21:34:55 2020 (r551735)
+++ head/editors/openoffice-devel/distinfo Thu Oct 8 22:56:45 2020 (r551736)
@@ -1,6 +1,6 @@
-TIMESTAMP = 1589755463
-SHA256 (openoffice/apache-openoffice-1589199787-6fb151b2c8-src.tar.xz) = 6a6923c7db49c82c31eba1288f93f05e64485db2995913e3fa62e1220cd502b9
-SIZE (openoffice/apache-openoffice-1589199787-6fb151b2c8-src.tar.xz) = 239665804
+TIMESTAMP = 1602076603
+SHA256 (openoffice/apache-openoffice-1602022694-d92770c00e-src.tar.xz) = 0091c200b250701d734fddfc094589716afa590beff9d3c24a03c54d5a205bf4
+SIZE (openoffice/apache-openoffice-1602022694-d92770c00e-src.tar.xz) = 239804844
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/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
Modified: head/editors/openoffice-devel/files/patch-connectivity_source_parse_sqlbison.y
==============================================================================
--- head/editors/openoffice-devel/files/patch-connectivity_source_parse_sqlbison.y Thu Oct 8 21:34:55 2020 (r551735)
+++ head/editors/openoffice-devel/files/patch-connectivity_source_parse_sqlbison.y Thu Oct 8 22:56:45 2020 (r551736)
@@ -5,11 +5,12 @@
%{
/**************************************************************
*
-@@ -123,8 +124,6 @@ static connectivity::OSQLInternalNode* newNode(const :
+@@ -123,9 +124,6 @@ static connectivity::OSQLInternalNode* newNode(const :
connectivity::OSQLParser* xxx_pGLOBAL_SQLPARSER;
-
+-#define YYDEBUG 1
-#define YYERROR_VERBOSE
#define SQLyyerror(s) \
More information about the svn-ports-all
mailing list