8 files changed, 4 insertions, 84 deletions

diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 53f9d01f42c6..d90365e9707b 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -21,6 +21,7 @@ LIB_DEPENDS=	guile.15:${PORTSDIR}/lang/guile
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+INSTALLS_OMF=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack libgnomeui \
diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist
index e2a994af5003..6df66145aa97 100644
--- a/games/gnome-games/pkg-plist
+++ b/games/gnome-games/pkg-plist
@@ -315,45 +315,25 @@ share/gnome/help/same-gnome/C/same-gnome.xml
 share/gnome/mime-info/gnome-stones.keys
 share/gnome/mime-info/gnome-stones.mime
 share/gnome/omf/gnome-games/aisleriot-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/aisleriot-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/blackjack-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/blackjack-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/gataxx-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gataxx-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/glines-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/glines-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/gnect-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnect-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/gnibbles-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnibbles-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/gnobots2-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnobots2-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/gnobots2-da.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnobots2-da.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/gnobots2-es.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnobots2-es.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/gnobots2-it.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnobots2-it.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/gnome-stones-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnome-stones-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/gnometris-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnometris-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/gnomine-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnomine-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/gnotravex-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnotravex-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/gnotski-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnotski-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/gtali-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gtali-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/gtali-da.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gtali-da.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/iagno-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/iagno-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/mahjongg-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/mahjongg-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/same-gnome-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/same-gnome-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/blackjack/baize.png
 share/gnome/pixmaps/blackjack/blackjack-splash.png
 share/gnome/pixmaps/blackjack/chip-1.svg
@@ -711,24 +691,4 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
 @dirrm share/gnome/blackjack
 @dirrm lib/gnome-stones/objects
 @dirrm lib/gnome-stones
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/aisleriot-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/blackjack-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gataxx-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/glines-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnect-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnibbles-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnobots2-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnobots2-da.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnobots2-es.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnobots2-it.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnome-stones-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnometris-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnomine-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnotravex-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnotski-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gtali-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gtali-da.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/iagno-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/mahjongg-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/same-gnome-C.omf 2>/dev/null || /usr/bin/true
 @unexec update-desktop-database > /dev/null || /usr/bin/true
diff --git a/games/gnomechess/Makefile b/games/gnomechess/Makefile
index 566ab6f16832..6f7c6d5d3711 100644
--- a/games/gnomechess/Makefile
+++ b/games/gnomechess/Makefile
@@ -22,6 +22,7 @@ RUN_DEPENDS=	crafty:${PORTSDIR}/games/crafty
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomecanvas gnomehack gnomeprefix libglade
 USE_GMAKE=	yes
+INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/games/gnomechess/pkg-plist b/games/gnomechess/pkg-plist
index f824301f1be4..a2b6620b3a3f 100644
--- a/games/gnomechess/pkg-plist
+++ b/games/gnomechess/pkg-plist
@@ -28,7 +28,6 @@ share/gnome/help/gnome-chess-manual/C/usage.html
 share/gnome/mime-info/gnome-chess.keys
 share/gnome/mime-info/gnome-chess.mime
 share/gnome/omf/gnome-chess/gnome-chess-manual-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-chess/gnome-chess-manual-C.omf 2>/dev/null || true
 share/gnome/pixmaps/gnome-chess.png
 share/gnome/pixmaps/gnome-chess/B.png
 share/gnome/pixmaps/gnome-chess/K.png
@@ -77,4 +76,3 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gnome-chess.mo
 @dirrm share/gnome/help/gnome-chess-manual
 @dirrm share/gnome/gnome-chess/glade
 @dirrm share/gnome/gnome-chess
-@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-chess/gnome-chess-manual-C.omf 2>/dev/null || true
diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile
index 53f9d01f42c6..d90365e9707b 100644
--- a/games/gnomegames2/Makefile
+++ b/games/gnomegames2/Makefile
@@ -21,6 +21,7 @@ LIB_DEPENDS=	guile.15:${PORTSDIR}/lang/guile
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+INSTALLS_OMF=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack libgnomeui \
diff --git a/games/gnomegames2/pkg-plist b/games/gnomegames2/pkg-plist
index e2a994af5003..6df66145aa97 100644
--- a/games/gnomegames2/pkg-plist
+++ b/games/gnomegames2/pkg-plist
@@ -315,45 +315,25 @@ share/gnome/help/same-gnome/C/same-gnome.xml
 share/gnome/mime-info/gnome-stones.keys
 share/gnome/mime-info/gnome-stones.mime
 share/gnome/omf/gnome-games/aisleriot-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/aisleriot-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/blackjack-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/blackjack-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/gataxx-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gataxx-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/glines-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/glines-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/gnect-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnect-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/gnibbles-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnibbles-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/gnobots2-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnobots2-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/gnobots2-da.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnobots2-da.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/gnobots2-es.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnobots2-es.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/gnobots2-it.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnobots2-it.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/gnome-stones-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnome-stones-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/gnometris-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnometris-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/gnomine-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnomine-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/gnotravex-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnotravex-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/gnotski-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnotski-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/gtali-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gtali-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/gtali-da.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gtali-da.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/iagno-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/iagno-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/mahjongg-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/mahjongg-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/same-gnome-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/same-gnome-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/blackjack/baize.png
 share/gnome/pixmaps/blackjack/blackjack-splash.png
 share/gnome/pixmaps/blackjack/chip-1.svg
@@ -711,24 +691,4 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
 @dirrm share/gnome/blackjack
 @dirrm lib/gnome-stones/objects
 @dirrm lib/gnome-stones
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/aisleriot-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/blackjack-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gataxx-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/glines-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnect-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnibbles-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnobots2-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnobots2-da.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnobots2-es.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnobots2-it.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnome-stones-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnometris-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnomine-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnotravex-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnotski-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gtali-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gtali-da.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/iagno-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/mahjongg-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/same-gnome-C.omf 2>/dev/null || /usr/bin/true
 @unexec update-desktop-database > /dev/null || /usr/bin/true
diff --git a/games/gretools/Makefile b/games/gretools/Makefile
index 8e1e9013f8ee..539daf700a20 100644
--- a/games/gretools/Makefile
+++ b/games/gretools/Makefile
@@ -18,6 +18,7 @@ COMMENT=	GNOME vocabulary builder
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix gnometarget pygnome2
 USE_PYTHON=	yes
+INSTALLS_OMF=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/games/gretools/pkg-plist b/games/gretools/pkg-plist
index c0c52665ee0a..35eddc0bee48 100644
--- a/games/gretools/pkg-plist
+++ b/games/gretools/pkg-plist
@@ -10,7 +10,6 @@ share/gnome/help/gretools/C/figures/gretools_start_window.png
 share/gnome/help/gretools/C/gretools.xml
 share/gnome/help/gretools/C/legal.xml
 share/gnome/omf/gretools/gretools-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gretools/gretools-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/gretools.png
 @dirrm share/gnome/omf/gretools
 @dirrm share/gnome/help/gretools/C/figures
@@ -20,4 +19,3 @@ share/gnome/pixmaps/gretools.png
 @dirrm share/gnome/gretools/glade
 @dirrm share/gnome/gretools
 @dirrm %%PYTHON_SITELIBDIR%%/gretools
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gretools/gretools-C.omf 2>/dev/null || /usr/bin/true