update to 0.91, provided by Marc Recht per PR pkg/20750

Most notable changes:
-uses gtk2 now
-Python support
-cleanups, UI improvements, fixes...

graphics/dia/Makefile

@@ -1,30 +1,39 @@
-# $NetBSD: Makefile,v 1.13 2003/05/02 11:55:12 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2003/05/09 15:21:29 drochner Exp $
 
-DISTNAME=		dia-0.90
-PKGREVISION=		1
-CATEGORIES=		devel
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/dia/0.90/}
+DISTNAME=	dia-0.91
+CATEGORIES=	graphics
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dia/0.91/}
 
 MAINTAINER=		jmcneill@invisible.yi.org
 HOMEPAGE=		http://www.lysator.liu.se/~alla/dia/
 COMMENT=		program for creating diagrams of all kinds
 
-BUILD_DEPENDS+=		bison>=1.35:../../devel/bison
+MAINTAINER=	jmcneill@invisible.yi.org
+HOMEPAGE=	http://www.lysator.liu.se/~alla/dia/
+COMMENT=	program for creating diagrams of all kinds
 
+DEPENDS=		gnome2-dirs>=1.0:../../misc/gnome2-dirs
+
+USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
 USE_GMAKE=		YES
 USE_LIBTOOL=		YES
-USE_BUILDLINK2=		YES
-USE_PKGLOCALEDIR=	YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 GNU_CONFIGURE=		YES
+CONFIGURE_ENV+=		PYTHON=${PYTHONBIN}
 CONFIGURE_ARGS+=	--enable-gnome
+CONFIGURE_ARGS+=	--with-python
 
-.include "../../graphics/gdk-pixbuf/buildlink2.mk"
-.include "../../x11/gnome-libs/buildlink2.mk"
-.include "../../textproc/libxml/buildlink2.mk"
-.include "../../devel/popt/buildlink2.mk"
-.include "../../textproc/libunicode/buildlink2.mk"
+PYTHON_PATCH_SCRIPTS=	plug-ins/python/gtkcons.py
 
+XSLT_FILE=	${WRKSRC}/plug-ins/xslt/xslt.c
+post-patch:
+	${MV} ${XSLT_FILE} ${XSLT_FILE}.pre
+	${SED}  -e "s,%%PREFIX%%,${PREFIX},g" ${XSLT_FILE}.pre > ${XSLT_FILE}
+
+.include "../../devel/libgnomeui/buildlink2.mk"
+.include "../../x11/py-gtk2/buildlink2.mk"
+.include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"

graphics/dia/PLIST

