10 files changed, 5 insertions, 42 deletions

diff --git a/misc/gnome-user-docs/Makefile b/misc/gnome-user-docs/Makefile
index 918376f9db1e..3c5b69fe62e0 100644
--- a/misc/gnome-user-docs/Makefile
+++ b/misc/gnome-user-docs/Makefile
@@ -21,6 +21,7 @@ RUN_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+INSTALLS_OMF=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier gnometarget
diff --git a/misc/gnome-user-docs/pkg-plist b/misc/gnome-user-docs/pkg-plist
index 2786bf221d96..434eda5fd682 100644
--- a/misc/gnome-user-docs/pkg-plist
+++ b/misc/gnome-user-docs/pkg-plist
@@ -140,11 +140,8 @@ share/gnome/help/user-guide/C/wgosoverview.xml
 share/gnome/help/user-guide/C/wgospanel.xml
 share/gnome/help/user-guide/C/wgosstartsession.xml
 share/gnome/omf/gnome2-user-docs/gnome-access-guide-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome2-user-docs/gnome-access-guide-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome2-user-docs/system-admin-guide-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome2-user-docs/system-admin-guide-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/user-guide/user-guide-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/user-guide-C.omf 2>/dev/null || /usr/bin/true
 @dirrm share/gnome/omf/user-guide
 @dirrm share/gnome/omf/gnome2-user-docs
 @dirrm share/gnome/help/user-guide/C/figures
