svn commit: r472229 - head/editors/openoffice-4

[Don Lewis]

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 at 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} \