8 files changed, 291 insertions, 89 deletions

diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index 181eb808a3cd..4be0fed6e616 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	dia
-PORTVERSION=	0.86
-PORTREVISION=	1
+PORTVERSION=	0.88
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/dia
@@ -20,7 +19,7 @@ USE_IMLIB=	yes
 WANT_GNOME=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LIBS="-L${LOCALBASE}/lib -lintl"
 
 MAN1=		dia.1
 
diff --git a/graphics/dia/distinfo b/graphics/dia/distinfo
index 7c9cf194bc5f..bc87a1b464c7 100644
--- a/graphics/dia/distinfo
+++ b/graphics/dia/distinfo
@@ -1 +1 @@
-MD5 (dia-0.86.tar.gz) = 66c32ceb8d034137be88d4b649e405a2
+MD5 (dia-0.88.tar.gz) = 8343ccd4cbb7d8ced3e00346fef65c21
diff --git a/graphics/dia/files/patch-ab b/graphics/dia/files/patch-ab
index b3a5bd9a1570..bdf4e05a4547 100644
--- a/graphics/dia/files/patch-ab
+++ b/graphics/dia/files/patch-ab
@@ -1,54 +1,21 @@
---- Makefile.in.orig	Mon Aug  7 12:15:36 2000
-+++ Makefile.in	Mon Aug  7 12:15:39 2000
-@@ -120,14 +120,16 @@
- pkgdata_DATA = dia_logo.png
- man_MANS = dia.1
- 
-+ifdef HAVE_GNOME
- pixmapdir = $(gnomedatadir)/pixmaps
- pixmap_DATA = dia_gnome_icon.png dia-diagram.png
+--- Makefile.in.orig	Fri May 11 05:04:49 2001
++++ Makefile.in	Thu May 17 14:28:56 2001
+@@ -154,3 +154,4 @@
  
 -Applicationsdir = $(gnomedatadir)/gnome/apps/Applications
++ifdef HAVE_GNOME
 +Applicationsdir = $(gnomedatadir)/apps/Applications
- Applications_DATA = dia.desktop
- 
- mimedir = $(gnomedatadir)/mime-info
+ Applications_DATA = dia.desktop 
+@@ -159,2 +160,3 @@
  mime_DATA = dia.mime dia.keys
 +endif
  
- EXTRA_DIST = dia.xpm dia_gnome_icon.png dia_gnome_menu_icon.png 	dia.desktop dia.spec KNOWN_BUGS $(pkgdata_DATA) $(man_MANS) 	dia-diagram.png dia.mime dia.keys.in 	doc/diagram.dtd doc/sheet.dtd doc/custom-shapes
- 
-@@ -237,7 +239,6 @@
- 
- install-ApplicationsDATA: $(Applications_DATA)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(Applicationsdir)
- 	@list='$(Applications_DATA)'; for p in $$list; do \
- 	  if test -f $(srcdir)/$$p; then \
- 	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(Applicationsdir)/$$p"; \
-@@ -256,7 +257,6 @@
- 
- install-mimeDATA: $(mime_DATA)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(mimedir)
- 	@list='$(mime_DATA)'; for p in $$list; do \
- 	  if test -f $(srcdir)/$$p; then \
- 	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(mimedir)/$$p"; \
-@@ -275,7 +275,6 @@
- 
- install-pixmapDATA: $(pixmap_DATA)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(pixmapdir)
- 	@list='$(pixmap_DATA)'; for p in $$list; do \
- 	  if test -f $(srcdir)/$$p; then \
- 	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pixmapdir)/$$p"; \
-@@ -490,8 +489,7 @@
- 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
- installdirs: installdirs-recursive
- installdirs-am:
--	$(mkinstalldirs)  $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(Applicationsdir) \
--		$(DESTDIR)$(mimedir) $(DESTDIR)$(pixmapdir) \
-+	$(mkinstalldirs)  $(DESTDIR)$(mandir)/man1 \
- 		$(DESTDIR)$(pkgdatadir)
+@@ -556,4 +558,8 @@
  
