Date: Thu, 28 Apr 2011 12:45:46 GMT From: Emil <the_mix_room@hotmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/156699: Patch for Makefile for VirtualBox-OSE Message-ID: <201104281245.p3SCjkxR069353@red.freebsd.org> Resent-Message-ID: <201104281250.p3SCo9eB067276@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 156699
>Category: ports
>Synopsis: Patch for Makefile for VirtualBox-OSE
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Apr 28 12:50:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Emil
>Release: 8.2-RELEASE
>Organization:
>Environment:
PORTS
>Description:
Change 'CONFLICTS=' to 'CONFLICTS_INSTALL=' in the Makefiles for virtualbox-ose and virtualbox-ose-additions ports.
Previously making the port failed. Now it should fail after building but before installation.
>How-To-Repeat:
Have virtualbox-ose install and then make virtualbox-ose-additions
>Fix:
Patch attached with submission follows:
*** emulators/virtualbox-ose-additions/Makefile Thu Apr 21 15:51:54 2011
--- emulators/virtualbox-ose-additions/Makefile Thu Apr 28 14:21:07 2011
***************
*** 37,43 ****
--disable-alsa --disable-dbus --disable-python \
--build-headless
! CONFLICTS= bcc-[0-9]* virtualbox-ose-additions-devel-[3,4]* virtualbox-ose-[3,4]* virtualbox-ose-devel-[3,4]*
OPTIONS= DEBUG "Build with debugging symbols" off \
X11 "Build with X11 support" on \
--- 37,44 ----
--disable-alsa --disable-dbus --disable-python \
--build-headless
! CONFLICTS= bcc-[0-9]*
! CONFLICTS_INSTALL= virtualbox-ose-additions-devel-[3,4]* virtualbox-ose-[3,4]* virtualbox-ose-devel-[3,4]*
OPTIONS= DEBUG "Build with debugging symbols" off \
X11 "Build with X11 support" on \
*** emulators/virtualbox-ose/Makefile Thu Apr 21 15:51:54 2011
--- emulators/virtualbox-ose/Makefile Thu Apr 28 14:25:55 2011
***************
*** 46,52 ****
CONFIGURE_ARGS+=--with-gcc="${CC}" --with-g++="${CXX}" --passive-mesa
USE_LDCONFIG= ${PREFIX}/lib/virtualbox
! CONFLICTS= bcc-[0-9]* virtualbox-ose-devel-[3,4]* virtualbox-ose-additions-[3,4]* virtualbox-ose-additions-devel-[3,4]*
VBOXUSER?= vboxusers
VBOXWSUSER?= vboxusers
--- 46,53 ----
CONFIGURE_ARGS+=--with-gcc="${CC}" --with-g++="${CXX}" --passive-mesa
USE_LDCONFIG= ${PREFIX}/lib/virtualbox
! CONFLICTS= bcc-[0-9]*
! CONFLICTS_INSTALL= virtualbox-ose-devel-[3,4]* virtualbox-ose-additions-[3,4]* virtualbox-ose-additions-devel-[3,4]*
VBOXUSER?= vboxusers
VBOXWSUSER?= vboxusers
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201104281245.p3SCjkxR069353>