From 730108d659fdd27fb1b2931a054baf473696cdc8 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Sat, 11 Apr 2009 10:05:47 +0000 Subject: [PATCH] - several fixes: * xdg-utils is only needed to the !gnome FLAVOR * regen WANTLIB, esd is no more a dependency (unbreak gnome FLAVOR) * use yelp for the gnome FLAVOR * regen PLIST --- graphics/dia/Makefile | 18 ++++++++++------ graphics/dia/patches/patch-app_commands_c | 25 +++++------------------ graphics/dia/pkg/PFRAG.gnome | 4 ++-- graphics/dia/pkg/PLIST | 4 ++-- 4 files changed, 21 insertions(+), 30 deletions(-) diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile index 614149446de..ab89792d8fa 100644 --- a/graphics/dia/Makefile +++ b/graphics/dia/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.56 2008/11/24 09:52:47 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.57 2009/04/11 10:05:47 ajacoutot Exp $ COMMENT= technical diagrams drawing tool DISTNAME= dia-0.96.1 -PKGNAME= ${DISTNAME}p11 +PKGNAME= ${DISTNAME}p12 CATEGORIES= graphics HOMEPAGE= http://live.gnome.org/Dia/ @@ -31,8 +31,7 @@ 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 \ - ::devel/xdg-utils +RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils MODULES= devel/gettext \ textproc/intltool @@ -41,6 +40,9 @@ USE_X11= Yes USE_GMAKE= Yes USE_LIBTOOL= Yes +# patch-doc_en_usage-layers_xml seen as binary file +DIFF_ARGS= -a + CONFIGURE_STYLE=gnu CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/libpng \ -I${LOCALBASE}/include" \ @@ -58,14 +60,15 @@ CONFIGURE_ARGS+=--enable-gnome \ --with-gnomeprint LIB_DEPENDS+= gnomeui-2::x11/gnome/libgnomeui \ gnomeprint-2-2::x11/gnome/libgnomeprint -WANTLIB+= ICE ORBit-2 ORBitCosNaming-2 SM audiofile bonobo-2 \ +WANTLIB+= ICE ORBit-2 ORBitCosNaming-2 SM bonobo-2 \ bonobo-activation bonoboui-2 crypto dbus-1 dbus-glib-1 \ - esd gailutil gconf-2 gnome-2 gnome-keyring \ + gailutil gconf-2 gnome-2 gnome-keyring \ gnomecanvas-2 gnomevfs-2 ssl util RUN_DEPENDS+= :yelp-*:x11/gnome/yelp .else CONFIGURE_ARGS+=--disable-gnome \ --without-gnomeprint +RUN_DEPENDS+= ::devel/xdg-utils .endif pre-configure: @@ -76,5 +79,8 @@ post-install: xmlto -o ${PREFIX}/share/doc/dia/html/en html ${WRKSRC}/doc/en/dia.xml xmlto -o ${PREFIX}/share/doc/dia/html/pl html ${WRKSRC}/doc/pl/dia.xml @cd ${PREFIX}/share/doc/dia/html && ln -s en C +.if ${FLAVOR:L:Mgnome} + @cd ${PREFIX}/share/gnome/help/dia && ln -s en C +.endif .include diff --git a/graphics/dia/patches/patch-app_commands_c b/graphics/dia/patches/patch-app_commands_c index f471a1514db..8af0f7e65fa 100644 --- a/graphics/dia/patches/patch-app_commands_c +++ b/graphics/dia/patches/patch-app_commands_c @@ -1,16 +1,7 @@ -$OpenBSD: patch-app_commands_c,v 1.3 2008/10/30 17:10:41 ajacoutot Exp $ +$OpenBSD: patch-app_commands_c,v 1.4 2009/04/11 10:05:47 ajacoutot Exp $ --- app/commands.c.orig Sun Mar 18 20:49:14 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) - { --#ifdef GNOME -- gnome_help_display("dia", NULL, NULL); --#else - char *helpdir, *helpindex = NULL, *command; - guint bestscore = G_MAXINT; - GDir *dp; ++++ app/commands.c Sat Apr 11 11:16:22 2009 +@@ -532,7 +532,7 @@ help_manual_callback (GtkAction *action) const char *dentry; GError *error = NULL; @@ -19,7 +10,7 @@ $OpenBSD: patch-app_commands_c,v 1.3 2008/10/30 17:10:41 ajacoutot Exp $ if (!helpdir) { message_warning(_("Could not find help directory")); return; -@@ -581,13 +578,12 @@ help_manual_callback (GtkAction *action) +@@ -581,7 +581,7 @@ help_manual_callback (GtkAction *action) ShellExecuteA (0, "open", helpindex, NULL, helpdir, SW_SHOWNORMAL); #else command = getenv("BROWSER"); @@ -28,13 +19,7 @@ $OpenBSD: patch-app_commands_c,v 1.3 2008/10/30 17:10:41 ajacoutot Exp $ system(command); g_free(command); #endif - - g_free(helpindex); --#endif - } - - static void -@@ -599,7 +595,7 @@ activate_url (GtkAboutDialog *about, +@@ -599,7 +599,7 @@ activate_url (GtkAboutDialog *about, ShellExecuteA (0, "open", link, NULL, NULL, SW_SHOWNORMAL); #else gchar *command = getenv("BROWSER"); diff --git a/graphics/dia/pkg/PFRAG.gnome b/graphics/dia/pkg/PFRAG.gnome index c3f9a000767..ce418aa8f4a 100644 --- a/graphics/dia/pkg/PFRAG.gnome +++ b/graphics/dia/pkg/PFRAG.gnome @@ -1,9 +1,9 @@ -@comment $OpenBSD: PFRAG.gnome,v 1.3 2008/11/24 09:52:47 ajacoutot Exp $ +@comment $OpenBSD: PFRAG.gnome,v 1.4 2009/04/11 10:05:47 ajacoutot Exp $ %%SHARED%% lib/dia/libgprint_filter.a lib/dia/libgprint_filter.la -share/gnome/help/ share/gnome/help/dia/ +share/gnome/help/dia/C share/gnome/help/dia/en/ share/gnome/help/dia/en/authors.xml share/gnome/help/dia/en/dia.xml diff --git a/graphics/dia/pkg/PLIST b/graphics/dia/pkg/PLIST index d88b08da2e1..c20a96b138b 100644 --- a/graphics/dia/pkg/PLIST +++ b/graphics/dia/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.18 2008/11/24 09:52:47 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.19 2009/04/11 10:05:47 ajacoutot Exp $ %%SHARED%% @bin bin/dia lib/dia/ @@ -1821,8 +1821,8 @@ share/locale/zh_TW/LC_MESSAGES/dia.mo share/mime-info/ share/mime-info/dia.keys share/mime-info/dia.mime -@comment share/omf/ @comment share/oaf/ +@comment share/omf/ @comment share/omf/dia/ share/pixmaps/ share/pixmaps/dia-diagram.png