++ifdef HAVE_GNOME
+ install-data-am: install-ApplicationsDATA install-man install-mimeDATA \
+ 	install-pixmapDATA install-pkgdataDATA
++else
++install-data-am: install-man install-pkgdataDATA
++endif
  
diff --git a/graphics/dia/files/patch-ad b/graphics/dia/files/patch-ad
index 8d00152d61ed..5dbe20742fc4 100644
--- a/graphics/dia/files/patch-ad
+++ b/graphics/dia/files/patch-ad
@@ -1,11 +1,37 @@
---- configure.orig	Mon Aug  7 11:47:15 2000
-+++ configure	Mon Aug  7 11:47:51 2000
-@@ -2565,7 +2565,7 @@
+--- configure.orig	Fri May 11 04:08:46 2001
++++ configure	Thu May 17 15:59:22 2001
+@@ -5296,4 +5296,19 @@
  
+-
+-
++# Actually configure libtool.  ac_aux_dir is where install-sh is found.
++CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
++LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
++LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
++DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
++${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
++$libtool_flags $ac_aux_dir/ltmain.sh $lt_target \
++|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
++
++# Reload cache, that may have been modified by ltconfig
++if test -r "$cache_file"; then
++  echo "loading cache $cache_file"
++  . $cache_file
++else
++  echo "creating cache $cache_file"
++  > $cache_file
++fi
  
+@@ -5306,4 +5321,5 @@
+ 
+-# Prevent multiple expansion
+-
++# Redirect the config.log output again, so that the ltconfig log is not
++# clobbered by the next message.
++exec 5>>./config.log
+ 
+@@ -6197,3 +6213,3 @@
  OLDCPPFLAGS=$CPPFLAGS
 -CPPFLAGS="$CPPFLAGS `glib-config --cflags`"
-+CPPFLAGS="$CPPFLAGS `${GLIB_CONFIG} --cflags`"
- 
++CPPFLAGS="$CPPFLAGS `$GLIB_CONFIG --cflags`"
  
- CPPFLAGS=$OLDCPPFLAGS
diff --git a/graphics/dia/files/patch-ae b/graphics/dia/files/patch-ae
index 8f16e74f66eb..aca97ced24ad 100644
--- a/graphics/dia/files/patch-ae
+++ b/graphics/dia/files/patch-ae
@@ -1,20 +1,12 @@
---- app/main.c.org	Wed Apr 19 20:56:49 2000
-+++ app/main.c	Wed Apr 19 20:57:43 2000
-@@ -15,6 +15,8 @@
-  * along with this program; if not, write to the Free Software
-  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-  */
+--- app/main.c.orig	Sun Mar 25 19:05:16 2001
++++ app/main.c	Thu May 17 14:09:02 2001
+@@ -19,2 +19,4 @@
+ 
 +#include <ieeefp.h>
 +
  #include "geometry.h"
- #include "diagram.h"
- #include "display.h"
-@@ -25,6 +27,8 @@
-      
- int main(int argc, char *argv[])
+@@ -35,2 +37,4 @@
  {
 +  fpsetmask(0);
 +
    app_init(argc, argv);
- 
-   gtk_main ();
diff --git a/graphics/dia/files/patch-af b/graphics/dia/files/patch-af
index dffc53b222b0..4368d300a9d9 100644
--- a/graphics/dia/files/patch-af
+++ b/graphics/dia/files/patch-af
@@ -1,21 +1,20 @@
---- 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 = 
+--- app/Makefile.in.orig	Fri May 11 05:04:49 2001
++++ app/Makefile.in	Thu May 17 16:18:20 2001
+@@ -177,4 +177,2 @@
  
 -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
+-
+ oafinfodir = $(datadir)/oaf
+@@ -336,4 +334,4 @@
+ 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
+@@ -552,2 +550,5 @@
  	$(LINK) $(dia_LDFLAGS) $(dia_OBJECTS) $(dia_LDADD) $(LIBS)
 +
-+dia-bin: dia
-+	cp dia dia-bin
++dia-bin$(EXEEXT): dia$(EXEEXT)
++	cp dia$(EXEEXT) dia-bin$(EXEEXT)
  
- dia-embedd: $(dia_embedd_OBJECTS) $(dia_embedd_DEPENDENCIES)
- 	@rm -f dia-embedd
diff --git a/graphics/dia/files/patch-po::Makefile.in.in b/graphics/dia/files/patch-po::Makefile.in.in
new file mode 100644
index 000000000000..da394213d95f
--- /dev/null
+++ b/graphics/dia/files/patch-po::Makefile.in.in
@@ -0,0 +1,7 @@
+--- po/Makefile.in.in.orig	Thu May 17 14:51:15 2001
++++ po/Makefile.in.in	Thu May 17 14:52:27 2001
+@@ -55,3 +55,3 @@
+ CATOBJEXT = @CATOBJEXT@
+-INSTOBJEXT = @INSTOBJEXT@
++INSTOBJEXT = .mo
+ 
diff --git a/graphics/dia/pkg-plist b/graphics/dia/pkg-plist
index 41cb97d5850e..40ced0e8b72f 100644
--- a/graphics/dia/pkg-plist
+++ b/graphics/dia/pkg-plist
@@ -4,6 +4,7 @@ lib/dia/libcgm_filter.so
 lib/dia/libchronogram_objects.so
 lib/dia/libcustom_objects.so
 lib/dia/libdxf_filter.so
+lib/dia/libeml_objects.so
 lib/dia/liber_objects.so
 lib/dia/libflowchart_objects.so
 lib/dia/libfs_objects.so
@@ -12,11 +13,13 @@ lib/dia/libhpgl_filter.so
 lib/dia/libnetwork_objects.so
 lib/dia/libpstricks_filter.so
 lib/dia/libsadt_objects.so
+lib/dia/libshape_filter.so
 lib/dia/libstandard_objects.so
 lib/dia/libsvg_filter.so
 lib/dia/libsybase_objects.so
 lib/dia/libuml_objects.so
 lib/dia/libwpg_filter.so
+lib/dia/libxfig_filter.so
 %%GNOME:%%share/gnome/apps/Applications/dia.desktop
 %%DATADIR%%/dia/dia_logo.png
 %%DATADIR%%/dia/shapes/Circuit/ground.shape
@@ -78,6 +81,40 @@ lib/dia/libwpg_filter.so
 %%DATADIR%%/dia/shapes/Circuit/vzener.xpm
 %%DATADIR%%/dia/shapes/Civil/bvrest.shape
 %%DATADIR%%/dia/shapes/Civil/bvrest.xpm
+%%DATADIR%%/dia/shapes/Civil/civil_aerator.shape
+%%DATADIR%%/dia/shapes/Civil/civil_aerator.xpm
+%%DATADIR%%/dia/shapes/Civil/civil_arrow_right.shape
+%%DATADIR%%/dia/shapes/Civil/civil_arrow_right.xpm
+%%DATADIR%%/dia/shapes/Civil/civil_arrow_up.shape
+%%DATADIR%%/dia/shapes/Civil/civil_arrow_up.xpm
+%%DATADIR%%/dia/shapes/Civil/civil_backflow_preventer.shape
+%%DATADIR%%/dia/shapes/Civil/civil_backflow_preventer.xpm
+%%DATADIR%%/dia/shapes/Civil/civil_basin.shape
+%%DATADIR%%/dia/shapes/Civil/civil_basin.xpm
+%%DATADIR%%/dia/shapes/Civil/civil_container.shape
+%%DATADIR%%/dia/shapes/Civil/civil_container.xpm
+%%DATADIR%%/dia/shapes/Civil/civil_final-settling_basin.shape
+%%DATADIR%%/dia/shapes/Civil/civil_final-settling_basin.xpm
+%%DATADIR%%/dia/shapes/Civil/civil_frequency_converter.shape
+%%DATADIR%%/dia/shapes/Civil/civil_frequency_converter.xpm
+%%DATADIR%%/dia/shapes/Civil/civil_gas_bottle.shape
+%%DATADIR%%/dia/shapes/Civil/civil_gas_bottle.xpm
+%%DATADIR%%/dia/shapes/Civil/civil_horizontal_limiting_line.shape
+%%DATADIR%%/dia/shapes/Civil/civil_horizontal_limiting_line.xpm
+%%DATADIR%%/dia/shapes/Civil/civil_horizontal_valve.shape
+%%DATADIR%%/dia/shapes/Civil/civil_horizontal_valve.xpm
+%%DATADIR%%/dia/shapes/Civil/civil_motor.shape
+%%DATADIR%%/dia/shapes/Civil/civil_motor.xpm
+%%DATADIR%%/dia/shapes/Civil/civil_preliminary_clarification_tank.shape
+%%DATADIR%%/dia/shapes/Civil/civil_preliminary_clarification_tank.xpm
+%%DATADIR%%/dia/shapes/Civil/civil_rotor.shape
+%%DATADIR%%/dia/shapes/Civil/civil_rotor.xpm
+%%DATADIR%%/dia/shapes/Civil/civil_soil.shape
+%%DATADIR%%/dia/shapes/Civil/civil_soil.xpm
+%%DATADIR%%/dia/shapes/Civil/civil_vertical_limiting_line.shape
+%%DATADIR%%/dia/shapes/Civil/civil_vertical_limiting_line.xpm
+%%DATADIR%%/dia/shapes/Civil/civil_vertical_propeller.shape
+%%DATADIR%%/dia/shapes/Civil/civil_vertical_propeller.xpm
 %%DATADIR%%/dia/shapes/Civil/hcompressor.shape
 %%DATADIR%%/dia/shapes/Civil/hcompressor.xpm
 %%DATADIR%%/dia/shapes/Civil/hpump.shape
@@ -190,14 +227,68 @@ lib/dia/libwpg_filter.so
 %%DATADIR%%/dia/shapes/Flowchart/transaction.xpm
 %%DATADIR%%/dia/shapes/Flowchart/transmittape.shape
 %%DATADIR%%/dia/shapes/Flowchart/transmittape.xpm
+%%DATADIR%%/dia/shapes/Logic/and.png
+%%DATADIR%%/dia/shapes/Logic/and.shape
+%%DATADIR%%/dia/shapes/Logic/buffer.png
+%%DATADIR%%/dia/shapes/Logic/buffer.shape
+%%DATADIR%%/dia/shapes/Logic/connector.png
+%%DATADIR%%/dia/shapes/Logic/connector.shape
+%%DATADIR%%/dia/shapes/Logic/inverter.png
+%%DATADIR%%/dia/shapes/Logic/inverter.shape
+%%DATADIR%%/dia/shapes/Logic/nand.png
+%%DATADIR%%/dia/shapes/Logic/nand.shape
+%%DATADIR%%/dia/shapes/Logic/nor.png
+%%DATADIR%%/dia/shapes/Logic/nor.shape
+%%DATADIR%%/dia/shapes/Logic/not.png
+%%DATADIR%%/dia/shapes/Logic/not.shape
+%%DATADIR%%/dia/shapes/Logic/or.png
+%%DATADIR%%/dia/shapes/Logic/or.shape
+%%DATADIR%%/dia/shapes/Logic/xor.png
+%%DATADIR%%/dia/shapes/Logic/xor.shape
+%%DATADIR%%/dia/shapes/MSE/demultiplexer.shape
+%%DATADIR%%/dia/shapes/MSE/demultiplexer.xpm
+%%DATADIR%%/dia/shapes/MSE/large_extension_node.shape
+%%DATADIR%%/dia/shapes/MSE/large_extension_node.xpm
+%%DATADIR%%/dia/shapes/MSE/multiplexer.shape
+%%DATADIR%%/dia/shapes/MSE/multiplexer.xpm
+%%DATADIR%%/dia/shapes/MSE/node_center.shape
+%%DATADIR%%/dia/shapes/MSE/node_center.xpm
+%%DATADIR%%/dia/shapes/MSE/small_extension_node.shape
+%%DATADIR%%/dia/shapes/MSE/small_extension_node.xpm
+%%DATADIR%%/dia/shapes/MSE/tacsat.shape
+%%DATADIR%%/dia/shapes/MSE/tacsat.xpm
+%%DATADIR%%/dia/shapes/Network/dat_external.shape
+%%DATADIR%%/dia/shapes/Network/dat_external.xpm
+%%DATADIR%%/dia/shapes/Network/diskette.shape
+%%DATADIR%%/dia/shapes/Network/diskette.xpm
+%%DATADIR%%/dia/shapes/Network/mobile_phone.shape
+%%DATADIR%%/dia/shapes/Network/mobile_phone.xpm
+%%DATADIR%%/dia/shapes/Network/monitor.shape
+%%DATADIR%%/dia/shapes/Network/monitor.xpm
 %%DATADIR%%/dia/shapes/Network/nwcloud.shape
 %%DATADIR%%/dia/shapes/Network/nwcloud.xpm
+%%DATADIR%%/dia/shapes/Network/pc_bigtower.shape
+%%DATADIR%%/dia/shapes/Network/pc_bigtower.xpm
+%%DATADIR%%/dia/shapes/Network/pc_desktop.shape
+%%DATADIR%%/dia/shapes/Network/pc_desktop.xpm
+%%DATADIR%%/dia/shapes/Network/pc_miditower.shape
+%%DATADIR%%/dia/shapes/Network/pc_miditower.xpm
+%%DATADIR%%/dia/shapes/Network/pc_minitower.shape
+%%DATADIR%%/dia/shapes/Network/pc_minitower.xpm
 %%DATADIR%%/dia/shapes/Network/router-symbol.shape
 %%DATADIR%%/dia/shapes/Network/router-symbol.xpm
+%%DATADIR%%/dia/shapes/Network/speaker.shape
+%%DATADIR%%/dia/shapes/Network/speaker.xpm
+%%DATADIR%%/dia/shapes/Network/speaker_amp.shape
+%%DATADIR%%/dia/shapes/Network/speaker_amp.xpm
 %%DATADIR%%/dia/shapes/Network/switch-atm-symbol.shape
 %%DATADIR%%/dia/shapes/Network/switch-atm-symbol.xpm
 %%DATADIR%%/dia/shapes/Network/switch-symbol.shape
 %%DATADIR%%/dia/shapes/Network/switch-symbol.xpm
+%%DATADIR%%/dia/shapes/Network/workstation.shape
+%%DATADIR%%/dia/shapes/Network/workstation.xpm
+%%DATADIR%%/dia/shapes/Network/zip-disk.shape
+%%DATADIR%%/dia/shapes/Network/zip-disk.xpm
 %%DATADIR%%/dia/shapes/Pneumatic/cnx.shape
 %%DATADIR%%/dia/shapes/Pneumatic/cnx.xpm
 %%DATADIR%%/dia/shapes/Pneumatic/comelec1.shape
@@ -236,8 +327,75 @@ lib/dia/libwpg_filter.so
 %%DATADIR%%/dia/shapes/Pneumatic/seijack.xpm
 %%DATADIR%%/dia/shapes/Pneumatic/seojack.shape
 %%DATADIR%%/dia/shapes/Pneumatic/seojack.xpm
+%%DATADIR%%/dia/shapes/SDL/block.shape
+%%DATADIR%%/dia/shapes/SDL/block.xpm
+%%DATADIR%%/dia/shapes/SDL/comment.shape
+%%DATADIR%%/dia/shapes/SDL/comment.xpm
+%%DATADIR%%/dia/shapes/SDL/decision.shape
+%%DATADIR%%/dia/shapes/SDL/decision.xpm
+%%DATADIR%%/dia/shapes/SDL/function.shape
+%%DATADIR%%/dia/shapes/SDL/function.xpm
+%%DATADIR%%/dia/shapes/SDL/header.shape
+%%DATADIR%%/dia/shapes/SDL/header.xpm
+%%DATADIR%%/dia/shapes/SDL/inout.shape
+%%DATADIR%%/dia/shapes/SDL/inout.xpm
+%%DATADIR%%/dia/shapes/SDL/macro.shape
+%%DATADIR%%/dia/shapes/SDL/macro.xpm
+%%DATADIR%%/dia/shapes/SDL/note.shape
+%%DATADIR%%/dia/shapes/SDL/note.xpm
+%%DATADIR%%/dia/shapes/SDL/process.shape
+%%DATADIR%%/dia/shapes/SDL/process.xpm
+%%DATADIR%%/dia/shapes/SDL/receive.shape
+%%DATADIR%%/dia/shapes/SDL/receive.xpm
+%%DATADIR%%/dia/shapes/SDL/return.shape
+%%DATADIR%%/dia/shapes/SDL/return.xpm
+%%DATADIR%%/dia/shapes/SDL/save.shape
+%%DATADIR%%/dia/shapes/SDL/save.xpm
+%%DATADIR%%/dia/shapes/SDL/send.shape
+%%DATADIR%%/dia/shapes/SDL/send.xpm
+%%DATADIR%%/dia/shapes/SDL/service.shape
+%%DATADIR%%/dia/shapes/SDL/service.xpm
+%%DATADIR%%/dia/shapes/SDL/state.shape
+%%DATADIR%%/dia/shapes/SDL/state.xpm
+%%DATADIR%%/dia/shapes/SDL/stop.shape
+%%DATADIR%%/dia/shapes/SDL/stop.xpm
+%%DATADIR%%/dia/shapes/SDL/task.shape
+%%DATADIR%%/dia/shapes/SDL/task.xpm
+%%DATADIR%%/dia/shapes/jigsaw/part_iiii.shape
+%%DATADIR%%/dia/shapes/jigsaw/part_iiii.xpm
+%%DATADIR%%/dia/shapes/jigsaw/part_iiio.shape
+%%DATADIR%%/dia/shapes/jigsaw/part_iiio.xpm
+%%DATADIR%%/dia/shapes/jigsaw/part_iioi.shape
+%%DATADIR%%/dia/shapes/jigsaw/part_iioi.xpm
+%%DATADIR%%/dia/shapes/jigsaw/part_iioo.shape
+%%DATADIR%%/dia/shapes/jigsaw/part_iioo.xpm
+%%DATADIR%%/dia/shapes/jigsaw/part_ioii.shape
+%%DATADIR%%/dia/shapes/jigsaw/part_ioii.xpm
+%%DATADIR%%/dia/shapes/jigsaw/part_ioio.shape
+%%DATADIR%%/dia/shapes/jigsaw/part_ioio.xpm
+%%DATADIR%%/dia/shapes/jigsaw/part_iooi.shape
+%%DATADIR%%/dia/shapes/jigsaw/part_iooi.xpm
+%%DATADIR%%/dia/shapes/jigsaw/part_iooo.shape
+%%DATADIR%%/dia/shapes/jigsaw/part_iooo.xpm
+%%DATADIR%%/dia/shapes/jigsaw/part_oiii.shape
+%%DATADIR%%/dia/shapes/jigsaw/part_oiii.xpm
+%%DATADIR%%/dia/shapes/jigsaw/part_oiio.shape
+%%DATADIR%%/dia/shapes/jigsaw/part_oiio.xpm
+%%DATADIR%%/dia/shapes/jigsaw/part_oioi.shape
+%%DATADIR%%/dia/shapes/jigsaw/part_oioi.xpm
+%%DATADIR%%/dia/shapes/jigsaw/part_oioo.shape
+%%DATADIR%%/dia/shapes/jigsaw/part_oioo.xpm
+%%DATADIR%%/dia/shapes/jigsaw/part_ooii.shape
+%%DATADIR%%/dia/shapes/jigsaw/part_ooii.xpm
+%%DATADIR%%/dia/shapes/jigsaw/part_ooio.shape
+%%DATADIR%%/dia/shapes/jigsaw/part_ooio.xpm
+%%DATADIR%%/dia/shapes/jigsaw/part_oooi.shape
+%%DATADIR%%/dia/shapes/jigsaw/part_oooi.xpm
+%%DATADIR%%/dia/shapes/jigsaw/part_oooo.shape
+%%DATADIR%%/dia/shapes/jigsaw/part_oooo.xpm
 %%DATADIR%%/dia/sheets/Circuit.sheet
 %%DATADIR%%/dia/sheets/Contact.sheet
+%%DATADIR%%/dia/sheets/EML.sheet
 %%DATADIR%%/dia/sheets/ER.sheet
 %%DATADIR%%/dia/sheets/ER/weakentity.xpm
 %%DATADIR%%/dia/sheets/Electric.sheet
@@ -250,18 +408,64 @@ lib/dia/libwpg_filter.so
 %%DATADIR%%/dia/sheets/GRAFCET/etapems.xpm
 %%DATADIR%%/dia/sheets/GRAFCET/etapesp.xpm
 %%DATADIR%%/dia/sheets/GRAFCET/vergent_and.xpm
+%%DATADIR%%/dia/sheets/Logic.sheet
+%%DATADIR%%/dia/sheets/MSE.sheet
 %%DATADIR%%/dia/sheets/Pneumatic.sheet
 %%DATADIR%%/dia/sheets/SADT.sheet
+%%DATADIR%%/dia/sheets/SDL.sheet
 %%DATADIR%%/dia/sheets/UML.sheet
 %%DATADIR%%/dia/sheets/UML/aggregation.xpm
 %%DATADIR%%/dia/sheets/UML/umlclass_template.xpm
 %%DATADIR%%/dia/sheets/chronogram.sheet
+%%DATADIR%%/dia/sheets/civil.sheet
+%%DATADIR%%/dia/sheets/jigsaw.sheet
 %%DATADIR%%/dia/sheets/network.sheet
 %%DATADIR%%/dia/sheets/sybase.sheet
-%%GNOME:%%share/gnome/mime-info/dia.keys
-%%GNOME:%%share/gnome/mime-info/dia.mime
-%%GNOME:%%share/gnome/pixmaps/dia-diagram.png
-%%GNOME:%%share/gnome/pixmaps/dia_gnome_icon.png
+%%GNOME:%%/share/gnome/help/dia/C
+%%GNOME:%%/share/gnome/help/dia/en/background-color.html
+%%GNOME:%%/share/gnome/help/dia/en/canvas-chapter.html
+%%GNOME:%%/share/gnome/help/dia/en/colors.html
+%%GNOME:%%/share/gnome/help/dia/en/creating-canvas.html
+%%GNOME:%%/share/gnome/help/dia/en/docbook.css
+%%GNOME:%%/share/gnome/help/dia/en/graphics/greendots.png
+%%GNOME:%%/share/gnome/help/dia/en/graphics/home_network.png
+%%GNOME:%%/share/gnome/help/dia/en/graphics/line_props.png
+%%GNOME:%%/share/gnome/help/dia/en/gridlines.html
+%%GNOME:%%/share/gnome/help/dia/en/index.html
+%%GNOME:%%/share/gnome/help/dia/en/ln9.html
+%%GNOME:%%/share/gnome/help/dia/en/making-diagram.html
+%%GNOME:%%/share/gnome/help/dia/en/object-properties.html
+%%GNOME:%%/share/gnome/help/dia/en/objects-chapter.html
+%%GNOME:%%/share/gnome/help/dia/en/quickstart-chapter.html
+%%GNOME:%%/share/gnome/help/dia/en/quickstart-intro.html
+%%GNOME:%%/share/gnome/help/dia/en/rulers.html
+%%GNOME:%%/share/gnome/help/dia/en/save-print-diagram.html
+%%GNOME:%%/share/gnome/help/dia/en/starting-dia.html
+%%GNOME:%%/share/gnome/help/dia/en/stylesheet-images/caution.gif
+%%GNOME:%%/share/gnome/help/dia/en/stylesheet-images/home.gif
+%%GNOME:%%/share/gnome/help/dia/en/stylesheet-images/important.gif
+%%GNOME:%%/share/gnome/help/dia/en/stylesheet-images/next.gif
+%%GNOME:%%/share/gnome/help/dia/en/stylesheet-images/note.gif
+%%GNOME:%%/share/gnome/help/dia/en/stylesheet-images/prev.gif
+%%GNOME:%%/share/gnome/help/dia/en/stylesheet-images/tip.gif
+%%GNOME:%%/share/gnome/help/dia/en/stylesheet-images/toc-blank.gif
+%%GNOME:%%/share/gnome/help/dia/en/stylesheet-images/toc-minus.gif
+%%GNOME:%%/share/gnome/help/dia/en/stylesheet-images/toc-plus.gif
+%%GNOME:%%/share/gnome/help/dia/en/stylesheet-images/up.gif
+%%GNOME:%%/share/gnome/help/dia/en/stylesheet-images/warning.gif
+%%GNOME:%%/share/gnome/help/dia/en/topic.dat
+%%GNOME:%%/share/gnome/help/dia/en/using-objects.html
+%%GNOME:%%/share/gnome/help/dia/en/who-appeal-too.html
+%%GNOME:%%/share/gnome/help/dia/en/zooming.html
+%%GNOME:%%/mime-info/dia.keys
+%%GNOME:%%/mime-info/dia.mime
+%%GNOME:%%/pixmaps/dia-diagram.png
+%%GNOME:%%/pixmaps/dia_gnome_icon.png
+share/locale/az/LC_MESSAGES/dia.mo          
+share/locale/es/LC_MESSAGES/dia.mo          
+share/locale/nl/LC_MESSAGES/dia.mo          
+share/locale/pt_BR/LC_MESSAGES/dia.mo          
+share/locale/zh_CN.GB2312/LC_MESSAGES/dia.mo
 share/locale/ca/LC_MESSAGES/dia.mo
 share/locale/da/LC_MESSAGES/dia.mo
 share/locale/de/LC_MESSAGES/dia.mo
@@ -283,12 +487,20 @@ 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
+%%GNOME:%% @dirrm share/gnome/help/dia/en/stylesheet-images
+%%GNOME:%% @dirrm share/gnome/help/dia/en/graphics
+%%GNOME:%% @dirrm share/gnome/help/dia/en
+%%GNOME:%% @dirrm share/gnome/help/dia
 @dirrm %%DATADIR%%/dia/sheets/UML
 @dirrm %%DATADIR%%/dia/sheets/GRAFCET
 @dirrm %%DATADIR%%/dia/sheets/ER
 @dirrm %%DATADIR%%/dia/sheets
+@dirrm %%DATADIR%%/dia/shapes/jigsaw
+@dirrm %%DATADIR%%/dia/shapes/SDL
 @dirrm %%DATADIR%%/dia/shapes/Pneumatic
 @dirrm %%DATADIR%%/dia/shapes/Network
+@dirrm %%DATADIR%%/dia/shapes/MSE
+@dirrm %%DATADIR%%/dia/shapes/Logic
 @dirrm %%DATADIR%%/dia/shapes/Flowchart
 @dirrm %%DATADIR%%/dia/shapes/Electric
 @dirrm %%DATADIR%%/dia/shapes/Contact