diff options
| author | Don Lewis <truckman@FreeBSD.org> | 2020-10-08 22:56:45 +0000 |
|---|---|---|
| committer | Don Lewis <truckman@FreeBSD.org> | 2020-10-08 22:56:45 +0000 |
| commit | ac0af7737843d3ce6b59f8f4619363d88ae14290 (patch) | |
| tree | 289b9b98cf378eaee7d27924db082f1c353dc3be /editors/openoffice-devel | |
| parent | e916ded5b9840925e12eaf16bafabe7dab9e6d9c (diff) | |
| download | ports-ac0af7737843d3ce6b59f8f4619363d88ae14290.tar.gz ports-ac0af7737843d3ce6b59f8f4619363d88ae14290.zip | |
Upgrade editors/openoffice-devel to a newer snapshot.
patch-gmake43 has been upstreamed.
Fix LICENSE_MPL11 generation.
Notes
Notes:
svn path=/head/; revision=551736
Diffstat (limited to 'editors/openoffice-devel')
| -rw-r--r-- | editors/openoffice-devel/Makefile | 13 | ||||
| -rw-r--r-- | editors/openoffice-devel/distinfo | 6 | ||||
| -rw-r--r-- | editors/openoffice-devel/files/patch-connectivity_source_parse_sqlbison.y | 3 | ||||
| -rw-r--r-- | editors/openoffice-devel/files/patch-gmake43 | 11 |
4 files changed, 12 insertions, 21 deletions
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index 6f7b856f4e74..7a6b7ce57007 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -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' \ diff --git a/editors/openoffice-devel/distinfo b/editors/openoffice-devel/distinfo index 00c34178c45c..adee0e35cefd 100644 --- a/editors/openoffice-devel/distinfo +++ b/editors/openoffice-devel/distinfo @@ -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 diff --git a/editors/openoffice-devel/files/patch-connectivity_source_parse_sqlbison.y b/editors/openoffice-devel/files/patch-connectivity_source_parse_sqlbison.y index fdad691cd9d9..5d6a8cf71cf0 100644 --- a/editors/openoffice-devel/files/patch-connectivity_source_parse_sqlbison.y +++ b/editors/openoffice-devel/files/patch-connectivity_source_parse_sqlbison.y @@ -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) \ diff --git a/editors/openoffice-devel/files/patch-gmake43 b/editors/openoffice-devel/files/patch-gmake43 deleted file mode 100644 index a32207fa2277..000000000000 --- a/editors/openoffice-devel/files/patch-gmake43 +++ /dev/null @@ -1,11 +0,0 @@ ---- solenv/gbuild/Tempfile.mk.orig 2019-09-17 22:55:21 UTC -+++ solenv/gbuild/Tempfile.mk -@@ -27,7 +27,7 @@ $(strip $(1) - $(eval gb_var2file_helpervar := $$(shell printf "%s" "" > $(1) ))\ - $(foreach item,$(3),$(eval gb_var2file_curblock += $(item) - ifeq ($$(words $$(gb_var2file_curblock)),$(2)) -- gb_var2file_helpervar := $$(shell printf "%s" "$$(gb_var2file_curblock)" >> $(1) ) -+ gb_var2file_helpervar := $$(shell printf " %s" "$$(gb_var2file_curblock)" >> $(1) ) - gb_var2file_curblock := - endif - ))\ |