8 files changed, 346 insertions, 194 deletions

diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index 5c342ecdc881..7eea16802e41 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -6,27 +6,47 @@
 #
 
 PORTNAME=	dia
-PORTVERSION=	0.84
+PORTVERSION=	0.86
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/dia
 
 MAINTAINER=	saper@system.pl
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12  \
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
+		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12  \
 		xml.5:${PORTSDIR}/textproc/libxml	\
-		gdk_imlib.5:${PORTSDIR}/graphics/imlib
+		gdk_imlib.5:${PORTSDIR}/graphics/imlib \
+		popt.0:${PORTSDIR}/devel/popt
+RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
 
+GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=    ${X11BASE}/bin/gtk12-config
 
 USE_X_PREFIX=   yes
 USE_LIBTOOL=	yes
+USE_GMAKE=	yes
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
+		--datadir=${PREFIX}/share/gnome \
+		--enable-gnome
 CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include" \
 		GTK_CONFIG="${GTK_CONFIG}" \
-		LIBS="-L${LOCALBASE}/lib"
+		GLIB_CONFIG="${GLIB_CONFIG}" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		dia.1
 
+pre-patch:
+	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
+		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+
+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 5861b7d7b135..7c9cf194bc5f 100644
--- a/graphics/dia/distinfo
+++ b/graphics/dia/distinfo
@@ -1 +1 @@
-MD5 (dia-0.84.tar.gz) = 0391dc1cdf31a42880a2ad11893a8c76
+MD5 (dia-0.86.tar.gz) = 66c32ceb8d034137be88d4b649e405a2
diff --git a/graphics/dia/files/dia.sh b/graphics/dia/files/dia.sh
new file mode 100644
index 000000000000..5d9473f4e89c
--- /dev/null
+++ b/graphics/dia/files/dia.sh
@@ -0,0 +1,7 @@
+#!/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-ab b/graphics/dia/files/patch-ab
index d37fcd28158b..b35be2f31f82 100644
--- a/graphics/dia/files/patch-ab
+++ b/graphics/dia/files/patch-ab
@@ -1,15 +1,6 @@
---- Makefile.in.orig	Sat Feb 19 17:56:06 2000
-+++ Makefile.in	Sat Feb 19 17:57:05 2000
-@@ -111,7 +111,7 @@
- 
- SUBDIRS = lib objects plug-ins shapes intl app samples po sheets
- 
--gnomedatadir = $(datadir)
-+gnomedatadir = $(datadir)/gnome
- 
- pkgdata_DATA = dia_logo.png
- man_MANS = dia.1
-@@ -119,7 +119,7 @@
+--- Makefile.in.orig	Mon Aug  7 12:15:36 2000
++++ Makefile.in	Mon Aug  7 12:15:39 2000
+@@ -136,7 +136,7 @@
  pixmapdir = $(gnomedatadir)/pixmaps
  pixmap_DATA = dia_gnome_icon.png dia-diagram.png
  
