Add a "gnome" option for dasher (enabled by default), to make it possible to

build the package without the gnome dependencies.

XXX sometimes the canvas isn't drawn on startup.  Resizing the window makes
    it appear (noted by Patrick Welche).

3 files changed, 210 insertions, 188 deletions

diff --git a/editors/dasher/Makefile b/editors/dasher/Makefile
index a6994c77bc7..a35cca65cf7 100644
--- a/editors/dasher/Makefile
+++ b/editors/dasher/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2010/01/18 09:58:48 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2010/01/22 19:55:07 ghen Exp $
 
 DISTNAME=	dasher-4.10.1
 PKGREVISION=	2
@@ -22,6 +22,7 @@ GNU_CONFIGURE=		yes
 INSTALLATION_DIRS=	${GCONF_SCHEMAS_DIR}
 
 .include "../../mk/bsd.prefs.mk"
+.include "options.mk"
 
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly"
 # Needed for ftime(3).
@@ -36,27 +37,11 @@ post-build:
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/Data/dasher.schemas ${DESTDIR}${GCONF_SCHEMAS_DIR}
 
-.include "../../audio/gnome-speech/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/atk/buildlink3.mk"
-.include "../../devel/at-spi/buildlink3.mk"
 .include "../../devel/GConf/schemas.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.0
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libbonoboui/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
-.include "../../devel/libgnome/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/libwnck/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../net/ORBit2/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
-.include "../../textproc/gnome-doc-utils/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.8.0
 .include "../../x11/gtk2/buildlink3.mk"
-.include "../../mk/omf-scrollkeeper.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/dasher/PLIST b/editors/dasher/PLIST
index 6ce3a0cbad0..067964b7533 100644
--- a/editors/dasher/PLIST
+++ b/editors/dasher/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2009/06/14 17:50:21 joerg Exp $
+@comment $NetBSD: PLIST,v 1.24 2010/01/22 19:55:07 ghen Exp $
 bin/dasher
 man/man1/dasher.1
 share/applications/dasher.desktop
@@ -189,166 +189,166 @@ share/dasher/training_swedish_SE.txt
 share/dasher/training_turkish_TR.txt
 share/dasher/training_welsh_GB.txt
 share/gconf/schemas/dasher.schemas
