Date: Mon, 8 Dec 2014 22:18:13 +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: r374336 - head/multimedia/avidemux2 Message-ID: <201412082218.sB8MIDTp087819@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412082218.sB8MIDTp087819>