[PC-BSD Commits] r19588 - pcbsd/branches/9.1/build-files/metapkgsets/pcbsd

[svn at pcbsd.org]

Author: kris
Date: 2012-10-03 14:07:45 +0000 (Wed, 03 Oct 2012)
New Revision: 19588

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

MFC the updated optionsNG make.conf



Modified: pcbsd/branches/9.1/build-files/metapkgsets/pcbsd/make.conf
===================================================================
--- pcbsd/branches/9.1/build-files/metapkgsets/pcbsd/make.conf	2012-10-03 12:49:16 UTC (rev 19587)
+++ pcbsd/branches/9.1/build-files/metapkgsets/pcbsd/make.conf	2012-10-03 14:07:45 UTC (rev 19588)
@@ -2,142 +2,50 @@
 KDE4_PREFIX=/usr/local
 SAMBA_PORT=samba36
 USE_QT=yes
-WITH_GPGSM=YES
-WITH_MTP=yes
-WITH_PRINTER_APPLET=Y
-WITH_SCDAEMON=YES
-WITH_SRVLOC=yes
-WITH_PLASMA_PYTHON=yes
-WITH_PLASMA_RUBY=yes
-WITHOUT_JAVA=yes
-WITHOUT_NOUVEAU=yes
-WITH_SWAT=yes
-WITH_ACPI_PM=yes
-WITH_NEW_XORG=yes
-WITH_KMS=yes
-WITH_VDPAU=yes
+WITH_DVD_DEVICE=/dev/cd0
+WITH_CDROM_DEVICE=/dev/cd0
+WITH_PKGNG=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
+OPTIONS_SET=GPGSM KDE_PHONON MTP PRINTER_APPLET SCDAEMON SVRLOC PLASMA_PYTHON PLASMA_RUBE SWAT ACPI_PM NEW_XORG KMS VDPAU PKGNG
 
 # 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
-  WITH_WINBIND=yes
-  WITH_ACL_SUPPORT=yes
-  WITH_PAM_SMBPASS=yes
-  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
 
 # OptionsNG
 xbmc_SET=NONFREE WEBSERVER VDPAU LIBBLURAY OSS MLIRC
 
-# Disable CCACHE for ports that dont like it
-.if ${.CURDIR:M${PORTSDIR}/sysutils/swapexd} != ""
-  NO_CCACHE=yes
-.endif
-.if ${.CURDIR:M${PORTSDIR}/audio/festival} != ""
-  NO_CCACHE=yes
-.endif
-.if ${.CURDIR:M${PORTSDIR}/audio/festvox-don} != ""
-  NO_CCACHE=yes
-.endif
-.if ${.CURDIR:M${PORTSDIR}/audio/festvox-el11} != ""
-  NO_CCACHE=yes
-.endif
-.if ${.CURDIR:M${PORTSDIR}/audio/kdeartwork4} != ""
-  NO_CCACHE=yes
-.endif
-.if ${.CURDIR:M${PORTSDIR}/emulators/open-vm-tools} != ""
-  NO_CCACHE=yes
-.endif
-.if ${.CURDIR:M${PORTSDIR}/sysutils/volman} != ""
-  WITH_NTFS3G=yes
-  WITH_OPENBOX=yes
-.endif
-
 # OptionsNG
-volman_SET=NTFS3G OPENBOX
-
-.if ${.CURDIR:M${PORTSDIR}/print/freetype2} != ""
-  WITH_LCD_FILTERING=yes
-.endif
-
-# OptionsNG
 freetype2_SET=LCD_FILTERING
 
 # Dont use xfce4-notifyd
@@ -146,25 +54,23 @@
 # Enable sudo LDAP
 sudo_SET=LDAP
 
-# Use regular xscreensaver port
-.if ${.CURDIR:M${PORTSDIR}/x11/gnome2-lite} != "" 
-  WITH_XSCREENSAVER=yes 
-  WITH_PAM=yes 
-  WITH_KERBEROS=yes 
-.endif 
+# OptionsNG
+mplayer_SET=LIBCDIO SMB BLURAY VDPAU
 
-.if ${.CURDIR:M${PORTSDIR}/multimedia/mplayer} != "" 
-  WITH_DVD_DEVICE=/dev/cd0
-  WITH_CDROM_DEVICE=/dev/cd0
-  WITH_LIBCDIO=yes
-  WITH_SMB=yes
-  WITH_BLURAY=yes
-  WITH_VDPAU=yes
-.endif 
-
 # OptionsNG 
 gnome2_SET=XSCREENSAVER PAM KERBEROS
 
 # Cups options, using XPDF fixes issues with pdftops failing in some cases
 cups_UNSET=GHOSTSCRIPT
 cups_SET=XPDF
+
+php5_SET=APACHE
+
+virtualbox_SET=VNC WEBSERVICE
+nginx_SET=HTTP_FLV
+
+# Configuration for www/bigbluebutton
+.if ${.CURDIR:M${PORTSDIR}/www/tomcat6} != ""
+  HTTP_PORT=8080
+.endif
+