aboutsummaryrefslogtreecommitdiff
path: root/editors/openoffice-4/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'editors/openoffice-4/Makefile')
-rw-r--r--editors/openoffice-4/Makefile18
1 files changed, 11 insertions, 7 deletions
diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile
index 9384b4d1b0ed..1535c0db2bf7 100644
--- a/editors/openoffice-4/Makefile
+++ b/editors/openoffice-4/Makefile
@@ -1,9 +1,11 @@
PORTNAME= apache-openoffice
-PORTVERSION= ${AOOVERSION}
-PORTREVISION= 6
+PORTVERSION= ${AOOVERSION}${AOORCN:?.p${AOORCN}:}
+PORTREVISION= 0
CATEGORIES= editors java
-MASTER_SITES= https://dlcdn.apache.org/openoffice/${PORTVERSION}/source/ \
- https://archive.apache.org/dist/openoffice/${PORTVERSION}/source/ \
+MASTER_SITES= https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}${AOORCN:?-RC${AOORCN}:}/source/
+#MASTER_SITES= https://dlcdn.apache.org/openoffice/${PORTVERSION}/source/ \
+# https://archive.apache.org/dist/openoffice/${PORTVERSION}/source
+MASTER_SITES+= https://dlcdn.apache.org/openoffice/${PORTVERSION}/source/ \
http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \
LOCAL/truckman/openoffice:extsrc \
SF/oooextras.mirror/:sf
@@ -123,10 +125,11 @@ CONFLICTS_INSTALL= apache-openoffice-devel
AOOVERSION1= 4
AOOVERSION2= 1
-AOOVERSION3= 15
+AOOVERSION3= 16
+AOORCN= 3
# From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD
-AOOTAG= AOO4115m2\(Build:9813\)
-GITREVISION= 5f13fa0070
+AOOTAG= AOO4116m3\(Build:9816\)
+GITREVISION= 277251aa7e
EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz
AOOVERSION= ${AOOVERSION1}.${AOOVERSION2}.${AOOVERSION3}
@@ -211,6 +214,7 @@ CONFIGURE_ARGS+= --enable-strip-solver
PYTHON_DISTFILE= 38c84292658ed4456157195f1c9bcbe1-Python-2.7.18.tgz
GCC_EXTRA_DISTFILES= d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 \
+ e3738abd0d3ce1870dc1fd1f22bba5b1-icu4c-4_2_1-src.tgz \
d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz
.if ${CHOSEN_COMPILER_TYPE} == clang