Use new INSTALLS_OMF.

Approved by:	bland, kwm, marcus and pav

8 files changed, 4 insertions, 8 deletions

diff --git a/databases/libgda2/Makefile b/databases/libgda2/Makefile
index 27d219afd7e2..f8213425ceda 100644
--- a/databases/libgda2/Makefile
+++ b/databases/libgda2/Makefile
@@ -24,6 +24,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier glib20 libxslt
+INSTALLS_OMF=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
diff --git a/databases/libgda2/pkg-plist b/databases/libgda2/pkg-plist
index 52fdb5fdc2d9..47a454eadc30 100644
--- a/databases/libgda2/pkg-plist
+++ b/databases/libgda2/pkg-plist
@@ -192,7 +192,6 @@ share/gnome/libgda/xml/gda-report-result.dtd
 share/gnome/libgda/xml/gda-xml-query.dtd
 share/gnome/libgda/xml/gda-xml-query.xsl
 share/gnome/omf/libgda/libgda-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/libgda/libgda-C.omf 2>/dev/null || /usr/bin/true
 share/locale/az/LC_MESSAGES/libgda-2.mo
 share/locale/ca/LC_MESSAGES/libgda-2.mo
 share/locale/cs/LC_MESSAGES/libgda-2.mo
@@ -240,4 +239,3 @@ share/locale/zh_TW/LC_MESSAGES/libgda-2.mo
 @dirrm include/libgda
 @dirrm include/libgda-report
 @dirrm etc/libgda
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/libgda/libgda-C.omf 2>/dev/null || /usr/bin/true
diff --git a/databases/libgda3/Makefile b/databases/libgda3/Makefile
index 27d219afd7e2..f8213425ceda 100644
--- a/databases/libgda3/Makefile
+++ b/databases/libgda3/Makefile
@@ -24,6 +24,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier glib20 libxslt
+INSTALLS_OMF=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
diff --git a/databases/libgda3/pkg-plist b/databases/libgda3/pkg-plist
index 52fdb5fdc2d9..47a454eadc30 100644
--- a/databases/libgda3/pkg-plist
+++ b/databases/libgda3/pkg-plist
@@ -192,7 +192,6 @@ share/gnome/libgda/xml/gda-report-result.dtd
 share/gnome/libgda/xml/gda-xml-query.dtd
 share/gnome/libgda/xml/gda-xml-query.xsl
 share/gnome/omf/libgda/libgda-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/libgda/libgda-C.omf 2>/dev/null || /usr/bin/true
 share/locale/az/LC_MESSAGES/libgda-2.mo
 share/locale/ca/LC_MESSAGES/libgda-2.mo
 share/locale/cs/LC_MESSAGES/libgda-2.mo
@@ -240,4 +239,3 @@ share/locale/zh_TW/LC_MESSAGES/libgda-2.mo
 @dirrm include/libgda
 @dirrm include/libgda-report
 @dirrm etc/libgda
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/libgda/libgda-C.omf 2>/dev/null || /usr/bin/true
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index 8345b510cd39..9802eb3559e0 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -22,6 +22,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnomeui libgda2 gtksourceview \
 		intlhack lthack
 USE_INC_LIBTOOL_VER=	13
+INSTALLS_OMF=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/databases/libgnomedb/pkg-plist b/databases/libgnomedb/pkg-plist
index d51a30d7d651..be38bcbd1973 100644
--- a/databases/libgnomedb/pkg-plist
+++ b/databases/libgnomedb/pkg-plist
@@ -92,7 +92,6 @@ share/gnome/gnome-db/ui/db-shell.xml
 share/gnome/mime-info/libgnomedb.keys
 share/gnome/mime-info/libgnomedb.mime
 share/gnome/omf/libgnomedb/libgnomedb-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/libgnomedb/libgnomedb-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/libgnomedb/gnome-db-aggregates_16x16.png
 share/gnome/pixmaps/libgnomedb/gnome-db-aggregates_24x24.png
 share/gnome/pixmaps/libgnomedb/gnome-db-commit_24x24.png
@@ -169,4 +168,3 @@ share/locale/zh_TW/LC_MESSAGES/libgnomedb-2.mo
 @dirrm share/gnome/gnome-db
 @dirrm %%DOCSDIR%%
 @dirrm include/libgnomedb
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/libgnomedb/libgnomedb-C.omf 2>/dev/null || /usr/bin/true
diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile
index 8d101f53dc79..83797f1daf3c 100644
--- a/databases/mergeant/Makefile
+++ b/databases/mergeant/Makefile
@@ -18,6 +18,7 @@ COMMENT=	Provide uniform access to data sources for the GNOME 2 environment
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+INSTALLS_OMF=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnomedb libgnomeprintui
 USE_PERL5=	yes
diff --git a/databases/mergeant/pkg-plist b/databases/mergeant/pkg-plist
index 42a3db768379..d4ade5f9bc46 100644
--- a/databases/mergeant/pkg-plist
+++ b/databases/mergeant/pkg-plist
@@ -48,7 +48,6 @@ share/gnome/mergeant/dtd/mergeant.dtd
 share/gnome/mime-info/mergeant.keys
 share/gnome/mime-info/mergeant.mime
 share/gnome/omf/mergeant/mergeant-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/mergeant/mergeant-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/document-icons/gnome-application-x-mergeant.png
 share/gnome/pixmaps/mergeant/mergeant.png
 share/gnome/pixmaps/mergeant/mergeant_connect.png
@@ -98,4 +97,3 @@ share/locale/vi/LC_MESSAGES/mergeant.mo
 @dirrm share/gnome/help/mergeant
 @dirrm lib/mergeant/plugins
 @dirrm lib/mergeant
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/mergeant/mergeant-C.omf 2>/dev/null || /usr/bin/true