Use new INSTALLS_OMF.

Approved by:	bland, kwm, marcus and pav

4 files changed, 2 insertions, 24 deletions

diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index 20b43a8cc78a..4179cbe64807 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -20,6 +20,7 @@ COMMENT=	A GNOME 2 calculator tool based on the old calctool for OpenWindows
 USE_BZIP2=	yes
 USE_BISON=	yes
 USE_X_PREFIX=	yes
+INSTALLS_OMF=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL_VER=15
 USE_REINPLACE=	yes
diff --git a/math/gcalctool/pkg-plist b/math/gcalctool/pkg-plist
index 0627d491fd8c..299563af0e42 100644
--- a/math/gcalctool/pkg-plist
+++ b/math/gcalctool/pkg-plist
@@ -68,27 +68,16 @@ share/gnome/help/gcalctool/zh_TW/figures/gcalctool_scientific_window.png
 share/gnome/help/gcalctool/zh_TW/gcalctool.xml
 share/gnome/help/gcalctool/zh_TW/legal.xml
 share/gnome/omf/gcalctool/gcalctool-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gcalctool/gcalctool-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gcalctool/gcalctool-de.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gcalctool/gcalctool-de.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gcalctool/gcalctool-es.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gcalctool/gcalctool-es.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gcalctool/gcalctool-fr.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gcalctool/gcalctool-fr.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gcalctool/gcalctool-it.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gcalctool/gcalctool-it.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gcalctool/gcalctool-ja.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gcalctool/gcalctool-ja.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gcalctool/gcalctool-ko.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gcalctool/gcalctool-ko.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gcalctool/gcalctool-sv.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gcalctool/gcalctool-sv.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gcalctool/gcalctool-zh_CN.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gcalctool/gcalctool-zh_CN.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gcalctool/gcalctool-zh_HK.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gcalctool/gcalctool-zh_HK.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gcalctool/gcalctool-zh_TW.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gcalctool/gcalctool-zh_TW.omf 2>/dev/null || /usr/bin/true
 share/locale/am/LC_MESSAGES/gcalctool.mo
 share/locale/ar/LC_MESSAGES/gcalctool.mo
 share/locale/az/LC_MESSAGES/gcalctool.mo
@@ -171,14 +160,3 @@ share/locale/zh_TW/LC_MESSAGES/gcalctool.mo
 @dirrm share/gnome/help/gcalctool/C/figures
 @dirrm share/gnome/help/gcalctool/C
 @dirrm share/gnome/help/gcalctool
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gcalctool/gcalctool-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gcalctool/gcalctool-de.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gcalctool/gcalctool-es.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gcalctool/gcalctool-fr.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gcalctool/gcalctool-it.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gcalctool/gcalctool-ja.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gcalctool/gcalctool-ko.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gcalctool/gcalctool-sv.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gcalctool/gcalctool-zh_CN.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gcalctool/gcalctool-zh_HK.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gcalctool/gcalctool-zh_TW.omf 2>/dev/null || /usr/bin/true
diff --git a/math/gnumeric2/Makefile b/math/gnumeric2/Makefile
index df0eba300123..8a971e10e2a5 100644
--- a/math/gnumeric2/Makefile
+++ b/math/gnumeric2/Makefile
@@ -27,6 +27,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier libgnomeprintui libgnomedb \
 		libgsf_gnome
 USE_PYTHON=	yes
+INSTALLS_OMF=	yes
 USE_REINPLACE=	yes
 USE_LIBTOOL_VER=15
 CONFIGURE_ARGS=	--without-guile --with-bonobo --with-gnome-db
diff --git a/math/gnumeric2/pkg-plist b/math/gnumeric2/pkg-plist
index 8d443180167f..d7ba6c755209 100644
--- a/math/gnumeric2/pkg-plist
+++ b/math/gnumeric2/pkg-plist
@@ -550,7 +550,6 @@ share/gnome/mc/templates/gnumeric.desktop
 share/gnome/mime-info/gnumeric.keys
 share/gnome/mime-info/gnumeric.mime
 share/gnome/omf/gnumeric/gnumeric-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnumeric/gnumeric-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/gnome-application-vnd.lotus-1-2-3.png
 share/gnome/pixmaps/gnome-application-x-applix-spreadsheet.png
 share/gnome/pixmaps/gnome-application-x-generic-spreadsheet.png
@@ -745,4 +744,3 @@ share/locale/zh_TW/LC_MESSAGES/gnumeric.mo
 @dirrm lib/gnumeric/%%VERSION%%/plugins
 @dirrm lib/gnumeric/%%VERSION%%
 @dirrm lib/gnumeric
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnumeric/gnumeric-C.omf 2>/dev/null || /usr/bin/true