diff --git a/graphics/dia/files/patch-ad b/graphics/dia/files/patch-ad
index 91c000412bff..8d00152d61ed 100644
--- a/graphics/dia/files/patch-ad
+++ b/graphics/dia/files/patch-ad
@@ -1,11 +1,11 @@
---- configure.orig	Sun Jan 16 21:51:51 2000
-+++ configure	Sun Jan 16 21:52:01 2000
-@@ -3770,7 +3770,7 @@
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CATOBJEXT=.mo
--		   DATADIRNAME=lib
-+		   DATADIRNAME=share
- fi
- rm -f conftest*
- 		INSTOBJEXT=.mo
+--- configure.orig	Mon Aug  7 11:47:15 2000
++++ configure	Mon Aug  7 11:47:51 2000
+@@ -2565,7 +2565,7 @@
+ 
+ 
+ OLDCPPFLAGS=$CPPFLAGS
+-CPPFLAGS="$CPPFLAGS `glib-config --cflags`"
++CPPFLAGS="$CPPFLAGS `${GLIB_CONFIG} --cflags`"
+ 
+ 
+ CPPFLAGS=$OLDCPPFLAGS
diff --git a/graphics/dia/files/patch-af b/graphics/dia/files/patch-af
new file mode 100644
index 000000000000..dffc53b222b0
--- /dev/null
+++ b/graphics/dia/files/patch-af
@@ -0,0 +1,21 @@
+--- app/Makefile.in.orig	Mon Aug  7 13:13:57 2000
++++ app/Makefile.in	Mon Aug  7 13:15:10 2000
+@@ -157,7 +157,7 @@
+ @HAVE_BONOBO_TRUE@dia_oafinfo = @HAVE_BONOBO_TRUE@dia.oafinfo
+ @HAVE_BONOBO_FALSE@dia_oafinfo = 
+ 
+-bin_PROGRAMS = dia $(dia_embedd)
++bin_PROGRAMS = dia-bin $(dia_embedd)
+ 
+ gnorbadir = $(sysconfdir)/CORBA/servers
+ gnorba_DATA = $(dia_gnorba)
+@@ -488,6 +488,9 @@
+ dia: $(dia_OBJECTS) $(dia_DEPENDENCIES)
+ 	@rm -f dia
+ 	$(LINK) $(dia_LDFLAGS) $(dia_OBJECTS) $(dia_LDADD) $(LIBS)
++
++dia-bin: dia
++	cp dia dia-bin
+ 
+ dia-embedd: $(dia_embedd_OBJECTS) $(dia_embedd_DEPENDENCIES)
+ 	@rm -f dia-embedd
diff --git a/graphics/dia/files/patch-ag b/graphics/dia/files/patch-ag
new file mode 100644
index 000000000000..30f688242da2
--- /dev/null
+++ b/graphics/dia/files/patch-ag
@@ -0,0 +1,11 @@
+--- lib/plug-ins.c.orig	Mon Aug  7 13:51:41 2000
++++ lib/plug-ins.c	Mon Aug  7 13:52:01 2000
+@@ -45,7 +45,7 @@
+ #  define PLUG_IN_EXT_LEN 4
+ #else
+ /* this one should work on any platform where libtool is used to compile dia */
+-#  define PLUG_IN_EXT ".la"
++#  define PLUG_IN_EXT ".so"
+ #  define PLUG_IN_EXT_LEN 3
+ #endif
+ 
diff --git a/graphics/dia/pkg-plist b/graphics/dia/pkg-plist
index a9c17edb4f17..b3e07958de60 100644
--- a/graphics/dia/pkg-plist
+++ b/graphics/dia/pkg-plist
@@ -1,197 +1,299 @@
 bin/dia
+bin/dia-bin
 lib/dia/libcgm_filter.so
 lib/dia/libchronogram_objects.so
 lib/dia/libcustom_objects.so
+lib/dia/libdxf_filter.so
 lib/dia/liber_objects.so
 lib/dia/libflowchart_objects.so
 lib/dia/libfs_objects.so
 lib/dia/libgrafcet_objects.so
+lib/dia/libhpgl_filter.so
 lib/dia/libnetwork_objects.so
+lib/dia/libpstricks_filter.so
 lib/dia/libsadt_objects.so
 lib/dia/libstandard_objects.so
+lib/dia/libsvg_filter.so
 lib/dia/libsybase_objects.so
 lib/dia/libuml_objects.so
