Use new INSTALLS_OMF.

Approved by:	bland, kwm, marcus and pav

8 files changed, 4 insertions, 32 deletions

diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index 23641392107a..b292ecc72e6e 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -23,6 +23,7 @@ USE_REINPLACE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack eel2 libgnomeprintui \
 		librsvg2 desktopfileutils
 USE_X_PREFIX=	yes
+INSTALLS_OMF=	yes
 USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/graphics/eog2/pkg-plist b/graphics/eog2/pkg-plist
index 8965a0bbc56f..c48cb0f1697c 100644
--- a/graphics/eog2/pkg-plist
+++ b/graphics/eog2/pkg-plist
@@ -38,27 +38,16 @@ share/gnome/help/eog/zh_TW/eog.xml
 share/gnome/help/eog/zh_TW/figures/eog_start_window.png
 share/gnome/help/eog/zh_TW/legal.xml
 share/gnome/omf/eog/eog-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/eog/eog-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/eog/eog-de.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/eog/eog-de.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/eog/eog-es.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/eog/eog-es.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/eog/eog-eu.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/eog/eog-eu.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/eog/eog-fr.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/eog/eog-fr.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/eog/eog-it.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/eog/eog-it.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/eog/eog-ja.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/eog/eog-ja.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/eog/eog-ko.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/eog/eog-ko.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/eog/eog-sv.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/eog/eog-sv.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/eog/eog-zh_CN.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/eog/eog-zh_CN.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/eog/eog-zh_TW.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/eog/eog-zh_TW.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/eog/down-right.png
 share/gnome/pixmaps/eog/loading.png
 share/gnome/pixmaps/eog/orient-horizontal.png
@@ -163,15 +152,4 @@ share/locale/zh_TW/LC_MESSAGES/eog.mo
 @dirrm share/gnome/help/eog/C
 @dirrm share/gnome/eog/glade
 @dirrm share/gnome/eog
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-de.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-es.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-eu.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-fr.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-it.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-ja.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-ko.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-sv.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-zh_CN.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-zh_TW.omf 2>/dev/null || /usr/bin/true
 @unexec update-desktop-database > /dev/null || /usr/bin/true
diff --git a/graphics/gnofract4d/Makefile b/graphics/gnofract4d/Makefile
index 3532b5a242f8..84f2596c4a66 100644
--- a/graphics/gnofract4d/Makefile
+++ b/graphics/gnofract4d/Makefile
@@ -21,6 +21,7 @@ USE_GMAKE=	yes
 USE_INC_LIBTOOL_VER=	13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
+INSTALLS_OMF=	yes
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.pre.mk>
diff --git a/graphics/gnofract4d/pkg-plist b/graphics/gnofract4d/pkg-plist
index 64efbdfd1109..0d05b9e72593 100644
--- a/graphics/gnofract4d/pkg-plist
+++ b/graphics/gnofract4d/pkg-plist
@@ -94,9 +94,7 @@ share/gnome/maps/gnofract4d/vooon.map
 share/gnome/maps/gnofract4d/wild.map
 share/gnome/maps/gnofract4d/wine.map
 share/gnome/maps/gnofract4d/world.map
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnofract4d/gnofract4d-manual-C.omf 2>/dev/null || true
 share/gnome/omf/gnofract4d/gnofract4d-manual-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnofract4d/gnofract4d-manual-C.omf 2>/dev/null || true
 share/gnome/pixmaps/gnofract4d/deepen_now.png
 share/gnome/pixmaps/gnofract4d/explorer_mode.png
 share/gnome/pixmaps/gnofract4d/gnofract4d-logo.png
diff --git a/graphics/gpdf/Makefile b/graphics/gpdf/Makefile
index 3bacabe61fc0..9c833a28ac51 100644
--- a/graphics/gpdf/Makefile
+++ b/graphics/gpdf/Makefile
@@ -21,6 +21,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui libgnomeprintui \
 		desktopfileutils
 USE_X_PREFIX=	yes
+INSTALLS_OMF=	yes
 USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/graphics/gpdf/pkg-plist b/graphics/gpdf/pkg-plist
index fd5b70418812..b5c1ad62aaa7 100644
--- a/graphics/gpdf/pkg-plist
+++ b/graphics/gpdf/pkg-plist
@@ -20,11 +20,8 @@ share/gnome/help/gpdf/es/gpdf.xml
 share/gnome/help/gpdf/es/legal.xml
 share/gnome/mime-info/gpdf.keys
 share/gnome/omf/gpdf/gpdf-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gpdf/gpdf-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gpdf/gpdf-de.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gpdf/gpdf-de.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gpdf/gpdf-es.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gpdf/gpdf-es.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/gnome-pdf.png
 share/gnome/pixmaps/gpdf/fitwidth.png
 share/gnome/pixmaps/gpdf/stock_book-closed-mark.png
@@ -108,7 +105,4 @@ share/locale/zh_TW/LC_MESSAGES/gpdf.mo
 @dirrm share/gnome/help/gpdf
 @dirrm share/gnome/gpdf/glade
 @dirrm share/gnome/gpdf
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gpdf/gpdf-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gpdf/gpdf-de.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gpdf/gpdf-es.omf 2>/dev/null || /usr/bin/true
 @unexec update-desktop-database > /dev/null || /usr/bin/true
diff --git a/graphics/gtkam/Makefile b/graphics/gtkam/Makefile
index 3053fc01b77b..1af0f94aca5a 100644
--- a/graphics/gtkam/Makefile
+++ b/graphics/gtkam/Makefile
@@ -44,6 +44,7 @@ PLIST_SUB+=	GIMP="@comment "
 .if ${HAVE_GNOME:Mlibgnomeui}!=""
 PKGNAMESUFFIX=	-gnome
 USE_GNOME+=	gnomeprefix libgnomeui
+INSTALLS_OMF=	yes
 MAKE_ENV+=	GNOME_SUBDIRS="help omf-install"
 DATADIR=	${PREFIX}/share/gnome/${PORTNAME}
 .else
diff --git a/graphics/gtkam/pkg-plist b/graphics/gtkam/pkg-plist
index 4400bde58c7c..a665c4287ceb 100644
--- a/graphics/gtkam/pkg-plist
+++ b/graphics/gtkam/pkg-plist
@@ -13,9 +13,7 @@ share/gnome/applications/gtkam.desktop
 %%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_start_window.png
 %%GNOME:%%share/gnome/help/gtkam/C/gtkam.xml
 %%GNOME:%%share/gnome/help/gtkam/C/legal.xml
-%%GNOME:%%@exec scrollkeeper-install -q %D/share/gnome/omf/gtkam/gtkam-C.omf 2>/dev/null || true
 %%GNOME:%%share/gnome/omf/gtkam/gtkam-C.omf
-%%GNOME:%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gtkam/gtkam-C.omf 2>/dev/null || true
 share/gnome/pixmaps/gtkam.png
 %%DATADIR%%/images/gtkam-audio.png
 %%DATADIR%%/images/gtkam-camera.png