[PC-BSD Commits] r19611 - in pcbsd: branches/9.1/build-files/metapkgsets/pcbsd branches/9.1/build-files/ports-overlay/print branches/9.1/build-files/ports-overlay/print/cups-base branches/9.1/build-files/ports-overlay/print/cups-base/files current/build-files/conf current/build-files/ports-overlay/print current/build-files/ports-overlay/print/cups-base current/build-files/ports-overlay/print/cups-base/files

[svn at pcbsd.org]

Author: kris
Date: 2012-10-06 12:14:08 +0000 (Sat, 06 Oct 2012)
New Revision: 19611

Added:
   pcbsd/branches/9.1/build-files/ports-overlay/print/cups-base/
   pcbsd/branches/9.1/build-files/ports-overlay/print/cups-base/Makefile
   pcbsd/branches/9.1/build-files/ports-overlay/print/cups-base/distinfo
   pcbsd/branches/9.1/build-files/ports-overlay/print/cups-base/files/
   pcbsd/branches/9.1/build-files/ports-overlay/print/cups-base/files/cupsd.in
   pcbsd/branches/9.1/build-files/ports-overlay/print/cups-base/files/patch-Makefile
   pcbsd/branches/9.1/build-files/ports-overlay/print/cups-base/files/patch-conf-Makefile
   pcbsd/branches/9.1/build-files/ports-overlay/print/cups-base/files/patch-configure
   pcbsd/branches/9.1/build-files/ports-overlay/print/cups-base/files/patch-cups.pam
   pcbsd/branches/9.1/build-files/ports-overlay/print/cups-base/files/ulpt-cupsd.conf.in
   pcbsd/branches/9.1/build-files/ports-overlay/print/cups-base/files/ulpt-cupsd.sh.in
   pcbsd/branches/9.1/build-files/ports-overlay/print/cups-base/pkg-descr
   pcbsd/branches/9.1/build-files/ports-overlay/print/cups-base/pkg-descr.client
   pcbsd/branches/9.1/build-files/ports-overlay/print/cups-base/pkg-descr.image
   pcbsd/branches/9.1/build-files/ports-overlay/print/cups-base/pkg-message
   pcbsd/branches/9.1/build-files/ports-overlay/print/cups-base/pkg-plist
   pcbsd/branches/9.1/build-files/ports-overlay/print/cups-base/pkg-plist.client
   pcbsd/branches/9.1/build-files/ports-overlay/print/cups-base/pkg-plist.image
   pcbsd/current/build-files/ports-overlay/print/cups-base/
   pcbsd/current/build-files/ports-overlay/print/cups-base/Makefile
   pcbsd/current/build-files/ports-overlay/print/cups-base/distinfo
   pcbsd/current/build-files/ports-overlay/print/cups-base/files/
   pcbsd/current/build-files/ports-overlay/print/cups-base/files/cupsd.in
   pcbsd/current/build-files/ports-overlay/print/cups-base/files/patch-Makefile
   pcbsd/current/build-files/ports-overlay/print/cups-base/files/patch-conf-Makefile
   pcbsd/current/build-files/ports-overlay/print/cups-base/files/patch-configure
   pcbsd/current/build-files/ports-overlay/print/cups-base/files/patch-cups.pam
   pcbsd/current/build-files/ports-overlay/print/cups-base/files/ulpt-cupsd.conf.in
   pcbsd/current/build-files/ports-overlay/print/cups-base/files/ulpt-cupsd.sh.in
   pcbsd/current/build-files/ports-overlay/print/cups-base/pkg-descr
   pcbsd/current/build-files/ports-overlay/print/cups-base/pkg-descr.client
   pcbsd/current/build-files/ports-overlay/print/cups-base/pkg-descr.image
   pcbsd/current/build-files/ports-overlay/print/cups-base/pkg-message
   pcbsd/current/build-files/ports-overlay/print/cups-base/pkg-plist
   pcbsd/current/build-files/ports-overlay/print/cups-base/pkg-plist.client
   pcbsd/current/build-files/ports-overlay/print/cups-base/pkg-plist.image
Modified:
   pcbsd/branches/9.1/build-files/metapkgsets/pcbsd/make.conf
   pcbsd/current/build-files/conf/port-make.conf
Log:

Add fixed cups-base port, and correct make options for XPDF support

Fix options for nvidia ACPI_PM



Modified: pcbsd/branches/9.1/build-files/metapkgsets/pcbsd/make.conf
===================================================================
--- pcbsd/branches/9.1/build-files/metapkgsets/pcbsd/make.conf	2012-10-06 11:59:58 UTC (rev 19610)
+++ pcbsd/branches/9.1/build-files/metapkgsets/pcbsd/make.conf	2012-10-06 12:14:08 UTC (rev 19611)
@@ -8,13 +8,12 @@
 WITH_KMS=yes
 WITH_GPGSM=yes
 WITH_PRINTER_APPLET=yes
-WITH_ACPI_PM=yes
 WITH_PLASMA_PYTHON=yes
 WITH_PLASMA_RUBY=yes
 
 
 # Enable universal optionsng
-OPTIONS_SET=GPGSM KDE_PHONON MTP PRINTER_APPLET SCDAEMON SVRLOC PLASMA_PYTHON PLASMA_RUBY SWAT ACPI_PM NEW_XORG KMS VDPAU
+OPTIONS_SET=GPGSM KDE_PHONON MTP PRINTER_APPLET SCDAEMON SVRLOC PLASMA_PYTHON PLASMA_RUBY SWAT NEW_XORG KMS VDPAU
 
 # Disable some universal optionng 
 OPTIONS_UNSET=JAVA NOUVEAU
@@ -68,8 +67,8 @@
 gnome2_SET=XSCREENSAVER PAM KERBEROS
 
 # Cups options, using XPDF fixes issues with pdftops failing in some cases
-cups_UNSET=GHOSTSCRIPT
-cups_SET=XPDF
+cups-base_SET=XPDF
+cups-base_UNSET=GHOSTSCRIPT
 
 php5_SET=APACHE
 
@@ -81,3 +80,4 @@
   HTTP_PORT=8080
 .endif
 
+nvidia-driver_SET=ACPI_PM

Modified: pcbsd/current/build-files/conf/port-make.conf
===================================================================
--- pcbsd/current/build-files/conf/port-make.conf	2012-10-06 11:59:58 UTC (rev 19610)
+++ pcbsd/current/build-files/conf/port-make.conf	2012-10-06 12:14:08 UTC (rev 19611)
@@ -11,6 +11,7 @@
 WITH_ACPI_PM=yes
 WITH_PLASMA_PYTHON=yes
 WITH_PLASMA_RUBY=yes
+WITH_VDPAU=yes
 WITH_PKGNG=yes
 
 # Enable universal optionsng
@@ -68,8 +69,8 @@
 gnome2_SET=XSCREENSAVER PAM KERBEROS
 
 # Cups options, using XPDF fixes issues with pdftops failing in some cases
-cups_UNSET=GHOSTSCRIPT
-cups_SET=XPDF
+cups-base_SET=XPDF
+cups-base_UNSET=GHOSTSCRIPT
 
 php5_SET=APACHE
 
@@ -81,3 +82,4 @@
   HTTP_PORT=8080
 .endif
 
+nvidia-driver_SET=ACPI_PM