Unbreak wrapper script so that if a particular application is

specified but without specifying a document, that application is
started instead of presenting the user with the generic startup
window and requiring him to pick the document type (running
openoffice-*-scalc should open to a new spreadsheet, etc.)

Building with clang 3.7 is reported to have the same failure mode
as clang 3.6, so use the same optimization tweak as a workaround.

Various cleanups to do-install:

  * The paths ${PREFIX}/${INSTALLATION_BASEDIR} and
    ${PREFIX}/${INSTALLATION_BASEDIR}/${AOODIR}, and
    ${PREFIX}/${INSTALLATION_BASEDIR}/${AOODIR}/share/xdg are
    frequently used, so create a few variables to hold those paths
    instead of repeating the same, long sequence in a number of places

  * Tweak openoffice-wrapper to take advantage of the previous change

  * Use INSTALLS_ICONS=yes instead of manually adding the @exec and
    @unexec entries to the plist

  * Edit bootstraprc only once with ${REINPLACE_CMD} instead of
    running it twice to edit the same line

  * Remove bootstraprc.bak so that it does not get installed

  * With the advent of staging, it is not necessary to remove
    ${STAGEDIR}${DESKTOPDIR}/${EXECBASE}

  * Simplify code for installing icons

Rename remaining OOO* variables to AOO*.

1 files changed, 2 insertions, 2 deletions

diff --git a/editors/openoffice-devel/files/openoffice-wrapper b/editors/openoffice-devel/files/openoffice-wrapper
index 958878c645b4..6af286a38b8d 100644
--- a/editors/openoffice-devel/files/openoffice-wrapper
+++ b/editors/openoffice-devel/files/openoffice-wrapper
@@ -2,8 +2,8 @@
 #
 # $FreeBSD$
 
-oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/%%OOODIR%%
-program=`echo $0 | sed -e 's|.*-%%SVNREVISION%%-||'`
+oopath=%%OOPATH%%
+program=`echo $0 | sed -e 's|.*%%EXECBASE%%-||'`
 
 case $program in
 $0)