svn commit: r512377 - head/editors/openoffice-devel
Don Lewis
truckman at FreeBSD.org
Thu Sep 19 23:01:06 UTC 2019
Author: truckman
Date: Thu Sep 19 23:01:04 2019
New Revision: 512377
URL: https://svnweb.freebsd.org/changeset/ports/512377
Log:
Upgrade editors/openoffice-devel to upstream git hash d871312c80.
Since upstream has migrated from svn to git, use seconds from epoch of
the last commit as the minor component of PORTVERSION.
The build wants to include the git hash value in the build for display
on the Help -> About popup, but it can't determine that when building
from a source tarball, as opposed to a git checkout. Patch around that
issue until upstream implements a way to include this info into the
tarball and pick it up from there.
Add xorg to USES for correctness.
Modified:
head/editors/openoffice-devel/Makefile
head/editors/openoffice-devel/distinfo
Modified: head/editors/openoffice-devel/Makefile
==============================================================================
--- head/editors/openoffice-devel/Makefile Thu Sep 19 21:14:55 2019 (r512376)
+++ head/editors/openoffice-devel/Makefile Thu Sep 19 23:01:04 2019 (r512377)
@@ -2,12 +2,11 @@
# $FreeBSD$
PORTNAME= apache-openoffice
-PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION}
-PORTREVISION= 4
-#PORTREVISION= 1
+PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${TIMESTAMP}
+PORTREVISION= 0
PORTEPOCH= 4
CATEGORIES= editors java
-MASTER_SITES= https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \
+MASTER_SITES= https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-${TIMESTAMP}/source/ \
http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \
LOCAL/truckman/openoffice:snap,extsrc
.if defined(LANG_PKGNAME)
@@ -101,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}
+ python:2.7 shared-mime-info ssl tar:${TARTYPE} xorg
USE_GL= gl glu
USE_GNOME= gtk20 libxslt libidl glib20
USE_JAVA= yes
@@ -119,8 +118,9 @@ AOOVERSION1= 4
AOOVERSION2= 2
AOOVERSION3= 0
# From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD
-AOOTAG= AOO420m1\(Build:9820\)
-SVNREVISION= 1856382
+AOOTAG= AOO420m1\(Build:9821\)
+GITREVISION= d871312c80
+TIMESTAMP= 1568906168
#AOORC=rc3
EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz
@@ -128,12 +128,12 @@ AOOVERSION= ${AOOVERSION1}.${AOOVERSION2}.${AOOVERSION
AOOXXX= ${AOOVERSION1}${AOOVERSION2}${AOOVERSION3}
.if defined(AOORC)
AOOSUFFIX= ${AOOVERSION}-${AOORC}
-AOOSRC= apache-openoffice-${AOOVERSION}-r${SVNREVISION}-src${EXTRACT_SUFX}
+AOOSRC= apache-openoffice-${AOOVERSION}-${GITREVISION}-src${EXTRACT_SUFX}
AOODISTTAG=
TARTYPE= bzip2
.else
AOOSUFFIX= ${PORTVERSION}
-AOOSRC= apache-openoffice-r${SVNREVISION}-src${EXTRACT_SUFX}
+AOOSRC= apache-openoffice-${TIMESTAMP}-${GITREVISION}-src${EXTRACT_SUFX}
AOODISTTAG= :snap
TARTYPE= xz
.endif
@@ -394,6 +394,8 @@ 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 Thu Sep 19 21:14:55 2019 (r512376)
+++ head/editors/openoffice-devel/distinfo Thu Sep 19 23:01:04 2019 (r512377)
@@ -1,6 +1,6 @@
-TIMESTAMP = 1553832531
-SHA256 (openoffice/apache-openoffice-r1856382-src.tar.xz) = 2f71b56bdc7a687a75259822926f8a46ac7365886ad8f7519bfea9e96caa0017
-SIZE (openoffice/apache-openoffice-r1856382-src.tar.xz) = 235780892
+TIMESTAMP = 1568913049
+SHA256 (openoffice/apache-openoffice-1568906168-d871312c80-src.tar.xz) = ac00df211af8061db6e63dc78c95c256a668d7d66fc67f3995dcf5acb76f6efe
+SIZE (openoffice/apache-openoffice-1568906168-d871312c80-src.tar.xz) = 239214188
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
More information about the svn-ports-head
mailing list