svn commit: r400064 - in head/editors/openoffice-4: . files

[Don Lewis]

Author: truckman
Date: Fri Oct 23 23:22:24 2015
New Revision: 400064
URL: https://svnweb.freebsd.org/changeset/ports/400064

Log:
  Explicity set $JAVA_HOME in startup wrapper to the OpenJDK version used
  for the build to avoid any potential issues with relying on javavmwrapper
  parsing bsd.java.mk to determine this at runtime.
  
  Fix an botch in the FreeBSD-specific $LD_LIBRARY_PATH code in the
  startup wrapper.
  
  Java is needed at runtime, so flag it as a runtime dependency.

Added:
  head/editors/openoffice-4/files/patch-desktop_scripts_soffice.sh   (contents, props changed)
Modified:
  head/editors/openoffice-4/Makefile

Modified: head/editors/openoffice-4/Makefile
==============================================================================
--- head/editors/openoffice-4/Makefile	Fri Oct 23 23:07:07 2015	(r400063)
+++ head/editors/openoffice-4/Makefile	Fri Oct 23 23:22:24 2015	(r400064)
@@ -3,7 +3,7 @@
 
 PORTNAME=	apache-openoffice
 PORTVERSION=	${AOOVERSION}
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=	editors java
 MASTER_SITES=	APACHE/openoffice/${PORTVERSION}/source \
 		http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \
@@ -121,6 +121,7 @@ USE_GL=		gl glu
 USE_GNOME=	gtk20 libxslt libidl glib20
 USE_JAVA=	yes
 JAVA_BUILD=	jdk
+JAVA_RUN=	jdk
 JAVA_VENDOR=	openjdk
 JAVA_VERSION=	1.6+
 USE_PERL5=	build
@@ -323,6 +324,8 @@ post-extract:
 post-patch:
 	${REINPLACE_CMD} -e "/^ICONVERSION/s/=.*/= '-${AOOSUFFIX}'/" \
 		${WRKSRC}/sysui/desktop/productversion.mk
+	${REINPLACE_CMD} -e "s|%%JAVA_HOME%%|${JAVA_HOME}|" \
+		${WRKSRC}/desktop/scripts/soffice.sh
 .if ${COMPILER_TYPE} == gcc
 	# g++49 -Os sometimes leaves inline class methods undefined,
 	# affects fmgridif.cxx and ColumnControl.cxx

Added: head/editors/openoffice-4/files/patch-desktop_scripts_soffice.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/openoffice-4/files/patch-desktop_scripts_soffice.sh	Fri Oct 23 23:22:24 2015	(r400064)
@@ -0,0 +1,16 @@
+--- desktop/scripts/soffice.sh.orig	2014-02-25 08:22:34 UTC
++++ desktop/scripts/soffice.sh
+@@ -90,11 +90,11 @@ if [ -x "$sd_prog/javaldx" ] ; then
+     case "`uname -s`" in
+     FreeBSD)
+ 	sd_prog1="$sd_prog"
+-	LD_LIBRARY_PATH=$sd_prog1:${LD_LIBRARY_PATH}}
++	LD_LIBRARY_PATH=$sd_prog1${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ 	export LD_LIBRARY_PATH
+ 	;;
+     esac
+-    my_path=`"$sd_prog/javaldx" $BOOTSTRAPVARS \
++    my_path=`JAVA_HOME="%%JAVA_HOME%%" "$sd_prog/javaldx" $BOOTSTRAPVARS \
+         "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"`
+     if [ -n "$my_path" ] ; then
+         LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}