-Update to 0.95.1.

-USE_X_PREFIX -> USE_XLIB, no function change because of gnomeprefix.
-Add desktopfileutils dependency and manual run update-desktop-database.
-Remove the locale dirs that aren't in the mtree.

Security:	Format string vulnerabilities
		http://bugzilla.gnome.org/show_bug.cgi?id=342111

3 files changed, 46 insertions, 8 deletions

diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index 15ce1f67dec4..776837a371d7 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dia
-PORTVERSION=	0.95
+DISTVERSION=	0.95-1
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -20,9 +20,10 @@ BUILD_DEPENDS=	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/t
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gtk20 gnomehack gnomeprefix libxslt libartlgpl2 intlhack
+USE_GNOME=	gtk20 gnomehack gnomeprefix libxslt libartlgpl2 intlhack \
+		desktopfileutils
 WANT_GNOME=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
@@ -62,5 +63,6 @@ pre-configure:
 
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/dia.xpm ${PREFIX}/share/gnome/dia/
+	@-update-desktop-database
 
 .include <bsd.port.post.mk>
diff --git a/graphics/dia/distinfo b/graphics/dia/distinfo
index 661b44c859e7..4c0357e57b74 100644
--- a/graphics/dia/distinfo
+++ b/graphics/dia/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/dia-0.95.tar.bz2) = d319921a91d4600df3578a4a64416393
-SHA256 (gnome2/dia-0.95.tar.bz2) = be505ca1632ab1e573c034f2954dfc18fd4679b095e84900bcaaeaaefa0241c4
-SIZE (gnome2/dia-0.95.tar.bz2) = 4202618
+MD5 (gnome2/dia-0.95-1.tar.bz2) = bd4d5bd71b60b9ce11610256534e4d82
+SHA256 (gnome2/dia-0.95-1.tar.bz2) = 809d00268b6f6ab02fb666c70ba0b8f556d258825e004ab4386103bcac4b7bc5
+SIZE (gnome2/dia-0.95-1.tar.bz2) = 4203188
diff --git a/graphics/dia/pkg-plist b/graphics/dia/pkg-plist
index 6593bdb03053..98f7413b8776 100644
--- a/graphics/dia/pkg-plist
+++ b/graphics/dia/pkg-plist
@@ -454,10 +454,10 @@ share/gnome/dia/shapes/Cisco/content_service_module.png
 share/gnome/dia/shapes/Cisco/content_service_module.shape
 share/gnome/dia/shapes/Cisco/content_switch.png
 share/gnome/dia/shapes/Cisco/content_switch.shape
-share/gnome/dia/shapes/Cisco/css1100.png
-share/gnome/dia/shapes/Cisco/css1100.shape
 share/gnome/dia/shapes/Cisco/csm-s.png
 share/gnome/dia/shapes/Cisco/csm-s.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
@@ -1666,8 +1666,42 @@ share/locale/uk/LC_MESSAGES/dia.mo
 share/locale/vi/LC_MESSAGES/dia.mo
 share/locale/zh_CN/LC_MESSAGES/dia.mo
 share/locale/zh_TW/LC_MESSAGES/dia.mo
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
 @dirrm share/gnome/omf/dia
 @dirrm share/gnome/help/dia/pl/graphics
 @dirrm share/gnome/help/dia/pl
@@ -1709,3 +1743,5 @@ share/locale/zh_TW/LC_MESSAGES/dia.mo
 %%PYTHON:%%@dirrm share/gnome/dia/python
 @dirrm share/gnome/dia
 @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