svn commit: r423381 - in head: . emulators emulators/virtualbox-ose emulators/virtualbox-ose-lite emulators/virtualbox-ose-nox11
Jung-uk Kim
jkim at FreeBSD.org
Wed Oct 5 19:55:25 UTC 2016
Author: jkim
Date: Wed Oct 5 19:55:24 2016
New Revision: 423381
URL: https://svnweb.freebsd.org/changeset/ports/423381
Log:
- Rename emulators/virtualbox-ose-lite to emulators/virtualbox-ose-nox11 and
assign its maintainership to vbox at . [1]
- Use OPTIONS_EXCLUDE to simplify its master port.
Approved by: alfred (maintainer) [1]
Added:
head/emulators/virtualbox-ose-nox11/
- copied from r423380, head/emulators/virtualbox-ose-lite/
Deleted:
head/emulators/virtualbox-ose-lite/
Modified:
head/MOVED
head/emulators/Makefile
head/emulators/virtualbox-ose-nox11/Makefile
head/emulators/virtualbox-ose/Makefile
Modified: head/MOVED
==============================================================================
--- head/MOVED Wed Oct 5 19:42:38 2016 (r423380)
+++ head/MOVED Wed Oct 5 19:55:24 2016 (r423381)
@@ -8671,3 +8671,4 @@ databases/postgresql91-pgtcl||2016-10-03
databases/postgresql91-server||2016-10-03|Has expired: End-of-life is near
databases/postgresql-pllua||2016-10-03|Has expired: Depends on expired PostgreSQL 9.1
multimedia/kvazaar-devel|multimedia/kvazaar|2016-10-05|Out of date: use multimedia/kvazaar for now
+emulators/virtualbox-ose-lite|emulators/virtualbox-ose-nox11|2016-10-05:Renamed
Modified: head/emulators/Makefile
==============================================================================
--- head/emulators/Makefile Wed Oct 5 19:42:38 2016 (r423380)
+++ head/emulators/Makefile Wed Oct 5 19:55:24 2016 (r423381)
@@ -153,7 +153,7 @@
SUBDIR += virtualbox-ose-additions
SUBDIR += virtualbox-ose-additions-nox11
SUBDIR += virtualbox-ose-kmod
- SUBDIR += virtualbox-ose-lite
+ SUBDIR += virtualbox-ose-nox11
SUBDIR += visualboyadvance-m
SUBDIR += vmips
SUBDIR += vmsbackup
Modified: head/emulators/virtualbox-ose-nox11/Makefile
==============================================================================
--- head/emulators/virtualbox-ose-lite/Makefile Wed Oct 5 19:42:38 2016 (r423380)
+++ head/emulators/virtualbox-ose-nox11/Makefile Wed Oct 5 19:55:24 2016 (r423381)
@@ -1,14 +1,10 @@
-# Created by: Alfred Perlstein <alfred at freebsd.org>
# $FreeBSD$
-PORTREVISION= 0
+PKGNAMESUFFIX= -nox11
-MAINTAINER= alfred at FreeBSD.org
-COMMENT= Small install of virtualbox without graphics
+OPTIONS_EXCLUDE= ALSA DBUS DEBUG GUESTADDITIONS MANUAL NLS PULSEAUDIO
+OPTIONS_EXCLUDE+= QT4 QT5 VPX X11
-LITE= yes
-
-MASTERDIR= ${.CURDIR}/../virtualbox-ose
+MASTERDIR= ${.CURDIR}/../virtualbox-ose
.include "${MASTERDIR}/Makefile"
-
Modified: head/emulators/virtualbox-ose/Makefile
==============================================================================
--- head/emulators/virtualbox-ose/Makefile Wed Oct 5 19:42:38 2016 (r423380)
+++ head/emulators/virtualbox-ose/Makefile Wed Oct 5 19:55:24 2016 (r423381)
@@ -9,7 +9,7 @@ MASTER_SITES= http://download.virtualbox
DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}
EXTRACT_ONLY= VirtualBox-${PORTVERSION}${EXTRACT_SUFX}
-MAINTAINER?= vbox at FreeBSD.org
+MAINTAINER= vbox at FreeBSD.org
COMMENT= General-purpose full virtualizer for x86 hardware
LICENSE= GPLv2
@@ -43,17 +43,6 @@ CONFLICTS_INSTALL= virtualbox-ose-additi
virtualbox-ose-devel-4* \
virtualbox-ose-legacy-4*
-.if defined(LITE)
-CONFIGURE_ARGS+= --build-headless --disable-alsa --disable-dbus \
- --disable-docs --disable-libvpx --disable-pulse
-CONFLICTS_INSTALL+= ${PORTNAME}-[4,5]*
-PKGNAMESUFFIX= -lite
-PLIST_SUB= GUESTADDITIONS="@comment " MANUAL="@comment " \
- NLS="@comment " QT="@comment " X11="@comment "
-.else
-CONFLICTS_INSTALL+= ${PORTNAME}-lite-[4,5]*
-.endif
-
VBOXUSER?= vboxusers
VBOXWSUSER?= vboxusers
VBOXGROUP?= vboxusers
@@ -67,15 +56,11 @@ VBOX_PROGS= VBoxAutostart VBoxBalloonCtr
VBOX_UTILS= VBoxExtPackHelperApp VBoxNetAdpCtl VBoxNetDHCP VBoxNetNAT \
VBoxSVC VBoxXPCOMIPCD
-OPTIONS_DEFINE= PYTHON R0LOGGING UDPTUNNEL VDE VNC WEBSERVICE
-OPTIONS_DEFAULT= UDPTUNNEL VNC
-.if !defined(LITE)
-OPTIONS_DEFINE+= ALSA DBUS DEBUG GUESTADDITIONS MANUAL NLS PULSEAUDIO
-OPTIONS_DEFINE+= VPX X11
-OPTIONS_DEFAULT+= DBUS PYTHON QT5 WEBSERVICE X11
+OPTIONS_DEFINE= ALSA DBUS DEBUG GUESTADDITIONS MANUAL NLS PULSEAUDIO \
+ PYTHON R0LOGGING UDPTUNNEL VDE VNC WEBSERVICE VPX X11
+OPTIONS_DEFAULT= DBUS QT5 UDPTUNNEL VNC WEBSERVICE X11
OPTIONS_RADIO= GUI
OPTIONS_RADIO_GUI= QT4 QT5
-.endif
OPTIONS_SUB= yes
DEBUG_DESC= Debug symbols, additional logs and assertions
@@ -90,27 +75,24 @@ VNC_DESC= Build with VNC support
VPX_DESC= Use vpx for video capturing
WEBSERVICE_DESC= Build Webservice
-MANUAL_BUILD_DEPENDS= ${LOCALBASE}/share/xml/docbook/4.4/docbookx.dtd:textproc/docbook-xml
-PYTHON_CONFIGURE_OFF= --disable-python
-UDPTUNNEL_CONFIGURE_OFF= --disable-udptunnel
-VDE_CONFIGURE_ON= --enable-vde
-VDE_RUN_DEPENDS= vde_switch:net/vde2
-VNC_CONFIGURE_ON= --enable-vnc
-VNC_LIB_DEPENDS= libvncserver.so:net/libvncserver
-
-.if !defined(LITE)
ALSA_CONFIGURE_OFF= --disable-alsa
ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
DBUS_CONFIGURE_OFF= --disable-dbus
DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus
DEBUG_CONFIGURE_ON= --build-debug
+MANUAL_BUILD_DEPENDS= ${LOCALBASE}/share/xml/docbook/4.4/docbookx.dtd:textproc/docbook-xml
MANUAL_CONFIGURE_OFF= --disable-docs
PULSEAUDIO_CONFIGURE_OFF= --disable-pulse
PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
+PYTHON_CONFIGURE_OFF= --disable-python
+UDPTUNNEL_CONFIGURE_OFF= --disable-udptunnel
+VDE_CONFIGURE_ON= --enable-vde
+VDE_RUN_DEPENDS= vde_switch:net/vde2
+VNC_CONFIGURE_ON= --enable-vnc
+VNC_LIB_DEPENDS= libvncserver.so:net/libvncserver
VPX_CONFIGURE_OFF= --disable-libvpx
VPX_LIB_DEPENDS= libvpx.so:multimedia/libvpx
X11_CONFIGURE_OFF= --build-headless
-.endif
# bmake doesn't know about unsetenv=true
.if defined(.PARSEDIR)
@@ -120,18 +102,25 @@ ENV=
.SHELL: path="/bin/sh" unsetenv=true
.endif
-PLIST_SUB+= GUEST_VER=${PORTVERSION} \
+PLIST_SUB= GUEST_VER=${PORTVERSION} \
PYTHON_VERU=${PYTHON_VER:S/./_/}${PYTHON_ABIVER} \
VBOXGROUP=${VBOXGROUP}
-SUB_LIST+= VBOXDIR=${VBOX_DIR} \
+SUB_LIST= VBOXDIR=${VBOX_DIR} \
VBOXGROUP=${VBOXGROUP} \
VBOXUSER=${VBOXUSER} \
VBOXWSUSER=${VBOXWSUSER}
-USE_RC_SUBR+= vboxheadless vboxwatchdog
+USE_RC_SUBR= vboxheadless vboxwatchdog
.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MNLS} && empty(PORT_OPTIONS:MQT[45]) && !defined(LITE)
+.if ${SLAVE_PORT} == no
+OPTIONS_DEFAULT+= PYTHON
+CONFLICTS_INSTALL+= ${PORTNAME}-lite-[4,5]*
+.else
+CONFLICTS_INSTALL+= ${PORTNAME}-[4,5]*
+.endif
+
+.if ${PORT_OPTIONS:MNLS} && empty(PORT_OPTIONS:MQT[45])
BROKEN= NLS support requires QT frontend. Run 'make config' again!
.endif
@@ -390,7 +379,7 @@ do-install:
${STAGEDIR}${DOCSDIR}
.endif
-.if ${PORT_OPTIONS:MNLS} && !defined(LITE)
+.if ${PORT_OPTIONS:MNLS}
cd ${KMK_BUILDDIR}/obj/VirtualBox/qtnls && \
${COPYTREE_SHARE} "*.qm" ${STAGEDIR}${DATADIR}/nls
.endif
More information about the svn-ports-head
mailing list