From owner-svn-ports-head@FreeBSD.ORG  Mon Dec  8 22:23:51 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 37255FF;
 Mon,  8 Dec 2014 22:23:51 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0955DA5D;
 Mon,  8 Dec 2014 22:23:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB8MNoRU092221;
 Mon, 8 Dec 2014 22:23:50 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB8MNoLg092220;
 Mon, 8 Dec 2014 22:23:50 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201412082223.sB8MNoLg092220@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
 using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 8 Dec 2014 22:23:50 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r374337 - head/multimedia/avidemux26
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Dec 2014 22:23:51 -0000

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>