13 files changed, 950 insertions, 130 deletions

diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index 95a993ace2fa..de1fe285b250 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -6,37 +6,41 @@
 #
 
 PORTNAME=	dia
-PORTVERSION=	0.90
-CATEGORIES+=	graphics gnome
+PORTVERSION=	0.91
+CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/dia/0.90
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.91
+DIST_SUBDIR=	gnome2
 
 MAINTAINER?=	gnome@FreeBSD.org
 COMMENT=	Diagram creation program, similar to Visio
 
-BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
-		freetype.9:${PORTSDIR}/print/freetype2 \
-		unicode.0:${PORTSDIR}/devel/libunicode
+		gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOMENG=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomelibs gdkpixbuf bonobo
+USE_GNOME=	gnomeprefix gnomehack
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--enable-gnome --enable-gnome-print --enable-bonobo \
-		--enable-freetype
+CONFIGURE_ARGS=	--enable-gnome --enable-bonobo
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lintl"
 
 MAN1=		dia.1
 
+.if !defined(WITHOUT_PYTHON)
+USE_PYTHON=	yes
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pygtk.py:${PORTSDIR}/x11-toolkits/py-gtk2
+CONFIGURE_ARGS+=	--with-python
+PLIST_SUB=	PYTHON:=""
+.else
+PLIST_SUB=	PYTHON:="@comment "
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 
-post-install:
-	${SED} "s|%%PREFIX%%|${PREFIX}|g" ${FILESDIR}/dia.sh > ${WRKDIR}/dia.sh
-	${INSTALL_SCRIPT} ${WRKDIR}/dia.sh ${PREFIX}/bin/dia
-
 .include <bsd.port.mk>
diff --git a/graphics/dia/distinfo b/graphics/dia/distinfo
index 3d1705d507f6..d78cd8292f00 100644
--- a/graphics/dia/distinfo
+++ b/graphics/dia/distinfo
@@ -1 +1 @@
-MD5 (dia-0.90.tar.gz) = 62c80b2492e2b7d92bfbe360f46c157a
+MD5 (gnome2/dia-0.91.tar.bz2) = 283517483601e81749db81a849a3bc91
diff --git a/graphics/dia/files/dia.sh b/graphics/dia/files/dia.sh
deleted file mode 100644
index a41d856d67b4..000000000000
--- a/graphics/dia/files/dia.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh 
-DIA_LIB_PATH=$DIA_LIB_PATH:%%PREFIX%%/lib/dia
-DIA_SHAPE_PATH=%%PREFIX%%/share/gnome/dia/shapes
-DIA_SHEET_PATH=%%PREFIX%%/share/gnome/dia/sheets
-export DIA_LIB_PATH DIA_SHAPE_PATH DIA_INT_SHAPE_PATH DIA_SHEET_PATH
-
-exec %%PREFIX%%/bin/dia-bin "$@"
diff --git a/graphics/dia/files/patch-ad b/graphics/dia/files/patch-ad
index d6c279a24ab4..3a809187a895 100644
--- a/graphics/dia/files/patch-ad
+++ b/graphics/dia/files/patch-ad
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- configure.orig	Sat Jun  1 10:40:13 2002
-+++ configure	Fri Jul 12 13:52:26 2002
-@@ -7118,6 +7118,7 @@
+--- configure.orig	Wed Mar 12 19:51:36 2003
++++ configure	Mon Mar 17 14:05:51 2003
+@@ -7546,6 +7546,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -11,12 +8,12 @@ $FreeBSD$
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -7911,7 +7912,7 @@
+@@ -9738,7 +9739,7 @@
  
  
- OLDCPPFLAGS=$CPPFLAGS
--CPPFLAGS="$CPPFLAGS `glib-config --cflags`"
-+CPPFLAGS="$CPPFLAGS `$GLIB_CONFIG --cflags`"
+ cat >>confdefs.h <<_ACEOF
+-#define GNOME_ICONDIR "${prefix}/share/pixmaps"
++#define GNOME_ICONDIR "${datadir}/pixmaps"
+ _ACEOF
  
- 
-   echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5
+     have_gnome=true
diff --git a/graphics/dia/files/patch-af b/graphics/dia/files/patch-af
deleted file mode 100644
index 6f70ae98769e..000000000000
--- a/graphics/dia/files/patch-af
+++ /dev/null
@@ -1,53 +0,0 @@
-
-$FreeBSD$
-
---- app/Makefile.in.orig	Tue May 14 02:48:53 2002
-+++ app/Makefile.in	Tue May 14 02:51:06 2002
-@@ -164,8 +164,6 @@
- @HAVE_BONOBO_TRUE@dia_oafinfo = GNOME_Dia.oaf
- @HAVE_BONOBO_FALSE@dia_oafinfo = 
- 
--bin_PROGRAMS = dia $(dia_embedd)
--
- oafinfodir = $(datadir)/oaf
- oafinfo_DATA = $(dia_oafinfo)
- 
-@@ -199,8 +197,8 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES = 
--@HAVE_BONOBO_TRUE@bin_PROGRAMS =  dia$(EXEEXT) dia-embedd$(EXEEXT)
--@HAVE_BONOBO_FALSE@bin_PROGRAMS =  dia$(EXEEXT)
-+@HAVE_BONOBO_TRUE@bin_PROGRAMS =  dia-bin$(EXEEXT) dia-embedd$(EXEEXT)
-+@HAVE_BONOBO_FALSE@bin_PROGRAMS =  dia-bin$(EXEEXT)
- noinst_PROGRAMS =  run_dia.sh run_diaconv.sh diaconv$(EXEEXT)
- PROGRAMS =  $(bin_PROGRAMS) $(noinst_PROGRAMS)
- 
-@@ -532,6 +530,9 @@
- 	@rm -f dia$(EXEEXT)
- 	$(LINK) $(dia_LDFLAGS) $(dia_OBJECTS) $(dia_LDADD) $(LIBS)
- 
-+dia-bin$(EXEEXT): dia$(EXEEXT)
-+	cp dia$(EXEEXT) dia-bin$(EXEEXT)
-+
- dia-embedd$(EXEEXT): $(dia_embedd_OBJECTS) $(dia_embedd_DEPENDENCIES)
- 	@rm -f dia-embedd$(EXEEXT)
- 	$(LINK) $(dia_embedd_LDFLAGS) $(dia_embedd_OBJECTS) $(dia_embedd_LDADD) $(LIBS)
-@@ -1137,7 +1138,7 @@
- install-exec-am: install-binPROGRAMS
- install-exec: install-exec-am
- 
--install-data-am: install-oafinfoDATA
-+install-data-am:
- install-data: install-data-am
- 
- install-am: all-am
-@@ -1150,7 +1151,7 @@
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
- installdirs:
--	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(oafinfodir)
-+	$(mkinstalldirs)  $(DESTDIR)$(bindir)
- 
- 
- mostlyclean-generic:
diff --git a/graphics/dia/files/patch-lib::charconv.c b/graphics/dia/files/patch-lib::charconv.c
deleted file mode 100644
index ee085c256d35..000000000000
--- a/graphics/dia/files/patch-lib::charconv.c
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- lib/charconv.c	2002/06/03 07:54:31	1.1
-+++ lib/charconv.c	2002/06/03 08:10:29
-@@ -98,7 +98,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. */
diff --git a/graphics/dia/files/patch-lib::font.c b/graphics/dia/files/patch-lib::font.c
deleted file mode 100644
index f6f9ec7ce9a7..000000000000
--- a/graphics/dia/files/patch-lib::font.c
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- lib/font.c	2002/06/03 08:27:47	1.1
-+++ lib/font.c	2002/06/03 08:34:08
-@@ -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
diff --git a/graphics/dia/files/patch-lib_intl.c b/graphics/dia/files/patch-lib_intl.c
new file mode 100644
index 000000000000..5449af46de43
--- /dev/null
+++ b/graphics/dia/files/patch-lib_intl.c
@@ -0,0 +1,10 @@
+--- lib/intl.c.orig	Mon Mar 17 14:06:02 2003
++++ lib/intl.c	Mon Mar 17 14:07:10 2003
+@@ -65,6 +65,7 @@
+     read_aliases ("/usr/share/locale/locale.alias");
+     read_aliases ("/usr/local/share/locale/locale.alias");
+     read_aliases ("/usr/lib/X11/locale/locale.alias");
++    read_aliases ("/usr/X11R6/lib/X11/locale/locale.alias");
+     read_aliases ("/usr/openwin/lib/locale/locale.alias");
+   }
+   while((p=g_hash_table_lookup(alias_table,lang)) && strcmp(p, lang))
diff --git a/graphics/dia/files/patch-objects::GRAFCET::boolequation.c b/graphics/dia/files/patch-objects::GRAFCET::boolequation.c
index 6cccd75ed6d9..7db01d1e20da 100644
--- a/graphics/dia/files/patch-objects::GRAFCET::boolequation.c
+++ b/graphics/dia/files/patch-objects::GRAFCET::boolequation.c
@@ -1,21 +1,18 @@
-
-$FreeBSD$
-
---- objects/GRAFCET/boolequation.c	2002/07/12 11:18:01	1.1
-+++ objects/GRAFCET/boolequation.c	2002/07/12 11:24:38
-@@ -64,7 +64,7 @@
+--- objects/GRAFCET/boolequation.c.orig	Sun Oct  6 14:55:22 2002
++++ objects/GRAFCET/boolequation.c	Mon Mar 17 13:56:09 2003
+@@ -58,7 +58,7 @@
  
  
  /* utility */
