summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2016-09-20 20:56:57 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2016-09-20 20:56:57 +0000
commit86166a432386f94801d4fcbdb7c2da7129c09a69 (patch)
tree555c55c5772fd2b2ef7c1da4066fb157cbcbafe6
parentRevert r422537 and use the official repository, not a fork. (diff)
Revert r422225 as devel/ucpp is now fixed.
Notes
Notes: svn path=/head/; revision=422545
Diffstat
-rw-r--r--editors/libreoffice/Makefile5
-rw-r--r--editors/libreoffice/distinfo14
-rw-r--r--editors/libreoffice4/Makefile7
-rw-r--r--editors/libreoffice4/distinfo2
4 files changed, 13 insertions, 15 deletions
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index 03ededa3e587..0793f591b51b 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -20,6 +20,7 @@ BUILD_DEPENDS= p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
${LOCALBASE}/bin/gperf:devel/gperf \
${LOCALBASE}/include/mdds/global.hpp:devel/mdds0 \
gpatch:devel/patch \
+ ucpp:devel/ucpp \
${LOCALBASE}/include/sane/sane.h:graphics/sane-backends \
vigra-config:graphics/vigra \
${LOCALBASE}/include/glm/glm.hpp:math/glm \
@@ -75,8 +76,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/fonts/Caladea/Caladea-Bold.ttf:x11-fonts/crosext
${LOCALBASE}/share/fonts/LinLibertineG/LinLibertine_DR_G.ttf:x11-fonts/linuxlibertine-g
DISTFILES+= 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz:src \
- 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2:src \
- 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz:src
+ 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2:src
.if defined(PRERELEASE)
MASTER_SITES+= http://dev-builds.libreoffice.org/pre-releases/src/
@@ -240,6 +240,7 @@ CONFIGURE_ARGS= --disable-dependency-tracking \
--with-system-libs \
--with-system-libxml \
--with-system-opencollada \
+ --with-system-ucpp \
--with-system-zlib \
--with-vendor="FreeBSD ports" \
--without-fonts \
diff --git a/editors/libreoffice/distinfo b/editors/libreoffice/distinfo
index 48a4b3b14c4b..8f2108f46f75 100644
--- a/editors/libreoffice/distinfo
+++ b/editors/libreoffice/distinfo
@@ -3,14 +3,12 @@ SHA256 (libreoffice/libreoffice-5.0.6.3.tar.xz) = 4601d778318e6221cf5b44398c54a7
SIZE (libreoffice/libreoffice-5.0.6.3.tar.xz) = 167281064
SHA256 (libreoffice/libreoffice-help-5.0.6.3.tar.xz) = 4cb6aa44ce6db9acf1bed2a6f1e69cb3471e6a1deb3ba3b128c820b05a6d1c1b
SIZE (libreoffice/libreoffice-help-5.0.6.3.tar.xz) = 1882932
-SHA256 (libreoffice/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz) = 390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a
-SIZE (libreoffice/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz) = 1652670
-SHA256 (libreoffice/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2) = b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb
-SIZE (libreoffice/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2) = 555291
-SHA256 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776
-SIZE (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 96939
SHA256 (libreoffice/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
SIZE (libreoffice/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = 3519470
+SHA256 (libreoffice/185d60944ea767075d27247c3162b3bc-unowinreg.dll) = eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6
+SIZE (libreoffice/185d60944ea767075d27247c3162b3bc-unowinreg.dll) = 12288
+SHA256 (libreoffice/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz) = 390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a
+SIZE (libreoffice/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz) = 1652670
SHA256 (libreoffice/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip) = 5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b
SIZE (libreoffice/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip) = 1180582
SHA256 (libreoffice/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip) = 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1
@@ -19,6 +17,8 @@ SHA256 (libreoffice/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip) = 085f2112
SIZE (libreoffice/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip) = 153157
SHA256 (libreoffice/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip) = e0531091787c0f16c83965fdcbc49162c059d7f0c64669e7f119699321549743
SIZE (libreoffice/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip) = 5750610
+SHA256 (libreoffice/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2) = b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb
+SIZE (libreoffice/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2) = 555291
SHA256 (libreoffice/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip) = 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
SIZE (libreoffice/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip) = 1521926
SHA256 (libreoffice/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip) = abe2c57ac12ba45d83563b02e240fa95d973376de2f720aab8fe11f2e621c095
@@ -37,5 +37,3 @@ SHA256 (libreoffice/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip) = 75c803
SIZE (libreoffice/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip) = 427800
SHA256 (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) = 05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343
SIZE (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) = 211919
-SHA256 (libreoffice/185d60944ea767075d27247c3162b3bc-unowinreg.dll) = eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6
-SIZE (libreoffice/185d60944ea767075d27247c3162b3bc-unowinreg.dll) = 12288
diff --git a/editors/libreoffice4/Makefile b/editors/libreoffice4/Makefile
index efe6a81cff43..0b4f0b639667 100644
--- a/editors/libreoffice4/Makefile
+++ b/editors/libreoffice4/Makefile
@@ -4,7 +4,7 @@ PORTNAME= libreoffice
PORTVERSION= 4.3.7
PORTREVISION= 6
CATEGORIES= editors
-MASTER_SITES= https://downloadarchive.documentfoundation.org/libreoffice/old/${LOVERSION}/src/ \
+MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/${PORTVERSION}/ \
http://dev-www.libreoffice.org/extern/:ext \
http://dev-www.libreoffice.org/src/:src
PKGNAMESUFFIX= 4
@@ -27,6 +27,7 @@ BUILD_DEPENDS= p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
${LOCALBASE}/bin/gperf:devel/gperf \
${LOCALBASE}/include/mdds/global.hpp:devel/mdds0 \
gpatch:devel/patch \
+ ucpp:devel/ucpp \
vigra-config:graphics/vigra \
${LOCALBASE}/include/glm/glm.hpp:math/glm \
bash:shells/bash \
@@ -96,8 +97,7 @@ LOVERSION= ${PORTVERSION}.${RCVER}
RCVER= 2
DISTFILES+= 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz:src \
- 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2:src \
- 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz:src
+ 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2:src
EXTRA_PATCHES= ${FILESDIR}/enable-opencollada:-p1
WRKSRC= ${WRKDIR}/${PORTNAME}-${LOVERSION}
@@ -193,6 +193,7 @@ CONFIGURE_ARGS+= --disable-coinmp \
--with-system-postgresql \
--with-system-redland \
--with-system-serf \
+ --with-system-ucpp \
--with-system-vigra \
--with-system-zlib \
--without-fonts \
diff --git a/editors/libreoffice4/distinfo b/editors/libreoffice4/distinfo
index c8b1561eb5d7..cb234423c729 100644
--- a/editors/libreoffice4/distinfo
+++ b/editors/libreoffice4/distinfo
@@ -1,6 +1,4 @@
TIMESTAMP = 1473971067
-SHA256 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776
-SIZE (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 96939
SHA256 (libreoffice/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip) = a751a036a3488e2519bc105dcf80df9c004ab1a982d1dd96bbfbf07802df8831
SIZE (libreoffice/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip) = 525299
SHA256 (libreoffice/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-02 23:04:29 +0000