- Update to 0.97.2. [1]

- Update the header.
- gnomehack -> USES=pathfix
- Remove libgnomeui dependency and always disable it. We want to get rid of
  GNOME2.
- Disable Python support as it doesn't build.
- Update WWW.

PR:		ports/175858 [1]
Submitted by:	Dmitry <dmitry2006@yandex.ru> [1]

6 files changed, 97 insertions, 306 deletions

diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index b5b2b6824c21..ec3cdd225304 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -1,14 +1,9 @@
-# New ports collection makefile for:	dia
-# Date created:        21 December 1999
-# Whom:                saper@system.pl
-#
+# Created by: saper@system.pl
 # $FreeBSD$
 #   $MCom: ports/graphics/dia/Makefile,v 1.16 2007/10/11 02:49:12 mezz Exp $
-#
 
 PORTNAME=	dia
-DISTVERSION=	0.97.1
-PORTREVISION=	3
+DISTVERSION=	0.97.2
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME
@@ -17,34 +12,38 @@ DIST_SUBDIR=	gnome2
 MAINTAINER?=	gnome@FreeBSD.org
 COMMENT=	Diagram creation program, similar to Visio
 
-BUILD_DEPENDS=	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
-LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
+LIB_DEPENDS=	popt:${PORTSDIR}/devel/popt \
 		png15:${PORTSDIR}/graphics/png
 
-USE_BZIP2=	yes
+USES=		pathfix
+USE_XZ=		yes
 USE_GMAKE=	yes
-USE_GNOME=	gtk20 gnomehack gnomeprefix libxslt libartlgpl2 intlhack \
+USE_GNOME=	gtk20 gnomeprefix libxslt libartlgpl2 intlhack \
 		desktopfileutils
-WANT_GNOME=	yes
 INSTALLS_ICONS=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lintl" \
 		LOCALBASE="${LOCALBASE}"
 CPPFLAGS+=	-I${LOCALBASE}/include
+CONFIGURE_ARGS=	--disable-gnome
+
 
+.if !defined(NOPORTDOCS)
+BUILD_DEPENDS=	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
 MAN1=		dia.1
 MANLANG=	"" fr
-
-.if !defined(WITHOUT_PYTHON)
-USE_PYTHON=	yes
-USE_GNOME+=	pygtk2
-CONFIGURE_ARGS=	--with-python
-PLIST_SUB+=	PYTHON=""
-.else
-PLIST_SUB+=	PYTHON="@comment "
 .endif
 
+#.if !defined(WITHOUT_PYTHON)
+#USE_PYTHON=	yes
+#USE_GNOME+=	pygtk2
+#CONFIGURE_ARGS=	--with-python
+#PLIST_SUB+=	PYTHON=""
+#.else
+#PLIST_SUB+=	PYTHON="@comment "
+#.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386"
@@ -56,18 +55,6 @@ CONFIGURE_ARGS+=	--disable-libemf
 PLIST_SUB+=		WMF="@comment "
 .endif
 
-.if ${HAVE_GNOME:Mlibgnomeui}!=""
-USE_GNOME+=		libgnomeui
-INSTALLS_OMF=		yes
-CONFIGURE_ARGS+=	--enable-gnome
-PKGNAMESUFFIX=		-gnome
-GNOME_ENABLED=		yes
-PLIST_SUB+=		GNOME=""
-.else
-CONFIGURE_ARGS+=	--disable-gnome
-PLIST_SUB+=		GNOME="@comment "
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/lib/intl.c
@@ -76,16 +63,13 @@ post-patch:
 		${WRKSRC}/tests/test-objects.c \
 		${WRKSRC}/tests/test-boundingbox.c
 .if defined(NOPORTDOCS)
-	@${FIND} ${WRKSRC}/doc -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
-		's|$$(examples)||g ; s|$$(mkinstalldirs) $$(sysdoc)/examples||g ; \
-		s|$$(mkinstalldirs) $$(sysdoc)||g'
+	@${REINPLACE_CMD} -e '/SUBDIRS/s|data doc tests|data tests|g' \
+		${WRKSRC}/Makefile.in
 .endif
-.ifndef (GNOME_ENABLED)
 	@${FIND} ${WRKSRC} -name Makefile.in | \
 		${XARGS} ${REINPLACE_CMD} -e \
 		's,\(^GTK_LIBS.*\),\1 ${PTHREAD_LIBS}, ; \
 		 s,\(^GTK_CFLAGS = \),\1 ${PTHREAD_CFLAGS} ,'
