Date: Sun, 16 Aug 2020 12:18:17 +0000 (UTC) From: Dima Panov <fluffy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r545099 - in head/editors: . libreoffice6 Message-ID: <202008161218.07GCIHC9044358@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: fluffy Date: Sun Aug 16 12:18:17 2020 New Revision: 545099 URL: https://svnweb.freebsd.org/changeset/ports/545099 Log: editors/libreoffice6: - repocopy from editors/libreoffice - add i18n option (off by default to mimic classic behaviour) - register conflicts with main libreoffice port Added: head/editors/libreoffice6/ - copied from r544941, head/editors/libreoffice/ Modified: head/editors/Makefile head/editors/libreoffice6/Makefile head/editors/libreoffice6/distinfo Modified: head/editors/Makefile ============================================================================== --- head/editors/Makefile Sun Aug 16 12:12:43 2020 (r545098) +++ head/editors/Makefile Sun Aug 16 12:18:17 2020 (r545099) @@ -184,6 +184,7 @@ SUBDIR += libreoffice-vec SUBDIR += libreoffice-xh SUBDIR += libreoffice-zu + SUBDIR += libreoffice6 SUBDIR += linux-sublime SUBDIR += linux-sublime3 SUBDIR += madedit Modified: head/editors/libreoffice6/Makefile ============================================================================== --- head/editors/libreoffice/Makefile Sat Aug 15 13:23:25 2020 (r544941) +++ head/editors/libreoffice6/Makefile Sun Aug 16 12:18:17 2020 (r545099) @@ -9,6 +9,7 @@ DISTFILES= ${PORTNAME}-${LOVERSION}${EXTRACT_SUFX} \ ${PORTNAME}-help-${LOVERSION}${EXTRACT_SUFX} DIST_SUBDIR= libreoffice EXTRACT_ONLY:= ${DISTFILES} +PKGNAMESUFFIX= 6 COMMENT= Full integrated office productivity suite @@ -81,6 +82,7 @@ LIB_DEPENDS= libapr-1.so:devel/apr1 \ libraptor2.so:textproc/raptor2 \ librdf.so:textproc/redland \ libfontconfig.so:x11-fonts/fontconfig \ + libxcb-icccm.so:x11/xcb-util-wm \ libserf-1.so:www/serf RUN_DEPENDS= xdg-open:devel/xdg-utils \ ${LOCALBASE}/share/fonts/Caladea/Caladea-Bold.ttf:x11-fonts/crosextrafonts-caladea-ttf \ @@ -100,6 +102,8 @@ NOT_FOR_ARCHS_REASON= Unsupported host_cpu MASTER_SITES+= https://dev-builds.libreoffice.org/pre-releases/src/ .endif +CONFLICTS_INSTALL= libreoffice + INSTALL_TARGET= distro-pack-install WRKSRC= ${WRKDIR}/${PORTNAME}-${LOVERSION} @@ -109,19 +113,19 @@ GNU_CONFIGURE= yes USE_GL= gl glew glu USE_OPENLDAP= yes USE_PERL5= build -USE_XORG= ice sm x11 xaw xext xinerama xrandr xrender -USES= autoreconf:build bison compiler:c++14-lang cpe gl gmake gnome \ - jpeg mysql:client \ - perl5 pkgconfig python shebangfix shared-mime-info ssl tar:xz \ - xorg +USE_XORG= ice sm x11 xaw xcb xext xinerama xrandr xrender +USES= autoreconf:build bison compiler:c++14-lang cpe desktop-file-utils \ + 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 JAVA KF5 MMEDIA PGSQL QT5 SDK TEST WEBDAV +OPTIONS_DEFINE= CUPS DOCS GNOME GTK3 I18N JAVA KF5 MMEDIA PGSQL QT5 SDK TEST WEBDAV OPTIONS_DEFAULT= CUPS MMEDIA OPTIONS_DEFAULT_FreeBSD_12= QT5 OPTIONS_DEFAULT_FreeBSD_13= QT5 OPTIONS_DEFAULT+= ${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}} -GTK3_DESC= GTK+ 3 GUI toolkit support (broken visual style) +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) KF5_DESC= KF5/Qt5 GUI toolkit support (implies QT5) MMEDIA_DESC= Enable multimedia backend for Impress @@ -138,14 +142,19 @@ DOCS_CONFIGURE_WITH= help GNOME_CONFIGURE_ENABLE= dbus dconf GNOME_IMPLIES= GTK3 -GNOME_LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib +GNOME_LIB_DEPENDS= libdbus-1.so:devel/dbus \ + libdbus-glib-1.so:devel/dbus-glib GNOME_USE= GNOME=dconf GTK3_CONFIGURE_ENABLE= gtk3 GTK3_USE= GNOME=gtk30,gtk-update-icon-cache -GTK3_USES= desktop-file-utils GTK3_VARS= POST_PLIST=add-plist-gnome +I18N_CONFIGURE_WITH= lang=ALL +I18N_DISTFILES= ${PORTNAME}-dictionaries-${LOVERSION}${EXTRACT_SUFX} \ + ${PORTNAME}-translations-${LOVERSION}${EXTRACT_SUFX} +I18N_EXTRACT_ONLY= ${I18N_DISTFILES} + JAVA_BUILD_DEPENDS= ant:devel/apache-ant \ ${JAVAJARDIR}/commons-codec.jar:java/apache-commons-codec \ ${JAVAJARDIR}/commons-httpclient.jar:java/apache-commons-httpclient \ @@ -268,7 +277,7 @@ MAKE_ENV+= verbose=1 .include <bsd.port.pre.mk> .if ${PORT_OPTIONS:MGTK3} -WARNING= "GTK3 visual style is broken yet, build at your own risk" +WARNING= "GTK3 visual style is incomplete yet, build at your own risk" .endif .if ${CHOSEN_COMPILER_TYPE} == clang Modified: head/editors/libreoffice6/distinfo ============================================================================== --- head/editors/libreoffice/distinfo Sat Aug 15 13:23:25 2020 (r544941) +++ head/editors/libreoffice6/distinfo Sun Aug 16 12:18:17 2020 (r545099) @@ -1,10 +1,14 @@ -TIMESTAMP = 1597379137 +TIMESTAMP = 1597385574 SHA256 (libreoffice/libreoffice-6.4.6.2.tar.xz) = ab8281c5290e23eb46c4d4aee4abb16d2dcc5ff6daf46991c0370bee6ec0aa4c SIZE (libreoffice/libreoffice-6.4.6.2.tar.xz) = 232180876 SHA256 (libreoffice/libreoffice-help-6.4.6.2.tar.xz) = 4af036e3f2a033b620b31acff24c0ce7b239ddd40a3782fb77640c0b386e04c8 SIZE (libreoffice/libreoffice-help-6.4.6.2.tar.xz) = 88297908 SHA256 (libreoffice/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf) = 884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc SIZE (libreoffice/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf) = 207544 +SHA256 (libreoffice/libreoffice-dictionaries-6.4.6.2.tar.xz) = d87de685e5f7a810c36d3c8a26af34ca53247e9d6e1ad2a650cab652bdbf0c5b +SIZE (libreoffice/libreoffice-dictionaries-6.4.6.2.tar.xz) = 45948020 +SHA256 (libreoffice/libreoffice-translations-6.4.6.2.tar.xz) = a3a95168ed9845d28f5e10f1a729383dae9e706f63e5a898de72b4843fe5352a +SIZE (libreoffice/libreoffice-translations-6.4.6.2.tar.xz) = 173134460 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008161218.07GCIHC9044358>