Date: Wed, 14 Mar 2007 00:25:41 +0300 (MSK) From: Maxim Samsonov <xors@mne.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/110286: [PATCH]: net-p2p/ktorrent Resolves conflict with net-p2p/libtorrent during building Message-ID: <200703132125.l2DLPfMw056099@xors.pg.org> Resent-Message-ID: <200703132130.l2DLU7eR022978@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 110286 >Category: ports >Synopsis: [PATCH]: net-p2p/ktorrent Resolves conflict with net-p2p/libtorrent during building >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Mar 13 21:30:05 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Maxim Samsonov >Release: FreeBSD 6.2-STABLE i386 >Organization: >Environment: >Description: This patch allows to avoid inclusion of files from "/usr/local/include/torrent" dir during ktorrent building. It was achieved by moving the system include dir list "all_includes" to the end of the include dir list "INCLUDES" in the appropriate "Makefile.in". >How-To-Repeat: >Fix: --- ktorrent.diff begins here --- diff -ubdBrN ktorrent.orig/Makefile ktorrent/Makefile --- ktorrent.orig/Makefile Tue Mar 13 22:38:45 2007 +++ ktorrent/Makefile Tue Mar 13 22:43:38 2007 @@ -24,5 +24,9 @@ post-patch: @${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -e 's|zeroconf||' ${WRKSRC}/plugins/Makefile.in + @${FIND} ${WRKSRC} -name Makefile.in | \ + ${XARGS} ${REINPLACE_CMD} \ + -e '/^INCLUDES =/{:loop' -e '/\\$$/{N;bloop' \ + -e '};/$$(all_includes)/{s///;s/$$/ $$(all_includes)/' -e '}' -e '}' .include <bsd.port.mk> --- ktorrent.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?200703132125.l2DLPfMw056099>