From owner-svn-ports-head@FreeBSD.ORG Mon Dec 8 22:18:13 2014 Return-Path: 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 A7F95DF0; Mon, 8 Dec 2014 22:18:13 +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 93EF798F; Mon, 8 Dec 2014 22:18:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB8MIDNu087822; Mon, 8 Dec 2014 22:18:13 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB8MIDTp087819; Mon, 8 Dec 2014 22:18:13 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201412082218.sB8MIDTp087819@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Mon, 8 Dec 2014 22:18:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374336 - head/multimedia/avidemux2 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Dec 2014 22:18:13 -0000 Author: bapt Date: Mon Dec 8 22:18:12 2014 New Revision: 374336 URL: https://svnweb.freebsd.org/changeset/ports/374336 QAT: https://qat.redports.org/buildarchive/r374336/ Log: Avoid usage of @cwd Modified: head/multimedia/avidemux2/Makefile head/multimedia/avidemux2/pkg-plist Modified: head/multimedia/avidemux2/Makefile ============================================================================== --- head/multimedia/avidemux2/Makefile Mon Dec 8 22:11:09 2014 (r374335) +++ head/multimedia/avidemux2/Makefile Mon Dec 8 22:18:12 2014 (r374336) @@ -11,31 +11,36 @@ 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 + post-configure: post-configure-common post-install: .if ${PORT_OPTIONS:MGTK2} || ${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} @${MKDIR} "${STAGEDIR}${DESKTOPDIR}" - @${ECHO_CMD} "@cwd ${DESKTOPDIR}" >> ${TMPPLIST} .if ${PORT_OPTIONS:MGTK2} @${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} @${ECHO_CMD} "@unexec ${RMDIR} ${DESKTOPDIR} 2>/dev/null || true" >> ${TMPPLIST} @${ECHO_CMD} "@exec %D/bin/update-desktop-database 2>/dev/null || ${TRUE}" >> ${TMPPLIST} @${ECHO_CMD} "@unexec %D/bin/update-desktop-database 2>/dev/null || ${TRUE}" >> ${TMPPLIST} Modified: head/multimedia/avidemux2/pkg-plist ============================================================================== --- head/multimedia/avidemux2/pkg-plist Mon Dec 8 22:11:09 2014 (r374335) +++ head/multimedia/avidemux2/pkg-plist Mon Dec 8 22:18:12 2014 (r374336) @@ -21,12 +21,6 @@ share/ADM_scripts/auto/Optical Disc/Vide share/ADM_scripts/auto/Optical Disc/Super Video CD.js share/ADM_scripts/auto/Optical Disc/DVD.js share/ADM_scripts/auto/Apple iPod.js -@dirrm share/ADM_addons/avsfilter -@dirrm share/ADM_addons -@dirrm share/ADM_scripts/auto/Optical Disc -@dirrm share/ADM_scripts/auto -@dirrm share/ADM_scripts/video -@dirrm share/ADM_scripts %%GTK%%bin/avidemux2_gtk %%QT4%%bin/avidemux2_qt4 %%GTK%%lib/libADM_UIGtk.so @@ -51,8 +45,6 @@ share/ADM_scripts/auto/Apple iPod.js %%NLS%%share/locale/tr/LC_MESSAGES/avidemux.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/avidemux.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/avidemux.mo -%%NLS%%@dirrmtry share/locale/sr@latin/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/sr@latin %%QT_NLS%%share/avidemux/i18n/avidemux_ca.qm %%QT_NLS%%share/avidemux/i18n/avidemux_cs.qm %%QT_NLS%%share/avidemux/i18n/avidemux_de.qm @@ -74,5 +66,3 @@ share/ADM_scripts/auto/Apple iPod.js %%QT_NLS%%share/avidemux/i18n/qt_fr.qm %%QT_NLS%%share/avidemux/i18n/qt_it.qm %%QT_NLS%%share/avidemux/i18n/qt_zh_TW.qm -%%QT_NLS%%@dirrm share/avidemux/i18n -%%QT_NLS%%@dirrm share/avidemux