- some cleanings:

* precise license marker
 * indent
 * tweak DESCR
- use SUBST_VAR
- add gnomeprint support to the gnome FLAVOR
- use textproc/intltool MODULE
- fix a memleak that would lead to a crash when trying to export using
pixbux(png, jpg...); from GNOME svn

graphics/dia/Makefile

@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.50 2007/12/16 11:24:09 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.51 2008/05/16 11:55:29 ajacoutot Exp $
 
 COMMENT=	technical diagrams drawing tool
 
 DISTNAME=	dia-0.96.1
-PKGNAME=	${DISTNAME}p5
+PKGNAME=	${DISTNAME}p6
 CATEGORIES=	graphics
 
 HOMEPAGE=	http://live.gnome.org/Dia/
@@ -12,20 +12,19 @@ MAINTAINER=	Antoine Jacoutot <ajacoutot@openbsd.org>
 
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dia/0.96/}
 
-# GPL
+# GPLv2
 PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
 
-WANTLIB=	X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama Xrandr \
+WANTLIB=	X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
-		Xcomposite Xdamage pcre \
+		Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat \
-		Xrender atk-1.0 c cairo expat fontconfig freetype \
+		fontconfig freetype glib-2.0 glitz gmodule-2.0 \
-		glib-2.0 glitz gmodule-2.0 gobject-2.0 gthread-2.0 m \
+		gobject-2.0 gthread-2.0 m pango-1.0 pangocairo-1.0 \
-		pango-1.0 pangocairo-1.0 pangoft2-1.0 png pthread xml2 z
+		pangoft2-1.0 pcre png pthread xml2 z
 
-BUILD_DEPENDS=	:p5-XML-Parser-*:textproc/p5-XML-Parser \
+BUILD_DEPENDS=	::textproc/xmlto \
-		::textproc/xmlto \
 		::textproc/docbook
 LIB_DEPENDS=	gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
 		art_lgpl_2.>=5::graphics/libart \
@@ -33,39 +32,41 @@ LIB_DEPENDS=	gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
 		xslt.>=1::textproc/libxslt
 RUN_DEPENDS=	:desktop-file-utils-*:devel/desktop-file-utils
 
-MODULES=	devel/gettext
+MODULES=	devel/gettext \
+		textproc/intltool
 
-USE_X11=		Yes
+USE_X11=	Yes
-USE_GMAKE=		Yes
+USE_GMAKE=	Yes
-USE_LIBTOOL=		Yes
+USE_LIBTOOL=	Yes
-CONFIGURE_STYLE=	gnu
 
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include/libpng \
+CONFIGURE_STYLE=gnu
-			-I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/libpng \
-			LDFLAGS="-L${LOCALBASE}/lib" \
+		-I${LOCALBASE}/include" \
-			LOCALBASE=${LOCALBASE}
+		LDFLAGS="-L${LOCALBASE}/lib" \
-CONFIGURE_ARGS=		${CONFIGURE_SHARED} \
+		LOCALBASE=${LOCALBASE}
-			--without-cairo \
+CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-			--without-gnomeprint \
+		--without-cairo \
-			--without-python
+		--without-python
 
-FLAVORS=		gnome
+FLAVORS=	gnome
 FLAVOR?=
 
 .if ${FLAVOR:L:Mgnome}
-CONFIGURE_ARGS+=	--enable-gnome
+CONFIGURE_ARGS+=--enable-gnome \
-LIB_DEPENDS+=		gnomeui-2::x11/gnome/libgnomeui
+		--with-gnomeprint
-WANTLIB+=		gthread-2.0 gnomevfs-2 ORBitCosNaming-2 crypto \
+LIB_DEPENDS+=	gnomeui-2::x11/gnome/libgnomeui \
-			audiofile bonobo-activation jpeg bonobo-2 gconf-2 \
+		gnomeprint-2-2::x11/gnome/libgnomeprint
-			ICE bonoboui-2 gnomecanvas-2 SM ORBit-2 pthread esd \
+WANTLIB+=	ICE ORBit-2 ORBitCosNaming-2 SM audiofile bonobo-2 \
-			ssl gnome-2 gnome-keyring dbus-1 dbus-glib-1 util
+		bonobo-activation bonoboui-2 crypto dbus-1 dbus-glib-1 \
+		esd gailutil gconf-2 gnome-2 gnome-keyring \
+		gnomecanvas-2 gnomevfs-2 jpeg ssl util
 .else
-CONFIGURE_ARGS+=	--disable-gnome
+CONFIGURE_ARGS+=--disable-gnome \
+		--without-gnomeprint
 .endif
 
 pre-configure:
-	@perl -pi -e 's,!!PREFIX!!,${PREFIX},g' \
+	${SUBST_CMD} ${WRKSRC}/app/commands.c
-		${WRKSRC}/app/commands.c
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dia/html/{en,pl}

