diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile index 79e29191e1e..53109092248 100644 --- a/graphics/dia/Makefile +++ b/graphics/dia/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.54 2008/10/03 11:39:01 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.55 2008/10/30 17:10:41 ajacoutot Exp $ COMMENT= technical diagrams drawing tool DISTNAME= dia-0.96.1 -PKGNAME= ${DISTNAME}p9 +PKGNAME= ${DISTNAME}p10 CATEGORIES= graphics HOMEPAGE= http://live.gnome.org/Dia/ @@ -31,7 +31,8 @@ LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \ popt::devel/popt \ xml2.>=10::textproc/libxml \ xslt.>=1::textproc/libxslt -RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils +RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils \ + ::devel/xdg-utils MODULES= devel/gettext \ textproc/intltool diff --git a/graphics/dia/patches/patch-app_commands_c b/graphics/dia/patches/patch-app_commands_c index c661ff7c639..f471a1514db 100644 --- a/graphics/dia/patches/patch-app_commands_c +++ b/graphics/dia/patches/patch-app_commands_c @@ -1,6 +1,6 @@ -$OpenBSD: patch-app_commands_c,v 1.2 2008/05/16 11:55:29 ajacoutot Exp $ +$OpenBSD: patch-app_commands_c,v 1.3 2008/10/30 17:10:41 ajacoutot Exp $ --- app/commands.c.orig Sun Mar 18 20:49:14 2007 -+++ app/commands.c Thu Oct 18 14:02:37 2007 ++++ app/commands.c Thu Oct 30 17:48:05 2008 @@ -523,16 +523,13 @@ edit_redo_callback (GtkAction *action) void help_manual_callback (GtkAction *action) @@ -19,15 +19,12 @@ $OpenBSD: patch-app_commands_c,v 1.2 2008/05/16 11:55:29 ajacoutot Exp $ if (!helpdir) { message_warning(_("Could not find help directory")); return; -@@ -581,13 +578,16 @@ help_manual_callback (GtkAction *action) +@@ -581,13 +578,12 @@ help_manual_callback (GtkAction *action) ShellExecuteA (0, "open", helpindex, NULL, helpdir, SW_SHOWNORMAL); #else command = getenv("BROWSER"); -+#ifdef GNOME - command = g_strdup_printf("%s 'file://%s' &", command ? command : "gnome-open", helpindex); -+#else -+ command = g_strdup_printf("%s '%s' &", command ? command : "xterm -e lynx", helpindex); -+#endif +- command = g_strdup_printf("%s 'file://%s' &", command ? command : "gnome-open", helpindex); ++ command = g_strdup_printf("%s 'file://%s' &", command ? command : "xdg-open", helpindex); system(command); g_free(command); #endif @@ -37,15 +34,12 @@ $OpenBSD: patch-app_commands_c,v 1.2 2008/05/16 11:55:29 ajacoutot Exp $ } static void -@@ -599,7 +599,11 @@ activate_url (GtkAboutDialog *about, +@@ -599,7 +595,7 @@ activate_url (GtkAboutDialog *about, ShellExecuteA (0, "open", link, NULL, NULL, SW_SHOWNORMAL); #else gchar *command = getenv("BROWSER"); -+#ifdef GNOME - command = g_strdup_printf("%s '%s' &", command ? command : "gnome-open", link); -+#else -+ command = g_strdup_printf("%s '%s' &", command ? command : "xterm -e lynx", link); -+#endif +- command = g_strdup_printf("%s '%s' &", command ? command : "gnome-open", link); ++ command = g_strdup_printf("%s '%s' &", command ? command : "xdg-open", link); system(command); g_free(command); #endif diff --git a/graphics/dia/pkg/PFRAG.gnome b/graphics/dia/pkg/PFRAG.gnome index 3aa84d52fbf..51116350f0d 100644 --- a/graphics/dia/pkg/PFRAG.gnome +++ b/graphics/dia/pkg/PFRAG.gnome @@ -1,4 +1,40 @@ -@comment $OpenBSD: PFRAG.gnome,v 1.1 2008/05/16 11:55:29 ajacoutot Exp $ +@comment $OpenBSD: PFRAG.gnome,v 1.2 2008/10/30 17:10:41 ajacoutot Exp $ %%SHARED%% lib/dia/libgprint_filter.a lib/dia/libgprint_filter.la +share/gnome/ +share/gnome/help/ +share/gnome/help/dia/ +share/gnome/help/dia/en/ +share/gnome/help/dia/en/authors.xml +share/gnome/help/dia/en/dia.xml +share/gnome/help/dia/en/entities.xml +share/gnome/help/dia/en/graphics/ +share/gnome/help/dia/en/graphics/greendots.png +share/gnome/help/dia/en/graphics/home_network.png +share/gnome/help/dia/en/graphics/line_icon.png +share/gnome/help/dia/en/graphics/line_props.png +share/gnome/help/dia/en/intro.xml +share/gnome/help/dia/en/license.xml +share/gnome/help/dia/en/usage-canvas.xml +share/gnome/help/dia/en/usage-customization.xml +share/gnome/help/dia/en/usage-layers.xml +share/gnome/help/dia/en/usage-loadsave.xml +share/gnome/help/dia/en/usage-objects-basic.xml +share/gnome/help/dia/en/usage-objects-selecting.xml +share/gnome/help/dia/en/usage-objects-special.xml +share/gnome/help/dia/en/usage-objects.xml +share/gnome/help/dia/en/usage-quickstart.xml +share/gnome/help/dia/eu/ +share/gnome/help/dia/eu/dia.xml +share/gnome/help/dia/eu/graphics/ +share/gnome/help/dia/eu/graphics/greendots.png +share/gnome/help/dia/eu/graphics/home_network.png +share/gnome/help/dia/eu/graphics/line_icon.png +share/gnome/help/dia/eu/graphics/line_props.png +share/gnome/help/dia/pl/ +share/gnome/help/dia/pl/dia.xml +share/gnome/help/dia/pl/graphics/ +share/gnome/help/dia/pl/graphics/greendots.png +share/gnome/help/dia/pl/graphics/home_network.png +share/gnome/help/dia/pl/graphics/line_props.png diff --git a/graphics/dia/pkg/PLIST b/graphics/dia/pkg/PLIST index b790a55061d..5dff2f13d98 100644 --- a/graphics/dia/pkg/PLIST +++ b/graphics/dia/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.16 2008/10/03 11:39:01 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.17 2008/10/30 17:10:41 ajacoutot Exp $ %%SHARED%% @bin bin/dia lib/dia/ @@ -1763,52 +1763,30 @@ share/doc/dia/html/pl/ch08s03.html share/doc/dia/html/pl/ch09.html share/doc/dia/html/pl/ch10.html share/doc/dia/html/pl/index.html -share/gnome/help/dia/ -share/gnome/help/dia/en/ -share/gnome/help/dia/en/authors.xml -share/gnome/help/dia/en/dia.xml -share/gnome/help/dia/en/entities.xml -share/gnome/help/dia/en/graphics/ -share/gnome/help/dia/en/graphics/greendots.png -share/gnome/help/dia/en/graphics/home_network.png -share/gnome/help/dia/en/graphics/line_icon.png -share/gnome/help/dia/en/graphics/line_props.png -share/gnome/help/dia/en/intro.xml -share/gnome/help/dia/en/license.xml -share/gnome/help/dia/en/usage-canvas.xml -share/gnome/help/dia/en/usage-customization.xml -share/gnome/help/dia/en/usage-layers.xml -share/gnome/help/dia/en/usage-loadsave.xml -share/gnome/help/dia/en/usage-objects-basic.xml -share/gnome/help/dia/en/usage-objects-selecting.xml -share/gnome/help/dia/en/usage-objects-special.xml -share/gnome/help/dia/en/usage-objects.xml -share/gnome/help/dia/en/usage-quickstart.xml -share/gnome/help/dia/eu/ -share/gnome/help/dia/eu/dia.xml -share/gnome/help/dia/eu/graphics/ -share/gnome/help/dia/eu/graphics/greendots.png -share/gnome/help/dia/eu/graphics/home_network.png -share/gnome/help/dia/eu/graphics/line_icon.png -share/gnome/help/dia/eu/graphics/line_props.png -share/gnome/help/dia/pl/ -share/gnome/help/dia/pl/dia.xml -share/gnome/help/dia/pl/graphics/ -share/gnome/help/dia/pl/graphics/greendots.png -share/gnome/help/dia/pl/graphics/home_network.png -share/gnome/help/dia/pl/graphics/line_props.png +share/locale/am/ +share/locale/am/LC_MESSAGES/ share/locale/am/LC_MESSAGES/dia.mo +share/locale/ar/ +share/locale/ar/LC_MESSAGES/ share/locale/ar/LC_MESSAGES/dia.mo +share/locale/az/ +share/locale/az/LC_MESSAGES/ share/locale/az/LC_MESSAGES/dia.mo share/locale/be/LC_MESSAGES/dia.mo share/locale/bg/LC_MESSAGES/dia.mo +share/locale/bs/ +share/locale/bs/LC_MESSAGES/ share/locale/bs/LC_MESSAGES/dia.mo share/locale/ca/LC_MESSAGES/dia.mo share/locale/cs/LC_MESSAGES/dia.mo share/locale/da/LC_MESSAGES/dia.mo share/locale/de/LC_MESSAGES/dia.mo share/locale/el/LC_MESSAGES/dia.mo +share/locale/en_CA/ +share/locale/en_CA/LC_MESSAGES/ share/locale/en_CA/LC_MESSAGES/dia.mo +share/locale/en_GB/ +share/locale/en_GB/LC_MESSAGES/ share/locale/en_GB/LC_MESSAGES/dia.mo share/locale/es/LC_MESSAGES/dia.mo share/locale/eu/LC_MESSAGES/dia.mo @@ -1816,21 +1794,37 @@ share/locale/fi/LC_MESSAGES/dia.mo share/locale/fr/LC_MESSAGES/dia.mo share/locale/ga/LC_MESSAGES/dia.mo share/locale/gl/LC_MESSAGES/dia.mo +share/locale/gu/ +share/locale/gu/LC_MESSAGES/ share/locale/gu/LC_MESSAGES/dia.mo share/locale/hr/LC_MESSAGES/dia.mo share/locale/hu/LC_MESSAGES/dia.mo share/locale/id/LC_MESSAGES/dia.mo +share/locale/is/ +share/locale/is/LC_MESSAGES/ share/locale/is/LC_MESSAGES/dia.mo share/locale/it/LC_MESSAGES/dia.mo share/locale/ja/LC_MESSAGES/dia.mo share/locale/ko/LC_MESSAGES/dia.mo +share/locale/lt/ +share/locale/lt/LC_MESSAGES/ share/locale/lt/LC_MESSAGES/dia.mo share/locale/lv/LC_MESSAGES/dia.mo +share/locale/mk/ +share/locale/mk/LC_MESSAGES/ share/locale/mk/LC_MESSAGES/dia.mo +share/locale/ml/ +share/locale/ml/LC_MESSAGES/ share/locale/ml/LC_MESSAGES/dia.mo +share/locale/mn/ +share/locale/mn/LC_MESSAGES/ share/locale/mn/LC_MESSAGES/dia.mo +share/locale/ms/ +share/locale/ms/LC_MESSAGES/ share/locale/ms/LC_MESSAGES/dia.mo share/locale/nb/LC_MESSAGES/dia.mo +share/locale/ne/ +share/locale/ne/LC_MESSAGES/ share/locale/ne/LC_MESSAGES/dia.mo share/locale/nl/LC_MESSAGES/dia.mo share/locale/nn/LC_MESSAGES/dia.mo @@ -1839,13 +1833,21 @@ share/locale/pt/LC_MESSAGES/dia.mo share/locale/pt_BR/LC_MESSAGES/dia.mo share/locale/ro/LC_MESSAGES/dia.mo share/locale/ru/LC_MESSAGES/dia.mo +share/locale/rw/ +share/locale/rw/LC_MESSAGES/ share/locale/rw/LC_MESSAGES/dia.mo share/locale/sk/LC_MESSAGES/dia.mo share/locale/sl/LC_MESSAGES/dia.mo +share/locale/sq/ +share/locale/sq/LC_MESSAGES/ share/locale/sq/LC_MESSAGES/dia.mo share/locale/sr/LC_MESSAGES/dia.mo +share/locale/sr@Latn/ +share/locale/sr@Latn/LC_MESSAGES/ share/locale/sr@Latn/LC_MESSAGES/dia.mo share/locale/sv/LC_MESSAGES/dia.mo +share/locale/th/ +share/locale/th/LC_MESSAGES/ share/locale/th/LC_MESSAGES/dia.mo share/locale/tr/LC_MESSAGES/dia.mo share/locale/uk/LC_MESSAGES/dia.mo @@ -1856,6 +1858,7 @@ share/mime-info/ share/mime-info/dia.keys share/mime-info/dia.mime @comment share/oaf/ +@comment share/omf/ @comment share/omf/dia/ share/pixmaps/ share/pixmaps/dia-diagram.png