Date: Thu, 15 Sep 2016 20:25:28 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r422225 - in head/editors: libreoffice libreoffice4 Message-ID: <201609152025.u8FKPS0F050268@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Thu Sep 15 20:25:27 2016 New Revision: 422225 URL: https://svnweb.freebsd.org/changeset/ports/422225 Log: Use bundled ucpp at build time rather than the BROKEN devel/ucpp Reported by: antoine Modified: head/editors/libreoffice/Makefile head/editors/libreoffice/distinfo head/editors/libreoffice4/Makefile head/editors/libreoffice4/distinfo Modified: head/editors/libreoffice/Makefile ============================================================================== --- head/editors/libreoffice/Makefile Thu Sep 15 20:02:12 2016 (r422224) +++ head/editors/libreoffice/Makefile Thu Sep 15 20:25:27 2016 (r422225) @@ -20,7 +20,6 @@ BUILD_DEPENDS= p5-Archive-Zip>=0:archive ${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 \ @@ -76,7 +75,8 @@ RUN_DEPENDS= ${LOCALBASE}/share/fonts/Ca ${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 + 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2:src \ + 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz:src .if defined(PRERELEASE) MASTER_SITES+= http://dev-builds.libreoffice.org/pre-releases/src/ @@ -240,7 +240,6 @@ CONFIGURE_ARGS= --disable-dependency-tra --with-system-libs \ --with-system-libxml \ --with-system-opencollada \ - --with-system-ucpp \ --with-system-zlib \ --with-vendor="FreeBSD ports" \ --without-fonts \ Modified: head/editors/libreoffice/distinfo ============================================================================== --- head/editors/libreoffice/distinfo Thu Sep 15 20:02:12 2016 (r422224) +++ head/editors/libreoffice/distinfo Thu Sep 15 20:25:27 2016 (r422225) @@ -1,13 +1,16 @@ +TIMESTAMP = 1473971061 SHA256 (libreoffice/libreoffice-5.0.6.3.tar.xz) = 4601d778318e6221cf5b44398c54a790169ad3afb4e81aa29766bcefac0fecc7 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/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/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/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip) = 5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b SIZE (libreoffice/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip) = 1180582 SHA256 (libreoffice/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip) = 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1 @@ -16,8 +19,6 @@ SHA256 (libreoffice/39bb3fcea1514f1369fc 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 @@ -36,3 +37,5 @@ SHA256 (libreoffice/eeb2c7ddf0d302fba4bf 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 Modified: head/editors/libreoffice4/Makefile ============================================================================== --- head/editors/libreoffice4/Makefile Thu Sep 15 20:02:12 2016 (r422224) +++ head/editors/libreoffice4/Makefile Thu Sep 15 20:25:27 2016 (r422225) @@ -27,7 +27,6 @@ BUILD_DEPENDS= p5-Archive-Zip>=0:archive ${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 \ @@ -97,7 +96,8 @@ LOVERSION= ${PORTVERSION}.${RCVER} RCVER= 2 DISTFILES+= 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz:src \ - 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2:src + 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2:src \ + 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz:src EXTRA_PATCHES= ${FILESDIR}/enable-opencollada:-p1 WRKSRC= ${WRKDIR}/${PORTNAME}-${LOVERSION} @@ -193,7 +193,6 @@ CONFIGURE_ARGS+= --disable-coinmp \ --with-system-postgresql \ --with-system-redland \ --with-system-serf \ - --with-system-ucpp \ --with-system-vigra \ --with-system-zlib \ --without-fonts \ Modified: head/editors/libreoffice4/distinfo ============================================================================== --- head/editors/libreoffice4/distinfo Thu Sep 15 20:02:12 2016 (r422224) +++ head/editors/libreoffice4/distinfo Thu Sep 15 20:25:27 2016 (r422225) @@ -1,11 +1,18 @@ +TIMESTAMP = 1473971067 +SHA256 (libreoffice/libreoffice-4.3.7.2.tar.xz) = 8ea75fa05c3f86b652f119036e1a1ebe42b0930a5b8291533769684d481f34fe +SIZE (libreoffice/libreoffice-4.3.7.2.tar.xz) = 18789995 +SHA256 (libreoffice/libreoffice-help-4.3.7.2.tar.xz) = 21a7a445041d0794e76b83b3877ec1741feca6eaec984919bf6633b417aab9bc +SIZE (libreoffice/libreoffice-help-4.3.7.2.tar.xz) = 1854916 +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/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 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/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz) = f9a496d3418b0e15894fb351652cd4fa5ca434ebfc3ce3bb8da40defd8b097f2 SIZE (libreoffice/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz) = 1882664 SHA256 (libreoffice/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip) = 5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b @@ -16,8 +23,6 @@ SHA256 (libreoffice/39bb3fcea1514f1369fc 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/8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz) = 97ca24c80d416f651dcd3513611d5ea855be21a994e3d48563c837a599618908 @@ -44,7 +49,5 @@ SHA256 (libreoffice/eeb2c7ddf0d302fba4bf 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/libreoffice-4.3.7.2.tar.xz) = 3a6baa64e1f775f9c1c7398449780b118f8a2cef2be9dfa797c4732fe10c0db9 -SIZE (libreoffice/libreoffice-4.3.7.2.tar.xz) = 153267644 -SHA256 (libreoffice/libreoffice-help-4.3.7.2.tar.xz) = 21a7a445041d0794e76b83b3877ec1741feca6eaec984919bf6633b417aab9bc -SIZE (libreoffice/libreoffice-help-4.3.7.2.tar.xz) = 1854916 +SHA256 (libreoffice/185d60944ea767075d27247c3162b3bc-unowinreg.dll) = eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 +SIZE (libreoffice/185d60944ea767075d27247c3162b3bc-unowinreg.dll) = 12288
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609152025.u8FKPS0F050268>