tech-pkg: Re: openoffice2-bin and java

Subject: Re: openoffice2-bin and java
To: Geert Hendrickx <ghen@telenet.be>
From: Michael Rauch <mrauch@NetBSD.org>
List: tech-pkg
Date: 10/21/2005 15:30:28

Hi, 
On Fri, Oct 21, 2005 at 02:56:21PM +0200, Geert Hendrickx wrote:
> +.if !empty(PKG_JVM)
> 	${RM} -f ${PREFIX}/bin/soffice
> 	${SED} -e "s|@@PREFIX@@|${PREFIX}|g" -e "s|@@OO_VER@@|${OO_VER}|g" \
> +		-e "s|@@JAVA_HOME@@|${PKG_JAVA_HOME}|g" \
> 		< ${FILESDIR}/soffice > ${PREFIX}/bin/soffice
> 	${CHMOD} +x ${PREFIX}/bin/soffice
> +.else
> +	${LN} -sf ../openoffice.org${OO_VER}/program/soffice ${PREFIX}/bin/soffice
> +.endif
hmm, given the comment "# make sure we can find `whoami` on solaris"
we probably need the wrapper files/soffice also for the java-less case.
(at least as soon as Solaris is working). 
What about adding -e "s|@@PKG_JVM@@|${PKG_JVM}|g;" to the sed command
and wrapping the PATH setting with an 
 if [ -n "@@PKG_JVM@@" ]; then
 PATH=${PATH}:@@JAVA_HOME@@
 fi
(which avoids a spurious colon in the PATH)?
> with this options.mk: 
> [...] 
> PKG_JVMS_ACCEPTED=	sun-jdk13 sun-jdk14 sun-jdk15
blackdown-jdk13 should be fine as well, as it's based on the SUN
sources.
Apart from these two changes I think the patch is fine.
Michael