- Update to 12.04.0

- Remove the Author: line from pkg-descr
- Add files/patch-wxmaxima.desktop (validation ok)
- Replace DESKTOP_ENTRIES with the provided
  wxmaxima.desktop file
- Add desktopfileutils to USE_GNOME
- Add commands to update desktop database on install/deinstall

Buildlog:	http://goo.gl/HFNGE  [@redports]

5 files changed, 30 insertions, 9 deletions

diff --git a/math/wxMaxima/Makefile b/math/wxMaxima/Makefile
index bcee6cf2a5bb..3fd9eafc061d 100644
--- a/math/wxMaxima/Makefile
+++ b/math/wxMaxima/Makefile
@@ -6,10 +6,12 @@
 #
 
 PORTNAME=	wxMaxima
-PORTVERSION=	11.08.0
-PORTREVISION=	4
+PORTVERSION=	12.04.0
+PORTREVISION=	0
 CATEGORIES=	math
-MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME}/${PORTVERSION}
+MASTER_SITES=	SF
+MASTER_SITE_SUBDIR=	${PORTNAME:L}/${PORTNAME}/${PORTVERSION}
+#MASTER_SITE_SUBDIR=	${PORTNAME:tl}/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A wxWidgets GUI for the computer algebra system maxima
@@ -19,7 +21,7 @@ LICENSE=	GPLv2
 RUN_DEPENDS=	maxima:${PORTSDIR}/math/maxima
 
 USE_GETTEXT=	yes
-USE_GNOME=	libxml2
+USE_GNOME=	desktopfileutils libxml2
 USE_WX=		2.8
 WX_COMPS=	wx
 WX_CONF_ARGS=	absolute
@@ -27,10 +29,14 @@ WANT_UNICODE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-prefix=
 
-DESKTOP_ENTRIES=	"wxMaxima" "${COMMENT}" "${DATADIR}/wxmaxima.png" \
-			"wxmaxima" "Education;Science;Math;" false
+PLIST_SUB=	DESKTOPDIR=${DESKTOPDIR:S,${PREFIX}/,,}
 
 post-install:
+	@${LN} -s ${DATADIR}/wxmaxima.png ${PREFIX}/share/pixmaps/wxmaxima.png
+	@${LOCALBASE}/bin/desktop-file-install \
+		--mode=${SHAREMODE} --dir=${DESKTOPDIR} \
+		--rebuild-mime-info-cache ${WRKSRC}/${PORTNAME:L}.desktop
+# 		--rebuild-mime-info-cache ${WRKSRC}/${PORTNAME:tl}.desktop
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/math/wxMaxima/distinfo b/math/wxMaxima/distinfo
index 5dd20dac5971..41f49d4aff40 100644
--- a/math/wxMaxima/distinfo
+++ b/math/wxMaxima/distinfo
@@ -1,2 +1,2 @@
-SHA256 (wxMaxima-11.08.0.tar.gz) = dfa25cc15de52829a93da624d42344213cc979351b5fcd3dff2afed6738832df
-SIZE (wxMaxima-11.08.0.tar.gz) = 1471498
+SHA256 (wxMaxima-12.04.0.tar.gz) = 60110507e0a63738a1f420b22697eaac9bea3866122e072dcd697077e8744824
+SIZE (wxMaxima-12.04.0.tar.gz) = 1490662
diff --git a/math/wxMaxima/files/patch-wxmaxima.desktop b/math/wxMaxima/files/patch-wxmaxima.desktop
new file mode 100644
index 000000000000..19e798ff5f98
--- /dev/null
+++ b/math/wxMaxima/files/patch-wxmaxima.desktop
@@ -0,0 +1,11 @@
+--- ./wxmaxima.desktop.orig	2012-07-22 22:58:40.000000000 +0200
++++ ./wxmaxima.desktop	2012-07-22 22:58:43.000000000 +0200
+@@ -2,7 +2,7 @@
+ Name=wxMaxima
+ Comment=Perform symbolic and numeric calculations using Maxima
+ Exec=wxmaxima %f
+-Icon=wxmaxima.png
++Icon=wxmaxima
+ Terminal=false
+ Type=Application
+ Categories=Education;Science;Math;X-Red-Hat-Base;X-Red-Hat-Base-Only;
diff --git a/math/wxMaxima/pkg-descr b/math/wxMaxima/pkg-descr
index 8015aca6f01d..29c2fae19f32 100644
--- a/math/wxMaxima/pkg-descr
+++ b/math/wxMaxima/pkg-descr
@@ -5,5 +5,4 @@ dialogs. The input line has command history (up-key, down-key) and
 completion based on previous input (tab-key).
 wxMaxima provides 2d formated display of maxima output.
 
-Author:	Andrej Vodopivec
 WWW:	http://wxmaxima.sourceforge.net/
diff --git a/math/wxMaxima/pkg-plist b/math/wxMaxima/pkg-plist
index 1e72fee86b18..7760bb61c906 100644
--- a/math/wxMaxima/pkg-plist
+++ b/math/wxMaxima/pkg-plist
@@ -1,5 +1,6 @@
 @comment $FreeBSD$
 bin/wxmaxima
+%%DESKTOPDIR%%/wxmaxima.desktop
 share/locale/ca/LC_MESSAGES/wxMaxima.mo
 share/locale/cs/LC_MESSAGES/wxMaxima.mo
 share/locale/da/LC_MESSAGES/wxMaxima.mo
@@ -15,6 +16,7 @@ share/locale/pt_BR/LC_MESSAGES/wxMaxima.mo
 share/locale/ru/LC_MESSAGES/wxMaxima.mo
 share/locale/uk/LC_MESSAGES/wxMaxima.mo
 share/locale/zh_TW/LC_MESSAGES/wxMaxima.mo
+share/pixmaps/wxmaxima.png
 %%DATADIR%%/COPYING
 %%DATADIR%%/README
 %%DATADIR%%/autocomplete.txt
@@ -25,3 +27,6 @@ share/locale/zh_TW/LC_MESSAGES/wxMaxima.mo
 %%DATADIR%%/wxmathml.lisp
 %%DATADIR%%/wxmaxima.png
 @dirrm %%DATADIR%%
+@dirrmtry %%DESKTOPDIR%%
+@exec %%LOCALBASE%%/bin/update-desktop-database -q > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database -q > /dev/null || /usr/bin/true