From 19bbc1b1cd97a5c1fee89f9dcc4a860e83443fbf Mon Sep 17 00:00:00 2001 From: Don Lewis Date: Sat, 26 Sep 2015 07:40:47 +0000 Subject: Add Caladea and Carlito fonts. They are metrically equivalent to some Microsoft fonts and the proper definitions within OpenOffice have been added so that they are recognized as such. [1] The Linux ports handle the mapping from the printeradmin command to the spadmin executable in the shell wrapper. Do the same in the FreeBSD port rather than munging the printeradmin.desktop file. Retain the spadmin link to the wrapper for backwards compatability. The setofficelang command went away a long time ago. Remove it from the shell wrapper and remove the link. Exec the OpenOffice executables from the wrapper so that the shell for the wrapper doesn't hang around as an extra process until OpenOffice terminates. Nuke an extraneous shell continuation in the Makefile. Suggested by: pfg [1] --- editors/openoffice-devel/files/openoffice-wrapper | 9 ++++----- .../files/patch-sysui_desktop_menus_printeradmin.desktop | 10 ---------- editors/openoffice-devel/files/pkg-message.in | 5 ++--- 3 files changed, 6 insertions(+), 18 deletions(-) delete mode 100644 editors/openoffice-devel/files/patch-sysui_desktop_menus_printeradmin.desktop (limited to 'editors/openoffice-devel/files') diff --git a/editors/openoffice-devel/files/openoffice-wrapper b/editors/openoffice-devel/files/openoffice-wrapper index 6af286a38b8d..271bca94f59b 100644 --- a/editors/openoffice-devel/files/openoffice-wrapper +++ b/editors/openoffice-devel/files/openoffice-wrapper @@ -2,17 +2,16 @@ # # $FreeBSD$ -oopath=%%OOPATH%% program=`echo $0 | sed -e 's|.*%%EXECBASE%%-||'` case $program in $0) - $oopath/program/soffice "$@" + exec %%OOPATH%%/program/soffice "$@" ;; -setofficelang) - $oopath/basis-link/program/$program "$@" +printeradmin) + exec %%OOPATH%%/program/spadmin ;; *) - $oopath/program/$program "$@" + exec %%OOPATH%%/program/$program "$@" ;; esac diff --git a/editors/openoffice-devel/files/patch-sysui_desktop_menus_printeradmin.desktop b/editors/openoffice-devel/files/patch-sysui_desktop_menus_printeradmin.desktop deleted file mode 100644 index 7333737556a9..000000000000 --- a/editors/openoffice-devel/files/patch-sysui_desktop_menus_printeradmin.desktop +++ /dev/null @@ -1,10 +0,0 @@ ---- sysui/desktop/menus/printeradmin.desktop.orig 2014-09-19 18:25:03 UTC -+++ sysui/desktop/menus/printeradmin.desktop -@@ -24,6 +24,6 @@ Terminal=false - Icon=printeradmin - Type=Application - Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office; --Exec=openoffice-printeradmin -+Exec=openoffice-spadmin - Name=%PRODUCTNAME Printer Administration - StartupNotify=true diff --git a/editors/openoffice-devel/files/pkg-message.in b/editors/openoffice-devel/files/pkg-message.in index 467f53f96bef..4587a89bc49b 100644 --- a/editors/openoffice-devel/files/pkg-message.in +++ b/editors/openoffice-devel/files/pkg-message.in @@ -22,13 +22,12 @@ There are some wrappers installed for faster startup. Add "%%PREFIX%%/bin/" to your PATH and you will be able to use them. %%PREFIX%%/bin/%%EXECBASE%% +%%PREFIX%%/bin/%%EXECBASE%%-printeradmin %%PREFIX%%/bin/%%EXECBASE%%-sbase %%PREFIX%%/bin/%%EXECBASE%%-scalc %%PREFIX%%/bin/%%EXECBASE%%-sdraw -%%PREFIX%%/bin/%%EXECBASE%%-setofficelang -%%PREFIX%%/bin/%%EXECBASE%%-smath %%PREFIX%%/bin/%%EXECBASE%%-simpress -%%PREFIX%%/bin/%%EXECBASE%%-spadmin +%%PREFIX%%/bin/%%EXECBASE%%-smath %%PREFIX%%/bin/%%EXECBASE%%-swriter OpenOffice does need $LANG to be set to a suitable value. -- cgit v1.2.3