@@ -1,93 +1,172 @@
-@comment $NetBSD: PLIST,v 1.2 2002/09/01 00:38:08 mjl Exp $
-${PKGLOCALEDIR}/locale/az/LC_MESSAGES/dia.mo
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/dia.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/dia.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/dia.mo
-${PKGLOCALEDIR}/locale/el/LC_MESSAGES/dia.mo
-${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/dia.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/dia.mo
-${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/dia.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/dia.mo
-${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/dia.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/dia.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/dia.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/dia.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/dia.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/dia.mo
-${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/dia.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/dia.mo
-${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/dia.mo
-${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/dia.mo
-${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/dia.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/dia.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/dia.mo
-${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/dia.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/dia.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/dia.mo
-${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/dia.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/dia.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/dia.mo
-${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/dia.mo
+@comment $NetBSD: PLIST,v 1.3 2003/05/09 15:21:29 drochner Exp $
 bin/dia
+lib/dia/libbondgraph_objects.a
+lib/dia/libbondgraph_objects.la
+lib/dia/libbondgraph_objects.so
+lib/dia/libcgm_filter.a
 lib/dia/libcgm_filter.la
 lib/dia/libcgm_filter.so
+lib/dia/libchronogram_objects.a
 lib/dia/libchronogram_objects.la
 lib/dia/libchronogram_objects.so
+lib/dia/libcustom_objects.a
 lib/dia/libcustom_objects.la
 lib/dia/libcustom_objects.so
+lib/dia/libdia.a
+lib/dia/libdia.la
+lib/dia/libdia.so
+lib/dia/libdxf_filter.a
 lib/dia/libdxf_filter.la
 lib/dia/libdxf_filter.so
+lib/dia/liber_objects.a
 lib/dia/liber_objects.la
 lib/dia/liber_objects.so
+lib/dia/libflowchart_objects.a
 lib/dia/libflowchart_objects.la
 lib/dia/libflowchart_objects.so
+lib/dia/libfs_objects.a
 lib/dia/libfs_objects.la
 lib/dia/libfs_objects.so
+lib/dia/libgrafcet_objects.a
 lib/dia/libgrafcet_objects.la
 lib/dia/libgrafcet_objects.so
+lib/dia/libhpgl_filter.a
 lib/dia/libhpgl_filter.la
 lib/dia/libhpgl_filter.so
+lib/dia/libmetapost_filter.a
+lib/dia/libmetapost_filter.la
+lib/dia/libmetapost_filter.so
+lib/dia/libmisc_objects.a
+lib/dia/libmisc_objects.la
+lib/dia/libmisc_objects.so
+lib/dia/libnetwork_objects.a
 lib/dia/libnetwork_objects.la
 lib/dia/libnetwork_objects.so
+lib/dia/libpixbuf_filter.a
+lib/dia/libpixbuf_filter.la
+lib/dia/libpixbuf_filter.so
+lib/dia/libpstricks_filter.a
 lib/dia/libpstricks_filter.la
 lib/dia/libpstricks_filter.so
+lib/dia/libpython_plugin.a
+lib/dia/libpython_plugin.la
+lib/dia/libsadt_objects.a
 lib/dia/libsadt_objects.la
 lib/dia/libsadt_objects.so
+lib/dia/libshape_filter.a
 lib/dia/libshape_filter.la
 lib/dia/libshape_filter.so
 lib/dia/libstandard_objects.a
 lib/dia/libstandard_objects.la
 lib/dia/libstandard_objects.so
-lib/dia/libnetwork_objects.a
-lib/dia/libuml_objects.a
-lib/dia/liber_objects.a
-lib/dia/libfs_objects.a
-lib/dia/libflowchart_objects.a
-lib/dia/libcustom_objects.a
-lib/dia/libgrafcet_objects.a
-lib/dia/libchronogram_objects.a
-lib/dia/libsadt_objects.a
-lib/dia/libcgm_filter.a
-lib/dia/libmetapost_filter.so
-lib/dia/libmetapost_filter.la
-lib/dia/libpstricks_filter.a
-lib/dia/libhpgl_filter.a
-lib/dia/libwpg_filter.a
 lib/dia/libsvg_filter.a
-lib/dia/libshape_filter.a
-lib/dia/libdxf_filter.a
-lib/dia/libxfig_filter.a
-lib/dia/libmetapost_filter.a
 lib/dia/libsvg_filter.la
 lib/dia/libsvg_filter.so
+lib/dia/libuml_objects.a
 lib/dia/libuml_objects.la
 lib/dia/libuml_objects.so
+lib/dia/libwpg_filter.a
 lib/dia/libwpg_filter.la
 lib/dia/libwpg_filter.so
+lib/dia/libxfig_filter.a
 lib/dia/libxfig_filter.la
 lib/dia/libxfig_filter.so
+lib/dia/libxslt_filter.a
+lib/dia/libxslt_filter.la
+lib/dia/libxslt_filter.so
 man/man1/dia.1
 share/dia/dia_logo.png
+share/dia/plugins/xslt/dia-uml.xsl
+share/dia/plugins/xslt/dia-uml2c++.xsl
+share/dia/plugins/xslt/dia-uml2idl.xsl
+share/dia/plugins/xslt/dia-uml2java.xsl
+share/dia/plugins/xslt/stylesheets.xml
+share/dia/python-startup.py
+share/dia/python/diasvg.py
+share/dia/python/group_props.py
+share/dia/python/gtkcons.py
+share/dia/python/otypes.py
+share/dia/python/pydiadoc.py
+share/dia/shapes/Assorted/arrow-chevron.png
+share/dia/shapes/Assorted/arrow-chevron.shape
+share/dia/shapes/Assorted/arrow-down.png
+share/dia/shapes/Assorted/arrow-down.shape
+share/dia/shapes/Assorted/arrow-left-notched.png
+share/dia/shapes/Assorted/arrow-left-notched.shape
+share/dia/shapes/Assorted/arrow-left-right-up.png
+share/dia/shapes/Assorted/arrow-left-right-up.shape
+share/dia/shapes/Assorted/arrow-left-right.png
+share/dia/shapes/Assorted/arrow-left-right.shape
+share/dia/shapes/Assorted/arrow-left-up.png
+share/dia/shapes/Assorted/arrow-left-up.shape
+share/dia/shapes/Assorted/arrow-left.png
+share/dia/shapes/Assorted/arrow-left.shape
+share/dia/shapes/Assorted/arrow-pentagon.png
+share/dia/shapes/Assorted/arrow-pentagon.shape
+share/dia/shapes/Assorted/arrow-quad.png
+share/dia/shapes/Assorted/arrow-quad.shape
+share/dia/shapes/Assorted/arrow-right-notched.png
+share/dia/shapes/Assorted/arrow-right-notched.shape
+share/dia/shapes/Assorted/arrow-right.png
+share/dia/shapes/Assorted/arrow-right.shape
+share/dia/shapes/Assorted/arrow-up-down-left.png
+share/dia/shapes/Assorted/arrow-up-down-left.shape
+share/dia/shapes/Assorted/arrow-up-down.png
+share/dia/shapes/Assorted/arrow-up-down.shape
+share/dia/shapes/Assorted/arrow-up.png
+share/dia/shapes/Assorted/arrow-up.shape
+share/dia/shapes/Assorted/circle-quarter.png
+share/dia/shapes/Assorted/circle-quarter.shape
+share/dia/shapes/Assorted/circle.png
+share/dia/shapes/Assorted/circle.shape
+share/dia/shapes/Assorted/cross-maltese.png
+share/dia/shapes/Assorted/cross-maltese.shape
+share/dia/shapes/Assorted/cross-swiss.png
+share/dia/shapes/Assorted/cross-swiss.shape
+share/dia/shapes/Assorted/diamond.png
+share/dia/shapes/Assorted/diamond.shape
+share/dia/shapes/Assorted/heart.png
+share/dia/shapes/Assorted/heart.shape
+share/dia/shapes/Assorted/heptagon.png
+share/dia/shapes/Assorted/heptagon.shape
+share/dia/shapes/Assorted/hexagon.png
+share/dia/shapes/Assorted/hexagon.shape
+share/dia/shapes/Assorted/moon-quarter.png
+share/dia/shapes/Assorted/moon-quarter.shape
+share/dia/shapes/Assorted/octagon.png
+share/dia/shapes/Assorted/octagon.shape
+share/dia/shapes/Assorted/parallelogram-horizontal.png
+share/dia/shapes/Assorted/parallelogram-horizontal.shape
+share/dia/shapes/Assorted/parallelogram-vertical.png
+share/dia/shapes/Assorted/parallelogram-vertical.shape
+share/dia/shapes/Assorted/pentagon.png
+share/dia/shapes/Assorted/pentagon.shape
+share/dia/shapes/Assorted/square.png
+share/dia/shapes/Assorted/square.shape
+share/dia/shapes/Assorted/star4.png
+share/dia/shapes/Assorted/star4.shape
+share/dia/shapes/Assorted/star4curved.png
+share/dia/shapes/Assorted/star4curved.shape
+share/dia/shapes/Assorted/star5.png
+share/dia/shapes/Assorted/star5.shape
+share/dia/shapes/Assorted/star6.png
+share/dia/shapes/Assorted/star6.shape
+share/dia/shapes/Assorted/star7.png
+share/dia/shapes/Assorted/star7.shape
+share/dia/shapes/Assorted/star8.png
+share/dia/shapes/Assorted/star8.shape
+share/dia/shapes/Assorted/star8curved.png
+share/dia/shapes/Assorted/star8curved.shape
+share/dia/shapes/Assorted/star8sharp.png
+share/dia/shapes/Assorted/star8sharp.shape
+share/dia/shapes/Assorted/sun.png
+share/dia/shapes/Assorted/sun.shape
+share/dia/shapes/Assorted/trapezoid.png
+share/dia/shapes/Assorted/trapezoid.shape
+share/dia/shapes/Assorted/triangle-isoceles.png
+share/dia/shapes/Assorted/triangle-isoceles.shape
+share/dia/shapes/Assorted/triangle-rightangle.png
+share/dia/shapes/Assorted/triangle-rightangle.shape
 share/dia/shapes/Circuit/ground.shape
 share/dia/shapes/Circuit/ground.xpm
 share/dia/shapes/Circuit/hcapacitor.shape
@@ -100,6 +179,7 @@ share/dia/shapes/Circuit/hinductor.shape
 share/dia/shapes/Circuit/hinductor.xpm
 share/dia/shapes/Circuit/hinductor_de.shape
 share/dia/shapes/Circuit/hinductor_de.xpm
+share/dia/shapes/Circuit/hjumper.png
 share/dia/shapes/Circuit/hjumper.shape
 share/dia/shapes/Circuit/hled_de.shape
 share/dia/shapes/Circuit/hled_de.xpm
@@ -335,6 +415,8 @@ share/dia/shapes/Network/computer.shape
 share/dia/shapes/Network/computer.xpm
 share/dia/shapes/Network/dat_external.shape
 share/dia/shapes/Network/dat_external.xpm
+share/dia/shapes/Network/digitizing_board.png
+share/dia/shapes/Network/digitizing_board.shape
 share/dia/shapes/Network/disc.shape
 share/dia/shapes/Network/disc.xpm
 share/dia/shapes/Network/diskette.shape
@@ -365,6 +447,8 @@ share/dia/shapes/Network/pc_miditower.shape
 share/dia/shapes/Network/pc_miditower.xpm
 share/dia/shapes/Network/pc_minitower.shape
 share/dia/shapes/Network/pc_minitower.xpm
+share/dia/shapes/Network/plotter.png
+share/dia/shapes/Network/plotter.shape
 share/dia/shapes/Network/printer.shape
 share/dia/shapes/Network/printer.xpm
 share/dia/shapes/Network/rj45plug.shape
@@ -505,6 +589,7 @@ share/dia/shapes/sybase/rsm.shape
 share/dia/shapes/sybase/rsm.xpm
 share/dia/shapes/sybase/stableq.shape
 share/dia/shapes/sybase/stableq.xpm
+share/dia/sheets/Assorted.sheet
 share/dia/sheets/Circuit.sheet
 share/dia/sheets/Contact.sheet
 share/dia/sheets/EML.sheet
@@ -522,6 +607,7 @@ share/dia/sheets/GRAFCET/etapesp.xpm
 share/dia/sheets/GRAFCET/vergent_and.xpm
 share/dia/sheets/Logic.sheet
 share/dia/sheets/MSE.sheet
+share/dia/sheets/Misc.sheet
 share/dia/sheets/Pneumatic.sheet
 share/dia/sheets/SADT.sheet
 share/dia/sheets/SDL.sheet
@@ -529,39 +615,79 @@ share/dia/sheets/UML.sheet
 share/dia/sheets/UML/aggregation.xpm
 share/dia/sheets/UML/umlclass_template.xpm
 share/dia/sheets/chronogram.sheet
+share/dia/sheets/ciscocomputer.sheet
+share/dia/sheets/ciscohub.sheet
+share/dia/sheets/ciscomisc.sheet
+share/dia/sheets/cisconetwork.sheet
+share/dia/sheets/ciscorouter.sheet
 share/dia/sheets/civil.sheet
 share/dia/sheets/jigsaw.sheet
 share/dia/sheets/network.sheet
 share/dia/sheets/sybase.sheet
-share/dia/sheets/Misc.sheet
 share/gnome/apps/Applications/dia.desktop
+share/gnome/help/dia/C
 share/gnome/help/dia/en/topic.dat
 share/gnome/help/dia/pl/topic.dat
+${PKGLOCALEDIR}/locale/am/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/az/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/dia.mo
 share/mime-info/dia.keys
 share/mime-info/dia.mime
 share/pixmaps/dia-diagram.png
 share/pixmaps/dia_gnome_icon.png
-@dirrm lib/dia
-@dirrm share/dia/shapes/Circuit
-@dirrm share/dia/shapes/Civil
-@dirrm share/dia/shapes/Contact
-@dirrm share/dia/shapes/Electric
-@dirrm share/dia/shapes/Flowchart
-@dirrm share/dia/shapes/Logic
-@dirrm share/dia/shapes/MSE
-@dirrm share/dia/shapes/Misc
-@dirrm share/dia/shapes/Network
-@dirrm share/dia/shapes/Pneumatic
-@dirrm share/dia/shapes/SDL
-@dirrm share/dia/shapes/jigsaw
-@dirrm share/dia/shapes/sybase
-@dirrm share/dia/sheets/ER
-@dirrm share/dia/sheets/GRAFCET
-@dirrm share/dia/sheets/UML
-@dirrm share/dia/sheets
-@dirrm share/dia/shapes
-@dirrm share/dia
-@dirrm share/gnome/help/dia/en
-@unexec ${RM} %D/share/gnome/help/dia/C
 @dirrm share/gnome/help/dia/pl
+@dirrm share/gnome/help/dia/en
 @dirrm share/gnome/help/dia
+@dirrm share/dia/sheets/UML
+@dirrm share/dia/sheets/GRAFCET
+@dirrm share/dia/sheets/ER
+@dirrm share/dia/sheets
+@dirrm share/dia/shapes/sybase
+@dirrm share/dia/shapes/jigsaw
+@dirrm share/dia/shapes/SDL
+@dirrm share/dia/shapes/Pneumatic
+@dirrm share/dia/shapes/Network
+@dirrm share/dia/shapes/Misc
+@dirrm share/dia/shapes/MSE
+@dirrm share/dia/shapes/Logic
+@dirrm share/dia/shapes/Flowchart
+@dirrm share/dia/shapes/Electric
+@dirrm share/dia/shapes/Contact
+@dirrm share/dia/shapes/Civil
+@dirrm share/dia/shapes/Circuit
+@dirrm share/dia/shapes/Assorted
+@dirrm share/dia/shapes
+@dirrm share/dia/python
+@dirrm share/dia/plugins/xslt
+@dirrm share/dia/plugins
+@dirrm share/dia
+@dirrm lib/dia

graphics/dia/distinfo

@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.7 2002/12/30 20:26:08 jmcneill Exp $
+$NetBSD: distinfo,v 1.8 2003/05/09 15:21:29 drochner Exp $
 
-SHA1 (dia-0.90.tar.gz) = 7e9705dbf3f3ce62a58169f531dbc635140a88d8
-Size (dia-0.90.tar.gz) = 2888211 bytes
-SHA1 (patch-aa) = ed5bb19334fcacc772aa1c504fc3c3e4dab933b4
-SHA1 (patch-ab) = 9ec08acce0b9a2fe5f2e6b8b15cf294d961aabe1
-SHA1 (patch-ba) = 1f19128f6819e25011c79ea79fbaa962f7e9a660
-SHA1 (patch-bb) = 3838f817e02df719b121029e151d84cb307c7fd5
+SHA1 (dia-0.91.tar.gz) = 4514af1f5685e45480761c6f42e5ecdc2492cd2c
+Size (dia-0.91.tar.gz) = 3409320 bytes
+SHA1 (patch-bc) = 0b868e0b6c1d156eebfffce4c35a003db8e40613

graphics/dia/patches/patch-aa

@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2002/09/01 00:38:09 mjl Exp $
-
---- lib/sheet.c.orig	Sat Aug 31 13:17:08 2002
-+++ lib/sheet.c	Sat Aug 31 13:17:41 2002
-@@ -33,9 +33,9 @@
- #include <dirent.h>
- #endif
- #include <glib.h>
--#include <libxml/tree.h>
--#include <libxml/parser.h>
--#include <libxml/xmlmemory.h>
-+#include <gnome-xml/tree.h>
-+#include <gnome-xml/parser.h>
-+#include <gnome-xml/xmlmemory.h>
- #include "dia_xml_libxml.h"
- #include <string.h>
- 

graphics/dia/patches/patch-ab

@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2002/09/01 00:38:09 mjl Exp $
-
---- app/sheets_dialog_callbacks.c.orig	Sat Aug 31 13:42:24 2002
-+++ app/sheets_dialog_callbacks.c	Sat Aug 31 13:42:45 2002
-@@ -52,9 +52,9 @@
- #include <gtk/gtk.h>
- #endif
- 
--#include <libxml/tree.h>
--#include <libxml/parser.h>
--#include <libxml/xmlmemory.h>
-+#include <gnome-xml/tree.h>
-+#include <gnome-xml/parser.h>
-+#include <gnome-xml/xmlmemory.h>
- 
- #include "gtkwrapbox.h"
- 

graphics/dia/patches/patch-ba

@@ -1,51 +0,0 @@
-$NetBSD: patch-ba,v 1.3 2002/12/30 20:26:08 jmcneill Exp $
-
---- lib/charconv.c.orig	Thu May 16 20:06:50 2002
-+++ lib/charconv.c	Mon Dec 30 15:46:33 2002
-@@ -69,6 +69,8 @@
- {
-   static char *this_charset = NULL;
-   static int local_is_utf8 = 0;
-+  unicode_iconv_t t1 = (unicode_iconv_t)(-1);
-+  unicode_iconv_t t2 = (unicode_iconv_t)(-1);
- 
-   if (this_charset) {
-     *charset = this_charset;
-@@ -98,7 +100,8 @@
- 
-       if ((*charset == NULL) ||
-           (0==strcmp(*charset,"US-ASCII")) ||
--          (0==strcmp(*charset,"ANSI_X3.4-1968"))) {
-+          (0==strcmp(*charset,"ANSI_X3.4-1968")) ||
-+	  (**charset == '\0')) {
-               /* we got basic stupid ASCII here. We use its sane
-                  superset instead. Especially since libxml2 doesn't like
-                  the pedantic name of ASCII. */
-@@ -108,8 +111,25 @@
-   }
- 
-   this_charset = *charset;
--  local_is_utf8 = (*charset) && (0==strcmp(*charset,"UTF-8"));
--  
-+  if (*charset) {
-+    if (strcmp(*charset, "UTF-8") != 0) {
-+      if ((t1 = unicode_iconv_open(*charset, "UTF-8")) == (unicode_iconv_t)(-1)
-+         || (t2 = unicode_iconv_open("UTF-8", *charset)) ==
-+         (unicode_iconv_t)(-1)) {
-+        g_warning("unicode_iconv_open does not understand your charset %s\n%s",
-+		   *charset,
-+                  "Using UTF-8 as local. Set LC_CTYPE or CHARSET.");
-+        local_is_utf8 = 1;
-+        *charset = "UTF-8";
-+      }
-+    } else
-+      local_is_utf8 = 1;
-+  }
-+  if (t1 != (unicode_iconv_t)(-1))
-+    unicode_iconv_close(t1);
-+  if (t2 != (unicode_iconv_t)(-1))
-+    unicode_iconv_close(t2);
-+
-   return local_is_utf8;
- }
- 

graphics/dia/patches/patch-bb

@@ -1,14 +0,0 @@
-$NetBSD: patch-bb,v 1.1 2002/09/07 17:40:51 mjl Exp $
-
---- lib/font.c.orig	Sun Sep  1 02:46:29 2002
-+++ lib/font.c	Sun Sep  1 02:47:22 2002
-@@ -467,7 +467,8 @@
- 
- char *last_resort_fonts[] = {
-   "-adobe-courier-medium-r-normal-*-%d-*-*-*-*-*-*-*",
--#ifndef G_OS_WIN32
-+  "-*-courier-medium-r-normal-*-%d-*-*-*-*-*-*-*",
-+#ifdef G_OS_WIN32
-   "system" /* Must be last. This is guaranteed to exist on a MS-Windows 
-               system. */
- #else

graphics/dia/patches/patch-bc

@@ -0,0 +1,13 @@
+$NetBSD: patch-bc,v 1.1 2003/05/09 15:21:33 drochner Exp $
+
+--- plug-ins/xslt/xslt.c.orig	2003-05-09 17:13:12.000000000 +0200
++++ plug-ins/xslt/xslt.c	2003-05-09 17:14:09.000000000 +0200
+@@ -291,7 +291,7 @@
+ 	path = g_module_build_path("\Windows", "xslt");
+ #else
+ 	/* FIXME: We should have a --with-xslt-prefix and use this */
+-	path = g_module_build_path("/usr/lib", "xslt");
++	path = g_module_build_path("%%PREFIX%%/lib", "xslt");
+ #endif	
+ 	xslt_module = g_module_open(path, 0);
+ 	if(xslt_module == NULL) {