Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 8 Dec 2014 22:23:50 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r374337 - head/multimedia/avidemux26
Message-ID:  <201412082223.sB8MNoLg092220@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Mon Dec  8 22:23:50 2014
New Revision: 374337
URL: https://svnweb.freebsd.org/changeset/ports/374337
QAT: https://qat.redports.org/buildarchive/r374337/

Log:
  Avoid using @cwd

Modified:
  head/multimedia/avidemux26/Makefile

Modified: head/multimedia/avidemux26/Makefile
==============================================================================
--- head/multimedia/avidemux26/Makefile	Mon Dec  8 22:18:12 2014	(r374336)
+++ head/multimedia/avidemux26/Makefile	Mon Dec  8 22:23:50 2014	(r374337)
@@ -14,6 +14,18 @@ COMMENT=	Simple GUI based video editor
 
 .include "${.CURDIR}/Makefile.common"
 
+.if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MQT4}
+PLIST_FILES+=	${DATADIR}/${PORTNAME}.png
+.endif
+
+.if ${PORT_OPTIONS:MGTK2}
+PLIST_FILES+=	${DESKTOPDIR}/${PORTNAME}.desktop
+.endif
+.if ${PORT_OPTIONS:MQT4}
+PLIST_FILES+=	${DESKTOPDIR}/${PORTNAME}_qt4.desktop
+.endif
+
+
 CMAKE_SOURCE_PATH=	${WRKSRC}/avidemux_core
 
 post-configure: post-configure-common
@@ -22,24 +34,18 @@ post-install:
 .if ${PORT_OPTIONS:MGTK3} || ${PORT_OPTIONS:MQT4}
 	@${MKDIR} "${STAGEDIR}${DATADIR}"
 	${INSTALL_DATA} "${WRKSRC}/avidemux_icon.png" "${STAGEDIR}${DATADIR}/${PORTNAME}.png"
-	@${ECHO_CMD} "${DATADIR_REL}/${PORTNAME}.png" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec ${RMDIR} %D/${DATADIR_REL} 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@cwd ${DESKTOPDIR}" >> ${TMPPLIST}
 .if ${PORT_OPTIONS:MGTK3}
 	@${SED} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%DATADIR%%|${DATADIR}|g" \
 	    -e "s|%%NAME%%|${PORTNAME}|g" -e "s|%%API%%|gtk|g" \
 	    < ${FILESDIR}/avidemux2.desktop.in > ${WRKDIR}/${PORTNAME}.desktop
 	${INSTALL_DATA} "${WRKDIR}/${PORTNAME}.desktop" "${STAGEDIR}${DESKTOPDIR}"
-	@${ECHO_CMD} "${PORTNAME}.desktop" >> ${TMPPLIST}
 .endif
 .if ${PORT_OPTIONS:MQT4}
 	@${SED} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%DATADIR%%|${DATADIR}|g" \
 	    -e "s|%%NAME%%|${PORTNAME}|g" -e "s|%%API%%|qt4|g" \
 	    < ${FILESDIR}/avidemux2.desktop.in > ${WRKDIR}/${PORTNAME}_qt4.desktop
 	${INSTALL_DATA} "${WRKDIR}/${PORTNAME}_qt4.desktop" "${STAGEDIR}${DESKTOPDIR}"
-	@${ECHO_CMD} "${PORTNAME}_qt4.desktop" >> ${TMPPLIST}
 .endif
-	@${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}
 .endif
 
 .include <bsd.port.post.mk>



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