Date: Fri, 14 Feb 2014 06:14:14 -0600 From: "Zane C.B-H." <vvelox@vvelox.net> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@freebsd.org> Subject: ports/186763: Port: multimedia/avidemux2 Fix build with pkg(8). Message-ID: <1392380054.533871.81263@vixen42.vulpes.vvelox.net> Resent-Message-ID: <201402141230.s1ECU0eT088081@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.mk>
--- 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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1392380054.533871.81263>