Use new INSTALLS_OMF.

Approved by:	bland, kwm, marcus and pav

12 files changed, 6 insertions, 28 deletions

diff --git a/sysutils/battfink/Makefile b/sysutils/battfink/Makefile
index cffadd3debb4..81a2528a774f 100644
--- a/sysutils/battfink/Makefile
+++ b/sysutils/battfink/Makefile
@@ -18,6 +18,7 @@ COMMENT=	An energy saving preferences app for GNOME
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+INSTALLS_OMF=	yes
 USE_GNOME=	gnomehack gnomeprefix libgnomeui
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/sysutils/battfink/pkg-plist b/sysutils/battfink/pkg-plist
index bcec08856ec2..45526045abd9 100644
--- a/sysutils/battfink/pkg-plist
+++ b/sysutils/battfink/pkg-plist
@@ -13,7 +13,6 @@ share/gnome/battfink/icons/battfink-75.png
 share/gnome/battfink/icons/battfink-charge.png
 share/gnome/control-center-2.0/capplets/battfink-preferences.desktop
 share/gnome/omf/battfink/battfink-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/battfink/battfink-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/battfink.png
 share/locale/az/LC_MESSAGES/battfink-0.1.mo
 share/locale/da/LC_MESSAGES/battfink-0.1.mo
@@ -41,4 +40,3 @@ share/locale/zh_TW/LC_MESSAGES/battfink-0.1.mo
 @dirrm share/gnome/battfink/help/C
 @dirrm share/gnome/battfink/help
 @dirrm share/gnome/battfink
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/battfink/battfink-C.omf 2>/dev/null || /usr/bin/true
diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile
index 5539ca11d2b8..a38998eadd35 100644
--- a/sysutils/gconf-editor/Makefile
+++ b/sysutils/gconf-editor/Makefile
@@ -19,6 +19,7 @@ COMMENT=	A gconf database editor for the GNOME 2 environment
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+INSTALLS_OMF=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui
 USE_LIBTOOL_VER=15
diff --git a/sysutils/gconf-editor/pkg-plist b/sysutils/gconf-editor/pkg-plist
index 49065627221b..0a6b2d232ef9 100644
--- a/sysutils/gconf-editor/pkg-plist
+++ b/sysutils/gconf-editor/pkg-plist
@@ -10,7 +10,6 @@ share/gnome/help/gconf-editor/C/figures/gconf_editor_anno_window.png
 share/gnome/help/gconf-editor/C/gconf-editor.xml
 share/gnome/help/gconf-editor/C/legal.xml
 share/gnome/omf/gconf-editor/gconf-editor-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gconf-editor/gconf-editor-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/gconf-editor.png
 share/gnome/pixmaps/gconf-editor/entry-blank.png
 share/gnome/pixmaps/gconf-editor/entry-bool.png
@@ -90,4 +89,3 @@ share/locale/zh_TW/LC_MESSAGES/gconf-editor.mo
 @dirrm share/gnome/help/gconf-editor/C/figures
 @dirrm share/gnome/help/gconf-editor/C
 @dirrm share/gnome/help/gconf-editor
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gconf-editor/gconf-editor-C.omf 2>/dev/null || /usr/bin/true
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index bc8650e3e888..fea54dbfe25f 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -21,6 +21,7 @@ LIB_DEPENDS=	gtop-2.0.2:${PORTSDIR}/devel/libgtop2
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+INSTALLS_OMF=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui libwnck
diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist
index 27dd1f9c7159..b0fa0b688925 100644
--- a/sysutils/gnome-system-monitor/pkg-plist
+++ b/sysutils/gnome-system-monitor/pkg-plist
@@ -16,7 +16,6 @@ share/gnome/help/gnome-system-monitor/C/figures/viewMenu.png
 share/gnome/help/gnome-system-monitor/C/gnome-system-monitor.xml
 share/gnome/help/gnome-system-monitor/C/legal.xml
 share/gnome/omf/gnome-system-monitor/gnome-system-monitor-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-system-monitor/gnome-system-monitor-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/procman.png
 share/locale/am/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ar/LC_MESSAGES/gnome-system-monitor.mo
@@ -81,4 +80,3 @@ share/locale/zh_TW/LC_MESSAGES/gnome-system-monitor.mo
 @dirrm share/gnome/help/gnome-system-monitor/C/figures
 @dirrm share/gnome/help/gnome-system-monitor/C
 @dirrm share/gnome/help/gnome-system-monitor
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-system-monitor/gnome-system-monitor-C.omf 2>/dev/null || /usr/bin/true
diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile
index ea712a90ad50..638f2f1d6df7 100644
--- a/sysutils/gnome-system-tools/Makefile
+++ b/sysutils/gnome-system-tools/Makefile
@@ -21,6 +21,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_X_PREFIX=	yes
+INSTALLS_OMF=	yes
 USE_GNOME=	gnomehack gnomeprefix gnometarget intlhack libgnomeui
 USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/sysutils/gnome-system-tools/pkg-plist b/sysutils/gnome-system-tools/pkg-plist
