From owner-svn-ports-all@freebsd.org Tue Jun 12 03:55:03 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6365C1010235; Tue, 12 Jun 2018 03:55:03 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id ECB986A385; Tue, 12 Jun 2018 03:55:02 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CE1E7251C9; Tue, 12 Jun 2018 03:55:02 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5C3t2Gx003509; Tue, 12 Jun 2018 03:55:02 GMT (envelope-from truckman@FreeBSD.org) Received: (from truckman@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5C3t2jJ003508; Tue, 12 Jun 2018 03:55:02 GMT (envelope-from truckman@FreeBSD.org) Message-Id: <201806120355.w5C3t2jJ003508@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: truckman set sender to truckman@FreeBSD.org using -f From: Don Lewis Date: Tue, 12 Jun 2018 03:55:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r472229 - head/editors/openoffice-4 X-SVN-Group: ports-head X-SVN-Commit-Author: truckman X-SVN-Commit-Paths: head/editors/openoffice-4 X-SVN-Commit-Revision: 472229 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jun 2018 03:55:03 -0000 Author: truckman Date: Tue Jun 12 03:55:02 2018 New Revision: 472229 URL: https://svnweb.freebsd.org/changeset/ports/472229 Log: Instead of symlinking the directory containing the OpenOffice .desktop files under $PREFIX/share/applications, symlink the individual .desktop files. This is what upstream does on Linux and what LibreOffice does as well. The Plasma 5 desktop ignores symlinks to directories when it is scanning for .desktop files. PR: 228030 Reported by: kan@FreeBSD.org Modified: head/editors/openoffice-4/Makefile Modified: head/editors/openoffice-4/Makefile ============================================================================== --- head/editors/openoffice-4/Makefile Tue Jun 12 03:42:25 2018 (r472228) +++ head/editors/openoffice-4/Makefile Tue Jun 12 03:55:02 2018 (r472229) @@ -3,7 +3,7 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION} -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= editors java MASTER_SITES= APACHE/openoffice/${PORTVERSION}/sources \ http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \ @@ -454,7 +454,6 @@ do-install: ${LN} -f ${EXECBASE} ${EXECBASE}-$${i} ; \ done @${ECHO_CMD} "adding desktop support" - @${LN} -sf ${XDGREL} ${STAGEDIR}${DESKTOPDIR}/${EXECBASE} @cd ${WRKSRC} ; \ . ${FREEBSD_ENV_SET} ; \ cd sysui/$${INPATH}/misc/openoffice ; \ @@ -468,6 +467,10 @@ do-install: ${SH} ${CREATE_TREE} ; \ ${INSTALL_DATA} apacheopenoffice.xml \ ${STAGEDIR}/${PREFIX}/share/mime/packages + @cd ${STAGEDIR}${DESKTOPDIR}; for i in base calc draw impress \ + javafilter math printeradmin qstart startcenter writer ; do \ + ${LN} -sf ${XDGREL}/$${i}.desktop ${EXECBASE}-$${i}.desktop ; \ + done do-install-SDK-on: ${TAR} -s '|./[^/]*/||' -xz -C ${STAGEDIR}${PRINSTALLATION_BASEDIR} \