From owner-svn-ports-head@FreeBSD.ORG  Fri Feb 14 16:12:39 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7EACF295;
 Fri, 14 Feb 2014 16:12:39 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4DC30196C;
 Fri, 14 Feb 2014 16:12:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1EGCdrJ017408;
 Fri, 14 Feb 2014 16:12:39 GMT (envelope-from antoine@svn.freebsd.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1EGCdTA017407;
 Fri, 14 Feb 2014 16:12:39 GMT (envelope-from antoine@svn.freebsd.org)
Message-Id: <201402141612.s1EGCdTA017407@svn.freebsd.org>
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Fri, 14 Feb 2014 16:12:39 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r344274 - 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.17
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: Fri, 14 Feb 2014 16:12:39 -0000

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>