Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 12 Jul 2014 02:05:07 +0000 (UTC)
From:      Nicola Vitale <nivit@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r361595 - head/math/wxMaxima
Message-ID:  <201407120205.s6C257gd016380@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: nivit
Date: Sat Jul 12 02:05:07 2014
New Revision: 361595
URL: http://svnweb.freebsd.org/changeset/ports/361595
QAT: https://qat.redports.org/buildarchive/r361595/

Log:
  - Add support for stage dir
  - Use desktop-file-utils helper

Modified:
  head/math/wxMaxima/Makefile
  head/math/wxMaxima/pkg-plist

Modified: head/math/wxMaxima/Makefile
==============================================================================
--- head/math/wxMaxima/Makefile	Sat Jul 12 01:11:23 2014	(r361594)
+++ head/math/wxMaxima/Makefile	Sat Jul 12 02:05:07 2014	(r361595)
@@ -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 <bsd.port.mk>

Modified: head/math/wxMaxima/pkg-plist
==============================================================================
--- head/math/wxMaxima/pkg-plist	Sat Jul 12 01:11:23 2014	(r361594)
+++ head/math/wxMaxima/pkg-plist	Sat Jul 12 02:05:07 2014	(r361595)
@@ -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%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407120205.s6C257gd016380>