svn commit: r563895 - in head/editors/libreoffice6: . files
Dima Panov
fluffy at FreeBSD.org
Wed Feb 3 16:26:03 UTC 2021
Author: fluffy
Date: Wed Feb 3 16:26:02 2021
New Revision: 563895
URL: https://svnweb.freebsd.org/changeset/ports/563895
Log:
editors/libreoffice6: use some bundled libs in preparations of LO 7.1 update
Bundled: mdds, liborcus, libetonyek01
Simplify dependencies list by use USE_GNOME= cairo glib20 libxml2 libxslt
Bump PORTREVISION to force rebuild with bundled libs
Modified:
head/editors/libreoffice6/Makefile
head/editors/libreoffice6/distinfo
head/editors/libreoffice6/files/patch-configure
Modified: head/editors/libreoffice6/Makefile
==============================================================================
--- head/editors/libreoffice6/Makefile Wed Feb 3 15:31:01 2021 (r563894)
+++ head/editors/libreoffice6/Makefile Wed Feb 3 16:26:02 2021 (r563895)
@@ -1,5 +1,5 @@
# $FreeBSD$
-PORTREVISION= 2
+PORTREVISION= 3
.include "${.CURDIR}/Makefile.common"
@@ -20,7 +20,6 @@ BUILD_DEPENDS= p5-Archive-Zip>=0:archivers/p5-Archive-
cppunit-config:devel/cppunit \
dmake:devel/dmake \
gperf>=3.1:devel/gperf \
- mdds>=1.5:devel/mdds \
ucpp:devel/ucpp \
${LOCALBASE}/include/sane/sane.h:graphics/sane-backends \
vigra-config:graphics/vigra \
@@ -34,15 +33,12 @@ LIB_DEPENDS= libapr-1.so:devel/apr1 \
libicutu.so:devel/icu \
liblangtag.so:devel/liblangtag \
libltdl.so:devel/libltdl \
- liborcus-0.15.so:devel/liborcus \
libplds4.so:devel/nspr \
libcurl.so:ftp/curl \
- libcairo.so:graphics/cairo \
libgraphite2.so:graphics/graphite2 \
liblcms2.so:graphics/lcms2 \
libcdr-0.1.so:graphics/libcdr01 \
libepoxy.so:graphics/libepoxy \
- libetonyek-0.1.so:graphics/libetonyek01 \
libfreehand-0.1.so:graphics/libfreehand \
libgltf-0.0.so:graphics/libgltf \
libwpg-0.3.so:graphics/libwpg03 \
@@ -50,7 +46,6 @@ LIB_DEPENDS= libapr-1.so:devel/apr1 \
libpng.so:graphics/png \
libpoppler.so:graphics/poppler \
libqrcodegencpp.so:graphics/qr-code-generator \
- libCoinMP.so:math/coinmp \
liblpsolve55.so:math/lp_solve \
libcmis-0.5.so:net/libcmis \
libfreetype.so:print/freetype2 \
@@ -77,8 +72,6 @@ LIB_DEPENDS= libapr-1.so:devel/apr1 \
libvisio-0.1.so:textproc/libvisio01 \
libwpd-0.10.so:textproc/libwpd010 \
libwps-0.4.so:textproc/libwps \
- libxml2.so:textproc/libxml2 \
- libxslt.so:textproc/libxslt \
libmythes-1.2.so:textproc/mythes \
libraptor2.so:textproc/raptor2 \
librdf.so:textproc/redland \
@@ -95,6 +88,9 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils \
${LOCALBASE}/share/fonts/LinLibertineG/LinLibertine_DR_G.ttf:x11-fonts/linuxlibertine-g
DISTFILES+= 884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf:ext
+DISTFILES+= mdds-1.5.0.tar.bz2:src
+DISTFILES+= liborcus-0.15.3.tar.gz:src
+DISTFILES+= libetonyek-0.1.9.tar.xz:src
NOT_FOR_ARCHS= armv6 armv7
NOT_FOR_ARCHS_REASON= Unsupported host_cpu
@@ -112,6 +108,7 @@ SHEBANG_GLOB= *.py
GNU_CONFIGURE= yes
USE_GL= gl glew glu
+USE_GNOME= cairo glib20 libxml2 libxslt
USE_OPENLDAP= yes
USE_PERL5= build
USE_XORG= ice sm x11 xaw xcb xext xinerama xrandr xrender
@@ -119,7 +116,7 @@ USES= autoreconf:build bison compiler:c++14-lang cpe
gettext-runtime gl gmake gnome jpeg mysql:client perl5 pkgconfig \
pkgconfig python shebangfix shared-mime-info ssl tar:xz xorg
-OPTIONS_DEFINE= CUPS DOCS GNOME GTK3 I18N JAVA KF5 MMEDIA PGSQL QT5 SDK TEST WEBDAV
+OPTIONS_DEFINE= COINMP CUPS DOCS GNOME GTK3 I18N JAVA KF5 MMEDIA PGSQL QT5 SDK TEST WEBDAV
OPTIONS_DEFAULT= CUPS MMEDIA QT5
.if !defined(DEFAULT_VERSIONS) || ! ${DEFAULT_VERSIONS:Mssl=*}
@@ -127,6 +124,7 @@ OPTIONS_DEFAULT= CUPS MMEDIA QT5
OPTIONS_EXCLUDE_FreeBSD_11+= QT5
.endif
+COINMP_DESC= Enable CoinMP (deprecated) math solver
GTK3_DESC= GTK+ 3 GUI toolkit support (incomplete visual style)
I18N_DESC= Build i18n resources
JAVA_DESC= Add Java support (XML filters, macros, DB connections)
@@ -138,6 +136,10 @@ SDK_DESC= Build with SDK
TEST_DESC= Run all regression tests
WEBDAV_DESC= Enable WebDAV protocol
+COINMP_CONFIGURE_ENABLE= coinmp
+COINMP_CONFIGURE_ON= --with-system-coinmp
+COINMP_LIB_DEPENDS= libCoinMP.so:math/coinmp
+
CUPS_CONFIGURE_ENABLE= cups
CUPS_LIB_DEPENDS= libcups.so:print/cups
@@ -255,6 +257,9 @@ CONFIGURE_ARGS= --disable-dependency-tracking \
--with-system-libxml \
--with-system-ucpp \
--with-system-zlib \
+ --with-system-mdds=no \
+ --with-system-orcus=no \
+ --with-system-libetonyek=no \
--with-vendor="FreeBSD ports" \
--without-fonts \
--without-myspell-dicts
Modified: head/editors/libreoffice6/distinfo
==============================================================================
--- head/editors/libreoffice6/distinfo Wed Feb 3 15:31:01 2021 (r563894)
+++ head/editors/libreoffice6/distinfo Wed Feb 3 16:26:02 2021 (r563895)
@@ -1,10 +1,16 @@
-TIMESTAMP = 1603703932
+TIMESTAMP = 1612365374
SHA256 (libreoffice/libreoffice-6.4.7.2.tar.xz) = 034dd79a60cfff60c7d353130fe2cc8e6a1aabeab50d89e4570ae95f33296644
SIZE (libreoffice/libreoffice-6.4.7.2.tar.xz) = 232364676
SHA256 (libreoffice/libreoffice-help-6.4.7.2.tar.xz) = a126803900bca3bfd4d3efe2d3204fad828d86b2a52b05fcf7cb618a6cbb10b6
SIZE (libreoffice/libreoffice-help-6.4.7.2.tar.xz) = 88296892
SHA256 (libreoffice/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf) = 884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc
SIZE (libreoffice/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf) = 207544
+SHA256 (libreoffice/mdds-1.5.0.tar.bz2) = 144d6debd7be32726f332eac14ef9f17e2d3cf89cb3250eb31a7127e0789680d
+SIZE (libreoffice/mdds-1.5.0.tar.bz2) = 346888
+SHA256 (libreoffice/liborcus-0.15.3.tar.gz) = 0dd26f3f2e611c51df9ee02d6dbf08887989eaa417b73f6877cd0d94df795fc2
+SIZE (libreoffice/liborcus-0.15.3.tar.gz) = 2602283
+SHA256 (libreoffice/libetonyek-0.1.9.tar.xz) = e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a
+SIZE (libreoffice/libetonyek-0.1.9.tar.xz) = 1477064
SHA256 (libreoffice/libreoffice-dictionaries-6.4.7.2.tar.xz) = 3718c44d5ec5fc1d011ddf5b9bbbef384f1bdc695338e8459d6e403da2539bb7
SIZE (libreoffice/libreoffice-dictionaries-6.4.7.2.tar.xz) = 45951948
SHA256 (libreoffice/libreoffice-translations-6.4.7.2.tar.xz) = b13088a98be1f6e7e177331db3d723419bfeb11ae16516334f0fbb853ae40ab1
Modified: head/editors/libreoffice6/files/patch-configure
==============================================================================
--- head/editors/libreoffice6/files/patch-configure Wed Feb 3 15:31:01 2021 (r563894)
+++ head/editors/libreoffice6/files/patch-configure Wed Feb 3 16:26:02 2021 (r563895)
@@ -1,6 +1,6 @@
---- configure 2018-08-03 03:58:40.000000000 +0800
-+++ configure 2018-08-10 05:28:52.021925000 +0800
-@@ -31735,7 +31735,7 @@
+--- configure.orig 2020-10-07 12:27:53 UTC
++++ configure
+@@ -33015,7 +33015,7 @@ fi
@@ -9,10 +9,12 @@
&& test "$with_system_openssl" != "no"; then
with_system_openssl=yes
SYSTEM_OPENSSL=TRUE
-@@ -34402,5 +34412,5 @@
+@@ -35162,7 +35162,7 @@ if test -z "$PATCH"; then
+ as_fn_error $? "\"patch\" not found in \$PATH, install it" "$LINENO" 5
fi
-if test "$_os" = "SunOS" -o "$_os" = "FreeBSD" -o "$_os" = "Darwin"; then
+if test "$_os" = "SunOS" -o "$_os" = "Darwin"; then
if test -z "$with_gnu_patch"; then
GNUPATCH=$PATCH
+ else
More information about the svn-ports-all
mailing list