diff --git a/math/wxMaxima/Makefile b/math/wxMaxima/Makefile index 05a37aa80bd1..462272a30fa4 100644 --- a/math/wxMaxima/Makefile +++ b/math/wxMaxima/Makefile @@ -7,7 +7,6 @@ PORTREVISION= 2 CATEGORIES= math MASTER_SITES= SF MASTER_SITE_SUBDIR= ${PORTNAME:tl}/${PORTNAME}/${PORTVERSION} -#MASTER_SITE_SUBDIR= ${PORTNAME:tl}/${PORTNAME}/${PORTVERSION} MAINTAINER= nivit@FreeBSD.org COMMENT= WxWidgets GUI for the computer algebra system maxima @@ -16,8 +15,8 @@ LICENSE= GPLv2 RUN_DEPENDS= maxima:${PORTSDIR}/math/maxima -USES= gettext -USE_GNOME= desktopfileutils libxml2 +USES= gettext desktop-file-utils +USE_GNOME= libxml2 USE_WX= 2.8 WX_COMPS= wx WX_CONF_ARGS= absolute @@ -27,13 +26,10 @@ CONFIGURE_ARGS= --program-prefix= PLIST_SUB= DESKTOPDIR=${DESKTOPDIR:S,${PREFIX}/,,} -NO_STAGE= yes post-install: - @${LN} -s ${DATADIR}/wxmaxima.png ${PREFIX}/share/pixmaps/wxmaxima.png + @${LN} -s ../wxMaxima/wxmaxima.png ${STAGEDIR}${PREFIX}/share/pixmaps/wxmaxima.png @${LOCALBASE}/bin/desktop-file-install \ - --mode=${SHAREMODE} --dir=${DESKTOPDIR} \ - --rebuild-mime-info-cache ${WRKSRC}/${PORTNAME:tl}.desktop -# --rebuild-mime-info-cache ${WRKSRC}/${PORTNAME:tl}.desktop - @${CAT} ${PKGMESSAGE} + --mode=${SHAREMODE} --dir=${STAGEDIR}${DESKTOPDIR} \ + ${WRKSRC}/${PORTNAME:tl}.desktop .include diff --git a/math/wxMaxima/pkg-plist b/math/wxMaxima/pkg-plist index 295c3ffea90d..f5f3ec2613dc 100644 --- a/math/wxMaxima/pkg-plist +++ b/math/wxMaxima/pkg-plist @@ -27,7 +27,4 @@ share/pixmaps/wxmaxima.png %%DATADIR%%/tips.txt %%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 +@dirrmtry %%DATADIR%%