graphics/dia/patches/patch-app_commands_c

@@ -1,4 +1,4 @@
-$OpenBSD: patch-app_commands_c,v 1.1 2007/10/18 14:18:40 ajacoutot Exp $
+$OpenBSD: patch-app_commands_c,v 1.2 2008/05/16 11:55:29 ajacoutot Exp $
 --- app/commands.c.orig	Sun Mar 18 20:49:14 2007
 +++ app/commands.c	Thu Oct 18 14:02:37 2007
 @@ -523,16 +523,13 @@ edit_redo_callback (GtkAction *action)
@@ -15,7 +15,7 @@ $OpenBSD: patch-app_commands_c,v 1.1 2007/10/18 14:18:40 ajacoutot Exp $
    GError *error = NULL;
  
 -  helpdir = dia_get_data_directory("help");
-+  helpdir = g_strdup("!!PREFIX!!/share/doc/dia/html");
++  helpdir = g_strdup("${PREFIX}/share/doc/dia/html");
    if (!helpdir) {
      message_warning(_("Could not find help directory"));
      return;

graphics/dia/patches/patch-plug-ins_pixbuf_pixbuf_c

@@ -0,0 +1,20 @@
+$OpenBSD: patch-plug-ins_pixbuf_pixbuf_c,v 1.1 2008/05/16 11:55:29 ajacoutot Exp $
+--- plug-ins/pixbuf/pixbuf.c.orig	Fri May 16 13:43:44 2008
++++ plug-ins/pixbuf/pixbuf.c	Fri May 16 13:44:35 2008
+@@ -233,7 +233,7 @@ dia_plugin_init(PluginInfo *info)
+         }
+         /* there is no write only filter */
+         {
+-          DiaImportFilter* ifilter = g_new0 (DiaImportFilter, 1);
++          DiaImportFilter* ifilter;
+           gchar* name;
+ 
+           name = gdk_pixbuf_format_get_name (format);
+@@ -252,6 +252,7 @@ dia_plugin_init(PluginInfo *info)
+               g_free (name);
+               continue;
+             }
++          ifilter = g_new0 (DiaImportFilter, 1);
+           /* the pixbuf desriptions are too generic for Dia's usage, make our own */
+           ifilter->description = g_strdup_printf ("Pixbuf[%s]", name);
+           ifilter->extensions = (const gchar**)gdk_pixbuf_format_get_extensions (format);

graphics/dia/pkg/DESCR

@@ -8,3 +8,6 @@ a subset of SVG to draw the shape. It can load and save diagrams
 to a custom XML format (gzipped by default, to save space), can export
 diagrams to EPS or SVG formats and can print diagrams (including ones
 that span multiple pages).
+
+Available flavor:
+	gnome - build support for GNOME and the gnomeprint plug-in

graphics/dia/pkg/PFRAG.gnome

@@ -0,0 +1,4 @@
+@comment $OpenBSD: PFRAG.gnome,v 1.1 2008/05/16 11:55:29 ajacoutot Exp $
+%%SHARED%%
+lib/dia/libgprint_filter.a
+lib/dia/libgprint_filter.la

graphics/dia/pkg/PFRAG.shared-gnome

@@ -0,0 +1,2 @@
+@comment $OpenBSD: PFRAG.shared-gnome,v 1.1 2008/05/16 11:55:29 ajacoutot Exp $
+lib/dia/libgprint_filter.so

graphics/dia/pkg/PLIST

@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.14 2007/12/16 11:24:09 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.15 2008/05/16 11:55:29 ajacoutot Exp $
+%%SHARED%%
 bin/dia
 lib/dia/
 lib/dia/libaadl_objects.a
@@ -64,7 +65,6 @@ lib/dia/libxfig_filter.la
 lib/dia/libxslt_filter.a
 lib/dia/libxslt_filter.la
 @man man/man1/dia.1
-share/applications/
 share/applications/dia.desktop
 share/dia/
 share/dia/dia_logo.png
@@ -1805,6 +1805,8 @@ 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
@@ -1823,6 +1825,8 @@ 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/
+share/locale/eu/LC_MESSAGES/
 share/locale/eu/LC_MESSAGES/dia.mo
 share/locale/fi/LC_MESSAGES/dia.mo
 share/locale/fr/LC_MESSAGES/dia.mo
@@ -1840,6 +1844,8 @@ 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/
@@ -1851,6 +1857,8 @@ 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/
@@ -1863,9 +1871,13 @@ 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/
@@ -1889,6 +1901,6 @@ share/mime-info/dia.mime
 share/pixmaps/
 share/pixmaps/dia-diagram.png
 share/pixmaps/dia_gnome_icon.png
-%%SHARED%%
 @exec %D/bin/update-desktop-database
 @unexec %D/bin/update-desktop-database
+%%gnome%%