@@ -155,6 +152,3 @@ share/gnome/omf/user-guide/user-guide-C.omf
 @dirrm share/gnome/help/gnome-access-guide/C/figures
 @dirrm share/gnome/help/gnome-access-guide/C
 @dirrm share/gnome/help/gnome-access-guide
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome2-user-docs/gnome-access-guide-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome2-user-docs/system-admin-guide-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/user-guide-C.omf 2>/dev/null || /usr/bin/true
diff --git a/misc/gnomesword/Makefile b/misc/gnomesword/Makefile
index 7df677c1f3fd..4747cee57b4c 100644
--- a/misc/gnomesword/Makefile
+++ b/misc/gnomesword/Makefile
@@ -20,6 +20,7 @@ LIB_DEPENDS=	sword.4:${PORTSDIR}/misc/sword
 RUN_DEPENDS=	${X11BASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnomespell
 
 USE_X_PREFIX=	yes
+INSTALLS_OMF=	yes
 USE_GNOME=	gnomehack gnomeprefix gnometarget gtkhtml3 intlhack
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
diff --git a/misc/gnomesword/pkg-plist b/misc/gnomesword/pkg-plist
index 03672f0d6bc7..6ebb6e7655d6 100644
--- a/misc/gnomesword/pkg-plist
+++ b/misc/gnomesword/pkg-plist
@@ -29,9 +29,7 @@ share/gnome/help/gnomesword/fr/figures/gnomesword_studypad.png
 share/gnome/help/gnomesword/fr/gnomesword.xml
 share/gnome/help/gnomesword/fr/legal.xml
 share/gnome/omf/gnomesword/gnomesword-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnomesword/gnomesword-C.omf 2>/dev/null || true
 share/gnome/omf/gnomesword/gnomesword-fr.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnomesword/gnomesword-fr.omf 2>/dev/null || true
 share/gnome/pixmaps/gnomesword/about.png
 share/gnome/pixmaps/gnomesword/book-bl.png
 share/gnome/pixmaps/gnomesword/book-gold.png
@@ -66,5 +64,3 @@ share/locale/uk/LC_MESSAGES/gnomesword.mo
 @dirrm share/gnome/help/gnomesword/C
 @dirrm share/gnome/help/gnomesword
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnomesword/gnomesword-C.omf 2>/dev/null || true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnomesword/gnomesword-fr.omf 2>/dev/null || true
diff --git a/misc/gnomeuserdocs2/Makefile b/misc/gnomeuserdocs2/Makefile
index 918376f9db1e..3c5b69fe62e0 100644
--- a/misc/gnomeuserdocs2/Makefile
+++ b/misc/gnomeuserdocs2/Makefile
@@ -21,6 +21,7 @@ RUN_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+INSTALLS_OMF=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier gnometarget
diff --git a/misc/gnomeuserdocs2/pkg-plist b/misc/gnomeuserdocs2/pkg-plist
index 2786bf221d96..434eda5fd682 100644
--- a/misc/gnomeuserdocs2/pkg-plist
+++ b/misc/gnomeuserdocs2/pkg-plist
@@ -140,11 +140,8 @@ share/gnome/help/user-guide/C/wgosoverview.xml
 share/gnome/help/user-guide/C/wgospanel.xml
 share/gnome/help/user-guide/C/wgosstartsession.xml
 share/gnome/omf/gnome2-user-docs/gnome-access-guide-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome2-user-docs/gnome-access-guide-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome2-user-docs/system-admin-guide-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome2-user-docs/system-admin-guide-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/user-guide/user-guide-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/user-guide-C.omf 2>/dev/null || /usr/bin/true
 @dirrm share/gnome/omf/user-guide
 @dirrm share/gnome/omf/gnome2-user-docs
 @dirrm share/gnome/help/user-guide/C/figures
@@ -155,6 +152,3 @@ share/gnome/omf/user-guide/user-guide-C.omf
 @dirrm share/gnome/help/gnome-access-guide/C/figures
 @dirrm share/gnome/help/gnome-access-guide/C
 @dirrm share/gnome/help/gnome-access-guide
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome2-user-docs/gnome-access-guide-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome2-user-docs/system-admin-guide-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/user-guide-C.omf 2>/dev/null || /usr/bin/true
diff --git a/misc/quick-lounge-applet/Makefile b/misc/quick-lounge-applet/Makefile
index 1715117fbab4..e772cf9a85a2 100644
--- a/misc/quick-lounge-applet/Makefile
+++ b/misc/quick-lounge-applet/Makefile
@@ -18,6 +18,7 @@ COMMENT=	Applet to orginize your preferred applications on the GNOME Panel
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+INSTALLS_OMF=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gnomepanel
 USE_LIBTOOL_VER=15
diff --git a/misc/quick-lounge-applet/pkg-plist b/misc/quick-lounge-applet/pkg-plist
index ee4aaef11a06..e5b837556669 100644
--- a/misc/quick-lounge-applet/pkg-plist
+++ b/misc/quick-lounge-applet/pkg-plist
@@ -92,27 +92,16 @@ share/gnome/help/quick-lounge/zh_TW/figures/quick-lounge_window.png
 share/gnome/help/quick-lounge/zh_TW/legal.xml
 share/gnome/help/quick-lounge/zh_TW/quick-lounge.xml
 share/gnome/omf/quick-lounge-applet/quick-lounge-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/quick-lounge-applet/quick-lounge-de.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-de.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/quick-lounge-applet/quick-lounge-es.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-es.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/quick-lounge-applet/quick-lounge-fr.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-fr.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/quick-lounge-applet/quick-lounge-it.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-it.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/quick-lounge-applet/quick-lounge-ja.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-ja.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/quick-lounge-applet/quick-lounge-ko.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-ko.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/quick-lounge-applet/quick-lounge-sv.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-sv.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/quick-lounge-applet/quick-lounge-zh_CN.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-zh_CN.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/quick-lounge-applet/quick-lounge-zh_HK.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-zh_HK.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/quick-lounge-applet/quick-lounge-zh_TW.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-zh_TW.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/quick-lounge-applet.png
 share/gnome/quick-lounge/glade/quick-lounge.glade
 share/locale/az/LC_MESSAGES/quick-lounge-applet.mo
@@ -168,14 +157,3 @@ share/locale/zh_CN/LC_MESSAGES/quick-lounge-applet.mo
 @dirrm share/gnome/help/quick-lounge/C/figures
 @dirrm share/gnome/help/quick-lounge/C
 @dirrm share/gnome/help/quick-lounge
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-de.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-es.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-fr.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-it.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-ja.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-ko.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-sv.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-zh_CN.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-zh_HK.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-zh_TW.omf 2>/dev/null || /usr/bin/true
diff --git a/misc/xiphos/Makefile b/misc/xiphos/Makefile
index 7df677c1f3fd..4747cee57b4c 100644
--- a/misc/xiphos/Makefile
+++ b/misc/xiphos/Makefile
@@ -20,6 +20,7 @@ LIB_DEPENDS=	sword.4:${PORTSDIR}/misc/sword
 RUN_DEPENDS=	${X11BASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnomespell
 
 USE_X_PREFIX=	yes
+INSTALLS_OMF=	yes
 USE_GNOME=	gnomehack gnomeprefix gnometarget gtkhtml3 intlhack
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
diff --git a/misc/xiphos/pkg-plist b/misc/xiphos/pkg-plist
index 03672f0d6bc7..6ebb6e7655d6 100644
--- a/misc/xiphos/pkg-plist
+++ b/misc/xiphos/pkg-plist
@@ -29,9 +29,7 @@ share/gnome/help/gnomesword/fr/figures/gnomesword_studypad.png
 share/gnome/help/gnomesword/fr/gnomesword.xml
 share/gnome/help/gnomesword/fr/legal.xml
 share/gnome/omf/gnomesword/gnomesword-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnomesword/gnomesword-C.omf 2>/dev/null || true
 share/gnome/omf/gnomesword/gnomesword-fr.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnomesword/gnomesword-fr.omf 2>/dev/null || true
 share/gnome/pixmaps/gnomesword/about.png
 share/gnome/pixmaps/gnomesword/book-bl.png
 share/gnome/pixmaps/gnomesword/book-gold.png
@@ -66,5 +64,3 @@ share/locale/uk/LC_MESSAGES/gnomesword.mo
 @dirrm share/gnome/help/gnomesword/C
 @dirrm share/gnome/help/gnomesword
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnomesword/gnomesword-C.omf 2>/dev/null || true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnomesword/gnomesword-fr.omf 2>/dev/null || true