Bug 186763

Summary: Port: multimedia/avidemux2 Fix build with pkg(8).
Product: Ports & Packages Reporter: Zane C. Bowers-Hadley <vvelox>
Component: Individual Port(s)Assignee: freebsd-multimedia (Nobody) <multimedia>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
avidemux2_Makefile.diff
none
file.diff none

Description Zane C. Bowers-Hadley 2014-02-14 12:30:00 UTC 

pkg-static does not like the missing avidemux2_icon.png file.

Fix: delete files/avidemux2.desktop.in
How-To-Repeat: 

1: Try to build it on a to date system with pkg(8).
2: Watch it die during install as there is no avidemux2_icon.png included in the port.
3: Apply fix and enjoy.
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2014-02-14 12:30:10 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->freebsd-multimedia

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 dfilter service freebsd_committer freebsd_triage 2014-02-14 16:12:46 UTC 
Author: antoine
Date: Fri Feb 14 16:12:38 2014
New Revision: 344274
URL: http://svnweb.freebsd.org/changeset/ports/344274
QAT: https://qat.redports.org/buildarchive/r344274/

Log:
  Finish stage support
  
  Reported by:	pkg-fallout
  PR:		ports/186763

Modified:
  head/multimedia/avidemux2/Makefile

Modified: head/multimedia/avidemux2/Makefile
==============================================================================
--- head/multimedia/avidemux2/Makefile	Fri Feb 14 16:10:03 2014	(r344273)
+++ head/multimedia/avidemux2/Makefile	Fri Feb 14 16:12:38 2014	(r344274)
@@ -14,31 +14,30 @@ post-configure: post-configure-common
 
 post-install:
 .if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MQT4}
-	@${MKDIR} "${DATADIR}"
-	${INSTALL_DATA} "${WRKSRC}/avidemux_icon.png" "${DATADIR}/${PORTNAME}.png"
+	@${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} "${DESKTOPDIR}"
+	@${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" "${DESKTOPDIR}"
+	${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" "${DESKTOPDIR}"
+	${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}
-	-update-desktop-database
 .endif
 
 .include <bsd.port.mk>
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 Antoine Brodin freebsd_committer freebsd_triage 2014-02-14 16:12:56 UTC 
State Changed
From-To: open->closed

A fix has been committed, thanks for the report