-.endif
 
 pre-configure:
 	@${REINPLACE_CMD} -e 's|http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl|${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl| ; \
diff --git a/graphics/dia/distinfo b/graphics/dia/distinfo
index 0c2ba548dd78..4201e4f28262 100644
--- a/graphics/dia/distinfo
+++ b/graphics/dia/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/dia-0.97.1.tar.bz2) = 8dfe8b2c9d87baf29834c8de5e3ec91497c2b17f2b77fb1b867afddf5c429142
-SIZE (gnome2/dia-0.97.1.tar.bz2) = 6836081
+SHA256 (gnome2/dia-0.97.2.tar.xz) = a761478fb98697f71b00d3041d7c267f3db4b94fe33ac07c689cb89c4fe5eae1
+SIZE (gnome2/dia-0.97.2.tar.xz) = 5507004
diff --git a/graphics/dia/files/patch-doc_fr_Makefile.in b/graphics/dia/files/patch-doc_fr_Makefile.in
index 50205c91ceef..a2eb3fcb9033 100644
--- a/graphics/dia/files/patch-doc_fr_Makefile.in
+++ b/graphics/dia/files/patch-doc_fr_Makefile.in
@@ -1,9 +1,9 @@
---- doc/fr/Makefile.in.orig	2009-07-05 15:43:34.000000000 +1000
-+++ doc/fr/Makefile.in	2009-07-05 15:42:37.000000000 +1000
-@@ -304,7 +304,7 @@
+--- doc/fr/Makefile.in.orig
++++ doc/fr/Makefile.in
+@@ -285,7 +285,7 @@
+ libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
- lt_ECHO = @lt_ECHO@
 -mandir = $(datadir)/man/$(lang)
 +mandir = @mandir@/$(lang)
  mkdir_p = @mkdir_p@
diff --git a/graphics/dia/files/patch-export_png.c b/graphics/dia/files/patch-export_png.c
deleted file mode 100644
index c8553994dc9c..000000000000
--- a/graphics/dia/files/patch-export_png.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- plug-ins/libart/export_png.c.orig	2009-11-28 13:49:21.000000000 +0100
-+++ plug-ins/libart/export_png.c	2012-05-08 07:23:21.000000000 +0200
-@@ -178,7 +178,7 @@
-   }
- 
-   /* set error handling ... */
--  if (setjmp(png->jmpbuf)) {
-+  if (setjmp(png_jmpbuf(png))) {
-     fclose(fp);
-     png_destroy_write_struct(&png, &info);
-     message_error(_("Error occurred while writing PNG"));
diff --git a/graphics/dia/pkg-descr b/graphics/dia/pkg-descr
index bb793aad7965..47e6fe3867c0 100644
--- a/graphics/dia/pkg-descr
+++ b/graphics/dia/pkg-descr
@@ -11,4 +11,4 @@ It can load and save diagrams to a custom XML format (gzipped by default, to
 save space), can export diagrams to EPS or SVG formats and can print diagrams
 (including ones that span multiple pages).
 
-WWW: http://www.gnome.org/projects/dia/
+WWW: https://live.gnome.org/Dia
diff --git a/graphics/dia/pkg-plist b/graphics/dia/pkg-plist
index 916646c33d1d..6c3772e79854 100644
--- a/graphics/dia/pkg-plist
+++ b/graphics/dia/pkg-plist
@@ -1,20 +1,20 @@
 bin/dia
 lib/dia/libaadl_objects.la
 lib/dia/libaadl_objects.so
-lib/dia/libart_filter.so
 lib/dia/libart_filter.la
+lib/dia/libart_filter.so
 lib/dia/libcairo_filter.la
 lib/dia/libcairo_filter.so
 lib/dia/libcgm_filter.la
 lib/dia/libcgm_filter.so
 lib/dia/libchronogram_objects.la
 lib/dia/libchronogram_objects.so
-lib/dia/libcustom_lines_objects.so
 lib/dia/libcustom_lines_objects.la
+lib/dia/libcustom_lines_objects.so
 lib/dia/libcustom_objects.la
 lib/dia/libcustom_objects.so
-lib/dia/libdb_objects.so
 lib/dia/libdb_objects.la
+lib/dia/libdb_objects.so
 lib/dia/libdia.la
 lib/dia/libdia.so
 lib/dia/libdxf_filter.la
@@ -45,12 +45,10 @@ lib/dia/libpgf_filter.la
 lib/dia/libpgf_filter.so
 lib/dia/libpixbuf_filter.la
 lib/dia/libpixbuf_filter.so
-lib/dia/libpostscript_filter.so
 lib/dia/libpostscript_filter.la
+lib/dia/libpostscript_filter.so
 lib/dia/libpstricks_filter.la
 lib/dia/libpstricks_filter.so
-%%PYTHON%%lib/dia/libpython_plugin.la
-%%PYTHON%%lib/dia/libpython_plugin.so
 lib/dia/libsadt_objects.la
 lib/dia/libsadt_objects.so
 lib/dia/libshape_filter.la
@@ -72,21 +70,7 @@ lib/dia/libxfig_filter.so
 lib/dia/libxslt_filter.la
 lib/dia/libxslt_filter.so
 share/applications/dia.desktop
-%%PYTHON%%share/dia/python-startup.py
-%%PYTHON%%share/dia/python/allprops.py
-%%PYTHON%%share/dia/python/aobjects.py
-%%PYTHON%%share/dia/python/codegen.py
-%%PYTHON%%share/dia/python/diasvg.py
-%%PYTHON%%share/dia/python/diasvg_import.py
-%%PYTHON%%share/dia/python/dot.py
-%%PYTHON%%share/dia/python/doxrev.py
-%%PYTHON%%share/dia/python/gtkcons.py
-%%PYTHON%%share/dia/python/imgmap.py
-%%PYTHON%%share/dia/python/otypes.py
-%%PYTHON%%share/dia/python/pydiadoc.py
-%%PYTHON%%share/dia/python/scascale.py
-%%PYTHON%%share/dia/python/select_by.py
-%%PYTHON%%share/dia/python/select_empty.py
+share/dia/dia-splash.png
 share/dia/shapes/Assorted/arrow-chevron.png
 share/dia/shapes/Assorted/arrow-chevron.shape
 share/dia/shapes/Assorted/arrow-down.png
@@ -1321,32 +1305,32 @@ share/dia/shapes/Gane_and_Sarson/entity.png
 share/dia/shapes/Gane_and_Sarson/entity.shape
 share/dia/shapes/Gane_and_Sarson/process.png
 share/dia/shapes/Gane_and_Sarson/process.shape
-share/dia/shapes/Lights/ACL.shape
 share/dia/shapes/Lights/ACL.png
-share/dia/shapes/Lights/Blacklight.shape
+share/dia/shapes/Lights/ACL.shape
 share/dia/shapes/Lights/Blacklight.png
-share/dia/shapes/Lights/Blinders.shape
+share/dia/shapes/Lights/Blacklight.shape
 share/dia/shapes/Lights/Blinders.png
-share/dia/shapes/Lights/ERS.shape
+share/dia/shapes/Lights/Blinders.shape
 share/dia/shapes/Lights/ERS.png
-share/dia/shapes/Lights/Fresnel.shape
+share/dia/shapes/Lights/ERS.shape
 share/dia/shapes/Lights/Fresnel.png
-share/dia/shapes/Lights/Moving_head.shape
+share/dia/shapes/Lights/Fresnel.shape
 share/dia/shapes/Lights/Moving_head.png
-share/dia/shapes/Lights/PAR_floor.shape
-share/dia/shapes/Lights/PAR_floor.png
-share/dia/shapes/Lights/PAR.shape
+share/dia/shapes/Lights/Moving_head.shape
 share/dia/shapes/Lights/PAR.png
-share/dia/shapes/Lights/PC.shape
+share/dia/shapes/Lights/PAR.shape
+share/dia/shapes/Lights/PAR_floor.png
+share/dia/shapes/Lights/PAR_floor.shape
 share/dia/shapes/Lights/PC.png
-share/dia/shapes/Lights/Scanner.shape
+share/dia/shapes/Lights/PC.shape
 share/dia/shapes/Lights/Scanner.png
-share/dia/shapes/Lights/Striplight.shape
+share/dia/shapes/Lights/Scanner.shape
 share/dia/shapes/Lights/Striplight.png
-share/dia/shapes/Lights/Stroboscope.shape
+share/dia/shapes/Lights/Striplight.shape
 share/dia/shapes/Lights/Stroboscope.png
-share/dia/shapes/Lights/Structure.shape
+share/dia/shapes/Lights/Stroboscope.shape
 share/dia/shapes/Lights/Structure.png
+share/dia/shapes/Lights/Structure.shape
 share/dia/shapes/Logic/and.png
 share/dia/shapes/Logic/and.shape
 share/dia/shapes/Logic/buffer.png
@@ -1427,10 +1411,10 @@ share/dia/shapes/Map/Isometric/Train2.png
 share/dia/shapes/Map/Isometric/Train2.shape
 share/dia/shapes/Map/Isometric/Tree1.png
 share/dia/shapes/Map/Isometric/Tree1.shape
-share/dia/shapes/Misc/expended-node.shape
 share/dia/shapes/Misc/expended-node.png
-share/dia/shapes/Misc/expensible-node.shape
+share/dia/shapes/Misc/expended-node.shape
 share/dia/shapes/Misc/expensible-node.png
+share/dia/shapes/Misc/expensible-node.shape
 share/dia/shapes/Misc/file.png
 share/dia/shapes/Misc/file.shape
 share/dia/shapes/Misc/folder.png
@@ -1717,11 +1701,27 @@ share/dia/xslt/dia-uml2java.xsl
 share/dia/xslt/dia-uml2owl.xsl
 share/dia/xslt/dia-uml2python.xsl
 share/dia/xslt/stylesheets.xml
-share/dia/dia-splash.png
-share/mime-info/dia.keys
-share/mime-info/dia.mime
+%%PORTDOCS%%%%DOCSDIR%%/en/examples/diagram.dtd
+%%PORTDOCS%%%%DOCSDIR%%/en/examples/shape.dtd
+%%PORTDOCS%%%%DOCSDIR%%/en/examples/sheet.dtd
+%%PORTDOCS%%%%DOCSDIR%%/eu/examples/diagram.dtd
+%%PORTDOCS%%%%DOCSDIR%%/eu/examples/shape.dtd
+%%PORTDOCS%%%%DOCSDIR%%/eu/examples/sheet.dtd
+%%PORTDOCS%%%%DOCSDIR%%/fr/examples/diagram.dtd
+%%PORTDOCS%%%%DOCSDIR%%/fr/examples/shape.dtd
+%%PORTDOCS%%%%DOCSDIR%%/fr/examples/sheet.dtd
+%%PORTDOCS%%%%DOCSDIR%%/pl/examples/diagram.dtd
+%%PORTDOCS%%%%DOCSDIR%%/pl/examples/shape.dtd
+%%PORTDOCS%%%%DOCSDIR%%/pl/examples/sheet.dtd
+share/icons/hicolor/16x16/apps/dia.png
+share/icons/hicolor/22x22/apps/dia.png
+share/icons/hicolor/24x24/apps/dia.png
+share/icons/hicolor/32x32/apps/dia.png
+share/icons/hicolor/48x48/apps/dia.png
+share/icons/hicolor/scalable/apps/dia.svg
 share/locale/am/LC_MESSAGES/dia.mo
 share/locale/ar/LC_MESSAGES/dia.mo
+share/locale/ast/LC_MESSAGES/dia.mo
 share/locale/az/LC_MESSAGES/dia.mo
 share/locale/be/LC_MESSAGES/dia.mo
 share/locale/bg/LC_MESSAGES/dia.mo
@@ -1735,6 +1735,7 @@ share/locale/dz/LC_MESSAGES/dia.mo
 share/locale/el/LC_MESSAGES/dia.mo
 share/locale/en_CA/LC_MESSAGES/dia.mo
 share/locale/en_GB/LC_MESSAGES/dia.mo
+share/locale/eo/LC_MESSAGES/dia.mo
 share/locale/es/LC_MESSAGES/dia.mo
 share/locale/eu/LC_MESSAGES/dia.mo
 share/locale/fi/LC_MESSAGES/dia.mo
@@ -1748,8 +1749,8 @@ share/locale/id/LC_MESSAGES/dia.mo
 share/locale/is/LC_MESSAGES/dia.mo
 share/locale/it/LC_MESSAGES/dia.mo
 share/locale/ja/LC_MESSAGES/dia.mo
-share/locale/ko/LC_MESSAGES/dia.mo
 share/locale/kn/LC_MESSAGES/dia.mo
+share/locale/ko/LC_MESSAGES/dia.mo
 share/locale/lt/LC_MESSAGES/dia.mo
 share/locale/lv/LC_MESSAGES/dia.mo
 share/locale/mk/LC_MESSAGES/dia.mo
@@ -1757,12 +1758,12 @@ share/locale/ml/LC_MESSAGES/dia.mo
 share/locale/mn/LC_MESSAGES/dia.mo
 share/locale/mr/LC_MESSAGES/dia.mo
 share/locale/ms/LC_MESSAGES/dia.mo
-share/locale/oc/LC_MESSAGES/dia.mo
-share/locale/or/LC_MESSAGES/dia.mo
 share/locale/nb/LC_MESSAGES/dia.mo
 share/locale/ne/LC_MESSAGES/dia.mo
 share/locale/nl/LC_MESSAGES/dia.mo
 share/locale/nn/LC_MESSAGES/dia.mo
+share/locale/oc/LC_MESSAGES/dia.mo
+share/locale/or/LC_MESSAGES/dia.mo
 share/locale/pa/LC_MESSAGES/dia.mo
 share/locale/pl/LC_MESSAGES/dia.mo
 share/locale/pt/LC_MESSAGES/dia.mo
@@ -1784,204 +1785,30 @@ share/locale/vi/LC_MESSAGES/dia.mo
 share/locale/zh_CN/LC_MESSAGES/dia.mo
 share/locale/zh_HK/LC_MESSAGES/dia.mo
 share/locale/zh_TW/LC_MESSAGES/dia.mo
-%%GNOME%%share/gnome/help/dia/en/dia.xml
-%%GNOME%%share/gnome/help/dia/en/authors.xml
-%%GNOME%%share/gnome/help/dia/en/dia-cmdline.xml
-%%GNOME%%share/gnome/help/dia/en/entities.xml
-%%GNOME%%share/gnome/help/dia/en/intro.xml
-%%GNOME%%share/gnome/help/dia/en/license.xml
-%%GNOME%%share/gnome/help/dia/en/usage-canvas.xml
-%%GNOME%%share/gnome/help/dia/en/usage-customization.xml
-%%GNOME%%share/gnome/help/dia/en/usage-layers.xml
-%%GNOME%%share/gnome/help/dia/en/usage-loadsave.xml
-%%GNOME%%share/gnome/help/dia/en/usage-objects-basic.xml
-%%GNOME%%share/gnome/help/dia/en/usage-objects-selecting.xml
-%%GNOME%%share/gnome/help/dia/en/usage-objects-special.xml
-%%GNOME%%share/gnome/help/dia/en/usage-objects.xml
-%%GNOME%%share/gnome/help/dia/en/usage-quickstart.xml
-%%GNOME%%share/gnome/help/dia/en/custom-shapes.xml
-%%GNOME%%share/gnome/help/dia/en/dia-1.xml
-%%GNOME%%share/gnome/help/dia/en/graphics/adjacent.png
-%%GNOME%%share/gnome/help/dia/en/graphics/after-hor-spread.png
-%%GNOME%%share/gnome/help/dia/en/graphics/after-vert-spread.png
-%%GNOME%%share/gnome/help/dia/en/graphics/align-bottom.png
-%%GNOME%%share/gnome/help/dia/en/graphics/align-center.png
-%%GNOME%%share/gnome/help/dia/en/graphics/align-left.png
-%%GNOME%%share/gnome/help/dia/en/graphics/align-menu.png
-%%GNOME%%share/gnome/help/dia/en/graphics/align-middle.png
-%%GNOME%%share/gnome/help/dia/en/graphics/align-right.png
-%%GNOME%%share/gnome/help/dia/en/graphics/align-top.png
-%%GNOME%%share/gnome/help/dia/en/graphics/arrow-style.png
-%%GNOME%%share/gnome/help/dia/en/graphics/assorted-shapes.png
-%%GNOME%%share/gnome/help/dia/en/graphics/before-hor-spread.png
-%%GNOME%%share/gnome/help/dia/en/graphics/before-left.png
-%%GNOME%%share/gnome/help/dia/en/graphics/before-top.png
-%%GNOME%%share/gnome/help/dia/en/graphics/before-vert-spread.png
-%%GNOME%%share/gnome/help/dia/en/graphics/bezierline-rightclick.png
-%%GNOME%%share/gnome/help/dia/en/graphics/stacked.png
-%%GNOME%%share/gnome/help/dia/en/graphics/canvas-zoom.png
-%%GNOME%%share/gnome/help/dia/en/graphics/cisco-computer-shapes.png
-%%GNOME%%share/gnome/help/dia/en/graphics/cisco-misc-shapes.png
-%%GNOME%%share/gnome/help/dia/en/graphics/cisco-network-shapes.png
-%%GNOME%%share/gnome/help/dia/en/graphics/cisco-switch-shapes.png
-%%GNOME%%share/gnome/help/dia/en/graphics/cisco-telephony-shapes.png
-%%GNOME%%share/gnome/help/dia/en/graphics/color-dropdown.png
-%%GNOME%%share/gnome/help/dia/en/graphics/color-selector1.png
-%%GNOME%%share/gnome/help/dia/en/graphics/color_selector.png
-%%GNOME%%share/gnome/help/dia/en/graphics/connect-fixed.png
-%%GNOME%%share/gnome/help/dia/en/graphics/connect-middle.png
-%%GNOME%%share/gnome/help/dia/en/graphics/default-colors.png
-%%GNOME%%share/gnome/help/dia/en/graphics/defaults-box.png
-%%GNOME%%share/gnome/help/dia/en/graphics/defaults-text.png
-%%GNOME%%share/gnome/help/dia/en/graphics/delete-text.png
-%%GNOME%%share/gnome/help/dia/en/graphics/dia-startup.png
-%%GNOME%%share/gnome/help/dia/en/graphics/diagram-properties-grid.png
-%%GNOME%%share/gnome/help/dia/en/graphics/diagram-properties.png
-%%GNOME%%share/gnome/help/dia/en/graphics/diagram-tree-sort.png
-%%GNOME%%share/gnome/help/dia/en/graphics/diagram-tree.png
-%%GNOME%%share/gnome/help/dia/en/graphics/edit-text.png
-%%GNOME%%share/gnome/help/dia/en/graphics/file-preferences-diagram.png
-%%GNOME%%share/gnome/help/dia/en/graphics/file-preferences-favorites.png
-%%GNOME%%share/gnome/help/dia/en/graphics/file-preferences-tree.png
-%%GNOME%%share/gnome/help/dia/en/graphics/file-preferences-ui.png
-%%GNOME%%share/gnome/help/dia/en/graphics/file-preferences-view.png
-%%GNOME%%share/gnome/help/dia/en/graphics/flowchart-shapes.png
-%%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-arrows.png
-%%GNOME%%share/gnome/help/dia/en/graphics/line-buttons.png
-%%GNOME%%share/gnome/help/dia/en/graphics/line-colors.png
-%%GNOME%%share/gnome/help/dia/en/graphics/line-connect.png
-%%GNOME%%share/gnome/help/dia/en/graphics/line-styles.png
-%%GNOME%%share/gnome/help/dia/en/graphics/line-handles.png
-%%GNOME%%share/gnome/help/dia/en/graphics/line-width.png
-%%GNOME%%share/gnome/help/dia/en/graphics/line_icon.png
-%%GNOME%%share/gnome/help/dia/en/graphics/line_props.png
-%%GNOME%%share/gnome/help/dia/en/graphics/misc-shapes.png
-%%GNOME%%share/gnome/help/dia/en/graphics/network-shapes.png
-%%GNOME%%share/gnome/help/dia/en/graphics/object-group.png
-%%GNOME%%share/gnome/help/dia/en/graphics/polyline-rightclick.png
-%%GNOME%%share/gnome/help/dia/en/graphics/preferences-gridlines.png
-%%GNOME%%share/gnome/help/dia/en/graphics/preferences_fig.png
-%%GNOME%%share/gnome/help/dia/en/graphics/properties-uml-class1.png
-%%GNOME%%share/gnome/help/dia/en/graphics/reverse-colors.png
-%%GNOME%%share/gnome/help/dia/en/graphics/ruler-arrows.png
-%%GNOME%%share/gnome/help/dia/en/graphics/sample-flowchart.png
-%%GNOME%%share/gnome/help/dia/en/graphics/select-area.png
-%%GNOME%%share/gnome/help/dia/en/graphics/select-menu.png
-%%GNOME%%share/gnome/help/dia/en/graphics/selected-object.png
-%%GNOME%%share/gnome/help/dia/en/graphics/sheets-objects.png
-%%GNOME%%share/gnome/help/dia/en/graphics/snaptogrid-button.png
-%%GNOME%%share/gnome/help/dia/en/graphics/standard-line-properties.png
-%%GNOME%%share/gnome/help/dia/en/graphics/toolbox-basic.png
-%%GNOME%%share/gnome/help/dia/en/graphics/toolbox-image.png
-%%GNOME%%share/gnome/help/dia/en/graphics/toolbox-lower.png
-%%GNOME%%share/gnome/help/dia/en/graphics/toolbox-magnify.png
-%%GNOME%%share/gnome/help/dia/en/graphics/toolbox-modify.png
-%%GNOME%%share/gnome/help/dia/en/graphics/toolbox-scroll.png
-%%GNOME%%share/gnome/help/dia/en/graphics/toolbox-special.png
-%%GNOME%%share/gnome/help/dia/en/graphics/toolbox.png
-%%GNOME%%share/gnome/help/dia/en/graphics/uml-shapes.png
-%%GNOME%%share/gnome/help/dia/en/graphics/view-menu.png
-%%GNOME%%share/gnome/help/dia/en/graphics/view-zoom.png
-%%GNOME%%share/gnome/help/dia/en/graphics/zigzagline-rightclick.png
-%%GNOME%%share/gnome/help/dia/fr/dia.xml
-%%GNOME%%share/gnome/help/dia/fr/authors.xml
-%%GNOME%%share/gnome/help/dia/fr/entities.xml
-%%GNOME%%share/gnome/help/dia/fr/intro.xml
-%%GNOME%%share/gnome/help/dia/fr/license.xml
-%%GNOME%%share/gnome/help/dia/fr/usage-canvas.xml
-%%GNOME%%share/gnome/help/dia/fr/usage-customization.xml
-%%GNOME%%share/gnome/help/dia/fr/usage-layers.xml
-%%GNOME%%share/gnome/help/dia/fr/usage-loadsave.xml
-%%GNOME%%share/gnome/help/dia/fr/usage-objects-basic.xml
-%%GNOME%%share/gnome/help/dia/fr/usage-objects-selecting.xml
-%%GNOME%%share/gnome/help/dia/fr/usage-objects-special.xml
-%%GNOME%%share/gnome/help/dia/fr/usage-objects.xml
-%%GNOME%%share/gnome/help/dia/fr/usage-quickstart.xml
-%%GNOME%%share/gnome/help/dia/fr/custom-shapes.xml
-%%GNOME%%share/gnome/help/dia/fr/dia-cmdline.xml
-%%GNOME%%share/gnome/help/dia/fr/dia-1.xml
-%%GNOME%%share/gnome/help/dia/fr/graphics/color_selector.png
-%%GNOME%%share/gnome/help/dia/fr/graphics/greendots.png
-%%GNOME%%share/gnome/help/dia/fr/graphics/home_network.png
-%%GNOME%%share/gnome/help/dia/fr/graphics/line_icon.png
-%%GNOME%%share/gnome/help/dia/fr/graphics/line_props.png
-%%GNOME%%share/gnome/help/dia/fr/graphics/preferences_fig.png
-%%GNOME%%share/gnome/help/dia/eu/dia.xml
-%%GNOME%%share/gnome/help/dia/eu/authors.xml
-%%GNOME%%share/gnome/help/dia/eu/entities.xml
-%%GNOME%%share/gnome/help/dia/eu/intro.xml
-%%GNOME%%share/gnome/help/dia/eu/license.xml
-%%GNOME%%share/gnome/help/dia/eu/usage-canvas.xml
-%%GNOME%%share/gnome/help/dia/eu/usage-customization.xml
-%%GNOME%%share/gnome/help/dia/eu/usage-layers.xml
-%%GNOME%%share/gnome/help/dia/eu/usage-loadsave.xml
-%%GNOME%%share/gnome/help/dia/eu/usage-objects-basic.xml
-%%GNOME%%share/gnome/help/dia/eu/usage-objects-selecting.xml
-%%GNOME%%share/gnome/help/dia/eu/usage-objects-special.xml
-%%GNOME%%share/gnome/help/dia/eu/usage-objects.xml
-%%GNOME%%share/gnome/help/dia/eu/usage-quickstart.xml
-%%GNOME%%share/gnome/help/dia/eu/graphics/greendots.png
-%%GNOME%%share/gnome/help/dia/eu/graphics/home_network.png
-%%GNOME%%share/gnome/help/dia/eu/graphics/line_icon.png
-%%GNOME%%share/gnome/help/dia/eu/graphics/line_props.png
-%%GNOME%%share/gnome/help/dia/pl/dia.xml
-%%GNOME%%share/gnome/help/dia/pl/authors.xml
-%%GNOME%%share/gnome/help/dia/pl/intro.xml
-%%GNOME%%share/gnome/help/dia/pl/license.xml
-%%GNOME%%share/gnome/help/dia/pl/usage-canvas.xml
-%%GNOME%%share/gnome/help/dia/pl/usage-customization.xml
-%%GNOME%%share/gnome/help/dia/pl/usage-layers.xml
-%%GNOME%%share/gnome/help/dia/pl/usage-loadsave.xml
-%%GNOME%%share/gnome/help/dia/pl/usage-objects-selecting.xml
-%%GNOME%%share/gnome/help/dia/pl/usage-objects-special.xml
-%%GNOME%%share/gnome/help/dia/pl/usage-objects.xml
-%%GNOME%%share/gnome/help/dia/pl/usage-quickstart.xml
-%%GNOME%%share/gnome/help/dia/pl/graphics/greendots.png
-%%GNOME%%share/gnome/help/dia/pl/graphics/home_network.png
-%%GNOME%%share/gnome/help/dia/pl/graphics/line_props.png
-%%GNOME%%share/gnome/help/dia/C
-%%GNOME%%share/omf/dia/dia-C.omf
-%%GNOME%%share/omf/dia/dia-fr.omf
-%%GNOME%%share/omf/dia/dia-eu.omf
-%%GNOME%%share/omf/dia/dia-pl.omf
-%%PORTDOCS%%%%DOCSDIR%%/en/examples/shape.dtd
-%%PORTDOCS%%%%DOCSDIR%%/en/examples/diagram.dtd
-%%PORTDOCS%%%%DOCSDIR%%/en/examples/sheet.dtd
-%%PORTDOCS%%%%DOCSDIR%%/fr/examples/shape.dtd
-%%PORTDOCS%%%%DOCSDIR%%/fr/examples/diagram.dtd
-%%PORTDOCS%%%%DOCSDIR%%/fr/examples/sheet.dtd
-%%PORTDOCS%%%%DOCSDIR%%/eu/examples/shape.dtd
-%%PORTDOCS%%%%DOCSDIR%%/eu/examples/diagram.dtd
-%%PORTDOCS%%%%DOCSDIR%%/eu/examples/sheet.dtd
-%%PORTDOCS%%%%DOCSDIR%%/pl/examples/shape.dtd
-%%PORTDOCS%%%%DOCSDIR%%/pl/examples/diagram.dtd
-%%PORTDOCS%%%%DOCSDIR%%/pl/examples/sheet.dtd
-share/icons/hicolor/16x16/apps/dia.png
-share/icons/hicolor/22x22/apps/dia.png
-share/icons/hicolor/24x24/apps/dia.png
-share/icons/hicolor/32x32/apps/dia.png
-share/icons/hicolor/48x48/apps/dia.png
-share/icons/hicolor/scalable/apps/dia.svg
-%%GNOME%%@dirrm share/gnome/help/dia/en/graphics
-%%GNOME%%@dirrm share/gnome/help/dia/en
-%%GNOME%%@dirrm share/gnome/help/dia/fr/graphics
-%%GNOME%%@dirrm share/gnome/help/dia/fr
-%%GNOME%%@dirrm share/gnome/help/dia/eu/graphics
-%%GNOME%%@dirrm share/gnome/help/dia/eu
-%%GNOME%%@dirrm share/gnome/help/dia/pl/graphics
-%%GNOME%%@dirrm share/gnome/help/dia/pl
-%%GNOME%%@dirrm share/gnome/help/dia
-%%GNOME%%@dirrm share/omf/dia
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/examples
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/eu/examples
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/eu
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/fr/examples
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/fr
+share/mime-info/dia.keys
+share/mime-info/dia.mime
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/pl/examples
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/pl
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/fr/examples
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/fr
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/eu/examples
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/eu
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/examples
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm share/dia/xslt
 @dirrm share/dia/ui
@@ -2017,19 +1844,10 @@ share/icons/hicolor/scalable/apps/dia.svg
 @dirrm share/dia/shapes/BPMN
 @dirrm share/dia/shapes/Assorted
 @dirrm share/dia/shapes
-%%PYTHON%%@dirrm share/dia/python
 @dirrm share/dia
+@dirrmtry share/applications
+@dirrmtry man/fr/man1
+@dirrmtry man/fr
 @dirrm lib/dia
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/applications