index 1ccb07eb14e1..a9b10543285c 100644
--- a/sysutils/gnome-system-tools/pkg-plist
+++ b/sysutils/gnome-system-tools/pkg-plist
@@ -87,15 +87,10 @@ share/gnome/help/users-admin/C/figures/users-tool.png
 share/gnome/help/users-admin/C/legal.xml
 share/gnome/help/users-admin/C/users-admin.xml
 share/gnome/omf/gnome-system-tools/boot-admin-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-system-tools/boot-admin-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-system-tools/network-admin-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-system-tools/network-admin-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-system-tools/services-admin-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-system-tools/services-admin-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-system-tools/time-admin-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-system-tools/time-admin-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-system-tools/users-admin-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-system-tools/users-admin-C.omf 2>/dev/null || /usr/bin/true
 share/locale/am/LC_MESSAGES/gnome-system-tools.mo
 share/locale/ar/LC_MESSAGES/gnome-system-tools.mo
 share/locale/ar/LC_MESSAGES/setup-tools-backends.mo
@@ -250,8 +245,3 @@ share/setup-tool-backends/scripts/xml.pl
 @dirrm share/gnome-system-tools/pixmaps
 @dirrm share/gnome-system-tools/interfaces
 @dirrm share/gnome-system-tools
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-system-tools/boot-admin-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-system-tools/network-admin-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-system-tools/services-admin-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-system-tools/time-admin-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-system-tools/users-admin-C.omf 2>/dev/null || /usr/bin/true
diff --git a/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile
index bc8650e3e888..fea54dbfe25f 100644
--- a/sysutils/gnomesystemmonitor/Makefile
+++ b/sysutils/gnomesystemmonitor/Makefile
@@ -21,6 +21,7 @@ LIB_DEPENDS=	gtop-2.0.2:${PORTSDIR}/devel/libgtop2
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+INSTALLS_OMF=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui libwnck
diff --git a/sysutils/gnomesystemmonitor/pkg-plist b/sysutils/gnomesystemmonitor/pkg-plist
index 27dd1f9c7159..b0fa0b688925 100644
--- a/sysutils/gnomesystemmonitor/pkg-plist
+++ b/sysutils/gnomesystemmonitor/pkg-plist
@@ -16,7 +16,6 @@ share/gnome/help/gnome-system-monitor/C/figures/viewMenu.png
 share/gnome/help/gnome-system-monitor/C/gnome-system-monitor.xml
 share/gnome/help/gnome-system-monitor/C/legal.xml
 share/gnome/omf/gnome-system-monitor/gnome-system-monitor-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-system-monitor/gnome-system-monitor-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/procman.png
 share/locale/am/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ar/LC_MESSAGES/gnome-system-monitor.mo
@@ -81,4 +80,3 @@ share/locale/zh_TW/LC_MESSAGES/gnome-system-monitor.mo
 @dirrm share/gnome/help/gnome-system-monitor/C/figures
 @dirrm share/gnome/help/gnome-system-monitor/C
 @dirrm share/gnome/help/gnome-system-monitor
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-system-monitor/gnome-system-monitor-C.omf 2>/dev/null || /usr/bin/true
diff --git a/sysutils/gnomesystemtools/Makefile b/sysutils/gnomesystemtools/Makefile
index ea712a90ad50..638f2f1d6df7 100644
--- a/sysutils/gnomesystemtools/Makefile
+++ b/sysutils/gnomesystemtools/Makefile
@@ -21,6 +21,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_X_PREFIX=	yes
+INSTALLS_OMF=	yes
 USE_GNOME=	gnomehack gnomeprefix gnometarget intlhack libgnomeui
 USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/sysutils/gnomesystemtools/pkg-plist b/sysutils/gnomesystemtools/pkg-plist
index 1ccb07eb14e1..a9b10543285c 100644
--- a/sysutils/gnomesystemtools/pkg-plist
+++ b/sysutils/gnomesystemtools/pkg-plist
@@ -87,15 +87,10 @@ share/gnome/help/users-admin/C/figures/users-tool.png
 share/gnome/help/users-admin/C/legal.xml
 share/gnome/help/users-admin/C/users-admin.xml
 share/gnome/omf/gnome-system-tools/boot-admin-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-system-tools/boot-admin-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-system-tools/network-admin-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-system-tools/network-admin-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-system-tools/services-admin-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-system-tools/services-admin-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-system-tools/time-admin-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-system-tools/time-admin-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-system-tools/users-admin-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-system-tools/users-admin-C.omf 2>/dev/null || /usr/bin/true
 share/locale/am/LC_MESSAGES/gnome-system-tools.mo
 share/locale/ar/LC_MESSAGES/gnome-system-tools.mo
 share/locale/ar/LC_MESSAGES/setup-tools-backends.mo
@@ -250,8 +245,3 @@ share/setup-tool-backends/scripts/xml.pl
 @dirrm share/gnome-system-tools/pixmaps
 @dirrm share/gnome-system-tools/interfaces
 @dirrm share/gnome-system-tools
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-system-tools/boot-admin-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-system-tools/network-admin-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-system-tools/services-admin-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-system-tools/time-admin-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-system-tools/users-admin-C.omf 2>/dev/null || /usr/bin/true