Upgrade editors/openoffice-devel to git commit d12e928220 on the upstream

AOO420 branch.

patch-configure.ac and patch-icu_makefile.mk have been upstreamed.

Switch from python2 to python3.

4 files changed, 7 insertions, 32 deletions

diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index a597b6bd2acd..33422c2fa184 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	apache-openoffice
 PORTVERSION=	${AOOVERSION1}.${AOOVERSION2}.${TIMESTAMP}
-PORTREVISION=	2
+PORTREVISION=	0
 PORTEPOCH=	4
 CATEGORIES=	editors java
 MASTER_SITES=	https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-${TIMESTAMP}/source/ \
@@ -100,7 +100,7 @@ RUN_DEPENDS=								\
 
 USES=		autoreconf bison compiler:c++11-lib cpe desktop-file-utils \
 		gettext-runtime gl gmake gnome iconv jpeg perl5 pkgconfig \
-		python:2.7 shared-mime-info ssl tar:${TARTYPE} xorg
+		python:3.7 shared-mime-info ssl tar:${TARTYPE} xorg
 USE_GL=		gl glu
 USE_GNOME=	gtk20 libxslt libidl glib20
 USE_JAVA=	yes
@@ -118,8 +118,8 @@ AOOVERSION2=	2
 AOOVERSION3=	0
 # From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD
 AOOTAG=		AOO420m1\(Build:9821\)
-GITREVISION=	1742cb93dc
-TIMESTAMP=	1573127763
+GITREVISION=	d12e928220
+TIMESTAMP=	1579913986
 #AOORC=rc3
 EXTSRC=		ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz
 
diff --git a/editors/openoffice-devel/distinfo b/editors/openoffice-devel/distinfo
index 5e56b988b3e7..7332d2a375fe 100644
--- a/editors/openoffice-devel/distinfo
+++ b/editors/openoffice-devel/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1573194953
-SHA256 (openoffice/apache-openoffice-1573127763-1742cb93dc-src.tar.xz) = 8676a03590781acb5b18a2d0ae3722d792975f78b973d4dd89ad25745e7cac81
-SIZE (openoffice/apache-openoffice-1573127763-1742cb93dc-src.tar.xz) = 239203380
+TIMESTAMP = 1580376045
+SHA256 (openoffice/apache-openoffice-1579913986-d12e928220-src.tar.xz) = 8ef7828ab0f1f4eef92483f97bf5f729f62f8eb57ab31ee88c5b91c00481a07c
+SIZE (openoffice/apache-openoffice-1579913986-d12e928220-src.tar.xz) = 239320256
 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-configure.ac b/editors/openoffice-devel/files/patch-configure.ac
deleted file mode 100644
index dc51ac969e9b..000000000000
--- a/editors/openoffice-devel/files/patch-configure.ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.orig	2019-11-07 11:05:12 UTC
-+++ configure.ac
-@@ -2291,7 +2291,7 @@ AC_SUBST(COMNAME)
- 
- if test "$_os" = "FreeBSD"; then
-     FBSD_GCC_RPATH=
--    if "$COM" = "GCC"; then
-+    if test "$COM" = "GCC"; then
-         rpath=`$CC --print-file-name libstdc++.so`
-         rpath=`realpath $rpath`
-         rpath=`dirname $rpath`
diff --git a/editors/openoffice-devel/files/patch-icu_makefile.mk b/editors/openoffice-devel/files/patch-icu_makefile.mk
deleted file mode 100644
index 2e4b7c014a32..000000000000
--- a/editors/openoffice-devel/files/patch-icu_makefile.mk
+++ /dev/null
@@ -1,14 +0,0 @@
---- icu/makefile.mk.orig	2019-09-17 22:55:16 UTC
-+++ icu/makefile.mk
-@@ -86,6 +86,11 @@ LDFLAGSADD += -Wl,--hash-style=both
- LDFLAGSADD += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
- .ENDIF
- 
-+# FreeBSD with gcc from ports needs -Wl,-rpath= to find the matching libstdc++ 
-+.IF "$(OS)"=="FREEBSD"
-+LDFLAGSADD+=$(FBSD_GCC_RPATH)
-+.ENDIF
-+
- CONFIGURE_DIR=source
- 
- CONFIGURE_ACTION+=sh -c 'CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS) $(LDFLAGSADD)" ./configure --enable-layout --enable-static --enable-shared=yes $(DISABLE_64BIT)'