[PC-BSD Commits] r17556 - pcbsd/current/build-files/metapkgsets/pcbsd

[svn at pcbsd.org]

Author: kris
Date: 2012-07-02 14:13:12 +0000 (Mon, 02 Jul 2012)
New Revision: 17556

Modified:
   pcbsd/current/build-files/metapkgsets/pcbsd/make.conf
Log:

Since the ports tree now has an unholy mixture of traditional options and
optionsNG stuff, enable both for now in our make.conf, until they get this
all sorted out. 



Modified: pcbsd/current/build-files/metapkgsets/pcbsd/make.conf
===================================================================
--- pcbsd/current/build-files/metapkgsets/pcbsd/make.conf	2012-07-02 14:02:33 UTC (rev 17555)
+++ pcbsd/current/build-files/metapkgsets/pcbsd/make.conf	2012-07-02 14:13:12 UTC (rev 17556)
@@ -17,9 +17,20 @@
 WITH_NEW_XORG=yes
 WITH_KMS=yes
 WITH_VDPAU=yes
+
+# Enable universal optionsng
+OPTIONS_SET=GPGSM KDE_PHONON MTP PRINTER_APPLET SCDAEMON SVRLOC PLASMA_PYTHON PLASMA_RUBE SWAT ACPI_PM NEW_XORG KMS VDPAU
+
+# Disable some universal optionng 
+OPTIONS_UNSET=JAVA NOUVEAU
+
 .if ${.CURDIR:M${PORTSDIR}/net/samba-libsmbclient} != ""
   WITH_ADS=yes
 .endif
+
+# OptionsNG
+samba36-libsmbclient_SET=ADS
+
 .if ${.CURDIR:M${PORTSDIR}/net/samba36} != ""
   WITH_LDAP=yes
   WITH_ADS=yes
@@ -29,38 +40,78 @@
   WITH_AIO_SUPPORT=yes
   WITH_EXP_MODULES=yes
 .endif
+
+# OptionsNG
+samba36_SET=LDAP ADS WINBIND ACL_SUPPORT PAM_SMBPASS AIO_SUPPORT EXP_MODULES
+
 .if ${.CURDIR:M${PORTSDIR}/sysutils/hal} != ""
   WITH_FIXED_MOUNTPOINTS=YES
 .endif
+
+# OptionsNG
+hal_SET=FIXED_MOUNTPOINTS
+
 .if ${.CURDIR:M${PORTSDIR}/www/w3m} != ""
   WITH_M17N=yes
 .endif
+
+# OptionsNG
+w3m_SET=M17N
+
 .if ${.CURDIR:M${PORTSDIR}/security/gpgme} != ""
   WITH_GPGSM=yes
 .endif
+
+# OptionsNG
+gpgme_SET=GPGSM
+
 .if ${.CURDIR:M${PORTSDIR}/editors/vim} != ""
   WITH_GTK2=yes
 .endif
+
+# OptionsNG
+vim_SET=GTK2
+
 .if ${.CURDIR:M${PORTSDIR}/print/hplip} != ""
   WITH_SNMP=yes
   WITH_SCAN=yes
   WITH_XSANE=yes
   WITH_FAX=yes
 .endif
+
+# OptionsNG
+hplip_SET=SNMP SCAN XSANE FAX
+
 .if ${.CURDIR:M${PORTSDIR}/x11-wm/icewm} != ""
   WITH_BEASTIE=yes
 .endif
+
+# OptionsNG
+icewm_SET=BEASTIE
+
 .if ${.CURDIR:M${PORTSDIR}/x11-fonts/webfonts} != ""
   WITH_MSWINDOWS_LICENSE=yes
 .endif
+
+# OptionsNG
+webfonts_SET=MSWINDOWS_LICENSE
+
 .if ${.CURDIR:M${PORTSDIR}/multimedia/mythtv} != ""
   WITH_BINDINGS=yes
   WITH_LIRC=yes
 .endif
+
+# OptionsNG
+mythtv_SET=BINDINGS LIRC
+
 .if ${.CURDIR:M${PORTSDIR}/multimedia/xbmc} != ""
   WITH_NONFREE=yes
   WITH_WEBSERVER=yes
 .endif
+
+# OptionsNG
+xbmc_SET=NONFREE WEBSERVER
+
 # Disable CCACHE for ports that dont like it
 .if ${.CURDIR:M${PORTSDIR}/sysutils/swapexd} != ""
   NO_CCACHE=yes
@@ -84,13 +135,24 @@
   WITH_NTFS3G=yes
   WITH_OPENBOX=yes
 .endif
+
+# OptionsNG
+volman_SET=NTFS3G OPENBOX
+
 .if ${.CURDIR:M${PORTSDIR}/x11/gnome2-lite} != ""
   WITH_XSCREENSAVER=yes
 .endif
+
+# OptionsNG
+gnome2_SET=XSCREENSAVER
+
 .if ${.CURDIR:M${PORTSDIR}/print/freetype2} != ""
   WITH_LCD_FILTERING=yes
 .endif
 
+# OptionsNG
+freetype2_SET=LCD_FILTERING
+
 # Dont use xfce4-notifyd
 xfce4_UNSET=NOTIFY