-@exec /sbin/ldconfig -m %D/lib/dia
-@unexec /sbin/ldconfig -R
-share/dia/dia_logo.png
-share/dia/shapes/Circuit/ground.shape
-share/dia/shapes/Circuit/ground.xpm
-share/dia/shapes/Circuit/hcapacitor.shape
-share/dia/shapes/Circuit/hcapacitor.xpm
-share/dia/shapes/Circuit/hdiode.shape
-share/dia/shapes/Circuit/hdiode.xpm
-share/dia/shapes/Circuit/hfuse_de.shape
-share/dia/shapes/Circuit/hfuse_de.xpm
-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.shape
-share/dia/shapes/Circuit/hled_de.shape
-share/dia/shapes/Circuit/hled_de.xpm
-share/dia/shapes/Circuit/hpowersource_de.shape
-share/dia/shapes/Circuit/hpowersource_de.xpm
-share/dia/shapes/Circuit/hresistor.shape
-share/dia/shapes/Circuit/hresistor.xpm
-share/dia/shapes/Circuit/hresistor_de.shape
-share/dia/shapes/Circuit/hresistor_de.xpm
-share/dia/shapes/Circuit/hzener.shape
-share/dia/shapes/Circuit/hzener.xpm
-share/dia/shapes/Circuit/lamp_de.shape
-share/dia/shapes/Circuit/lamp_de.xpm
-share/dia/shapes/Circuit/nmos_de.shape
-share/dia/shapes/Circuit/nmos_de.xpm
-share/dia/shapes/Circuit/npn.shape
-share/dia/shapes/Circuit/npn.xpm
-share/dia/shapes/Circuit/opamp.shape
-share/dia/shapes/Circuit/opamp.xpm
-share/dia/shapes/Circuit/pmos_de.shape
-share/dia/shapes/Circuit/pmos_de.xpm
-share/dia/shapes/Circuit/pnp.shape
-share/dia/shapes/Circuit/pnp.xpm
-share/dia/shapes/Circuit/speaker_de.shape
-share/dia/shapes/Circuit/speaker_de.xpm
-share/dia/shapes/Circuit/vcapacitor.shape
-share/dia/shapes/Circuit/vcapacitor.xpm
-share/dia/shapes/Circuit/vdiode.shape
-share/dia/shapes/Circuit/vdiode.xpm
-share/dia/shapes/Circuit/vfuse_de.shape
-share/dia/shapes/Circuit/vfuse_de.xpm
-share/dia/shapes/Circuit/vinductor.shape
-share/dia/shapes/Circuit/vinductor.xpm
-share/dia/shapes/Circuit/vinductor_de.shape
-share/dia/shapes/Circuit/vinductor_de.xpm
-share/dia/shapes/Circuit/vled_de.shape
-share/dia/shapes/Circuit/vled_de.xpm
-share/dia/shapes/Circuit/vpowersource_de.shape
-share/dia/shapes/Circuit/vpowersource_de.xpm
-share/dia/shapes/Circuit/vresistor.shape
-share/dia/shapes/Circuit/vresistor.xpm
-share/dia/shapes/Circuit/vresistor_de.shape
-share/dia/shapes/Circuit/vresistor_de.xpm
-share/dia/shapes/Circuit/vzener.shape
-share/dia/shapes/Circuit/vzener.xpm
-share/dia/shapes/Contact/c_if.shape
-share/dia/shapes/Contact/c_if.xpm
-share/dia/shapes/Contact/c_ifnot.shape
-share/dia/shapes/Contact/c_ifnot.xpm
-share/dia/shapes/Contact/c_lamp.shape
-share/dia/shapes/Contact/c_lamp.xpm
-share/dia/shapes/Contact/c_relay.shape
-share/dia/shapes/Contact/c_relay.xpm
-share/dia/shapes/Contact/l_if.shape
-share/dia/shapes/Contact/l_if.xpm
-share/dia/shapes/Contact/l_ifnot.shape
-share/dia/shapes/Contact/l_ifnot.xpm
-share/dia/shapes/Contact/l_out.shape
-share/dia/shapes/Contact/l_out.xpm
-share/dia/shapes/Contact/l_outnot.shape
-share/dia/shapes/Contact/l_outnot.xpm
-share/dia/shapes/Contact/l_outr.shape
-share/dia/shapes/Contact/l_outr.xpm
-share/dia/shapes/Contact/l_outs.shape
-share/dia/shapes/Contact/l_outs.xpm
-share/dia/shapes/Flowchart/collate.shape
-share/dia/shapes/Flowchart/collate.xpm
-share/dia/shapes/Flowchart/delay.shape
-share/dia/shapes/Flowchart/delay.xpm
-share/dia/shapes/Flowchart/display.shape
-share/dia/shapes/Flowchart/display.xpm
-share/dia/shapes/Flowchart/document.shape
-share/dia/shapes/Flowchart/document.xpm
-share/dia/shapes/Flowchart/extract.shape
-share/dia/shapes/Flowchart/extract.xpm
-share/dia/shapes/Flowchart/intstorage.shape
-share/dia/shapes/Flowchart/intstorage.xpm
-share/dia/shapes/Flowchart/magdisk.shape
-share/dia/shapes/Flowchart/magdisk.xpm
-share/dia/shapes/Flowchart/magdrum.shape
-share/dia/shapes/Flowchart/magdrum.xpm
-share/dia/shapes/Flowchart/magtape.shape
-share/dia/shapes/Flowchart/magtape.xpm
-share/dia/shapes/Flowchart/manualinput.shape
-share/dia/shapes/Flowchart/manualinput.xpm
-share/dia/shapes/Flowchart/manualop.shape
-share/dia/shapes/Flowchart/manualop.xpm
-share/dia/shapes/Flowchart/merge.shape
-share/dia/shapes/Flowchart/merge.xpm
-share/dia/shapes/Flowchart/offlinestore.shape
-share/dia/shapes/Flowchart/offlinestore.xpm
-share/dia/shapes/Flowchart/offpageconn.shape
-share/dia/shapes/Flowchart/offpageconn.xpm
-share/dia/shapes/Flowchart/or.shape
-share/dia/shapes/Flowchart/or.xpm
-share/dia/shapes/Flowchart/predefdproc.shape
-share/dia/shapes/Flowchart/predefdproc.xpm
-share/dia/shapes/Flowchart/preparation.shape
-share/dia/shapes/Flowchart/preparation.xpm
-share/dia/shapes/Flowchart/punchedcard.shape
-share/dia/shapes/Flowchart/punchedcard.xpm
-share/dia/shapes/Flowchart/punchedtape.shape
-share/dia/shapes/Flowchart/punchedtape.xpm
-share/dia/shapes/Flowchart/sort.shape
-share/dia/shapes/Flowchart/sort.xpm
-share/dia/shapes/Flowchart/sumjunction.shape
-share/dia/shapes/Flowchart/sumjunction.xpm
-share/dia/shapes/Flowchart/terminal.shape
-share/dia/shapes/Flowchart/terminal.xpm
-share/dia/shapes/Flowchart/transaction.shape
-share/dia/shapes/Flowchart/transaction.xpm
-share/dia/shapes/Flowchart/transmittape.shape
-share/dia/shapes/Flowchart/transmittape.xpm
-share/dia/shapes/Network/nwcloud.shape
-share/dia/shapes/Network/nwcloud.xpm
-share/dia/shapes/Network/router-symbol.shape
-share/dia/shapes/Network/router-symbol.xpm
-share/dia/shapes/Network/switch-atm-symbol.shape
-share/dia/shapes/Network/switch-atm-symbol.xpm
-share/dia/shapes/Network/switch-symbol.shape
-share/dia/shapes/Network/switch-symbol.xpm
-share/dia/sheets/Circuit.sheet
-share/dia/sheets/Contact.sheet
-share/dia/sheets/ER.sheet
-share/dia/sheets/ER/weakentity.xpm
-share/dia/sheets/FS.sheet
-share/dia/sheets/Flowchart.sheet
-share/dia/sheets/GRAFCET.sheet
-share/dia/sheets/GRAFCET/etapei.xpm
-share/dia/sheets/GRAFCET/etapemc.xpm
-share/dia/sheets/GRAFCET/etapeme.xpm
-share/dia/sheets/GRAFCET/etapems.xpm
-share/dia/sheets/GRAFCET/etapesp.xpm
-share/dia/sheets/GRAFCET/vergent_and.xpm
-share/dia/sheets/SADT.sheet
-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/network.sheet
-share/dia/sheets/sybase.sheet
+lib/dia/libwpg_filter.so
 share/gnome/apps/Applications/dia.desktop
+share/gnome/dia/dia_logo.png
+share/gnome/dia/shapes/Circuit/ground.shape
+share/gnome/dia/shapes/Circuit/ground.xpm
+share/gnome/dia/shapes/Circuit/hcapacitor.shape
+share/gnome/dia/shapes/Circuit/hcapacitor.xpm
+share/gnome/dia/shapes/Circuit/hdiode.shape
+share/gnome/dia/shapes/Circuit/hdiode.xpm
+share/gnome/dia/shapes/Circuit/hfuse_de.shape
+share/gnome/dia/shapes/Circuit/hfuse_de.xpm
+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.shape
+share/gnome/dia/shapes/Circuit/hled_de.shape
+share/gnome/dia/shapes/Circuit/hled_de.xpm
+share/gnome/dia/shapes/Circuit/hpowersource_de.shape
+share/gnome/dia/shapes/Circuit/hpowersource_de.xpm
+share/gnome/dia/shapes/Circuit/hresistor.shape
+share/gnome/dia/shapes/Circuit/hresistor.xpm
+share/gnome/dia/shapes/Circuit/hresistor_de.shape
+share/gnome/dia/shapes/Circuit/hresistor_de.xpm
+share/gnome/dia/shapes/Circuit/hzener.shape
+share/gnome/dia/shapes/Circuit/hzener.xpm
+share/gnome/dia/shapes/Circuit/lamp_de.shape
+share/gnome/dia/shapes/Circuit/lamp_de.xpm
+share/gnome/dia/shapes/Circuit/nmos_de.shape
+share/gnome/dia/shapes/Circuit/nmos_de.xpm
+share/gnome/dia/shapes/Circuit/npn.shape
+share/gnome/dia/shapes/Circuit/npn.xpm
+share/gnome/dia/shapes/Circuit/opamp.shape
+share/gnome/dia/shapes/Circuit/opamp.xpm
+share/gnome/dia/shapes/Circuit/pmos_de.shape
+share/gnome/dia/shapes/Circuit/pmos_de.xpm
+share/gnome/dia/shapes/Circuit/pnp.shape
+share/gnome/dia/shapes/Circuit/pnp.xpm
+share/gnome/dia/shapes/Circuit/speaker_de.shape
+share/gnome/dia/shapes/Circuit/speaker_de.xpm
+share/gnome/dia/shapes/Circuit/vcapacitor.shape
+share/gnome/dia/shapes/Circuit/vcapacitor.xpm
+share/gnome/dia/shapes/Circuit/vdiode.shape
+share/gnome/dia/shapes/Circuit/vdiode.xpm
+share/gnome/dia/shapes/Circuit/vfuse_de.shape
+share/gnome/dia/shapes/Circuit/vfuse_de.xpm
+share/gnome/dia/shapes/Circuit/vinductor.shape
+share/gnome/dia/shapes/Circuit/vinductor.xpm
+share/gnome/dia/shapes/Circuit/vinductor_de.shape
+share/gnome/dia/shapes/Circuit/vinductor_de.xpm
+share/gnome/dia/shapes/Circuit/vled_de.shape
+share/gnome/dia/shapes/Circuit/vled_de.xpm
+share/gnome/dia/shapes/Circuit/vpowersource_de.shape
+share/gnome/dia/shapes/Circuit/vpowersource_de.xpm
+share/gnome/dia/shapes/Circuit/vresistor.shape
+share/gnome/dia/shapes/Circuit/vresistor.xpm
+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/Civil/bvrest.shape
+share/gnome/dia/shapes/Civil/bvrest.xpm
+share/gnome/dia/shapes/Civil/hcompressor.shape
+share/gnome/dia/shapes/Civil/hcompressor.xpm
+share/gnome/dia/shapes/Civil/hpump.shape
+share/gnome/dia/shapes/Civil/hpump.xpm
+share/gnome/dia/shapes/Civil/hrest.shape
+share/gnome/dia/shapes/Civil/hrest.xpm
+share/gnome/dia/shapes/Civil/line.shape
+share/gnome/dia/shapes/Civil/line.xpm
+share/gnome/dia/shapes/Civil/vcompressor.shape
+share/gnome/dia/shapes/Civil/vcompressor.xpm
+share/gnome/dia/shapes/Civil/vpump.shape
+share/gnome/dia/shapes/Civil/vpump.xpm
+share/gnome/dia/shapes/Civil/vrest.shape
+share/gnome/dia/shapes/Civil/vrest.xpm
+share/gnome/dia/shapes/Civil/water_level.shape
+share/gnome/dia/shapes/Civil/water_level.xpm
+share/gnome/dia/shapes/Contact/c_if.shape
+share/gnome/dia/shapes/Contact/c_if.xpm
+share/gnome/dia/shapes/Contact/c_ifnot.shape
+share/gnome/dia/shapes/Contact/c_ifnot.xpm
+share/gnome/dia/shapes/Contact/c_lamp.shape
+share/gnome/dia/shapes/Contact/c_lamp.xpm
+share/gnome/dia/shapes/Contact/c_relay.shape
+share/gnome/dia/shapes/Contact/c_relay.xpm
+share/gnome/dia/shapes/Contact/l_if.shape
+share/gnome/dia/shapes/Contact/l_if.xpm
+share/gnome/dia/shapes/Contact/l_ifnot.shape
+share/gnome/dia/shapes/Contact/l_ifnot.xpm
+share/gnome/dia/shapes/Contact/l_out.shape
+share/gnome/dia/shapes/Contact/l_out.xpm
+share/gnome/dia/shapes/Contact/l_outj.shape
+share/gnome/dia/shapes/Contact/l_outj.xpm
+share/gnome/dia/shapes/Contact/l_outnot.shape
+share/gnome/dia/shapes/Contact/l_outnot.xpm
+share/gnome/dia/shapes/Contact/l_outr.shape
+share/gnome/dia/shapes/Contact/l_outr.xpm
+share/gnome/dia/shapes/Contact/l_outrcep.shape
+share/gnome/dia/shapes/Contact/l_outrcep.xpm
+share/gnome/dia/shapes/Contact/l_outs.shape
+share/gnome/dia/shapes/Contact/l_outs.xpm
+share/gnome/dia/shapes/Contact/l_sout.shape
+share/gnome/dia/shapes/Contact/l_sout.xpm
+share/gnome/dia/shapes/Contact/l_soutnot.shape
+share/gnome/dia/shapes/Contact/l_soutnot.xpm
+share/gnome/dia/shapes/Contact/l_soutr.shape
+share/gnome/dia/shapes/Contact/l_soutr.xpm
+share/gnome/dia/shapes/Contact/l_souts.shape
+share/gnome/dia/shapes/Contact/l_souts.xpm
+share/gnome/dia/shapes/Electric/cnx.shape
+share/gnome/dia/shapes/Electric/cnx.xpm
+share/gnome/dia/shapes/Electric/command.shape
+share/gnome/dia/shapes/Electric/command.xpm
+share/gnome/dia/shapes/Electric/contact_f.shape
+share/gnome/dia/shapes/Electric/contact_f.xpm
+share/gnome/dia/shapes/Electric/contact_o.shape
+share/gnome/dia/shapes/Electric/contact_o.xpm
+share/gnome/dia/shapes/Electric/intpos_f.shape
+share/gnome/dia/shapes/Electric/intpos_f.xpm
+share/gnome/dia/shapes/Electric/intpos_o.shape
+share/gnome/dia/shapes/Electric/intpos_o.xpm
+share/gnome/dia/shapes/Electric/lamp.shape
+share/gnome/dia/shapes/Electric/lamp.xpm
+share/gnome/dia/shapes/Electric/relay.shape
+share/gnome/dia/shapes/Electric/relay.xpm
+share/gnome/dia/shapes/Flowchart/collate.shape
+share/gnome/dia/shapes/Flowchart/collate.xpm
+share/gnome/dia/shapes/Flowchart/delay.shape
+share/gnome/dia/shapes/Flowchart/delay.xpm
+share/gnome/dia/shapes/Flowchart/display.shape
+share/gnome/dia/shapes/Flowchart/display.xpm
+share/gnome/dia/shapes/Flowchart/document.shape
+share/gnome/dia/shapes/Flowchart/document.xpm
+share/gnome/dia/shapes/Flowchart/extract.shape
+share/gnome/dia/shapes/Flowchart/extract.xpm
+share/gnome/dia/shapes/Flowchart/intstorage.shape
+share/gnome/dia/shapes/Flowchart/intstorage.xpm
+share/gnome/dia/shapes/Flowchart/magdisk.shape
+share/gnome/dia/shapes/Flowchart/magdisk.xpm
+share/gnome/dia/shapes/Flowchart/magdrum.shape
+share/gnome/dia/shapes/Flowchart/magdrum.xpm
+share/gnome/dia/shapes/Flowchart/magtape.shape
+share/gnome/dia/shapes/Flowchart/magtape.xpm
+share/gnome/dia/shapes/Flowchart/manualinput.shape
+share/gnome/dia/shapes/Flowchart/manualinput.xpm
+share/gnome/dia/shapes/Flowchart/manualop.shape
+share/gnome/dia/shapes/Flowchart/manualop.xpm
+share/gnome/dia/shapes/Flowchart/merge.shape
+share/gnome/dia/shapes/Flowchart/merge.xpm
+share/gnome/dia/shapes/Flowchart/offlinestore.shape
+share/gnome/dia/shapes/Flowchart/offlinestore.xpm
+share/gnome/dia/shapes/Flowchart/offpageconn.shape
+share/gnome/dia/shapes/Flowchart/offpageconn.xpm
+share/gnome/dia/shapes/Flowchart/or.shape
+share/gnome/dia/shapes/Flowchart/or.xpm
+share/gnome/dia/shapes/Flowchart/predefdproc.shape
+share/gnome/dia/shapes/Flowchart/predefdproc.xpm
+share/gnome/dia/shapes/Flowchart/preparation.shape
+share/gnome/dia/shapes/Flowchart/preparation.xpm
+share/gnome/dia/shapes/Flowchart/punchedcard.shape
+share/gnome/dia/shapes/Flowchart/punchedcard.xpm
+share/gnome/dia/shapes/Flowchart/punchedtape.shape
+share/gnome/dia/shapes/Flowchart/punchedtape.xpm
+share/gnome/dia/shapes/Flowchart/sort.shape
+share/gnome/dia/shapes/Flowchart/sort.xpm
+share/gnome/dia/shapes/Flowchart/sumjunction.shape
+share/gnome/dia/shapes/Flowchart/sumjunction.xpm
+share/gnome/dia/shapes/Flowchart/terminal.shape
+share/gnome/dia/shapes/Flowchart/terminal.xpm
+share/gnome/dia/shapes/Flowchart/transaction.shape
+share/gnome/dia/shapes/Flowchart/transaction.xpm
+share/gnome/dia/shapes/Flowchart/transmittape.shape
+share/gnome/dia/shapes/Flowchart/transmittape.xpm
+share/gnome/dia/shapes/Network/nwcloud.shape
+share/gnome/dia/shapes/Network/nwcloud.xpm
+share/gnome/dia/shapes/Network/router-symbol.shape
+share/gnome/dia/shapes/Network/router-symbol.xpm
+share/gnome/dia/shapes/Network/switch-atm-symbol.shape
+share/gnome/dia/shapes/Network/switch-atm-symbol.xpm
+share/gnome/dia/shapes/Network/switch-symbol.shape
+share/gnome/dia/shapes/Network/switch-symbol.xpm
+share/gnome/dia/shapes/Pneumatic/cnx.shape
+share/gnome/dia/shapes/Pneumatic/cnx.xpm
+share/gnome/dia/shapes/Pneumatic/comelec1.shape
+share/gnome/dia/shapes/Pneumatic/comelec1.xpm
+share/gnome/dia/shapes/Pneumatic/comelec2.shape
+share/gnome/dia/shapes/Pneumatic/comelec2.xpm
+share/gnome/dia/shapes/Pneumatic/commusc.shape
+share/gnome/dia/shapes/Pneumatic/commusc.xpm
+share/gnome/dia/shapes/Pneumatic/compb.shape
+share/gnome/dia/shapes/Pneumatic/compb.xpm
+share/gnome/dia/shapes/Pneumatic/compilh.shape
+share/gnome/dia/shapes/Pneumatic/compilh.xpm
+share/gnome/dia/shapes/Pneumatic/compilp.shape
+share/gnome/dia/shapes/Pneumatic/compilp.xpm
+share/gnome/dia/shapes/Pneumatic/comspr.shape
+share/gnome/dia/shapes/Pneumatic/comspr.xpm
+share/gnome/dia/shapes/Pneumatic/dejack.shape
+share/gnome/dia/shapes/Pneumatic/dejack.xpm
+share/gnome/dia/shapes/Pneumatic/dist22.shape
+share/gnome/dia/shapes/Pneumatic/dist22.xpm
+share/gnome/dia/shapes/Pneumatic/dist32.shape
+share/gnome/dia/shapes/Pneumatic/dist32.xpm
+share/gnome/dia/shapes/Pneumatic/dist42.shape
+share/gnome/dia/shapes/Pneumatic/dist42.xpm
+share/gnome/dia/shapes/Pneumatic/dist52.shape
+share/gnome/dia/shapes/Pneumatic/dist52.xpm
+share/gnome/dia/shapes/Pneumatic/drain.shape
+share/gnome/dia/shapes/Pneumatic/drain.xpm
+share/gnome/dia/shapes/Pneumatic/press.shape
+share/gnome/dia/shapes/Pneumatic/press.xpm
+share/gnome/dia/shapes/Pneumatic/presshy.shape
+share/gnome/dia/shapes/Pneumatic/presshy.xpm
+share/gnome/dia/shapes/Pneumatic/presspn.shape
+share/gnome/dia/shapes/Pneumatic/presspn.xpm
+share/gnome/dia/shapes/Pneumatic/seijack.shape
+share/gnome/dia/shapes/Pneumatic/seijack.xpm
+share/gnome/dia/shapes/Pneumatic/seojack.shape
+share/gnome/dia/shapes/Pneumatic/seojack.xpm
+share/gnome/dia/sheets/Circuit.sheet
+share/gnome/dia/sheets/Contact.sheet
+share/gnome/dia/sheets/ER.sheet
+share/gnome/dia/sheets/ER/weakentity.xpm
+share/gnome/dia/sheets/Electric.sheet
+share/gnome/dia/sheets/FS.sheet
+share/gnome/dia/sheets/Flowchart.sheet
+share/gnome/dia/sheets/GRAFCET.sheet
+share/gnome/dia/sheets/GRAFCET/etapei.xpm
+share/gnome/dia/sheets/GRAFCET/etapemc.xpm
+share/gnome/dia/sheets/GRAFCET/etapeme.xpm
+share/gnome/dia/sheets/GRAFCET/etapems.xpm
+share/gnome/dia/sheets/GRAFCET/etapesp.xpm
+share/gnome/dia/sheets/GRAFCET/vergent_and.xpm
+share/gnome/dia/sheets/Pneumatic.sheet
+share/gnome/dia/sheets/SADT.sheet
+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/network.sheet
+share/gnome/dia/sheets/sybase.sheet
 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/ca/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_GB/LC_MESSAGES/dia.mo