--inline static gboolean isspecial(unichar c) 
-+inline static gboolean dia_isspecial(unichar c) 
+-inline static gboolean isspecial(gunichar c) 
++inline static gboolean dia_isspecial(gunichar c) 
  {
    switch (c) {
    case '!':
-@@ -141,7 +141,7 @@
+@@ -136,7 +136,7 @@
+     gchar *p1;
      c = g_utf8_get_char(*str);
      p1 = g_utf8_next_char(*str);
- #endif
 -    if (isspecial(c)) break;
 +    if (dia_isspecial(c)) break;
      *str = p1;
diff --git a/graphics/dia/files/patch-plug-ins_xslt_xslt.c b/graphics/dia/files/patch-plug-ins_xslt_xslt.c
new file mode 100644
index 000000000000..5c8b7567ffbf
--- /dev/null
+++ b/graphics/dia/files/patch-plug-ins_xslt_xslt.c
@@ -0,0 +1,11 @@
+--- plug-ins/xslt/xslt.c.orig	Mon Mar 17 15:10:23 2003
++++ plug-ins/xslt/xslt.c	Mon Mar 17 15:10:59 2003
+@@ -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("/usr/local/lib", "xslt");
+ #endif	
+ 	xslt_module = g_module_open(path, 0);
+ 	if(xslt_module == NULL) {
diff --git a/graphics/dia/files/patch-shapes_Cisco_Makefile.in b/graphics/dia/files/patch-shapes_Cisco_Makefile.in
new file mode 100644
index 000000000000..fc557fd1239a
--- /dev/null
+++ b/graphics/dia/files/patch-shapes_Cisco_Makefile.in
@@ -0,0 +1,336 @@
+--- shapes/Cisco/Makefile.in.orig	Mon Mar 17 15:19:18 2003
++++ shapes/Cisco/Makefile.in	Mon Mar 17 15:20:24 2003
+@@ -1,6 +1,7 @@
+-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
++# Makefile.in generated automatically by automake 1.5 from Makefile.am.
+ 
+-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -10,6 +11,7 @@
+ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ # PARTICULAR PURPOSE.
+ 
++@SET_MAKE@
+ 
+ SHELL = @SHELL@
+ 
+@@ -31,13 +33,9 @@
+ mandir = @mandir@
+ includedir = @includedir@
+ oldincludedir = /usr/include
+-
+-DESTDIR =
+-
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-
+ top_builddir = ../..
+ 
+ ACLOCAL = @ACLOCAL@
+@@ -46,11 +44,11 @@
+ AUTOHEADER = @AUTOHEADER@
+ 
+ INSTALL = @INSTALL@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_HEADER = $(INSTALL_DATA)
+ transform = @program_transform_name@
+-
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+@@ -69,7 +67,6 @@
+ DEBUG_FLAGS = @DEBUG_FLAGS@
+ DLLTOOL = @DLLTOOL@
+ ECHO = @ECHO@
+-EXEEXT = @EXEEXT@
+ FREETYPE_LIBS = @FREETYPE_LIBS@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_CONFIG = @FT2_CONFIG@
+@@ -108,7 +105,6 @@
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
+ MAINT = @MAINT@
+-MAKEINFO = @MAKEINFO@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+@@ -142,110 +138,11 @@
+ pkgpythondir = @pkgpythondir@
+ pyexecdir = @pyexecdir@
+ pythondir = @pythondir@
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = ../../config.h
+-CONFIG_CLEAN_FILES = 
+-DIST_COMMON =  Makefile.am Makefile.in
+ 
++shapedir = $(pkgdatadir)/shapes
+ 
+-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+-
+-TAR = tar
+-GZIP_ENV = --best
+-all: all-redirect
+-.SUFFIXES:
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps shapes/Cisco/Makefile
+-
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) \
+-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+-
+-tags: TAGS
+-TAGS:
+-
+-
+-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+-
+-subdir = shapes/Cisco
+-
+-distdir: $(DISTFILES)
+-	@for file in $(DISTFILES); do \
+-	  d=$(srcdir); \
+-	  if test -d $$d/$$file; then \
+-	    cp -pr $$d/$$file $(distdir)/$$file; \
+-	  else \
+-	    test -f $(distdir)/$$file \
+-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-	  fi; \
+-	done
+-info-am:
+-info: info-am
+-dvi-am:
+-dvi: dvi-am
+-check-am: all-am
+-check: check-am
+-installcheck-am:
+-installcheck: installcheck-am
+-install-exec-am:
+-install-exec: install-exec-am
+-
+-install-data-am:
+-install-data: install-data-am
+-
+-install-am: all-am
+-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+-install: install-am
+-uninstall-am:
+-uninstall: uninstall-am
+-all-am: Makefile
+-all-redirect: all-am
+-install-strip:
+-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+-installdirs:
+-
+-
+-mostlyclean-generic:
+-
+-clean-generic:
+-
+-distclean-generic:
+-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+-
+-maintainer-clean-generic:
+-mostlyclean-am:  mostlyclean-generic
+-
+-mostlyclean: mostlyclean-am
+-
+-clean-am:  clean-generic mostlyclean-am
+-
+-clean: clean-am
+-
+-distclean-am:  distclean-generic clean-am
+-	-rm -f libtool
+-
+-distclean: distclean-am
+-
+-maintainer-clean-am:  maintainer-clean-generic distclean-am
+-	@echo "This command is intended for maintainers to use;"
+-	@echo "it deletes files that may require special tools to rebuild."
+-
+-maintainer-clean: maintainer-clean-am
+-
+-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
+-installcheck-am installcheck install-exec-am install-exec \
+-install-data-am install-data install-am install uninstall-am uninstall \
+-all-redirect all-am all installdirs mostlyclean-generic \
+-distclean-generic clean-generic maintainer-clean-generic clean \
+-mostlyclean distclean maintainer-clean
+-
+-
+-  shapedir = $(pkgdatadir)/shapes
+-
+-  ciscodir = $(shapedir)/Cisco
+-  SHAPES = \
++ciscodir = $(shapedir)/Cisco
++SHAPES = \
+   1000.shape\
+   1000.png\
+   100baset_hub.shape\
+@@ -689,9 +586,155 @@
+   www_server.shape\
+   www_server.png
+ 
+-  EXTRA_DIST = $(SHAPES)
+ 
+-  cisco_DATA = $(SHAPES)
++EXTRA_DIST = $(SHAPES)
++
++cisco_DATA = $(SHAPES)
++subdir = shapes/Cisco
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++DIST_SOURCES =
++DATA = $(cisco_DATA)
++
++DIST_COMMON = Makefile.am Makefile.in
++all: all-am
++
++.SUFFIXES:
++
++mostlyclean-libtool:
++	-rm -f *.lo
++
++clean-libtool:
++	-rm -rf .libs _libs
++
++distclean-libtool:
++	-rm -f libtool
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
++	cd $(top_srcdir) && \
++	  $(AUTOMAKE) --gnu  shapes/Cisco/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && \
++	  CONFIG_HEADERS= CONFIG_LINKS= \
++	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
++uninstall-info-am:
++install-ciscoDATA: $(cisco_DATA)
++	@$(NORMAL_INSTALL)
++	$(mkinstalldirs) $(DESTDIR)$(ciscodir)
++	@list='$(cisco_DATA)'; for p in $$list; do \
++	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++	  f="`echo $$p | sed -e 's|^.*/||'`"; \
++	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(ciscodir)/$$f"; \
++	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(ciscodir)/$$f; \
++	done
++
++uninstall-ciscoDATA:
++	@$(NORMAL_UNINSTALL)
++	@list='$(cisco_DATA)'; for p in $$list; do \
++	  f="`echo $$p | sed -e 's|^.*/||'`"; \
++	  echo " rm -f $(DESTDIR)$(ciscodir)/$$f"; \
++	  rm -f $(DESTDIR)$(ciscodir)/$$f; \
++	done
++tags: TAGS
++TAGS:
++
++
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
++
++distdir: $(DISTFILES)
++	@for file in $(DISTFILES); do \
++	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
++	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++	    $(mkinstalldirs) "$(distdir)/$$dir"; \
++	  fi; \
++	  if test -d $$d/$$file; then \
++	    cp -pR $$d/$$file $(distdir) \
++	    || exit 1; \
++	  else \
++	    test -f $(distdir)/$$file \
++	    || cp -p $$d/$$file $(distdir)/$$file \
++	    || exit 1; \
++	  fi; \
++	done
++check-am: all-am
++check: check-am
++all-am: Makefile $(DATA)
++
++installdirs:
++	$(mkinstalldirs) $(DESTDIR)$(ciscodir)
++
++install: install-am
++install-exec: install-exec-am
++install-data: install-data-am
++uninstall: uninstall-am
++
++install-am: all-am
++	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++
++installcheck: installcheck-am
++install-strip:
++	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++	  `test -z '$(STRIP)' || \
++	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++mostlyclean-generic:
++
++clean-generic:
++
++distclean-generic:
++	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
++
++maintainer-clean-generic:
++	@echo "This command is intended for maintainers to use"
++	@echo "it deletes files that may require special tools to rebuild."
++clean: clean-am
++
++clean-am: clean-generic clean-libtool mostlyclean-am
++
++distclean: distclean-am
++
++distclean-am: clean-am distclean-generic distclean-libtool
++
++dvi: dvi-am
++
++dvi-am:
++
++info: info-am
++
++info-am:
++
++install-data-am: install-ciscoDATA
++
++install-exec-am:
++
++install-info: install-info-am
++
++install-man:
++
++installcheck-am:
++
++maintainer-clean: maintainer-clean-am
++
++maintainer-clean-am: distclean-am maintainer-clean-generic
++
++mostlyclean: mostlyclean-am
++
++mostlyclean-am: mostlyclean-generic mostlyclean-libtool
++
++uninstall-am: uninstall-ciscoDATA uninstall-info-am
++
++.PHONY: all all-am check check-am clean clean-generic clean-libtool \
++	distclean distclean-generic distclean-libtool distdir dvi \
++	dvi-am info info-am install install-am install-ciscoDATA \
++	install-data install-data-am install-exec install-exec-am \
++	install-info install-info-am install-man install-strip \
++	installcheck installcheck-am installdirs maintainer-clean \
++	maintainer-clean-generic mostlyclean mostlyclean-generic \
++	mostlyclean-libtool uninstall uninstall-am uninstall-ciscoDATA \
++	uninstall-info-am
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/graphics/dia/pkg-descr b/graphics/dia/pkg-descr
index 9814f9af64fb..f9840fe6bdd0 100644
--- a/graphics/dia/pkg-descr
+++ b/graphics/dia/pkg-descr
@@ -1,4 +1,4 @@
-Dia is a GTK+ based diagram creation program released under the GPL license. 
+Dia is a GNOME based diagram creation program released under the GPL license. 
 
 Dia is designed to be much like the commercial Windows program
 'Visio'. It can be used to draw different kind of diagrams. In this
@@ -6,7 +6,6 @@ first version there is support for UML static structure diagrams
 (class diagrams) and network diagrams. It can currently load and
 save diagrams to a custom fileformat and export to postscript.
 
-Current maintainer: James Henstridge <james@daa.com.au>
 WWW: http://www.lysator.liu.se/~alla/dia/
 
 -- 
diff --git a/graphics/dia/pkg-plist b/graphics/dia/pkg-plist
index 76190fdee8b1..bd6c0d756110 100644
--- a/graphics/dia/pkg-plist
+++ b/graphics/dia/pkg-plist
@@ -1,9 +1,9 @@
 bin/dia
-bin/dia-bin
-bin/dia-embedd
+lib/dia/libbondgraph_objects.so
 lib/dia/libcgm_filter.so
 lib/dia/libchronogram_objects.so
 lib/dia/libcustom_objects.so
+lib/dia/libdia.so
 lib/dia/libdxf_filter.so
 lib/dia/liber_objects.so
 lib/dia/libflowchart_objects.so
@@ -11,8 +11,11 @@ lib/dia/libfs_objects.so
 lib/dia/libgrafcet_objects.so
 lib/dia/libhpgl_filter.so
 lib/dia/libmetapost_filter.so
+lib/dia/libmisc_objects.so
 lib/dia/libnetwork_objects.so
+lib/dia/libpixbuf_filter.so
 lib/dia/libpstricks_filter.so
+%%PYTHON:%%lib/dia/libpython_plugin.so
 lib/dia/libsadt_objects.so
 lib/dia/libshape_filter.so
 lib/dia/libstandard_objects.so
@@ -20,8 +23,100 @@ lib/dia/libsvg_filter.so
 lib/dia/libuml_objects.so
 lib/dia/libwpg_filter.so
 lib/dia/libxfig_filter.so
+lib/dia/libxslt_filter.so
 share/gnome/apps/Applications/dia.desktop
 share/gnome/dia/dia_logo.png
+share/gnome/dia/plugins/xslt/dia-uml.xsl
+share/gnome/dia/plugins/xslt/dia-uml2c++.xsl
+share/gnome/dia/plugins/xslt/dia-uml2idl.xsl
+share/gnome/dia/plugins/xslt/dia-uml2java.xsl
+share/gnome/dia/plugins/xslt/stylesheets.xml
+%%PYTHON:%%share/gnome/dia/python-startup.py
+%%PYTHON:%%share/gnome/dia/python/diasvg.py
+%%PYTHON:%%share/gnome/dia/python/group_props.py
+%%PYTHON:%%share/gnome/dia/python/gtkcons.py
+%%PYTHON:%%share/gnome/dia/python/otypes.py
+%%PYTHON:%%share/gnome/dia/python/pydiadoc.py
+share/gnome/dia/shapes/Assorted/arrow-chevron.png
+share/gnome/dia/shapes/Assorted/arrow-chevron.shape
+share/gnome/dia/shapes/Assorted/arrow-down.png
+share/gnome/dia/shapes/Assorted/arrow-down.shape
+share/gnome/dia/shapes/Assorted/arrow-left-notched.png
+share/gnome/dia/shapes/Assorted/arrow-left-notched.shape
+share/gnome/dia/shapes/Assorted/arrow-left-right-up.png
+share/gnome/dia/shapes/Assorted/arrow-left-right-up.shape
+share/gnome/dia/shapes/Assorted/arrow-left-right.png
+share/gnome/dia/shapes/Assorted/arrow-left-right.shape
+share/gnome/dia/shapes/Assorted/arrow-left-up.png
+share/gnome/dia/shapes/Assorted/arrow-left-up.shape
+share/gnome/dia/shapes/Assorted/arrow-left.png
+share/gnome/dia/shapes/Assorted/arrow-left.shape
+share/gnome/dia/shapes/Assorted/arrow-pentagon.png
+share/gnome/dia/shapes/Assorted/arrow-pentagon.shape
+share/gnome/dia/shapes/Assorted/arrow-quad.png
+share/gnome/dia/shapes/Assorted/arrow-quad.shape
+share/gnome/dia/shapes/Assorted/arrow-right-notched.png
+share/gnome/dia/shapes/Assorted/arrow-right-notched.shape
+share/gnome/dia/shapes/Assorted/arrow-right.png
+share/gnome/dia/shapes/Assorted/arrow-right.shape
+share/gnome/dia/shapes/Assorted/arrow-up-down-left.png
+share/gnome/dia/shapes/Assorted/arrow-up-down-left.shape
+share/gnome/dia/shapes/Assorted/arrow-up-down.png
+share/gnome/dia/shapes/Assorted/arrow-up-down.shape
+share/gnome/dia/shapes/Assorted/arrow-up.png
+share/gnome/dia/shapes/Assorted/arrow-up.shape
+share/gnome/dia/shapes/Assorted/circle-quarter.png
+share/gnome/dia/shapes/Assorted/circle-quarter.shape
+share/gnome/dia/shapes/Assorted/circle.png
+share/gnome/dia/shapes/Assorted/circle.shape
+share/gnome/dia/shapes/Assorted/cross-maltese.png
+share/gnome/dia/shapes/Assorted/cross-maltese.shape
+share/gnome/dia/shapes/Assorted/cross-swiss.png
+share/gnome/dia/shapes/Assorted/cross-swiss.shape
+share/gnome/dia/shapes/Assorted/diamond.png
+share/gnome/dia/shapes/Assorted/diamond.shape
+share/gnome/dia/shapes/Assorted/heart.png
+share/gnome/dia/shapes/Assorted/heart.shape
+share/gnome/dia/shapes/Assorted/heptagon.png
+share/gnome/dia/shapes/Assorted/heptagon.shape
+share/gnome/dia/shapes/Assorted/hexagon.png
+share/gnome/dia/shapes/Assorted/hexagon.shape
+share/gnome/dia/shapes/Assorted/moon-quarter.png
+share/gnome/dia/shapes/Assorted/moon-quarter.shape
+share/gnome/dia/shapes/Assorted/octagon.png
+share/gnome/dia/shapes/Assorted/octagon.shape
+share/gnome/dia/shapes/Assorted/parallelogram-horizontal.png
+share/gnome/dia/shapes/Assorted/parallelogram-horizontal.shape
+share/gnome/dia/shapes/Assorted/parallelogram-vertical.png
+share/gnome/dia/shapes/Assorted/parallelogram-vertical.shape
+share/gnome/dia/shapes/Assorted/pentagon.png
+share/gnome/dia/shapes/Assorted/pentagon.shape
+share/gnome/dia/shapes/Assorted/square.png
+share/gnome/dia/shapes/Assorted/square.shape
+share/gnome/dia/shapes/Assorted/star4.png
+share/gnome/dia/shapes/Assorted/star4.shape
+share/gnome/dia/shapes/Assorted/star4curved.png
+share/gnome/dia/shapes/Assorted/star4curved.shape
+share/gnome/dia/shapes/Assorted/star5.png
+share/gnome/dia/shapes/Assorted/star5.shape
+share/gnome/dia/shapes/Assorted/star6.png
+share/gnome/dia/shapes/Assorted/star6.shape
+share/gnome/dia/shapes/Assorted/star7.png
+share/gnome/dia/shapes/Assorted/star7.shape
+share/gnome/dia/shapes/Assorted/star8.png
+share/gnome/dia/shapes/Assorted/star8.shape
+share/gnome/dia/shapes/Assorted/star8curved.png
+share/gnome/dia/shapes/Assorted/star8curved.shape
+share/gnome/dia/shapes/Assorted/star8sharp.png
+share/gnome/dia/shapes/Assorted/star8sharp.shape
+share/gnome/dia/shapes/Assorted/sun.png
+share/gnome/dia/shapes/Assorted/sun.shape
+share/gnome/dia/shapes/Assorted/trapezoid.png
+share/gnome/dia/shapes/Assorted/trapezoid.shape
+share/gnome/dia/shapes/Assorted/triangle-isoceles.png
+share/gnome/dia/shapes/Assorted/triangle-isoceles.shape
+share/gnome/dia/shapes/Assorted/triangle-rightangle.png
+share/gnome/dia/shapes/Assorted/triangle-rightangle.shape
 share/gnome/dia/shapes/Circuit/ground.shape
 share/gnome/dia/shapes/Circuit/ground.xpm
 share/gnome/dia/shapes/Circuit/hcapacitor.shape
@@ -34,6 +129,7 @@ share/gnome/dia/shapes/Circuit/hinductor.shape
 share/gnome/dia/shapes/Circuit/hinductor.xpm
 share/gnome/dia/shapes/Circuit/hinductor_de.shape
 share/gnome/dia/shapes/Circuit/hinductor_de.xpm
+share/gnome/dia/shapes/Circuit/hjumper.png
 share/gnome/dia/shapes/Circuit/hjumper.shape
 share/gnome/dia/shapes/Circuit/hled_de.shape
 share/gnome/dia/shapes/Circuit/hled_de.xpm
@@ -81,6 +177,448 @@ share/gnome/dia/shapes/Circuit/vresistor_de.shape
 share/gnome/dia/shapes/Circuit/vresistor_de.xpm
 share/gnome/dia/shapes/Circuit/vzener.shape
 share/gnome/dia/shapes/Circuit/vzener.xpm
+share/gnome/dia/shapes/Cisco/1000.png
+share/gnome/dia/shapes/Cisco/1000.shape
+share/gnome/dia/shapes/Cisco/100baset_hub.png
+share/gnome/dia/shapes/Cisco/100baset_hub.shape
+share/gnome/dia/shapes/Cisco/10700.png
+share/gnome/dia/shapes/Cisco/10700.shape
+share/gnome/dia/shapes/Cisco/15200.png
+share/gnome/dia/shapes/Cisco/15200.shape
+share/gnome/dia/shapes/Cisco/3174.png
+share/gnome/dia/shapes/Cisco/3174.shape
+share/gnome/dia/shapes/Cisco/3x74.png
+share/gnome/dia/shapes/Cisco/3x74.shape
+share/gnome/dia/shapes/Cisco/5000.png
+share/gnome/dia/shapes/Cisco/5000.shape
+share/gnome/dia/shapes/Cisco/5002.png
+share/gnome/dia/shapes/Cisco/5002.shape
+share/gnome/dia/shapes/Cisco/5500.png
+share/gnome/dia/shapes/Cisco/5500.shape
+share/gnome/dia/shapes/Cisco/6701.png
+share/gnome/dia/shapes/Cisco/6701.shape
+share/gnome/dia/shapes/Cisco/6705.png
+share/gnome/dia/shapes/Cisco/6705.shape
+share/gnome/dia/shapes/Cisco/6732.png
+share/gnome/dia/shapes/Cisco/6732.shape
+share/gnome/dia/shapes/Cisco/7500ars.png
+share/gnome/dia/shapes/Cisco/7500ars.shape
+share/gnome/dia/shapes/Cisco/7505.png
+share/gnome/dia/shapes/Cisco/7505.shape
+share/gnome/dia/shapes/Cisco/7507.png
+share/gnome/dia/shapes/Cisco/7507.shape
+share/gnome/dia/shapes/Cisco/accesspoint.png
+share/gnome/dia/shapes/Cisco/accesspoint.shape
+share/gnome/dia/shapes/Cisco/adm.png
+share/gnome/dia/shapes/Cisco/adm.shape
+share/gnome/dia/shapes/Cisco/asic.png
+share/gnome/dia/shapes/Cisco/asic.shape
+share/gnome/dia/shapes/Cisco/ata.png
+share/gnome/dia/shapes/Cisco/ata.shape
+share/gnome/dia/shapes/Cisco/atm3800.png
+share/gnome/dia/shapes/Cisco/atm3800.shape
+share/gnome/dia/shapes/Cisco/atm_fast_gigabit_etherswitch.png
+share/gnome/dia/shapes/Cisco/atm_fast_gigabit_etherswitch.shape
+share/gnome/dia/shapes/Cisco/atm_router.png
+share/gnome/dia/shapes/Cisco/atm_router.shape
+share/gnome/dia/shapes/Cisco/atm_switch.png
+share/gnome/dia/shapes/Cisco/atm_switch.shape
+share/gnome/dia/shapes/Cisco/atm_tag_sw_gigabit_router.png
+share/gnome/dia/shapes/Cisco/atm_tag_sw_gigabit_router.shape
+share/gnome/dia/shapes/Cisco/atm_tag_switch_router.png
+share/gnome/dia/shapes/Cisco/atm_tag_switch_router.shape
+share/gnome/dia/shapes/Cisco/bbfw.png
+share/gnome/dia/shapes/Cisco/bbfw.shape
+share/gnome/dia/shapes/Cisco/bbfw_media.png
+share/gnome/dia/shapes/Cisco/bbfw_media.shape
+share/gnome/dia/shapes/Cisco/bbsm.png
+share/gnome/dia/shapes/Cisco/bbsm.shape
+share/gnome/dia/shapes/Cisco/branch_office.png
+share/gnome/dia/shapes/Cisco/branch_office.shape
+share/gnome/dia/shapes/Cisco/breakout_box.png
+share/gnome/dia/shapes/Cisco/breakout_box.shape
+share/gnome/dia/shapes/Cisco/bridge.png
+share/gnome/dia/shapes/Cisco/bridge.shape
+share/gnome/dia/shapes/Cisco/broadband_router.png
+share/gnome/dia/shapes/Cisco/broadband_router.shape
+share/gnome/dia/shapes/Cisco/bts10200.png
+share/gnome/dia/shapes/Cisco/bts10200.shape
+share/gnome/dia/shapes/Cisco/ca.png
+share/gnome/dia/shapes/Cisco/ca.shape
+share/gnome/dia/shapes/Cisco/cable_modem.png
+share/gnome/dia/shapes/Cisco/cable_modem.shape
+share/gnome/dia/shapes/Cisco/callmanager.png
+share/gnome/dia/shapes/Cisco/callmanager.shape
+share/gnome/dia/shapes/Cisco/car.png
+share/gnome/dia/shapes/Cisco/car.shape
+share/gnome/dia/shapes/Cisco/catalyst_access_gateway.png
+share/gnome/dia/shapes/Cisco/catalyst_access_gateway.shape
+share/gnome/dia/shapes/Cisco/cddi_fddi.png
+share/gnome/dia/shapes/Cisco/cddi_fddi.shape
+share/gnome/dia/shapes/Cisco/cdm.png
+share/gnome/dia/shapes/Cisco/cdm.shape
+share/gnome/dia/shapes/Cisco/cellular_phone.png
+share/gnome/dia/shapes/Cisco/cellular_phone.shape
+share/gnome/dia/shapes/Cisco/centri.png
+share/gnome/dia/shapes/Cisco/centri.shape
+share/gnome/dia/shapes/Cisco/cisco_hub.png
+share/gnome/dia/shapes/Cisco/cisco_hub.shape
+share/gnome/dia/shapes/Cisco/ciscosecurity.png
+share/gnome/dia/shapes/Cisco/ciscosecurity.shape
+share/gnome/dia/shapes/Cisco/ciscoworks.png
+share/gnome/dia/shapes/Cisco/ciscoworks.shape
+share/gnome/dia/shapes/Cisco/class45_switch.png
+share/gnome/dia/shapes/Cisco/class45_switch.shape
+share/gnome/dia/shapes/Cisco/cloud.png
+share/gnome/dia/shapes/Cisco/cloud.shape
+share/gnome/dia/shapes/Cisco/communications_server.png
+share/gnome/dia/shapes/Cisco/communications_server.shape
+share/gnome/dia/shapes/Cisco/content_engine.png
+share/gnome/dia/shapes/Cisco/content_engine.shape
+share/gnome/dia/shapes/Cisco/content_service_router.png
+share/gnome/dia/shapes/Cisco/content_service_router.shape
+share/gnome/dia/shapes/Cisco/content_switch.png
+share/gnome/dia/shapes/Cisco/content_switch.shape
+share/gnome/dia/shapes/Cisco/content_switch_module.png
+share/gnome/dia/shapes/Cisco/content_switch_module.shape
+share/gnome/dia/shapes/Cisco/css1100.png
+share/gnome/dia/shapes/Cisco/css1100.shape
+share/gnome/dia/shapes/Cisco/csu_dsu.png
+share/gnome/dia/shapes/Cisco/csu_dsu.shape
+share/gnome/dia/shapes/Cisco/cte.png
+share/gnome/dia/shapes/Cisco/cte.shape
+share/gnome/dia/shapes/Cisco/directory_server.png
+share/gnome/dia/shapes/Cisco/directory_server.shape
+share/gnome/dia/shapes/Cisco/diskette.png
+share/gnome/dia/shapes/Cisco/diskette.shape
+share/gnome/dia/shapes/Cisco/distributed_director.png
+share/gnome/dia/shapes/Cisco/distributed_director.shape
+share/gnome/dia/shapes/Cisco/dot_dot.png
+share/gnome/dia/shapes/Cisco/dot_dot.shape
+share/gnome/dia/shapes/Cisco/dpt.png
+share/gnome/dia/shapes/Cisco/dpt.shape
+share/gnome/dia/shapes/Cisco/dslam.png
+share/gnome/dia/shapes/Cisco/dslam.shape
+share/gnome/dia/shapes/Cisco/dwdm_filter.png
+share/gnome/dia/shapes/Cisco/dwdm_filter.shape
+share/gnome/dia/shapes/Cisco/end_office.png
+share/gnome/dia/shapes/Cisco/end_office.shape
+share/gnome/dia/shapes/Cisco/fax.png
+share/gnome/dia/shapes/Cisco/fax.shape
+share/gnome/dia/shapes/Cisco/fc_storage.png
+share/gnome/dia/shapes/Cisco/fc_storage.shape
+share/gnome/dia/shapes/Cisco/fddi_ring.png
+share/gnome/dia/shapes/Cisco/fddi_ring.shape
+share/gnome/dia/shapes/Cisco/file_cabinet.png
+share/gnome/dia/shapes/Cisco/file_cabinet.shape
+share/gnome/dia/shapes/Cisco/file_server.png
+share/gnome/dia/shapes/Cisco/file_server.shape
+share/gnome/dia/shapes/Cisco/firewall.png
+share/gnome/dia/shapes/Cisco/firewall.shape
+share/gnome/dia/shapes/Cisco/front_end_processor.png
+share/gnome/dia/shapes/Cisco/front_end_processor.shape
+share/gnome/dia/shapes/Cisco/general_appliance.png
+share/gnome/dia/shapes/Cisco/general_appliance.shape
+share/gnome/dia/shapes/Cisco/generic_building.png
+share/gnome/dia/shapes/Cisco/generic_building.shape
+share/gnome/dia/shapes/Cisco/generic_gateway.png
+share/gnome/dia/shapes/Cisco/generic_gateway.shape
+share/gnome/dia/shapes/Cisco/generic_processor.png
+share/gnome/dia/shapes/Cisco/generic_processor.shape
+share/gnome/dia/shapes/Cisco/generic_softswitch.png
+share/gnome/dia/shapes/Cisco/generic_softswitch.shape
+share/gnome/dia/shapes/Cisco/gigabit_switch_router_atm_tag.png
+share/gnome/dia/shapes/Cisco/gigabit_switch_router_atm_tag.shape
+share/gnome/dia/shapes/Cisco/government_building.png
+share/gnome/dia/shapes/Cisco/government_building.shape
+share/gnome/dia/shapes/Cisco/h323.png
+share/gnome/dia/shapes/Cisco/h323.shape
+share/gnome/dia/shapes/Cisco/handheld.png
+share/gnome/dia/shapes/Cisco/handheld.shape
+share/gnome/dia/shapes/Cisco/hootphone.png
+share/gnome/dia/shapes/Cisco/hootphone.shape
+share/gnome/dia/shapes/Cisco/host.png
+share/gnome/dia/shapes/Cisco/host.shape
+share/gnome/dia/shapes/Cisco/hp_mini.png
+share/gnome/dia/shapes/Cisco/hp_mini.shape
+share/gnome/dia/shapes/Cisco/hub.png
+share/gnome/dia/shapes/Cisco/hub.shape
+share/gnome/dia/shapes/Cisco/iad_router.png
+share/gnome/dia/shapes/Cisco/iad_router.shape
+share/gnome/dia/shapes/Cisco/ibm_mainframe.png
+share/gnome/dia/shapes/Cisco/ibm_mainframe.shape
+share/gnome/dia/shapes/Cisco/ibm_mini.png
+share/gnome/dia/shapes/Cisco/ibm_mini.shape
+share/gnome/dia/shapes/Cisco/ibm_tower.png
+share/gnome/dia/shapes/Cisco/ibm_tower.shape
+share/gnome/dia/shapes/Cisco/icm.png
+share/gnome/dia/shapes/Cisco/icm.shape
+share/gnome/dia/shapes/Cisco/ics.png
+share/gnome/dia/shapes/Cisco/ics.shape
+share/gnome/dia/shapes/Cisco/ios_firewall.png
+share/gnome/dia/shapes/Cisco/ios_firewall.shape
+share/gnome/dia/shapes/Cisco/ip.png
+share/gnome/dia/shapes/Cisco/ip.shape
+share/gnome/dia/shapes/Cisco/ip_dsl.png
+share/gnome/dia/shapes/Cisco/ip_dsl.shape
+share/gnome/dia/shapes/Cisco/ip_phone.png
+share/gnome/dia/shapes/Cisco/ip_phone.shape
+share/gnome/dia/shapes/Cisco/ip_softphone.png
+share/gnome/dia/shapes/Cisco/ip_softphone.shape
+share/gnome/dia/shapes/Cisco/ip_telephony_router.png
+share/gnome/dia/shapes/Cisco/ip_telephony_router.shape
+share/gnome/dia/shapes/Cisco/iptc.png
+share/gnome/dia/shapes/Cisco/iptc.shape
+share/gnome/dia/shapes/Cisco/iptv_broadcast_server.png
+share/gnome/dia/shapes/Cisco/iptv_broadcast_server.shape
+share/gnome/dia/shapes/Cisco/iptv_content_manager.png
+share/gnome/dia/shapes/Cisco/iptv_content_manager.shape
+share/gnome/dia/shapes/Cisco/isdn_switch.png
+share/gnome/dia/shapes/Cisco/isdn_switch.shape
+share/gnome/dia/shapes/Cisco/itp.png
+share/gnome/dia/shapes/Cisco/itp.shape
+share/gnome/dia/shapes/Cisco/key.png
+share/gnome/dia/shapes/Cisco/key.shape
+share/gnome/dia/shapes/Cisco/lan_to_lan.png
+share/gnome/dia/shapes/Cisco/lan_to_lan.shape
+share/gnome/dia/shapes/Cisco/laptop.png
+share/gnome/dia/shapes/Cisco/laptop.shape
+share/gnome/dia/shapes/Cisco/layer3_switch.png
+share/gnome/dia/shapes/Cisco/layer3_switch.shape
+share/gnome/dia/shapes/Cisco/localdirector.png
+share/gnome/dia/shapes/Cisco/localdirector.shape
+share/gnome/dia/shapes/Cisco/lock.png
+share/gnome/dia/shapes/Cisco/lock.shape
+share/gnome/dia/shapes/Cisco/longreach_cpe.png
+share/gnome/dia/shapes/Cisco/longreach_cpe.shape
+share/gnome/dia/shapes/Cisco/mac_woman.png
+share/gnome/dia/shapes/Cisco/mac_woman.shape
+share/gnome/dia/shapes/Cisco/macintosh.png
+share/gnome/dia/shapes/Cisco/macintosh.shape
+share/gnome/dia/shapes/Cisco/man_woman.png
+share/gnome/dia/shapes/Cisco/man_woman.shape
+share/gnome/dia/shapes/Cisco/mas_gateway.png
+share/gnome/dia/shapes/Cisco/mas_gateway.shape
+share/gnome/dia/shapes/Cisco/mau.png
+share/gnome/dia/shapes/Cisco/mau.shape
+share/gnome/dia/shapes/Cisco/mdu.png
+share/gnome/dia/shapes/Cisco/mdu.shape
+share/gnome/dia/shapes/Cisco/me1100.png
+share/gnome/dia/shapes/Cisco/me1100.shape
+share/gnome/dia/shapes/Cisco/metro1500.png
+share/gnome/dia/shapes/Cisco/metro1500.shape
+share/gnome/dia/shapes/Cisco/mgx8220.png
+share/gnome/dia/shapes/Cisco/mgx8220.shape
+share/gnome/dia/shapes/Cisco/mgx8240.png
+share/gnome/dia/shapes/Cisco/mgx8240.shape
+share/gnome/dia/shapes/Cisco/mgx8260.png
+share/gnome/dia/shapes/Cisco/mgx8260.shape
+share/gnome/dia/shapes/Cisco/microphone.png
+share/gnome/dia/shapes/Cisco/microphone.shape
+share/gnome/dia/shapes/Cisco/microwebserver.png
+share/gnome/dia/shapes/Cisco/microwebserver.shape
+share/gnome/dia/shapes/Cisco/mini_vax.png
+share/gnome/dia/shapes/Cisco/mini_vax.shape
+share/gnome/dia/shapes/Cisco/modem.png
+share/gnome/dia/shapes/Cisco/modem.shape
+share/gnome/dia/shapes/Cisco/moh_server.png
+share/gnome/dia/shapes/Cisco/moh_server.shape
+share/gnome/dia/shapes/Cisco/multilayer_switch.png
+share/gnome/dia/shapes/Cisco/multilayer_switch.shape
+share/gnome/dia/shapes/Cisco/multiswitch_device.png
+share/gnome/dia/shapes/Cisco/multiswitch_device.shape
+share/gnome/dia/shapes/Cisco/mux.png
+share/gnome/dia/shapes/Cisco/mux.shape
+share/gnome/dia/shapes/Cisco/netflow_router.png
+share/gnome/dia/shapes/Cisco/netflow_router.shape
+share/gnome/dia/shapes/Cisco/netranger.png
+share/gnome/dia/shapes/Cisco/netranger.shape
+share/gnome/dia/shapes/Cisco/netsonar.png
+share/gnome/dia/shapes/Cisco/netsonar.shape
+share/gnome/dia/shapes/Cisco/network_management.png
+share/gnome/dia/shapes/Cisco/network_management.shape
+share/gnome/dia/shapes/Cisco/octel.png
+share/gnome/dia/shapes/Cisco/octel.shape
+share/gnome/dia/shapes/Cisco/ons15500.png
+share/gnome/dia/shapes/Cisco/ons15500.shape
+share/gnome/dia/shapes/Cisco/optical_amplifier.png
+share/gnome/dia/shapes/Cisco/optical_amplifier.shape
+share/gnome/dia/shapes/Cisco/optical_services_router.png
+share/gnome/dia/shapes/Cisco/optical_services_router.shape
+share/gnome/dia/shapes/Cisco/optical_transport.png
+share/gnome/dia/shapes/Cisco/optical_transport.shape
+share/gnome/dia/shapes/Cisco/pad.png
+share/gnome/dia/shapes/Cisco/pad.shape
+share/gnome/dia/shapes/Cisco/pad_x28.png
+share/gnome/dia/shapes/Cisco/pad_x28.shape
+share/gnome/dia/shapes/Cisco/pbx.png
+share/gnome/dia/shapes/Cisco/pbx.shape
+share/gnome/dia/shapes/Cisco/pbx_switch.png
+share/gnome/dia/shapes/Cisco/pbx_switch.shape
+share/gnome/dia/shapes/Cisco/pc.png
+share/gnome/dia/shapes/Cisco/pc.shape
+share/gnome/dia/shapes/Cisco/pc_adapter_card.png
+share/gnome/dia/shapes/Cisco/pc_adapter_card.shape
+share/gnome/dia/shapes/Cisco/pc_man.png
+share/gnome/dia/shapes/Cisco/pc_man.shape
+share/gnome/dia/shapes/Cisco/pc_router_card.png
+share/gnome/dia/shapes/Cisco/pc_router_card.shape
+share/gnome/dia/shapes/Cisco/pc_video.png
+share/gnome/dia/shapes/Cisco/pc_video.shape
+share/gnome/dia/shapes/Cisco/pda.png
+share/gnome/dia/shapes/Cisco/pda.shape
+share/gnome/dia/shapes/Cisco/phone.png
+share/gnome/dia/shapes/Cisco/phone.shape
+share/gnome/dia/shapes/Cisco/phone_fax.png
+share/gnome/dia/shapes/Cisco/phone_fax.shape
+share/gnome/dia/shapes/Cisco/pix_firewall.png
+share/gnome/dia/shapes/Cisco/pix_firewall.shape
+share/gnome/dia/shapes/Cisco/printer.png
+share/gnome/dia/shapes/Cisco/printer.shape
+share/gnome/dia/shapes/Cisco/programmable_switch.png
+share/gnome/dia/shapes/Cisco/programmable_switch.shape
+share/gnome/dia/shapes/Cisco/protocol_translator.png
+share/gnome/dia/shapes/Cisco/protocol_translator.shape
+share/gnome/dia/shapes/Cisco/pxf.png
+share/gnome/dia/shapes/Cisco/pxf.shape
+share/gnome/dia/shapes/Cisco/radio_tower.png
+share/gnome/dia/shapes/Cisco/radio_tower.shape
+share/gnome/dia/shapes/Cisco/ratemux.png
+share/gnome/dia/shapes/Cisco/ratemux.shape
+share/gnome/dia/shapes/Cisco/relational_database.png
+share/gnome/dia/shapes/Cisco/relational_database.shape
+share/gnome/dia/shapes/Cisco/repeater.png
+share/gnome/dia/shapes/Cisco/repeater.shape
+share/gnome/dia/shapes/Cisco/route_switch_processor.png
+share/gnome/dia/shapes/Cisco/route_switch_processor.shape
+share/gnome/dia/shapes/Cisco/router.png
+share/gnome/dia/shapes/Cisco/router.shape
+share/gnome/dia/shapes/Cisco/router_in_building.png
+share/gnome/dia/shapes/Cisco/router_in_building.shape
+share/gnome/dia/shapes/Cisco/router_with_firewall.png
+share/gnome/dia/shapes/Cisco/router_with_firewall.shape
+share/gnome/dia/shapes/Cisco/router_with_silicon_switch.png
+share/gnome/dia/shapes/Cisco/router_with_silicon_switch.shape
+share/gnome/dia/shapes/Cisco/rps.png
+share/gnome/dia/shapes/Cisco/rps.shape
+share/gnome/dia/shapes/Cisco/running_man.png
+share/gnome/dia/shapes/Cisco/running_man.shape
+share/gnome/dia/shapes/Cisco/satellite.png
+share/gnome/dia/shapes/Cisco/satellite.shape
+share/gnome/dia/shapes/Cisco/satellite_dish.png
+share/gnome/dia/shapes/Cisco/satellite_dish.shape
+share/gnome/dia/shapes/Cisco/sc2200.png
+share/gnome/dia/shapes/Cisco/sc2200.shape
+share/gnome/dia/shapes/Cisco/sc2200_vsc3000_host.png
+share/gnome/dia/shapes/Cisco/sc2200_vsc3000_host.shape
+share/gnome/dia/shapes/Cisco/scanner.png
+share/gnome/dia/shapes/Cisco/scanner.shape
+share/gnome/dia/shapes/Cisco/server_with_pc_router.png
+share/gnome/dia/shapes/Cisco/server_with_pc_router.shape
+share/gnome/dia/shapes/Cisco/sip_proxy_server.png
+share/gnome/dia/shapes/Cisco/sip_proxy_server.shape
+share/gnome/dia/shapes/Cisco/sitting_woman.png
+share/gnome/dia/shapes/Cisco/sitting_woman.shape
+share/gnome/dia/shapes/Cisco/small_business.png
+share/gnome/dia/shapes/Cisco/small_business.shape
+share/gnome/dia/shapes/Cisco/small_hub.png
+share/gnome/dia/shapes/Cisco/small_hub.shape
+share/gnome/dia/shapes/Cisco/softphone.png
+share/gnome/dia/shapes/Cisco/softphone.shape
+share/gnome/dia/shapes/Cisco/software_based_server.png
+share/gnome/dia/shapes/Cisco/software_based_server.shape
+share/gnome/dia/shapes/Cisco/speaker.png
+share/gnome/dia/shapes/Cisco/speaker.shape
+share/gnome/dia/shapes/Cisco/standing_man.png
+share/gnome/dia/shapes/Cisco/standing_man.shape
+share/gnome/dia/shapes/Cisco/stb.png
+share/gnome/dia/shapes/Cisco/stb.shape
+share/gnome/dia/shapes/Cisco/storage_array.png
+share/gnome/dia/shapes/Cisco/storage_array.shape
+share/gnome/dia/shapes/Cisco/storage_router.png
+share/gnome/dia/shapes/Cisco/storage_router.shape
+share/gnome/dia/shapes/Cisco/stp.png
+share/gnome/dia/shapes/Cisco/stp.shape
+share/gnome/dia/shapes/Cisco/sun_workstation.png
+share/gnome/dia/shapes/Cisco/sun_workstation.shape
+share/gnome/dia/shapes/Cisco/supercomputer.png
+share/gnome/dia/shapes/Cisco/supercomputer.shape
+share/gnome/dia/shapes/Cisco/svx.png
+share/gnome/dia/shapes/Cisco/svx.shape
+share/gnome/dia/shapes/Cisco/system_controller.png
+share/gnome/dia/shapes/Cisco/system_controller.shape
+share/gnome/dia/shapes/Cisco/tablet.png
+share/gnome/dia/shapes/Cisco/tablet.shape
+share/gnome/dia/shapes/Cisco/tdm_router.png
+share/gnome/dia/shapes/Cisco/tdm_router.shape
+share/gnome/dia/shapes/Cisco/telecommuter.png
+share/gnome/dia/shapes/Cisco/telecommuter.shape
+share/gnome/dia/shapes/Cisco/telecommuter_house.png
+share/gnome/dia/shapes/Cisco/telecommuter_house.shape
+share/gnome/dia/shapes/Cisco/telecommuter_house_router.png
+share/gnome/dia/shapes/Cisco/telecommuter_house_router.shape
+share/gnome/dia/shapes/Cisco/terminal.png
+share/gnome/dia/shapes/Cisco/terminal.shape
+share/gnome/dia/shapes/Cisco/tokenring.png
+share/gnome/dia/shapes/Cisco/tokenring.shape
+share/gnome/dia/shapes/Cisco/transpath.png
+share/gnome/dia/shapes/Cisco/transpath.shape
+share/gnome/dia/shapes/Cisco/truck.png
+share/gnome/dia/shapes/Cisco/truck.shape
+share/gnome/dia/shapes/Cisco/turret.png
+share/gnome/dia/shapes/Cisco/turret.shape
+share/gnome/dia/shapes/Cisco/tv.png
+share/gnome/dia/shapes/Cisco/tv.shape
+share/gnome/dia/shapes/Cisco/ubr910.png
+share/gnome/dia/shapes/Cisco/ubr910.shape
+share/gnome/dia/shapes/Cisco/unity_server.png
+share/gnome/dia/shapes/Cisco/unity_server.shape
+share/gnome/dia/shapes/Cisco/universal_gateway.png
+share/gnome/dia/shapes/Cisco/universal_gateway.shape
+share/gnome/dia/shapes/Cisco/university.png
+share/gnome/dia/shapes/Cisco/university.shape
+share/gnome/dia/shapes/Cisco/ups.png
+share/gnome/dia/shapes/Cisco/ups.shape
+share/gnome/dia/shapes/Cisco/video_camera.png
+share/gnome/dia/shapes/Cisco/video_camera.shape
+share/gnome/dia/shapes/Cisco/vip.png
+share/gnome/dia/shapes/Cisco/vip.shape
+share/gnome/dia/shapes/Cisco/voice_atm_switch.png
+share/gnome/dia/shapes/Cisco/voice_atm_switch.shape
+share/gnome/dia/shapes/Cisco/voice_commserver.png
+share/gnome/dia/shapes/Cisco/voice_commserver.shape
+share/gnome/dia/shapes/Cisco/voice_router.png
+share/gnome/dia/shapes/Cisco/voice_router.shape
+share/gnome/dia/shapes/Cisco/voice_switch.png
+share/gnome/dia/shapes/Cisco/voice_switch.shape
+share/gnome/dia/shapes/Cisco/voice_switch2.png
+share/gnome/dia/shapes/Cisco/voice_switch2.shape
+share/gnome/dia/shapes/Cisco/vpn_concentrator.png
+share/gnome/dia/shapes/Cisco/vpn_concentrator.shape
+share/gnome/dia/shapes/Cisco/vpn_gateway.png
+share/gnome/dia/shapes/Cisco/vpn_gateway.shape
+share/gnome/dia/shapes/Cisco/vsc3000.png
+share/gnome/dia/shapes/Cisco/vsc3000.shape
+share/gnome/dia/shapes/Cisco/wavelength_router.png
+share/gnome/dia/shapes/Cisco/wavelength_router.shape
+share/gnome/dia/shapes/Cisco/web_browser.png
+share/gnome/dia/shapes/Cisco/web_browser.shape
+share/gnome/dia/shapes/Cisco/web_cluster.png
+share/gnome/dia/shapes/Cisco/web_cluster.shape
+share/gnome/dia/shapes/Cisco/wireless.png
+share/gnome/dia/shapes/Cisco/wireless.shape
+share/gnome/dia/shapes/Cisco/wireless_bridge.png
+share/gnome/dia/shapes/Cisco/wireless_bridge.shape
+share/gnome/dia/shapes/Cisco/wireless_transport.png
+share/gnome/dia/shapes/Cisco/wireless_transport.shape
+share/gnome/dia/shapes/Cisco/workgroup_director.png
+share/gnome/dia/shapes/Cisco/workgroup_director.shape
+share/gnome/dia/shapes/Cisco/workgroup_switch.png
+share/gnome/dia/shapes/Cisco/workgroup_switch.shape
+share/gnome/dia/shapes/Cisco/workstation.png
+share/gnome/dia/shapes/Cisco/workstation.shape
+share/gnome/dia/shapes/Cisco/www_server.png
+share/gnome/dia/shapes/Cisco/www_server.shape
 share/gnome/dia/shapes/Civil/bvrest.shape
 share/gnome/dia/shapes/Civil/bvrest.xpm
 share/gnome/dia/shapes/Civil/civil_aerator.shape
@@ -269,6 +807,8 @@ share/gnome/dia/shapes/Network/computer.shape
 share/gnome/dia/shapes/Network/computer.xpm
 share/gnome/dia/shapes/Network/dat_external.shape
 share/gnome/dia/shapes/Network/dat_external.xpm
+share/gnome/dia/shapes/Network/digitizing_board.png
+share/gnome/dia/shapes/Network/digitizing_board.shape
 share/gnome/dia/shapes/Network/disc.shape
 share/gnome/dia/shapes/Network/disc.xpm
 share/gnome/dia/shapes/Network/diskette.shape
@@ -299,6 +839,8 @@ share/gnome/dia/shapes/Network/pc_miditower.shape
 share/gnome/dia/shapes/Network/pc_miditower.xpm
 share/gnome/dia/shapes/Network/pc_minitower.shape
 share/gnome/dia/shapes/Network/pc_minitower.xpm
+share/gnome/dia/shapes/Network/plotter.png
+share/gnome/dia/shapes/Network/plotter.shape
 share/gnome/dia/shapes/Network/printer.shape
 share/gnome/dia/shapes/Network/printer.xpm
 share/gnome/dia/shapes/Network/rj45plug.shape
@@ -439,6 +981,7 @@ share/gnome/dia/shapes/sybase/rsm.shape
 share/gnome/dia/shapes/sybase/rsm.xpm
 share/gnome/dia/shapes/sybase/stableq.shape
 share/gnome/dia/shapes/sybase/stableq.xpm
+share/gnome/dia/sheets/Assorted.sheet
 share/gnome/dia/sheets/Circuit.sheet
 share/gnome/dia/sheets/Contact.sheet
 share/gnome/dia/sheets/EML.sheet
@@ -464,6 +1007,11 @@ share/gnome/dia/sheets/UML.sheet
 share/gnome/dia/sheets/UML/aggregation.xpm
 share/gnome/dia/sheets/UML/umlclass_template.xpm
 share/gnome/dia/sheets/chronogram.sheet
+share/gnome/dia/sheets/ciscocomputer.sheet
+share/gnome/dia/sheets/ciscohub.sheet
+share/gnome/dia/sheets/ciscomisc.sheet
+share/gnome/dia/sheets/cisconetwork.sheet
+share/gnome/dia/sheets/ciscorouter.sheet
 share/gnome/dia/sheets/civil.sheet
 share/gnome/dia/sheets/jigsaw.sheet
 share/gnome/dia/sheets/network.sheet
@@ -475,8 +1023,10 @@ share/gnome/mime-info/dia.keys
 share/gnome/mime-info/dia.mime
 share/gnome/pixmaps/dia-diagram.png
 share/gnome/pixmaps/dia_gnome_icon.png
+share/locale/am/LC_MESSAGES/dia.mo
 share/locale/az/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
@@ -495,6 +1045,7 @@ share/locale/no/LC_MESSAGES/dia.mo
 share/locale/pl/LC_MESSAGES/dia.mo
 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/sk/LC_MESSAGES/dia.mo
 share/locale/sl/LC_MESSAGES/dia.mo
@@ -523,7 +1074,12 @@ share/locale/zh_TW/LC_MESSAGES/dia.mo
 @dirrm share/gnome/dia/shapes/Electric
 @dirrm share/gnome/dia/shapes/Contact
 @dirrm share/gnome/dia/shapes/Civil
+@dirrm share/gnome/dia/shapes/Cisco
 @dirrm share/gnome/dia/shapes/Circuit
+@dirrm share/gnome/dia/shapes/Assorted
 @dirrm share/gnome/dia/shapes
+%%PYTHON:%%@dirrm share/gnome/dia/python
+@dirrm share/gnome/dia/plugins/xslt
+@dirrm share/gnome/dia/plugins
 @dirrm share/gnome/dia
 @dirrm lib/dia