-share/gnome/help/dasher/C/dasher.xml
-share/gnome/help/dasher/C/figures/a-z.gif
-share/gnome/help/dasher/C/figures/aa-az.gif
-share/gnome/help/dasher/C/figures/ala-alz.gif
-share/gnome/help/dasher/C/figures/exampleHad2.png
-share/gnome/help/dasher/C/figures/exampleHad2a.png
-share/gnome/help/dasher/C/figures/exampleHad3a.png
-share/gnome/help/dasher/C/figures/exampleHad4.png
-share/gnome/help/dasher/C/figures/figure2.png
-share/gnome/help/dasher/C/figures/main.png
-share/gnome/help/dasher/C/figures/object.gif
-share/gnome/help/dasher/C/figures/prefs1.png
-share/gnome/help/dasher/C/figures/prefs2.png
-share/gnome/help/dasher/C/figures/prefs3.png
-share/gnome/help/dasher/C/figures/prefs4.png
-share/gnome/help/dasher/C/figures/prefs5.png
-share/gnome/help/dasher/de/dasher.xml
-share/gnome/help/dasher/de/figures/a-z.gif
-share/gnome/help/dasher/de/figures/aa-az.gif
-share/gnome/help/dasher/de/figures/ala-alz.gif
-share/gnome/help/dasher/de/figures/exampleHad2.png
-share/gnome/help/dasher/de/figures/exampleHad2a.png
-share/gnome/help/dasher/de/figures/exampleHad3a.png
-share/gnome/help/dasher/de/figures/exampleHad4.png
-share/gnome/help/dasher/de/figures/figure2.png
-share/gnome/help/dasher/de/figures/main.png
-share/gnome/help/dasher/de/figures/object.gif
-share/gnome/help/dasher/de/figures/prefs1.png
-share/gnome/help/dasher/de/figures/prefs2.png
-share/gnome/help/dasher/de/figures/prefs3.png
-share/gnome/help/dasher/de/figures/prefs4.png
-share/gnome/help/dasher/de/figures/prefs5.png
-share/gnome/help/dasher/el/dasher.xml
-share/gnome/help/dasher/el/figures/a-z.gif
-share/gnome/help/dasher/el/figures/aa-az.gif
-share/gnome/help/dasher/el/figures/ala-alz.gif
-share/gnome/help/dasher/el/figures/exampleHad2.png
-share/gnome/help/dasher/el/figures/exampleHad2a.png
-share/gnome/help/dasher/el/figures/exampleHad3a.png
-share/gnome/help/dasher/el/figures/exampleHad4.png
-share/gnome/help/dasher/el/figures/figure2.png
-share/gnome/help/dasher/el/figures/main.png
-share/gnome/help/dasher/el/figures/object.gif
-share/gnome/help/dasher/el/figures/prefs1.png
-share/gnome/help/dasher/el/figures/prefs2.png
-share/gnome/help/dasher/el/figures/prefs3.png
-share/gnome/help/dasher/el/figures/prefs4.png
-share/gnome/help/dasher/el/figures/prefs5.png
-share/gnome/help/dasher/en_GB/dasher.xml
-share/gnome/help/dasher/en_GB/figures/a-z.gif
-share/gnome/help/dasher/en_GB/figures/aa-az.gif
-share/gnome/help/dasher/en_GB/figures/ala-alz.gif
-share/gnome/help/dasher/en_GB/figures/exampleHad2.png
-share/gnome/help/dasher/en_GB/figures/exampleHad2a.png
-share/gnome/help/dasher/en_GB/figures/exampleHad3a.png
-share/gnome/help/dasher/en_GB/figures/exampleHad4.png
-share/gnome/help/dasher/en_GB/figures/figure2.png
-share/gnome/help/dasher/en_GB/figures/main.png
-share/gnome/help/dasher/en_GB/figures/object.gif
-share/gnome/help/dasher/en_GB/figures/prefs1.png
-share/gnome/help/dasher/en_GB/figures/prefs2.png
-share/gnome/help/dasher/en_GB/figures/prefs3.png
-share/gnome/help/dasher/en_GB/figures/prefs4.png
-share/gnome/help/dasher/en_GB/figures/prefs5.png
-share/gnome/help/dasher/es/dasher.xml
-share/gnome/help/dasher/es/figures/a-z.gif
-share/gnome/help/dasher/es/figures/aa-az.gif
-share/gnome/help/dasher/es/figures/ala-alz.gif
-share/gnome/help/dasher/es/figures/exampleHad2.png
-share/gnome/help/dasher/es/figures/exampleHad2a.png
-share/gnome/help/dasher/es/figures/exampleHad3a.png
-share/gnome/help/dasher/es/figures/exampleHad4.png
-share/gnome/help/dasher/es/figures/figure2.png
-share/gnome/help/dasher/es/figures/main.png
-share/gnome/help/dasher/es/figures/object.gif
-share/gnome/help/dasher/es/figures/prefs1.png
-share/gnome/help/dasher/es/figures/prefs2.png
-share/gnome/help/dasher/es/figures/prefs3.png
-share/gnome/help/dasher/es/figures/prefs4.png
-share/gnome/help/dasher/es/figures/prefs5.png
-share/gnome/help/dasher/eu/dasher.xml
-share/gnome/help/dasher/eu/figures/a-z.gif
-share/gnome/help/dasher/eu/figures/aa-az.gif
-share/gnome/help/dasher/eu/figures/ala-alz.gif
-share/gnome/help/dasher/eu/figures/exampleHad2.png
-share/gnome/help/dasher/eu/figures/exampleHad2a.png
-share/gnome/help/dasher/eu/figures/exampleHad3a.png
-share/gnome/help/dasher/eu/figures/exampleHad4.png
-share/gnome/help/dasher/eu/figures/figure2.png
-share/gnome/help/dasher/eu/figures/main.png
-share/gnome/help/dasher/eu/figures/object.gif
-share/gnome/help/dasher/eu/figures/prefs1.png
-share/gnome/help/dasher/eu/figures/prefs2.png
-share/gnome/help/dasher/eu/figures/prefs3.png
-share/gnome/help/dasher/eu/figures/prefs4.png
-share/gnome/help/dasher/eu/figures/prefs5.png
-share/gnome/help/dasher/fr/dasher.xml
-share/gnome/help/dasher/fr/figures/a-z.gif
-share/gnome/help/dasher/fr/figures/aa-az.gif
-share/gnome/help/dasher/fr/figures/ala-alz.gif
-share/gnome/help/dasher/fr/figures/exampleHad2.png
-share/gnome/help/dasher/fr/figures/exampleHad2a.png
-share/gnome/help/dasher/fr/figures/exampleHad3a.png
-share/gnome/help/dasher/fr/figures/exampleHad4.png
-share/gnome/help/dasher/fr/figures/figure2.png
-share/gnome/help/dasher/fr/figures/main.png
-share/gnome/help/dasher/fr/figures/object.gif
-share/gnome/help/dasher/fr/figures/prefs1.png
-share/gnome/help/dasher/fr/figures/prefs2.png
-share/gnome/help/dasher/fr/figures/prefs3.png
-share/gnome/help/dasher/fr/figures/prefs4.png
-share/gnome/help/dasher/fr/figures/prefs5.png
-share/gnome/help/dasher/oc/dasher.xml
-share/gnome/help/dasher/oc/figures/a-z.gif
-share/gnome/help/dasher/oc/figures/aa-az.gif
-share/gnome/help/dasher/oc/figures/ala-alz.gif
-share/gnome/help/dasher/oc/figures/exampleHad2.png
-share/gnome/help/dasher/oc/figures/exampleHad2a.png
-share/gnome/help/dasher/oc/figures/exampleHad3a.png
-share/gnome/help/dasher/oc/figures/exampleHad4.png
-share/gnome/help/dasher/oc/figures/figure2.png
-share/gnome/help/dasher/oc/figures/main.png
-share/gnome/help/dasher/oc/figures/object.gif
-share/gnome/help/dasher/oc/figures/prefs1.png
-share/gnome/help/dasher/oc/figures/prefs2.png
-share/gnome/help/dasher/oc/figures/prefs3.png
-share/gnome/help/dasher/oc/figures/prefs4.png
-share/gnome/help/dasher/oc/figures/prefs5.png
-share/gnome/help/dasher/ru/dasher.xml
-share/gnome/help/dasher/ru/figures/a-z.gif
-share/gnome/help/dasher/ru/figures/aa-az.gif
-share/gnome/help/dasher/ru/figures/ala-alz.gif
-share/gnome/help/dasher/ru/figures/exampleHad2.png
-share/gnome/help/dasher/ru/figures/exampleHad2a.png
-share/gnome/help/dasher/ru/figures/exampleHad3a.png
-share/gnome/help/dasher/ru/figures/exampleHad4.png
-share/gnome/help/dasher/ru/figures/figure2.png
-share/gnome/help/dasher/ru/figures/main.png
-share/gnome/help/dasher/ru/figures/object.gif
-share/gnome/help/dasher/ru/figures/prefs1.png
-share/gnome/help/dasher/ru/figures/prefs2.png
-share/gnome/help/dasher/ru/figures/prefs3.png
-share/gnome/help/dasher/ru/figures/prefs4.png
-share/gnome/help/dasher/ru/figures/prefs5.png
-share/gnome/help/dasher/sv/dasher.xml
-share/gnome/help/dasher/sv/figures/a-z.gif
-share/gnome/help/dasher/sv/figures/aa-az.gif
-share/gnome/help/dasher/sv/figures/ala-alz.gif
-share/gnome/help/dasher/sv/figures/exampleHad2.png
-share/gnome/help/dasher/sv/figures/exampleHad2a.png
-share/gnome/help/dasher/sv/figures/exampleHad3a.png
-share/gnome/help/dasher/sv/figures/exampleHad4.png
-share/gnome/help/dasher/sv/figures/figure2.png
-share/gnome/help/dasher/sv/figures/main.png
-share/gnome/help/dasher/sv/figures/object.gif
-share/gnome/help/dasher/sv/figures/prefs1.png
-share/gnome/help/dasher/sv/figures/prefs2.png
-share/gnome/help/dasher/sv/figures/prefs3.png
-share/gnome/help/dasher/sv/figures/prefs4.png
-share/gnome/help/dasher/sv/figures/prefs5.png
+${PLIST.gnome}share/gnome/help/dasher/C/dasher.xml
+${PLIST.gnome}share/gnome/help/dasher/C/figures/a-z.gif
+${PLIST.gnome}share/gnome/help/dasher/C/figures/aa-az.gif
+${PLIST.gnome}share/gnome/help/dasher/C/figures/ala-alz.gif
+${PLIST.gnome}share/gnome/help/dasher/C/figures/exampleHad2.png
+${PLIST.gnome}share/gnome/help/dasher/C/figures/exampleHad2a.png
+${PLIST.gnome}share/gnome/help/dasher/C/figures/exampleHad3a.png
+${PLIST.gnome}share/gnome/help/dasher/C/figures/exampleHad4.png
+${PLIST.gnome}share/gnome/help/dasher/C/figures/figure2.png
+${PLIST.gnome}share/gnome/help/dasher/C/figures/main.png
+${PLIST.gnome}share/gnome/help/dasher/C/figures/object.gif
+${PLIST.gnome}share/gnome/help/dasher/C/figures/prefs1.png
+${PLIST.gnome}share/gnome/help/dasher/C/figures/prefs2.png
+${PLIST.gnome}share/gnome/help/dasher/C/figures/prefs3.png
+${PLIST.gnome}share/gnome/help/dasher/C/figures/prefs4.png
+${PLIST.gnome}share/gnome/help/dasher/C/figures/prefs5.png
+${PLIST.gnome}share/gnome/help/dasher/de/dasher.xml
+${PLIST.gnome}share/gnome/help/dasher/de/figures/a-z.gif
+${PLIST.gnome}share/gnome/help/dasher/de/figures/aa-az.gif
+${PLIST.gnome}share/gnome/help/dasher/de/figures/ala-alz.gif
+${PLIST.gnome}share/gnome/help/dasher/de/figures/exampleHad2.png
+${PLIST.gnome}share/gnome/help/dasher/de/figures/exampleHad2a.png
+${PLIST.gnome}share/gnome/help/dasher/de/figures/exampleHad3a.png
+${PLIST.gnome}share/gnome/help/dasher/de/figures/exampleHad4.png
+${PLIST.gnome}share/gnome/help/dasher/de/figures/figure2.png
+${PLIST.gnome}share/gnome/help/dasher/de/figures/main.png
+${PLIST.gnome}share/gnome/help/dasher/de/figures/object.gif
+${PLIST.gnome}share/gnome/help/dasher/de/figures/prefs1.png
+${PLIST.gnome}share/gnome/help/dasher/de/figures/prefs2.png
+${PLIST.gnome}share/gnome/help/dasher/de/figures/prefs3.png
+${PLIST.gnome}share/gnome/help/dasher/de/figures/prefs4.png
+${PLIST.gnome}share/gnome/help/dasher/de/figures/prefs5.png
+${PLIST.gnome}share/gnome/help/dasher/el/dasher.xml
+${PLIST.gnome}share/gnome/help/dasher/el/figures/a-z.gif
+${PLIST.gnome}share/gnome/help/dasher/el/figures/aa-az.gif
+${PLIST.gnome}share/gnome/help/dasher/el/figures/ala-alz.gif
+${PLIST.gnome}share/gnome/help/dasher/el/figures/exampleHad2.png
+${PLIST.gnome}share/gnome/help/dasher/el/figures/exampleHad2a.png
+${PLIST.gnome}share/gnome/help/dasher/el/figures/exampleHad3a.png
+${PLIST.gnome}share/gnome/help/dasher/el/figures/exampleHad4.png
+${PLIST.gnome}share/gnome/help/dasher/el/figures/figure2.png
+${PLIST.gnome}share/gnome/help/dasher/el/figures/main.png
+${PLIST.gnome}share/gnome/help/dasher/el/figures/object.gif
+${PLIST.gnome}share/gnome/help/dasher/el/figures/prefs1.png
+${PLIST.gnome}share/gnome/help/dasher/el/figures/prefs2.png
+${PLIST.gnome}share/gnome/help/dasher/el/figures/prefs3.png
+${PLIST.gnome}share/gnome/help/dasher/el/figures/prefs4.png
+${PLIST.gnome}share/gnome/help/dasher/el/figures/prefs5.png
+${PLIST.gnome}share/gnome/help/dasher/en_GB/dasher.xml
+${PLIST.gnome}share/gnome/help/dasher/en_GB/figures/a-z.gif
+${PLIST.gnome}share/gnome/help/dasher/en_GB/figures/aa-az.gif
+${PLIST.gnome}share/gnome/help/dasher/en_GB/figures/ala-alz.gif
+${PLIST.gnome}share/gnome/help/dasher/en_GB/figures/exampleHad2.png
+${PLIST.gnome}share/gnome/help/dasher/en_GB/figures/exampleHad2a.png
+${PLIST.gnome}share/gnome/help/dasher/en_GB/figures/exampleHad3a.png
+${PLIST.gnome}share/gnome/help/dasher/en_GB/figures/exampleHad4.png
+${PLIST.gnome}share/gnome/help/dasher/en_GB/figures/figure2.png
+${PLIST.gnome}share/gnome/help/dasher/en_GB/figures/main.png
+${PLIST.gnome}share/gnome/help/dasher/en_GB/figures/object.gif
+${PLIST.gnome}share/gnome/help/dasher/en_GB/figures/prefs1.png
+${PLIST.gnome}share/gnome/help/dasher/en_GB/figures/prefs2.png
+${PLIST.gnome}share/gnome/help/dasher/en_GB/figures/prefs3.png
+${PLIST.gnome}share/gnome/help/dasher/en_GB/figures/prefs4.png
+${PLIST.gnome}share/gnome/help/dasher/en_GB/figures/prefs5.png
+${PLIST.gnome}share/gnome/help/dasher/es/dasher.xml
+${PLIST.gnome}share/gnome/help/dasher/es/figures/a-z.gif
+${PLIST.gnome}share/gnome/help/dasher/es/figures/aa-az.gif
+${PLIST.gnome}share/gnome/help/dasher/es/figures/ala-alz.gif
+${PLIST.gnome}share/gnome/help/dasher/es/figures/exampleHad2.png
+${PLIST.gnome}share/gnome/help/dasher/es/figures/exampleHad2a.png
+${PLIST.gnome}share/gnome/help/dasher/es/figures/exampleHad3a.png
+${PLIST.gnome}share/gnome/help/dasher/es/figures/exampleHad4.png
+${PLIST.gnome}share/gnome/help/dasher/es/figures/figure2.png
+${PLIST.gnome}share/gnome/help/dasher/es/figures/main.png
+${PLIST.gnome}share/gnome/help/dasher/es/figures/object.gif
+${PLIST.gnome}share/gnome/help/dasher/es/figures/prefs1.png
+${PLIST.gnome}share/gnome/help/dasher/es/figures/prefs2.png
+${PLIST.gnome}share/gnome/help/dasher/es/figures/prefs3.png
+${PLIST.gnome}share/gnome/help/dasher/es/figures/prefs4.png
+${PLIST.gnome}share/gnome/help/dasher/es/figures/prefs5.png
+${PLIST.gnome}share/gnome/help/dasher/eu/dasher.xml
+${PLIST.gnome}share/gnome/help/dasher/eu/figures/a-z.gif
+${PLIST.gnome}share/gnome/help/dasher/eu/figures/aa-az.gif
+${PLIST.gnome}share/gnome/help/dasher/eu/figures/ala-alz.gif
+${PLIST.gnome}share/gnome/help/dasher/eu/figures/exampleHad2.png
+${PLIST.gnome}share/gnome/help/dasher/eu/figures/exampleHad2a.png
+${PLIST.gnome}share/gnome/help/dasher/eu/figures/exampleHad3a.png
+${PLIST.gnome}share/gnome/help/dasher/eu/figures/exampleHad4.png
+${PLIST.gnome}share/gnome/help/dasher/eu/figures/figure2.png
+${PLIST.gnome}share/gnome/help/dasher/eu/figures/main.png
+${PLIST.gnome}share/gnome/help/dasher/eu/figures/object.gif
+${PLIST.gnome}share/gnome/help/dasher/eu/figures/prefs1.png
+${PLIST.gnome}share/gnome/help/dasher/eu/figures/prefs2.png
+${PLIST.gnome}share/gnome/help/dasher/eu/figures/prefs3.png
+${PLIST.gnome}share/gnome/help/dasher/eu/figures/prefs4.png
+${PLIST.gnome}share/gnome/help/dasher/eu/figures/prefs5.png
+${PLIST.gnome}share/gnome/help/dasher/fr/dasher.xml
+${PLIST.gnome}share/gnome/help/dasher/fr/figures/a-z.gif
+${PLIST.gnome}share/gnome/help/dasher/fr/figures/aa-az.gif
+${PLIST.gnome}share/gnome/help/dasher/fr/figures/ala-alz.gif
+${PLIST.gnome}share/gnome/help/dasher/fr/figures/exampleHad2.png
+${PLIST.gnome}share/gnome/help/dasher/fr/figures/exampleHad2a.png
+${PLIST.gnome}share/gnome/help/dasher/fr/figures/exampleHad3a.png
+${PLIST.gnome}share/gnome/help/dasher/fr/figures/exampleHad4.png
+${PLIST.gnome}share/gnome/help/dasher/fr/figures/figure2.png
+${PLIST.gnome}share/gnome/help/dasher/fr/figures/main.png
+${PLIST.gnome}share/gnome/help/dasher/fr/figures/object.gif
+${PLIST.gnome}share/gnome/help/dasher/fr/figures/prefs1.png
+${PLIST.gnome}share/gnome/help/dasher/fr/figures/prefs2.png
+${PLIST.gnome}share/gnome/help/dasher/fr/figures/prefs3.png
+${PLIST.gnome}share/gnome/help/dasher/fr/figures/prefs4.png
+${PLIST.gnome}share/gnome/help/dasher/fr/figures/prefs5.png
+${PLIST.gnome}share/gnome/help/dasher/oc/dasher.xml
+${PLIST.gnome}share/gnome/help/dasher/oc/figures/a-z.gif
+${PLIST.gnome}share/gnome/help/dasher/oc/figures/aa-az.gif
+${PLIST.gnome}share/gnome/help/dasher/oc/figures/ala-alz.gif
+${PLIST.gnome}share/gnome/help/dasher/oc/figures/exampleHad2.png
+${PLIST.gnome}share/gnome/help/dasher/oc/figures/exampleHad2a.png
+${PLIST.gnome}share/gnome/help/dasher/oc/figures/exampleHad3a.png
+${PLIST.gnome}share/gnome/help/dasher/oc/figures/exampleHad4.png
+${PLIST.gnome}share/gnome/help/dasher/oc/figures/figure2.png
+${PLIST.gnome}share/gnome/help/dasher/oc/figures/main.png
+${PLIST.gnome}share/gnome/help/dasher/oc/figures/object.gif
+${PLIST.gnome}share/gnome/help/dasher/oc/figures/prefs1.png
+${PLIST.gnome}share/gnome/help/dasher/oc/figures/prefs2.png
+${PLIST.gnome}share/gnome/help/dasher/oc/figures/prefs3.png
+${PLIST.gnome}share/gnome/help/dasher/oc/figures/prefs4.png
+${PLIST.gnome}share/gnome/help/dasher/oc/figures/prefs5.png
+${PLIST.gnome}share/gnome/help/dasher/ru/dasher.xml
+${PLIST.gnome}share/gnome/help/dasher/ru/figures/a-z.gif
+${PLIST.gnome}share/gnome/help/dasher/ru/figures/aa-az.gif
+${PLIST.gnome}share/gnome/help/dasher/ru/figures/ala-alz.gif
+${PLIST.gnome}share/gnome/help/dasher/ru/figures/exampleHad2.png
+${PLIST.gnome}share/gnome/help/dasher/ru/figures/exampleHad2a.png
+${PLIST.gnome}share/gnome/help/dasher/ru/figures/exampleHad3a.png
+${PLIST.gnome}share/gnome/help/dasher/ru/figures/exampleHad4.png
+${PLIST.gnome}share/gnome/help/dasher/ru/figures/figure2.png
+${PLIST.gnome}share/gnome/help/dasher/ru/figures/main.png
+${PLIST.gnome}share/gnome/help/dasher/ru/figures/object.gif
+${PLIST.gnome}share/gnome/help/dasher/ru/figures/prefs1.png
+${PLIST.gnome}share/gnome/help/dasher/ru/figures/prefs2.png
+${PLIST.gnome}share/gnome/help/dasher/ru/figures/prefs3.png
+${PLIST.gnome}share/gnome/help/dasher/ru/figures/prefs4.png
+${PLIST.gnome}share/gnome/help/dasher/ru/figures/prefs5.png
+${PLIST.gnome}share/gnome/help/dasher/sv/dasher.xml
+${PLIST.gnome}share/gnome/help/dasher/sv/figures/a-z.gif
+${PLIST.gnome}share/gnome/help/dasher/sv/figures/aa-az.gif
+${PLIST.gnome}share/gnome/help/dasher/sv/figures/ala-alz.gif
+${PLIST.gnome}share/gnome/help/dasher/sv/figures/exampleHad2.png
+${PLIST.gnome}share/gnome/help/dasher/sv/figures/exampleHad2a.png
+${PLIST.gnome}share/gnome/help/dasher/sv/figures/exampleHad3a.png
+${PLIST.gnome}share/gnome/help/dasher/sv/figures/exampleHad4.png
+${PLIST.gnome}share/gnome/help/dasher/sv/figures/figure2.png
+${PLIST.gnome}share/gnome/help/dasher/sv/figures/main.png
+${PLIST.gnome}share/gnome/help/dasher/sv/figures/object.gif
+${PLIST.gnome}share/gnome/help/dasher/sv/figures/prefs1.png
+${PLIST.gnome}share/gnome/help/dasher/sv/figures/prefs2.png
+${PLIST.gnome}share/gnome/help/dasher/sv/figures/prefs3.png
+${PLIST.gnome}share/gnome/help/dasher/sv/figures/prefs4.png
+${PLIST.gnome}share/gnome/help/dasher/sv/figures/prefs5.png
 share/icons/hicolor/48x48/apps/dasher.png
 share/icons/hicolor/scalable/apps/dasher.svg
 share/locale/af/LC_MESSAGES/dasher.mo
