From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Feb 14 12:30:01 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.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 056C4D9F for ; Fri, 14 Feb 2014 12:30:01 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 D521A11FD for ; Fri, 14 Feb 2014 12:30:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id s1ECU0Ot088082 for ; Fri, 14 Feb 2014 12:30:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s1ECU0eT088081; Fri, 14 Feb 2014 12:30:00 GMT (envelope-from gnats) Resent-Date: Fri, 14 Feb 2014 12:30:00 GMT Resent-Message-Id: <201402141230.s1ECU0eT088081@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Zane C.B-H." 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 6EDDDC14 for ; Fri, 14 Feb 2014 12:19:58 +0000 (UTC) Received: from vulpes.vvelox.net (vulpes.vvelox.net [99.69.115.42]) by mx1.freebsd.org (Postfix) with ESMTP id 327F71155 for ; Fri, 14 Feb 2014 12:19:58 +0000 (UTC) Received: from vixen42.vulpes.vvelox.net (vixen42.vulpes.vvelox.net [192.168.15.2]) (Authenticated sender: kitsune) by vulpes.vvelox.net (Postfix) with ESMTPA id 012F8492BADF for ; Fri, 14 Feb 2014 06:19:28 -0600 (CST) Message-Id: <1392380054.533871.81263@vixen42.vulpes.vvelox.net> Date: Fri, 14 Feb 2014 06:14:14 -0600 From: "Zane C.B-H." To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.9 Subject: ports/186763: Port: multimedia/avidemux2 Fix build with pkg(8). X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Feb 2014 12:30:01 -0000 >Number: 186763 >Category: ports >Synopsis: Port: multimedia/avidemux2 Fix build with pkg(8). >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Fri Feb 14 12:30:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Zane C.B-H. >Release: FreeBSD 9.2-STABLE amd64 >Organization: >Environment: System: FreeBSD 9.2-STABLE #2 r261201: Sun Jan 26 22:33:56 CST 2014 kitsune@vixen42.vulpes.vvelox.net:/usr/obj/arc/src/FreeBSD/9-stable/sys/GENERIC >Description: pkg-static does not like the missing avidemux2_icon.png file. >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. >Fix: delete files/avidemux2.desktop.in --- avidemux2_Makefile.diff begins here --- --- Makefile.orig 2014-02-14 05:51:33.425940457 -0600 +++ Makefile 2014-02-14 06:01:06.890942257 -0600 @@ -12,33 +12,4 @@ 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" - @${ECHO_CMD} "${DATADIR_REL}/${PORTNAME}.png" >> ${TMPPLIST} - @${ECHO_CMD} "@unexec ${RMDIR} %D/${DATADIR_REL} 2>/dev/null || ${TRUE}" >> ${TMPPLIST} - @${MKDIR} "${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}" - @${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}" - @${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 --- avidemux2_Makefile.diff ends here --- --- avidemux2_Makefile.common.diff begins here --- --- Makefile.common.orig 2014-02-14 06:01:39.961940657 -0600 +++ Makefile.common 2014-02-14 06:02:14.914942417 -0600 @@ -79,7 +79,7 @@ .if empty(PORT_OPTIONS:MGTK2) && empty(PORT_OPTIONS:MQT4) CMAKE_ARGS+= -DX11:BOOL=OFF .else -USE_GNOME+= libxslt desktopfileutils +USE_GNOME+= libxslt .endif .if ${PORT_OPTIONS:MGTK2} --- avidemux2_Makefile.common.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: