ports/143361: [patch] virtualbox-ose*: patches to make the three ports coexist peacefully

[Martin Birgmeier]

>Number:         143361
>Category:       ports
>Synopsis:       [patch] virtualbox-ose*: patches to make the three ports coexist peacefully
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 30 08:50:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Martin Birgmeier
>Release:        7.2, 8.0
>Organization:
MBi at home
>Environment:
FreeBSD atpcdvvc.xyzzy 7.2-RELEASE FreeBSD 7.2-RELEASE #0: Sun May  3 14:36:22 CEST 2009     root at atpcdvvc.xyzzy:/usr/VOL/OBJ/FreeBSD/RELENG_7_2_0_RELEASE/src/sys/XYZZY_SMP_NA  i386
>Description:
Recently, the following ports have been marked mutually exclusive:
- virtualbox-ose
- virtualbox-ose-additions

However, this is unnecessary, and only the /var/db/ports/*/options file clashes for them (these two, together with virtualbox-ose-kmod, save their options to /var/db/ports/virtualbox-ose/options).

Attached are patches which make all three ports installable at the same time, which is interesting if you use an installation both as a guest and a host.
>How-To-Repeat:

>Fix:
See the attached patches.

Patch attached with submission follows:

--- ./emulators/virtualbox-ose-additions/Makefile.ORIG	2010-01-25 20:37:07.000000000 +0100
+++ ./emulators/virtualbox-ose-additions/Makefile	2010-01-25 21:29:24.000000000 +0100
@@ -15,6 +15,7 @@
 		http://mirror.4bit.ws/
 PKGNAMESUFFIX=	-additions
 DISTNAME=	VirtualBox-${DISTVERSION}-OSE
+UNIQUENAME=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 
 MAINTAINER=	vbox at FreeBSD.org
 COMMENT=	VirtualBox additions for FreeBSD guests
@@ -34,7 +35,7 @@
 		--disable-alsa --disable-dbus --disable-python \
 		--build-headless
 
-CONFLICTS=	bcc-[0-9]* virtualbox-ose-3.*
+CONFLICTS=	bcc-[0-9]*
 
 OPTIONS=	DEBUG "Build with debugging symbols" off \
 		X11 "Build with X11 support" on \
--- ./emulators/virtualbox-ose-kmod/Makefile.ORIG	2010-01-25 20:37:07.000000000 +0100
+++ ./emulators/virtualbox-ose-kmod/Makefile	2010-01-25 21:30:03.000000000 +0100
@@ -15,6 +15,7 @@
 		http://mirror.4bit.ws/
 PKGNAMESUFFIX=	-kmod
 DISTNAME=	VirtualBox-${DISTVERSION}-OSE
+UNIQUENAME=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 
 MAINTAINER=	vbox at FreeBSD.org
 COMMENT=	VirtualBox kernel module for FreeBSD
--- ./emulators/virtualbox-ose/Makefile.ORIG	2010-01-25 20:37:07.000000000 +0100
+++ ./emulators/virtualbox-ose/Makefile	2010-01-25 21:30:23.000000000 +0100
@@ -44,7 +44,7 @@
 CONFIGURE_ARGS+=--with-gcc="${CC}" --with-g++="${CXX}"
 USE_LDCONFIG=	${PREFIX}/lib/virtualbox
 
-CONFLICTS=	bcc-[0-9]* virtualbox-ose-additions-3*
+CONFLICTS=	bcc-[0-9]*
 
 VBOXGROUP?=	vboxusers
 VBOXGID?=	920


>Release-Note:
>Audit-Trail:
>Unformatted: