[PC-BSD Commits] r19713 - in pbi/modules/emulators: qemu virtualbox-ose wine wine64

[svn at pcbsd.org]

Author: kenmoore
Date: 2012-10-17 15:06:37 +0000 (Wed, 17 Oct 2012)
New Revision: 19713

Modified:
   pbi/modules/emulators/qemu/pbi.conf
   pbi/modules/emulators/virtualbox-ose/pbi.conf
   pbi/modules/emulators/wine/pbi.conf
   pbi/modules/emulators/wine64/pbi.conf
Log:
Convert the emulators/ modules to optionsNG



Modified: pbi/modules/emulators/qemu/pbi.conf
===================================================================
--- pbi/modules/emulators/qemu/pbi.conf	2012-10-17 15:00:45 UTC (rev 19712)
+++ pbi/modules/emulators/qemu/pbi.conf	2012-10-17 15:06:37 UTC (rev 19713)
@@ -22,7 +22,7 @@
 PBI_MAKEPORT="emulators/qemu"
  
 # Additional options for make.conf
-PBI_MAKEOPTS="WITH_KQEMU=Y"
+PBI_MAKEOPTS="qemu_SET= KQEMU"
  
 # Ports to build before / after
 PBI_MKPORTBEFORE=""
@@ -30,7 +30,7 @@
 
 PBI_REQUIRESROOT="YES"; export PBI_REQUIRESROOT
 
-PBI_BUILDKEY="04"; export PBI_BUILDKEY
+PBI_BUILDKEY="05"; export PBI_BUILDKEY
 
 # PBI_PROGREVISION="01"; export PBI_PROGREVISION
  

Modified: pbi/modules/emulators/virtualbox-ose/pbi.conf
===================================================================
--- pbi/modules/emulators/virtualbox-ose/pbi.conf	2012-10-17 15:00:45 UTC (rev 19712)
+++ pbi/modules/emulators/virtualbox-ose/pbi.conf	2012-10-17 15:06:37 UTC (rev 19713)
@@ -22,16 +22,14 @@
 PBI_MAKEPORT="emulators/virtualbox-ose"
  
 # Additional options for make.conf
-PBI_MAKEOPTS="WITH_GUESTADDITIONS=yes
-WITH_VNC=yes
-WITH_WEBSERVICE=yes"
+PBI_MAKEOPTS="virtualbox-ose_SET= GUESTADDITIONS VNC WEBSERVICE"
  
 # Ports to build before / after
 PBI_MKPORTBEFORE=""
 PBI_MKPORTAFTER="devel/qt4"
 
 # Set the build key
-PBI_BUILDKEY="25"
+PBI_BUILDKEY="26"
 PBI_PROGREVISION="01"; export PBI_PROGREVISION
 
 # This app needs to install as root

Modified: pbi/modules/emulators/wine/pbi.conf
===================================================================
--- pbi/modules/emulators/wine/pbi.conf	2012-10-17 15:00:45 UTC (rev 19712)
+++ pbi/modules/emulators/wine/pbi.conf	2012-10-17 15:06:37 UTC (rev 19713)
@@ -22,15 +22,13 @@
 PBI_MAKEPORT="emulators/wine/"
  
 # Additional options for make.conf
-PBI_MAKEOPTS="WITH_HAL=YES
-WITH_OPENAL=YES
-WITH_CUPS=YES"
+PBI_MAKEOPTS="wine_SET= HAL OPENAL CUPS"
 
 # Ports to build before / after
 PBI_MKPORTBEFORE=""
 PBI_MKPORTAFTER="emulators/wine-gecko"
 
-PBI_BUILDKEY="03"
+PBI_BUILDKEY="04"
 
 # Set the priority
 PBI_AB_PRIORITY="5"

Modified: pbi/modules/emulators/wine64/pbi.conf
===================================================================
--- pbi/modules/emulators/wine64/pbi.conf	2012-10-17 15:00:45 UTC (rev 19712)
+++ pbi/modules/emulators/wine64/pbi.conf	2012-10-17 15:06:37 UTC (rev 19713)
@@ -22,16 +22,14 @@
 PBI_MAKEPORT="emulators/wine/"
  
 # Additional options for make.conf
-PBI_MAKEOPTS="WITH_HAL=YES
-WITH_OPENAL=YES
-WITH_CUPS=YES"
+PBI_MAKEOPTS="wine_SET= HAL OPENAL CUPS"
 
 # Ports to build before / after
 PBI_MKPORTBEFORE=""
 PBI_MKPORTAFTER="emulators/wine-gecko"
 
 # Set the build key
-PBI_BUILDKEY="05"
+PBI_BUILDKEY="06"
 
 # Set the priority
 PBI_AB_PRIORITY="5"