From owner-svn-ports-head@freebsd.org Sun Nov 10 19:00:25 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C97AB1BBEFC; Sun, 10 Nov 2019 19:00:25 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47B3HF4zlRz4HGX; Sun, 10 Nov 2019 19:00:25 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 754A73486; Sun, 10 Nov 2019 19:00:25 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xAAJ0PGl098693; Sun, 10 Nov 2019 19:00:25 GMT (envelope-from truckman@FreeBSD.org) Received: (from truckman@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xAAJ0PM2098691; Sun, 10 Nov 2019 19:00:25 GMT (envelope-from truckman@FreeBSD.org) Message-Id: <201911101900.xAAJ0PM2098691@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: truckman set sender to truckman@FreeBSD.org using -f From: Don Lewis Date: Sun, 10 Nov 2019 19:00:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r517222 - head/editors/openoffice-devel X-SVN-Group: ports-head X-SVN-Commit-Author: truckman X-SVN-Commit-Paths: head/editors/openoffice-devel X-SVN-Commit-Revision: 517222 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Nov 2019 19:00:25 -0000 Author: truckman Date: Sun Nov 10 19:00:24 2019 New Revision: 517222 URL: https://svnweb.freebsd.org/changeset/ports/517222 Log: Upgrade openoffice-devel to a newer snapshot from upstream, git hash 1742cb93dc, which contains some fixes that should help unbreak the powerpc build. Some further changes are needed to the FreeBSD port to complete the fix. Modified: head/editors/openoffice-devel/Makefile head/editors/openoffice-devel/distinfo Modified: head/editors/openoffice-devel/Makefile ============================================================================== --- head/editors/openoffice-devel/Makefile Sun Nov 10 18:35:55 2019 (r517221) +++ head/editors/openoffice-devel/Makefile Sun Nov 10 19:00:24 2019 (r517222) @@ -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/ \ @@ -120,8 +120,8 @@ AOOVERSION2= 2 AOOVERSION3= 0 # From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD AOOTAG= AOO420m1\(Build:9821\) -GITREVISION= d871312c80 -TIMESTAMP= 1568906168 +GITREVISION= 1742cb93dc +TIMESTAMP= 1573127763 #AOORC=rc3 EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz @@ -395,8 +395,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} do-build: Modified: head/editors/openoffice-devel/distinfo ============================================================================== --- head/editors/openoffice-devel/distinfo Sun Nov 10 18:35:55 2019 (r517221) +++ head/editors/openoffice-devel/distinfo Sun Nov 10 19:00:24 2019 (r517222) @@ -1,6 +1,6 @@ -TIMESTAMP = 1568913049 -SHA256 (openoffice/apache-openoffice-1568906168-d871312c80-src.tar.xz) = ac00df211af8061db6e63dc78c95c256a668d7d66fc67f3995dcf5acb76f6efe -SIZE (openoffice/apache-openoffice-1568906168-d871312c80-src.tar.xz) = 239214188 +TIMESTAMP = 1573194953 +SHA256 (openoffice/apache-openoffice-1573127763-1742cb93dc-src.tar.xz) = 8676a03590781acb5b18a2d0ae3722d792975f78b973d4dd89ad25745e7cac81 +SIZE (openoffice/apache-openoffice-1573127763-1742cb93dc-src.tar.xz) = 239203380 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