Avoid usage of @cwd

This commit is contained in:
Baptiste Daroussin 2014-12-08 22:18:12 +00:00
parent 4b43d52e17
commit 53e57f113a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=374336
2 changed files with 11 additions and 16 deletions

View file

@ -11,31 +11,36 @@ COMMENT= Simple GUI based video editor
.include "${.CURDIR}/Makefile.common" .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-configure: post-configure-common
post-install: post-install:
.if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MQT4} .if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MQT4}
@${MKDIR} "${STAGEDIR}${DATADIR}" @${MKDIR} "${STAGEDIR}${DATADIR}"
${INSTALL_DATA} "${WRKSRC}/avidemux_icon.png" "${STAGEDIR}${DATADIR}/${PORTNAME}.png" ${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}" @${MKDIR} "${STAGEDIR}${DESKTOPDIR}"
@${ECHO_CMD} "@cwd ${DESKTOPDIR}" >> ${TMPPLIST}
.if ${PORT_OPTIONS:MGTK2} .if ${PORT_OPTIONS:MGTK2}
@${SED} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%DATADIR%%|${DATADIR}|g" \ @${SED} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%DATADIR%%|${DATADIR}|g" \
-e "s|%%NAME%%|${PORTNAME}|g" -e "s|%%API%%|gtk|g" \ -e "s|%%NAME%%|${PORTNAME}|g" -e "s|%%API%%|gtk|g" \
< ${FILESDIR}/avidemux2.desktop.in > ${WRKDIR}/${PORTNAME}.desktop < ${FILESDIR}/avidemux2.desktop.in > ${WRKDIR}/${PORTNAME}.desktop
${INSTALL_DATA} "${WRKDIR}/${PORTNAME}.desktop" "${STAGEDIR}${DESKTOPDIR}" ${INSTALL_DATA} "${WRKDIR}/${PORTNAME}.desktop" "${STAGEDIR}${DESKTOPDIR}"
@${ECHO_CMD} "${PORTNAME}.desktop" >> ${TMPPLIST}
.endif .endif
.if ${PORT_OPTIONS:MQT4} .if ${PORT_OPTIONS:MQT4}
@${SED} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%DATADIR%%|${DATADIR}|g" \ @${SED} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%DATADIR%%|${DATADIR}|g" \
-e "s|%%NAME%%|${PORTNAME}|g" -e "s|%%API%%|qt4|g" \ -e "s|%%NAME%%|${PORTNAME}|g" -e "s|%%API%%|qt4|g" \
< ${FILESDIR}/avidemux2.desktop.in > ${WRKDIR}/${PORTNAME}_qt4.desktop < ${FILESDIR}/avidemux2.desktop.in > ${WRKDIR}/${PORTNAME}_qt4.desktop
${INSTALL_DATA} "${WRKDIR}/${PORTNAME}_qt4.desktop" "${STAGEDIR}${DESKTOPDIR}" ${INSTALL_DATA} "${WRKDIR}/${PORTNAME}_qt4.desktop" "${STAGEDIR}${DESKTOPDIR}"
@${ECHO_CMD} "${PORTNAME}_qt4.desktop" >> ${TMPPLIST}
.endif .endif
@${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}
@${ECHO_CMD} "@unexec ${RMDIR} ${DESKTOPDIR} 2>/dev/null || true" >> ${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} "@exec %D/bin/update-desktop-database 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
@${ECHO_CMD} "@unexec %D/bin/update-desktop-database 2>/dev/null || ${TRUE}" >> ${TMPPLIST} @${ECHO_CMD} "@unexec %D/bin/update-desktop-database 2>/dev/null || ${TRUE}" >> ${TMPPLIST}

View file

@ -21,12 +21,6 @@ share/ADM_scripts/auto/Optical Disc/Video CD.js
share/ADM_scripts/auto/Optical Disc/Super Video CD.js share/ADM_scripts/auto/Optical Disc/Super Video CD.js
share/ADM_scripts/auto/Optical Disc/DVD.js share/ADM_scripts/auto/Optical Disc/DVD.js
share/ADM_scripts/auto/Apple iPod.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 %%GTK%%bin/avidemux2_gtk
%%QT4%%bin/avidemux2_qt4 %%QT4%%bin/avidemux2_qt4
%%GTK%%lib/libADM_UIGtk.so %%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/tr/LC_MESSAGES/avidemux.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/avidemux.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/avidemux.mo
%%NLS%%share/locale/zh_TW/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_ca.qm
%%QT_NLS%%share/avidemux/i18n/avidemux_cs.qm %%QT_NLS%%share/avidemux/i18n/avidemux_cs.qm
%%QT_NLS%%share/avidemux/i18n/avidemux_de.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_fr.qm
%%QT_NLS%%share/avidemux/i18n/qt_it.qm %%QT_NLS%%share/avidemux/i18n/qt_it.qm
%%QT_NLS%%share/avidemux/i18n/qt_zh_TW.qm %%QT_NLS%%share/avidemux/i18n/qt_zh_TW.qm
%%QT_NLS%%@dirrm share/avidemux/i18n
%%QT_NLS%%@dirrm share/avidemux