@@ -432,13 +432,13 @@ share/locale/vi/LC_MESSAGES/dasher.mo
 share/locale/zh_CN/LC_MESSAGES/dasher.mo
 share/locale/zh_HK/LC_MESSAGES/dasher.mo
 share/locale/zh_TW/LC_MESSAGES/dasher.mo
-share/omf/dasher/dasher-C.omf
-share/omf/dasher/dasher-de.omf
-share/omf/dasher/dasher-el.omf
-share/omf/dasher/dasher-en_GB.omf
-share/omf/dasher/dasher-es.omf
-share/omf/dasher/dasher-eu.omf
-share/omf/dasher/dasher-fr.omf
-share/omf/dasher/dasher-oc.omf
-share/omf/dasher/dasher-ru.omf
-share/omf/dasher/dasher-sv.omf
+${PLIST.gnome}share/omf/dasher/dasher-C.omf
+${PLIST.gnome}share/omf/dasher/dasher-de.omf
+${PLIST.gnome}share/omf/dasher/dasher-el.omf
+${PLIST.gnome}share/omf/dasher/dasher-en_GB.omf
+${PLIST.gnome}share/omf/dasher/dasher-es.omf
+${PLIST.gnome}share/omf/dasher/dasher-eu.omf
+${PLIST.gnome}share/omf/dasher/dasher-fr.omf
+${PLIST.gnome}share/omf/dasher/dasher-oc.omf
+${PLIST.gnome}share/omf/dasher/dasher-ru.omf
+${PLIST.gnome}share/omf/dasher/dasher-sv.omf
diff --git a/editors/dasher/options.mk b/editors/dasher/options.mk
new file mode 100644
index 00000000000..7f4a535b323
--- /dev/null
+++ b/editors/dasher/options.mk
@@ -0,0 +1,37 @@
+# $NetBSD: options.mk,v 1.1 2010/01/22 19:55:07 ghen Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.dasher
+PKG_SUPPORTED_OPTIONS=	gnome
+PKG_SUGGESTED_OPTIONS=	gnome
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS=		gnome
+
+###
+### Gnome support
+###
+.if !empty(PKG_OPTIONS:Mgnome)
+CONFIGURE_ARGS+=	--with-gnome
+PLIST.enchant=		yes
+.include "../../audio/gnome-speech/buildlink3.mk"
+.include "../../devel/atk/buildlink3.mk"
+.include "../../devel/at-spi/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.0
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/libbonobo/buildlink3.mk"
+.include "../../devel/libbonoboui/buildlink3.mk"
+.include "../../devel/libgnome/buildlink3.mk"
+.include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../devel/libwnck/buildlink3.mk"
+.include "../../net/ORBit2/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../sysutils/gnome-vfs/buildlink3.mk"
+.include "../../textproc/gnome-doc-utils/buildlink3.mk"
+.include "../../mk/omf-scrollkeeper.mk"
+.else
+CONFIGURE_ARGS+=	--without-gnome
+CONFIGURE_ARGS+=	--disable-a11y
+CONFIGURE_ARGS+=	--disable-nls
+.endif # gnome