+share/locale/fi/LC_MESSAGES/dia.mo
 share/locale/fr/LC_MESSAGES/dia.mo
+share/locale/ga/LC_MESSAGES/dia.mo
 share/locale/hu/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/no/LC_MESSAGES/dia.mo
 share/locale/pl/LC_MESSAGES/dia.mo
 share/locale/pt/LC_MESSAGES/dia.mo
 share/locale/ru/LC_MESSAGES/dia.mo
+share/locale/sl/LC_MESSAGES/dia.mo
 share/locale/sv/LC_MESSAGES/dia.mo
+share/locale/tr/LC_MESSAGES/dia.mo
 share/locale/uk/LC_MESSAGES/dia.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/dia.mo
+@dirrm share/gnome/dia/sheets/UML
+@dirrm share/gnome/dia/sheets/GRAFCET
+@dirrm share/gnome/dia/sheets/ER
+@dirrm share/gnome/dia/sheets
+@dirrm share/gnome/dia/shapes/Pneumatic
+@dirrm share/gnome/dia/shapes/Network
+@dirrm share/gnome/dia/shapes/Flowchart
+@dirrm share/gnome/dia/shapes/Electric
+@dirrm share/gnome/dia/shapes/Contact
+@dirrm share/gnome/dia/shapes/Civil
+@dirrm share/gnome/dia/shapes/Circuit
+@dirrm share/gnome/dia/shapes
+@dirrm share/gnome/dia
 @dirrm lib/dia
-@dirrm share/dia/shapes/Circuit
-@dirrm share/dia/shapes/Contact
-@dirrm share/dia/shapes/Flowchart
-@dirrm share/dia/shapes/Network
-@dirrm share/dia/shapes
-@dirrm share/dia/sheets/ER
-@dirrm share/dia/sheets/GRAFCET
-@dirrm share/dia/sheets/UML
-@dirrm share/dia/sheets
-@dirrm share/dia