Update cups to 2.0.1 to handle most vuln warnings.

10 files changed, 107 insertions, 663 deletions

diff --git a/print/cups/Makefile b/print/cups/Makefile
index 067c9ad94ea..1100f9611f9 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.214 2014/10/09 14:06:51 wiz Exp $
+# $NetBSD: Makefile,v 1.215 2015/01/02 02:03:42 christos Exp $
 #
 # The CUPS author is very good about taking back changes into the main
 # CUPS distribution.  The correct place to send patches or bug-fixes is:
@@ -6,7 +6,7 @@
 
 DISTNAME=	cups-${DIST_VERS}-source
 PKGNAME=	cups-${DIST_VERS:S/-/./g}
-BASE_VERS=	1.7.5
+BASE_VERS=	2.0.1
 DIST_VERS=	${BASE_VERS}
 CATEGORIES=	print
 MASTER_SITES=	http://www.cups.org/software/${BASE_VERS}/
diff --git a/print/cups/PLIST b/print/cups/PLIST
index 409b236b04e..a93f93f7b22 100644
--- a/print/cups/PLIST
+++ b/print/cups/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.44 2014/08/23 20:02:11 schnoebe Exp $
+@comment $NetBSD: PLIST,v 1.45 2015/01/02 02:03:42 christos Exp $
 bin/cancel
 bin/cups-config
 bin/cupstestdsc
@@ -6,7 +6,6 @@ bin/cupstestppd
 bin/ipptool
 bin/lp
 bin/lpoptions
-bin/lppasswd
 bin/lpq
 bin/lpr
 bin/lprm
@@ -40,13 +39,11 @@ lib/libcupscgi.la
 lib/libcupsimage.la
 lib/libcupsmime.la
 lib/libcupsppdc.la
-${PLIST.dnssd}libexec/cups/backend/dnssd
+libexec/cups/backend/dnssd
 libexec/cups/backend/http
-libexec/cups/backend/https
 libexec/cups/backend/ipp
-libexec/cups/backend/ipps
 libexec/cups/backend/lpd
-${PLIST.dnssd}libexec/cups/backend/mdns
+libexec/cups/backend/mdns
 libexec/cups/backend/snmp
 libexec/cups/backend/socket
 libexec/cups/backend/usb
@@ -69,17 +66,17 @@ libexec/cups/filter/rastertolabel
 libexec/cups/filter/rastertopwg
 libexec/cups/monitor/bcp
 libexec/cups/monitor/tbcp
-${PLIST.dbus}libexec/cups/notifier/dbus
+libexec/cups/notifier/dbus
 libexec/cups/notifier/mailto
 libexec/cups/notifier/rss
 man/man1/cancel.1
 man/man1/cups-config.1
+man/man1/cups.1
 man/man1/cupstestdsc.1
 man/man1/cupstestppd.1
 man/man1/ipptool.1
 man/man1/lp.1
 man/man1/lpoptions.1
-man/man1/lppasswd.1
 man/man1/lpq.1
 man/man1/lpr.1
 man/man1/lprm.1
@@ -107,11 +104,14 @@ man/man7/notifier.7
 man/man8/accept.8
 man/man8/cups-deviced.8
 man/man8/cups-driverd.8
+man/man8/cups-exec.8
 man/man8/cups-lpd.8
 man/man8/cups-snmp.8
 man/man8/cupsaccept.8
 man/man8/cupsaddsmb.8
 man/man8/cupsctl.8
+man/man8/cupsd-helper.8
+man/man8/cupsd-logs.8
 man/man8/cupsd.8
 man/man8/cupsdisable.8
 man/man8/cupsenable.8
@@ -190,76 +190,6 @@ share/cups/templates/add-class.tmpl
 share/cups/templates/add-printer.tmpl
 share/cups/templates/add-rss-subscription.tmpl
 share/cups/templates/admin.tmpl
-share/cups/templates/ca/add-class.tmpl
-share/cups/templates/ca/add-printer.tmpl
-share/cups/templates/ca/add-rss-subscription.tmpl
-share/cups/templates/ca/admin.tmpl
-share/cups/templates/ca/choose-device.tmpl
-share/cups/templates/ca/choose-make.tmpl
-share/cups/templates/ca/choose-model.tmpl
-share/cups/templates/ca/choose-serial.tmpl
-share/cups/templates/ca/choose-uri.tmpl
-share/cups/templates/ca/class-added.tmpl
-share/cups/templates/ca/class-confirm.tmpl
-share/cups/templates/ca/class-deleted.tmpl
-share/cups/templates/ca/class-jobs-header.tmpl
-share/cups/templates/ca/class-modified.tmpl
-share/cups/templates/ca/class.tmpl
-share/cups/templates/ca/classes-header.tmpl
-share/cups/templates/ca/classes.tmpl
-share/cups/templates/ca/command.tmpl
-share/cups/templates/ca/edit-config.tmpl
-share/cups/templates/ca/error-op.tmpl
-share/cups/templates/ca/error.tmpl
-share/cups/templates/ca/header.tmpl
-share/cups/templates/ca/help-header.tmpl
-share/cups/templates/ca/help-printable.tmpl
-share/cups/templates/ca/help-trailer.tmpl
-share/cups/templates/ca/job-cancel.tmpl
-share/cups/templates/ca/job-hold.tmpl
-share/cups/templates/ca/job-move.tmpl
-share/cups/templates/ca/job-moved.tmpl
-share/cups/templates/ca/job-release.tmpl
-share/cups/templates/ca/job-restart.tmpl
-share/cups/templates/ca/jobs-header.tmpl
-share/cups/templates/ca/jobs.tmpl
-share/cups/templates/ca/list-available-printers.tmpl
-share/cups/templates/ca/modify-class.tmpl
-share/cups/templates/ca/modify-printer.tmpl
-share/cups/templates/ca/norestart.tmpl
-share/cups/templates/ca/option-boolean.tmpl
-share/cups/templates/ca/option-conflict.tmpl
-share/cups/templates/ca/option-header.tmpl
-share/cups/templates/ca/option-pickmany.tmpl
-share/cups/templates/ca/option-pickone.tmpl
-share/cups/templates/ca/option-trailer.tmpl
-share/cups/templates/ca/pager.tmpl
-share/cups/templates/ca/printer-accept.tmpl
-share/cups/templates/ca/printer-added.tmpl
-share/cups/templates/ca/printer-configured.tmpl
-share/cups/templates/ca/printer-confirm.tmpl
-share/cups/templates/ca/printer-default.tmpl
-share/cups/templates/ca/printer-deleted.tmpl
-share/cups/templates/ca/printer-jobs-header.tmpl
-share/cups/templates/ca/printer-modified.tmpl
-share/cups/templates/ca/printer-purge.tmpl
-share/cups/templates/ca/printer-reject.tmpl
-share/cups/templates/ca/printer-start.tmpl
-share/cups/templates/ca/printer-stop.tmpl
-share/cups/templates/ca/printer.tmpl
-share/cups/templates/ca/printers-header.tmpl
-share/cups/templates/ca/printers.tmpl
-share/cups/templates/ca/restart.tmpl
-share/cups/templates/ca/samba-export.tmpl
-share/cups/templates/ca/samba-exported.tmpl
-share/cups/templates/ca/search.tmpl
-share/cups/templates/ca/set-printer-options-header.tmpl
-share/cups/templates/ca/set-printer-options-trailer.tmpl
-share/cups/templates/ca/subscription-added.tmpl
-share/cups/templates/ca/subscription-canceled.tmpl
-share/cups/templates/ca/test-page.tmpl
-share/cups/templates/ca/trailer.tmpl
-share/cups/templates/ca/users.tmpl
 share/cups/templates/choose-device.tmpl
 share/cups/templates/choose-make.tmpl
 share/cups/templates/choose-model.tmpl
@@ -274,146 +204,6 @@ share/cups/templates/class.tmpl
 share/cups/templates/classes-header.tmpl
 share/cups/templates/classes.tmpl
 share/cups/templates/command.tmpl
-share/cups/templates/cs/add-class.tmpl
-share/cups/templates/cs/add-printer.tmpl
-share/cups/templates/cs/add-rss-subscription.tmpl
-share/cups/templates/cs/admin.tmpl
-share/cups/templates/cs/choose-device.tmpl
-share/cups/templates/cs/choose-make.tmpl
-share/cups/templates/cs/choose-model.tmpl
-share/cups/templates/cs/choose-serial.tmpl
-share/cups/templates/cs/choose-uri.tmpl
-share/cups/templates/cs/class-added.tmpl
-share/cups/templates/cs/class-confirm.tmpl
-share/cups/templates/cs/class-deleted.tmpl
-share/cups/templates/cs/class-jobs-header.tmpl
-share/cups/templates/cs/class-modified.tmpl
-share/cups/templates/cs/class.tmpl
-share/cups/templates/cs/classes-header.tmpl
-share/cups/templates/cs/classes.tmpl
-share/cups/templates/cs/command.tmpl
-share/cups/templates/cs/edit-config.tmpl
-share/cups/templates/cs/error-op.tmpl
-share/cups/templates/cs/error.tmpl
-share/cups/templates/cs/header.tmpl
-share/cups/templates/cs/help-header.tmpl
-share/cups/templates/cs/help-printable.tmpl
-share/cups/templates/cs/help-trailer.tmpl
-share/cups/templates/cs/job-cancel.tmpl
-share/cups/templates/cs/job-hold.tmpl
-share/cups/templates/cs/job-move.tmpl
-share/cups/templates/cs/job-moved.tmpl
-share/cups/templates/cs/job-release.tmpl
-share/cups/templates/cs/job-restart.tmpl
-share/cups/templates/cs/jobs-header.tmpl
-share/cups/templates/cs/jobs.tmpl
-share/cups/templates/cs/list-available-printers.tmpl
-share/cups/templates/cs/modify-class.tmpl
-share/cups/templates/cs/modify-printer.tmpl
-share/cups/templates/cs/norestart.tmpl
-share/cups/templates/cs/option-boolean.tmpl
-share/cups/templates/cs/option-conflict.tmpl
-share/cups/templates/cs/option-header.tmpl
-share/cups/templates/cs/option-pickmany.tmpl
-share/cups/templates/cs/option-pickone.tmpl
-share/cups/templates/cs/option-trailer.tmpl
-share/cups/templates/cs/pager.tmpl
-share/cups/templates/cs/printer-accept.tmpl
-share/cups/templates/cs/printer-added.tmpl
-share/cups/templates/cs/printer-configured.tmpl
-share/cups/templates/cs/printer-confirm.tmpl
-share/cups/templates/cs/printer-default.tmpl
-share/cups/templates/cs/printer-deleted.tmpl
-share/cups/templates/cs/printer-jobs-header.tmpl
-share/cups/templates/cs/printer-modified.tmpl
-share/cups/templates/cs/printer-purge.tmpl
-share/cups/templates/cs/printer-reject.tmpl
-share/cups/templates/cs/printer-start.tmpl
-share/cups/templates/cs/printer-stop.tmpl
-share/cups/templates/cs/printer.tmpl
-share/cups/templates/cs/printers-header.tmpl
-share/cups/templates/cs/printers.tmpl
-share/cups/templates/cs/restart.tmpl
-share/cups/templates/cs/samba-export.tmpl
-share/cups/templates/cs/samba-exported.tmpl
-share/cups/templates/cs/search.tmpl
-share/cups/templates/cs/set-printer-options-header.tmpl
-share/cups/templates/cs/set-printer-options-trailer.tmpl
-share/cups/templates/cs/subscription-added.tmpl
-share/cups/templates/cs/subscription-canceled.tmpl
-share/cups/templates/cs/test-page.tmpl
-share/cups/templates/cs/trailer.tmpl
-share/cups/templates/cs/users.tmpl
-share/cups/templates/de/add-class.tmpl
-share/cups/templates/de/add-printer.tmpl
-share/cups/templates/de/add-rss-subscription.tmpl
-share/cups/templates/de/admin.tmpl
-share/cups/templates/de/choose-device.tmpl
-share/cups/templates/de/choose-make.tmpl
-share/cups/templates/de/choose-model.tmpl
-share/cups/templates/de/choose-serial.tmpl
-share/cups/templates/de/choose-uri.tmpl
-share/cups/templates/de/class-added.tmpl
-share/cups/templates/de/class-confirm.tmpl
-share/cups/templates/de/class-deleted.tmpl
-share/cups/templates/de/class-jobs-header.tmpl
-share/cups/templates/de/class-modified.tmpl
-share/cups/templates/de/class.tmpl
-share/cups/templates/de/classes-header.tmpl
-share/cups/templates/de/classes.tmpl
-share/cups/templates/de/command.tmpl
-share/cups/templates/de/edit-config.tmpl
-share/cups/templates/de/error-op.tmpl
-share/cups/templates/de/error.tmpl
-share/cups/templates/de/header.tmpl
-share/cups/templates/de/help-header.tmpl
-share/cups/templates/de/help-printable.tmpl
-share/cups/templates/de/help-trailer.tmpl
-share/cups/templates/de/job-cancel.tmpl
-share/cups/templates/de/job-hold.tmpl
-share/cups/templates/de/job-move.tmpl
-share/cups/templates/de/job-moved.tmpl
-share/cups/templates/de/job-release.tmpl
-share/cups/templates/de/job-restart.tmpl
-share/cups/templates/de/jobs-header.tmpl
-share/cups/templates/de/jobs.tmpl
-share/cups/templates/de/list-available-printers.tmpl
-share/cups/templates/de/modify-class.tmpl
-share/cups/templates/de/modify-printer.tmpl
-share/cups/templates/de/norestart.tmpl
-share/cups/templates/de/option-boolean.tmpl
-share/cups/templates/de/option-conflict.tmpl
-share/cups/templates/de/option-header.tmpl
-share/cups/templates/de/option-pickmany.tmpl
-share/cups/templates/de/option-pickone.tmpl
-share/cups/templates/de/option-trailer.tmpl
-share/cups/templates/de/pager.tmpl
-share/cups/templates/de/printer-accept.tmpl
-share/cups/templates/de/printer-added.tmpl
-share/cups/templates/de/printer-configured.tmpl
-share/cups/templates/de/printer-confirm.tmpl
-share/cups/templates/de/printer-default.tmpl
-share/cups/templates/de/printer-deleted.tmpl
-share/cups/templates/de/printer-jobs-header.tmpl
-share/cups/templates/de/printer-modified.tmpl
-share/cups/templates/de/printer-purge.tmpl
-share/cups/templates/de/printer-reject.tmpl
-share/cups/templates/de/printer-start.tmpl
-share/cups/templates/de/printer-stop.tmpl
-share/cups/templates/de/printer.tmpl
-share/cups/templates/de/printers-header.tmpl
-share/cups/templates/de/printers.tmpl
-share/cups/templates/de/restart.tmpl
-share/cups/templates/de/samba-export.tmpl
-share/cups/templates/de/samba-exported.tmpl
-share/cups/templates/de/search.tmpl
-share/cups/templates/de/set-printer-options-header.tmpl
-share/cups/templates/de/set-printer-options-trailer.tmpl
-share/cups/templates/de/subscription-added.tmpl
-share/cups/templates/de/subscription-canceled.tmpl
-share/cups/templates/de/test-page.tmpl
-share/cups/templates/de/trailer.tmpl
-share/cups/templates/de/users.tmpl
 share/cups/templates/edit-config.tmpl
 share/cups/templates/error-op.tmpl
 share/cups/templates/error.tmpl
@@ -463,13 +253,13 @@ share/cups/templates/es/option-trailer.tmpl
 share/cups/templates/es/pager.tmpl
 share/cups/templates/es/printer-accept.tmpl
 share/cups/templates/es/printer-added.tmpl
+share/cups/templates/es/printer-cancel-jobs.tmpl
 share/cups/templates/es/printer-configured.tmpl
 share/cups/templates/es/printer-confirm.tmpl
 share/cups/templates/es/printer-default.tmpl
 share/cups/templates/es/printer-deleted.tmpl
 share/cups/templates/es/printer-jobs-header.tmpl
 share/cups/templates/es/printer-modified.tmpl
-share/cups/templates/es/printer-purge.tmpl
 share/cups/templates/es/printer-reject.tmpl
 share/cups/templates/es/printer-start.tmpl
 share/cups/templates/es/printer-stop.tmpl
@@ -487,220 +277,10 @@ share/cups/templates/es/subscription-canceled.tmpl
 share/cups/templates/es/test-page.tmpl
 share/cups/templates/es/trailer.tmpl
 share/cups/templates/es/users.tmpl
-share/cups/templates/fr/add-class.tmpl
-share/cups/templates/fr/add-printer.tmpl
-share/cups/templates/fr/add-rss-subscription.tmpl
-share/cups/templates/fr/admin.tmpl
-share/cups/templates/fr/choose-device.tmpl
-share/cups/templates/fr/choose-make.tmpl
-share/cups/templates/fr/choose-model.tmpl
-share/cups/templates/fr/choose-serial.tmpl
-share/cups/templates/fr/choose-uri.tmpl
-share/cups/templates/fr/class-added.tmpl
-share/cups/templates/fr/class-confirm.tmpl
-share/cups/templates/fr/class-deleted.tmpl
-share/cups/templates/fr/class-jobs-header.tmpl
-share/cups/templates/fr/class-modified.tmpl
-share/cups/templates/fr/class.tmpl
-share/cups/templates/fr/classes-header.tmpl
-share/cups/templates/fr/classes.tmpl
-share/cups/templates/fr/command.tmpl
-share/cups/templates/fr/edit-config.tmpl
-share/cups/templates/fr/error-op.tmpl
-share/cups/templates/fr/error.tmpl
-share/cups/templates/fr/header.tmpl
-share/cups/templates/fr/help-header.tmpl
-share/cups/templates/fr/help-printable.tmpl
-share/cups/templates/fr/help-trailer.tmpl
-share/cups/templates/fr/job-cancel.tmpl
-share/cups/templates/fr/job-hold.tmpl
-share/cups/templates/fr/job-move.tmpl
-share/cups/templates/fr/job-moved.tmpl
-share/cups/templates/fr/job-release.tmpl
-share/cups/templates/fr/job-restart.tmpl
-share/cups/templates/fr/jobs-header.tmpl
-share/cups/templates/fr/jobs.tmpl
-share/cups/templates/fr/list-available-printers.tmpl
-share/cups/templates/fr/modify-class.tmpl
-share/cups/templates/fr/modify-printer.tmpl
-share/cups/templates/fr/norestart.tmpl
-share/cups/templates/fr/option-boolean.tmpl
-share/cups/templates/fr/option-conflict.tmpl
-share/cups/templates/fr/option-header.tmpl
-share/cups/templates/fr/option-pickmany.tmpl
-share/cups/templates/fr/option-pickone.tmpl
-share/cups/templates/fr/option-trailer.tmpl
-share/cups/templates/fr/pager.tmpl
-share/cups/templates/fr/printer-accept.tmpl
-share/cups/templates/fr/printer-added.tmpl
-share/cups/templates/fr/printer-configured.tmpl
-share/cups/templates/fr/printer-confirm.tmpl
-share/cups/templates/fr/printer-default.tmpl
-share/cups/templates/fr/printer-deleted.tmpl
-share/cups/templates/fr/printer-jobs-header.tmpl
-share/cups/templates/fr/printer-modified.tmpl
-share/cups/templates/fr/printer-purge.tmpl
-share/cups/templates/fr/printer-reject.tmpl
-share/cups/templates/fr/printer-start.tmpl
-share/cups/templates/fr/printer-stop.tmpl
-share/cups/templates/fr/printer.tmpl
-share/cups/templates/fr/printers-header.tmpl
-share/cups/templates/fr/printers.tmpl
-share/cups/templates/fr/restart.tmpl
-share/cups/templates/fr/samba-export.tmpl
-share/cups/templates/fr/samba-exported.tmpl
-share/cups/templates/fr/search.tmpl
-share/cups/templates/fr/set-printer-options-header.tmpl
-share/cups/templates/fr/set-printer-options-trailer.tmpl
-share/cups/templates/fr/subscription-added.tmpl
-share/cups/templates/fr/subscription-canceled.tmpl
-share/cups/templates/fr/test-page.tmpl
-share/cups/templates/fr/trailer.tmpl
-share/cups/templates/fr/users.tmpl
 share/cups/templates/header.tmpl
 share/cups/templates/help-header.tmpl
 share/cups/templates/help-printable.tmpl
 share/cups/templates/help-trailer.tmpl
-share/cups/templates/it/add-class.tmpl
-share/cups/templates/it/add-printer.tmpl
-share/cups/templates/it/add-rss-subscription.tmpl
-share/cups/templates/it/admin.tmpl
-share/cups/templates/it/choose-device.tmpl
-share/cups/templates/it/choose-make.tmpl
-share/cups/templates/it/choose-model.tmpl
-share/cups/templates/it/choose-serial.tmpl
-share/cups/templates/it/choose-uri.tmpl
-share/cups/templates/it/class-added.tmpl
-share/cups/templates/it/class-confirm.tmpl
-share/cups/templates/it/class-deleted.tmpl
-share/cups/templates/it/class-jobs-header.tmpl
-share/cups/templates/it/class-modified.tmpl
-share/cups/templates/it/class.tmpl
-share/cups/templates/it/classes-header.tmpl
-share/cups/templates/it/classes.tmpl
-share/cups/templates/it/command.tmpl
-share/cups/templates/it/edit-config.tmpl
-share/cups/templates/it/error-op.tmpl
-share/cups/templates/it/error.tmpl
-share/cups/templates/it/header.tmpl
-share/cups/templates/it/help-header.tmpl
-share/cups/templates/it/help-printable.tmpl
-share/cups/templates/it/help-trailer.tmpl
-share/cups/templates/it/job-cancel.tmpl
-share/cups/templates/it/job-hold.tmpl
-share/cups/templates/it/job-move.tmpl
-share/cups/templates/it/job-moved.tmpl
-share/cups/templates/it/job-release.tmpl
-share/cups/templates/it/job-restart.tmpl
-share/cups/templates/it/jobs-header.tmpl
-share/cups/templates/it/jobs.tmpl
-share/cups/templates/it/list-available-printers.tmpl
-share/cups/templates/it/modify-class.tmpl
-share/cups/templates/it/modify-printer.tmpl
-share/cups/templates/it/norestart.tmpl
-share/cups/templates/it/option-boolean.tmpl
-share/cups/templates/it/option-conflict.tmpl
-share/cups/templates/it/option-header.tmpl
-share/cups/templates/it/option-pickmany.tmpl
-share/cups/templates/it/option-pickone.tmpl
-share/cups/templates/it/option-trailer.tmpl
-share/cups/templates/it/pager.tmpl
-share/cups/templates/it/printer-accept.tmpl
-share/cups/templates/it/printer-added.tmpl
-share/cups/templates/it/printer-configured.tmpl
-share/cups/templates/it/printer-confirm.tmpl
-share/cups/templates/it/printer-default.tmpl
-share/cups/templates/it/printer-deleted.tmpl
-share/cups/templates/it/printer-jobs-header.tmpl
-share/cups/templates/it/printer-modified.tmpl
-share/cups/templates/it/printer-purge.tmpl
-share/cups/templates/it/printer-reject.tmpl
-share/cups/templates/it/printer-start.tmpl
-share/cups/templates/it/printer-stop.tmpl
-share/cups/templates/it/printer.tmpl
-share/cups/templates/it/printers-header.tmpl
-share/cups/templates/it/printers.tmpl
-share/cups/templates/it/restart.tmpl
-share/cups/templates/it/samba-export.tmpl
-share/cups/templates/it/samba-exported.tmpl
-share/cups/templates/it/search.tmpl
-share/cups/templates/it/set-printer-options-header.tmpl
-share/cups/templates/it/set-printer-options-trailer.tmpl
-share/cups/templates/it/subscription-added.tmpl
-share/cups/templates/it/subscription-canceled.tmpl
-share/cups/templates/it/test-page.tmpl
-share/cups/templates/it/trailer.tmpl
-share/cups/templates/it/users.tmpl
-share/cups/templates/ja/add-class.tmpl
-share/cups/templates/ja/add-printer.tmpl
-share/cups/templates/ja/add-rss-subscription.tmpl
-share/cups/templates/ja/admin.tmpl
-share/cups/templates/ja/choose-device.tmpl
-share/cups/templates/ja/choose-make.tmpl
-share/cups/templates/ja/choose-model.tmpl
-share/cups/templates/ja/choose-serial.tmpl
-share/cups/templates/ja/choose-uri.tmpl
-share/cups/templates/ja/class-added.tmpl
-share/cups/templates/ja/class-confirm.tmpl
-share/cups/templates/ja/class-deleted.tmpl
-share/cups/templates/ja/class-jobs-header.tmpl
-share/cups/templates/ja/class-modified.tmpl
-share/cups/templates/ja/class.tmpl
-share/cups/templates/ja/classes-header.tmpl
-share/cups/templates/ja/classes.tmpl
-share/cups/templates/ja/command.tmpl
-share/cups/templates/ja/edit-config.tmpl
-share/cups/templates/ja/error-op.tmpl
-share/cups/templates/ja/error.tmpl
-share/cups/templates/ja/header.tmpl
-share/cups/templates/ja/help-header.tmpl
-share/cups/templates/ja/help-printable.tmpl
-share/cups/templates/ja/help-trailer.tmpl
-share/cups/templates/ja/job-cancel.tmpl
-share/cups/templates/ja/job-hold.tmpl
-share/cups/templates/ja/job-move.tmpl
-share/cups/templates/ja/job-moved.tmpl
-share/cups/templates/ja/job-release.tmpl
-share/cups/templates/ja/job-restart.tmpl
-share/cups/templates/ja/jobs-header.tmpl
-share/cups/templates/ja/jobs.tmpl
-share/cups/templates/ja/list-available-printers.tmpl
-share/cups/templates/ja/modify-class.tmpl
-share/cups/templates/ja/modify-printer.tmpl
-share/cups/templates/ja/norestart.tmpl
-share/cups/templates/ja/option-boolean.tmpl
-share/cups/templates/ja/option-conflict.tmpl
-share/cups/templates/ja/option-header.tmpl
-share/cups/templates/ja/option-pickmany.tmpl
-share/cups/templates/ja/option-pickone.tmpl
-share/cups/templates/ja/option-trailer.tmpl
-share/cups/templates/ja/pager.tmpl
-share/cups/templates/ja/printer-accept.tmpl
-share/cups/templates/ja/printer-added.tmpl
-share/cups/templates/ja/printer-configured.tmpl
-share/cups/templates/ja/printer-confirm.tmpl
-share/cups/templates/ja/printer-default.tmpl
-share/cups/templates/ja/printer-deleted.tmpl
-share/cups/templates/ja/printer-jobs-header.tmpl
-share/cups/templates/ja/printer-modified.tmpl
-share/cups/templates/ja/printer-purge.tmpl
-share/cups/templates/ja/printer-reject.tmpl
-share/cups/templates/ja/printer-start.tmpl
-share/cups/templates/ja/printer-stop.tmpl
-share/cups/templates/ja/printer.tmpl
-share/cups/templates/ja/printers-header.tmpl
-share/cups/templates/ja/printers.tmpl
-share/cups/templates/ja/restart.tmpl
-share/cups/templates/ja/samba-export.tmpl
-share/cups/templates/ja/samba-exported.tmpl
-share/cups/templates/ja/search.tmpl
-share/cups/templates/ja/set-printer-options-header.tmpl
-share/cups/templates/ja/set-printer-options-trailer.tmpl
-share/cups/templates/ja/subscription-added.tmpl
-share/cups/templates/ja/subscription-canceled.tmpl
-share/cups/templates/ja/test-page.tmpl
-share/cups/templates/ja/trailer.tmpl
-share/cups/templates/ja/users.tmpl
 share/cups/templates/job-cancel.tmpl
 share/cups/templates/job-hold.tmpl
 share/cups/templates/job-move.tmpl
@@ -722,158 +302,20 @@ share/cups/templates/option-trailer.tmpl
 share/cups/templates/pager.tmpl
 share/cups/templates/printer-accept.tmpl
 share/cups/templates/printer-added.tmpl
+share/cups/templates/printer-cancel-jobs.tmpl
 share/cups/templates/printer-configured.tmpl
 share/cups/templates/printer-confirm.tmpl
 share/cups/templates/printer-default.tmpl
 share/cups/templates/printer-deleted.tmpl
 share/cups/templates/printer-jobs-header.tmpl
 share/cups/templates/printer-modified.tmpl
-share/cups/templates/printer-purge.tmpl
 share/cups/templates/printer-reject.tmpl
 share/cups/templates/printer-start.tmpl
 share/cups/templates/printer-stop.tmpl
 share/cups/templates/printer.tmpl
 share/cups/templates/printers-header.tmpl
 share/cups/templates/printers.tmpl
-share/cups/templates/pt_BR/add-class.tmpl
-share/cups/templates/pt_BR/add-printer.tmpl
-share/cups/templates/pt_BR/add-rss-subscription.tmpl
-share/cups/templates/pt_BR/admin.tmpl
-share/cups/templates/pt_BR/choose-device.tmpl
-share/cups/templates/pt_BR/choose-make.tmpl
-share/cups/templates/pt_BR/choose-model.tmpl
-share/cups/templates/pt_BR/choose-serial.tmpl
-share/cups/templates/pt_BR/choose-uri.tmpl
-share/cups/templates/pt_BR/class-added.tmpl
-share/cups/templates/pt_BR/class-confirm.tmpl
-share/cups/templates/pt_BR/class-deleted.tmpl
-share/cups/templates/pt_BR/class-jobs-header.tmpl
-share/cups/templates/pt_BR/class-modified.tmpl
-share/cups/templates/pt_BR/class.tmpl
-share/cups/templates/pt_BR/classes-header.tmpl
-share/cups/templates/pt_BR/classes.tmpl
-share/cups/templates/pt_BR/command.tmpl
-share/cups/templates/pt_BR/edit-config.tmpl
-share/cups/templates/pt_BR/error-op.tmpl
-share/cups/templates/pt_BR/error.tmpl
-share/cups/templates/pt_BR/header.tmpl
-share/cups/templates/pt_BR/help-header.tmpl
-share/cups/templates/pt_BR/job-cancel.tmpl
-share/cups/templates/pt_BR/job-hold.tmpl
-share/cups/templates/pt_BR/job-move.tmpl
-share/cups/templates/pt_BR/job-moved.tmpl
-share/cups/templates/pt_BR/job-release.tmpl
-share/cups/templates/pt_BR/job-restart.tmpl
-share/cups/templates/pt_BR/jobs-header.tmpl
-share/cups/templates/pt_BR/jobs.tmpl
-share/cups/templates/pt_BR/list-available-printers.tmpl
-share/cups/templates/pt_BR/modify-class.tmpl
-share/cups/templates/pt_BR/modify-printer.tmpl
-share/cups/templates/pt_BR/norestart.tmpl
-share/cups/templates/pt_BR/option-boolean.tmpl
-share/cups/templates/pt_BR/option-conflict.tmpl
-share/cups/templates/pt_BR/option-header.tmpl
-share/cups/templates/pt_BR/option-pickmany.tmpl
-share/cups/templates/pt_BR/option-pickone.tmpl
-share/cups/templates/pt_BR/option-trailer.tmpl
-share/cups/templates/pt_BR/pager.tmpl
-share/cups/templates/pt_BR/printer-accept.tmpl
-share/cups/templates/pt_BR/printer-added.tmpl
-share/cups/templates/pt_BR/printer-configured.tmpl
-share/cups/templates/pt_BR/printer-confirm.tmpl
-share/cups/templates/pt_BR/printer-default.tmpl
-share/cups/templates/pt_BR/printer-deleted.tmpl
-share/cups/templates/pt_BR/printer-jobs-header.tmpl
-share/cups/templates/pt_BR/printer-modified.tmpl
-share/cups/templates/pt_BR/printer-purge.tmpl
-share/cups/templates/pt_BR/printer-reject.tmpl
-share/cups/templates/pt_BR/printer-start.tmpl
-share/cups/templates/pt_BR/printer-stop.tmpl
-share/cups/templates/pt_BR/printer.tmpl
-share/cups/templates/pt_BR/printers-header.tmpl
-share/cups/templates/pt_BR/printers.tmpl
-share/cups/templates/pt_BR/restart.tmpl
-share/cups/templates/pt_BR/samba-export.tmpl
-share/cups/templates/pt_BR/samba-exported.tmpl
-share/cups/templates/pt_BR/search.tmpl
-share/cups/templates/pt_BR/set-printer-options-header.tmpl
-share/cups/templates/pt_BR/set-printer-options-trailer.tmpl
-share/cups/templates/pt_BR/subscription-added.tmpl
-share/cups/templates/pt_BR/subscription-canceled.tmpl
-share/cups/templates/pt_BR/test-page.tmpl
-share/cups/templates/pt_BR/trailer.tmpl
-share/cups/templates/pt_BR/users.tmpl
 share/cups/templates/restart.tmpl
-share/cups/templates/ru/add-class.tmpl
-share/cups/templates/ru/add-printer.tmpl
-share/cups/templates/ru/add-rss-subscription.tmpl
-share/cups/templates/ru/admin.tmpl
-share/cups/templates/ru/choose-device.tmpl
-share/cups/templates/ru/choose-make.tmpl
-share/cups/templates/ru/choose-model.tmpl
-share/cups/templates/ru/choose-serial.tmpl
-share/cups/templates/ru/choose-uri.tmpl
-share/cups/templates/ru/class-added.tmpl
-share/cups/templates/ru/class-confirm.tmpl
-share/cups/templates/ru/class-deleted.tmpl
-share/cups/templates/ru/class-jobs-header.tmpl
-share/cups/templates/ru/class-modified.tmpl
-share/cups/templates/ru/class.tmpl
-share/cups/templates/ru/classes-header.tmpl
-share/cups/templates/ru/classes.tmpl
-share/cups/templates/ru/command.tmpl
-share/cups/templates/ru/edit-config.tmpl
-share/cups/templates/ru/error-op.tmpl
-share/cups/templates/ru/error.tmpl
-share/cups/templates/ru/header.tmpl
-share/cups/templates/ru/help-header.tmpl
-share/cups/templates/ru/help-printable.tmpl
-share/cups/templates/ru/help-trailer.tmpl
-share/cups/templates/ru/job-cancel.tmpl
-share/cups/templates/ru/job-hold.tmpl
-share/cups/templates/ru/job-move.tmpl
-share/cups/templates/ru/job-moved.tmpl
-share/cups/templates/ru/job-release.tmpl
-share/cups/templates/ru/job-restart.tmpl
-share/cups/templates/ru/jobs-header.tmpl
-share/cups/templates/ru/jobs.tmpl
-share/cups/templates/ru/list-available-printers.tmpl
-share/cups/templates/ru/modify-class.tmpl
-share/cups/templates/ru/modify-printer.tmpl
-share/cups/templates/ru/norestart.tmpl
-share/cups/templates/ru/option-boolean.tmpl
-share/cups/templates/ru/option-conflict.tmpl
-share/cups/templates/ru/option-header.tmpl
-share/cups/templates/ru/option-pickmany.tmpl
-share/cups/templates/ru/option-pickone.tmpl
-share/cups/templates/ru/option-trailer.tmpl
-share/cups/templates/ru/pager.tmpl
-share/cups/templates/ru/printer-accept.tmpl
-share/cups/templates/ru/printer-added.tmpl
-share/cups/templates/ru/printer-configured.tmpl
-share/cups/templates/ru/printer-confirm.tmpl
-share/cups/templates/ru/printer-default.tmpl
-share/cups/templates/ru/printer-deleted.tmpl
-share/cups/templates/ru/printer-jobs-header.tmpl
-share/cups/templates/ru/printer-modified.tmpl
-share/cups/templates/ru/printer-purge.tmpl
-share/cups/templates/ru/printer-reject.tmpl
-share/cups/templates/ru/printer-start.tmpl
-share/cups/templates/ru/printer-stop.tmpl
-share/cups/templates/ru/printer.tmpl
-share/cups/templates/ru/printers-header.tmpl
-share/cups/templates/ru/printers.tmpl
-share/cups/templates/ru/restart.tmpl
-share/cups/templates/ru/samba-export.tmpl
-share/cups/templates/ru/samba-exported.tmpl
-share/cups/templates/ru/search.tmpl
-share/cups/templates/ru/set-printer-options-header.tmpl
-share/cups/templates/ru/set-printer-options-trailer.tmpl
-share/cups/templates/ru/subscription-added.tmpl
-share/cups/templates/ru/subscription-canceled.tmpl
-share/cups/templates/ru/test-page.tmpl
-share/cups/templates/ru/trailer.tmpl
-share/cups/templates/ru/users.tmpl
 share/cups/templates/samba-export.tmpl
 share/cups/templates/samba-exported.tmpl
 share/cups/templates/search.tmpl
@@ -884,16 +326,13 @@ share/cups/templates/subscription-canceled.tmpl
 share/cups/templates/test-page.tmpl
 share/cups/templates/trailer.tmpl
 share/cups/templates/users.tmpl
-${PLIST.libusb}share/cups/usb/org.cups.usb-quirks
+share/cups/usb/org.cups.usb-quirks
 share/doc/cups/LICENSE.txt
 share/doc/cups/README.txt
-share/doc/cups/ca/index.html
-share/doc/cups/cs/index.html
+share/doc/cups/apple-touch-icon.png
 share/doc/cups/cups-printable.css
 share/doc/cups/cups.css
-share/doc/cups/de/index.html
 share/doc/cups/es/index.html
-share/doc/cups/fr/index.html
 share/doc/cups/help/accounting.html
 share/doc/cups/help/api-array.html
 share/doc/cups/help/api-cgi.html
@@ -913,11 +352,18 @@ share/doc/cups/help/kerberos.html
 share/doc/cups/help/license.html
 share/doc/cups/help/man-backend.html
 share/doc/cups/help/man-cancel.html
+share/doc/cups/help/man-classes.conf.html
+share/doc/cups/help/man-client.conf.html
 share/doc/cups/help/man-cups-config.html
+share/doc/cups/help/man-cups-files.conf.html
 share/doc/cups/help/man-cups-lpd.html
 share/doc/cups/help/man-cups-snmp.html
+share/doc/cups/help/man-cups.html
 share/doc/cups/help/man-cupsaccept.html
 share/doc/cups/help/man-cupsaddsmb.html
+share/doc/cups/help/man-cupsd-helper.html
+share/doc/cups/help/man-cupsd-logs.html
+share/doc/cups/help/man-cupsd.conf.html
 share/doc/cups/help/man-cupsd.html
 share/doc/cups/help/man-cupsenable.html
 share/doc/cups/help/man-cupstestdsc.html
@@ -931,7 +377,6 @@ share/doc/cups/help/man-lpc.html
 share/doc/cups/help/man-lpinfo.html
 share/doc/cups/help/man-lpmove.html
 share/doc/cups/help/man-lpoptions.html
-share/doc/cups/help/man-lppasswd.html
 share/doc/cups/help/man-lpq.html
 share/doc/cups/help/man-lpr.html
 share/doc/cups/help/man-lprm.html
@@ -944,6 +389,8 @@ share/doc/cups/help/man-ppdhtml.html
 share/doc/cups/help/man-ppdi.html
 share/doc/cups/help/man-ppdmerge.html
 share/doc/cups/help/man-ppdpo.html
+share/doc/cups/help/man-printers.conf.html
+share/doc/cups/help/man-subscriptions.conf.html
 share/doc/cups/help/network.html
 share/doc/cups/help/options.html
 share/doc/cups/help/overview.html
@@ -951,18 +398,7 @@ share/doc/cups/help/policies.html
 share/doc/cups/help/postscript-driver.html
 share/doc/cups/help/ppd-compiler.html
 share/doc/cups/help/raster-driver.html
-share/doc/cups/help/ref-access_log.html
-share/doc/cups/help/ref-classes-conf.html
-share/doc/cups/help/ref-client-conf.html
-share/doc/cups/help/ref-cups-files-conf.html
-share/doc/cups/help/ref-cupsd-conf.html
-share/doc/cups/help/ref-error_log.html
-share/doc/cups/help/ref-mailto-conf.html
-share/doc/cups/help/ref-page_log.html
 share/doc/cups/help/ref-ppdcfile.html
-share/doc/cups/help/ref-printers-conf.html
-share/doc/cups/help/ref-snmp-conf.html
-share/doc/cups/help/ref-subscriptions-conf.html
 share/doc/cups/help/security.html
 share/doc/cups/help/sharing.html
 share/doc/cups/help/spec-banner.html
@@ -976,7 +412,6 @@ share/doc/cups/help/spec-ppd.html
 share/doc/cups/help/spec-raster.html
 share/doc/cups/help/spec-stp.html
 share/doc/cups/help/translation.html
-share/doc/cups/help/whatsnew.html
 share/doc/cups/images/color-wheel.png
 share/doc/cups/images/cups-block-diagram.png
 share/doc/cups/images/cups-command-chain.png
@@ -994,23 +429,19 @@ share/doc/cups/images/smiley.jpg
 share/doc/cups/images/unsel.gif
 share/doc/cups/images/wait.gif
 share/doc/cups/index.html
-share/doc/cups/it/index.html
-share/doc/cups/ja/index.html
-share/doc/cups/pt_BR/index.html
 share/doc/cups/robots.txt
-share/doc/cups/ru/index.html
 ${PLIST.pam}share/examples/cups/cups.pam
 share/examples/cups/cups-files.conf
 share/examples/cups/cupsd.conf
 share/examples/cups/snmp.conf
 share/locale/ca/cups_ca.po
 share/locale/cs/cups_cs.po
-share/locale/de/cups_de.po
 share/locale/es/cups_es.po
 share/locale/fr/cups_fr.po
 share/locale/it/cups_it.po
 share/locale/ja/cups_ja.po
-share/locale/pt_BR/cups_pt_BR.po
 share/locale/ru/cups_ru.po
 @pkgdir share/cups/profiles
 @pkgdir share/cups/model
+@pkgdir share/cups/data
+@pkgdir share/cups/banners
diff --git a/print/cups/distinfo b/print/cups/distinfo
index 267d7eeb858..2fd9ebae544 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1,21 +1,22 @@
-$NetBSD: distinfo,v 1.106 2014/09/07 20:48:51 wiz Exp $
+$NetBSD: distinfo,v 1.107 2015/01/02 02:03:42 christos Exp $
 
-SHA1 (cups-1.7.5-source.tar.bz2) = 7cd1a18fe2988b4375e9276af313a53e1caf5a27
-RMD160 (cups-1.7.5-source.tar.bz2) = 1d8b6ffec373d89679e31c9331cd3a2ec0d6f312
-Size (cups-1.7.5-source.tar.bz2) = 8793338 bytes
-SHA1 (patch-ac) = a6f3ed84b727fe4735060a804eaf564ef813748b
-SHA1 (patch-ad) = c7c6b052e6ed5a78f8d3aeceaac9c5b08597df38
+SHA1 (cups-2.0.1-source.tar.bz2) = acbf4f5365b6c2a99d8d05965d168f15915135db
+RMD160 (cups-2.0.1-source.tar.bz2) = 977455ee8700a4e6fb40a807474ed8fb8e66945d
+Size (cups-2.0.1-source.tar.bz2) = 8738217 bytes
 SHA1 (patch-ae) = e8f4bbbbbe43cd5f6f9236e10d7241caeaedc3a3
 SHA1 (patch-af) = 1bac8b3ae3c44034be6fa6d2878f10d7f89cd1ce
-SHA1 (patch-ah) = d7a43f4fc9d4439fe9a490d6ea6d6c75afd7b777
 SHA1 (patch-ai) = 2c1ca67ea6f6c1dedb4c8ff97736f328a2b9a7c6
-SHA1 (patch-an) = c75ce52b7afc252c293da7024d93788fd5da3957
-SHA1 (patch-ao) = 26a9fbfbe44bdf9ba615a747a40521cb49a13fa3
 SHA1 (patch-at) = 66222cb2ab84d5889cd6d42fa08827e1a4e8c178
 SHA1 (patch-conf_Makefile) = bb076cc51309477c95940bd437f0892e41337516
+SHA1 (patch-config-scripts_cups-compiler.m4) = 00dac129c55ad8428923f051766d6b2d26d6958d
+SHA1 (patch-config-scripts_cups-directories.m4) = 58c7b5d452c1dd67b754c7dcf0a3b5bb5a8e2768
 SHA1 (patch-config-scripts_cups-gssapi.m4) = 7c8b0dd893b9d21597088062711cc50f13031338
+SHA1 (patch-config-scripts_cups-manpages.m4) = fc82b6da8f678359cedf80afff1615669d1b6ac7
+SHA1 (patch-config-scripts_cups-sharedlibs.m4) = 2754c4fb4e10ce148785a1c3423fcd981c67b416
 SHA1 (patch-config.h.in) = c18c4afac00eb2c4e03e5886095152091fd217aa
+SHA1 (patch-configure.ac) = 7bb171c959aa72e92efd04394751460727b0ca7d
+SHA1 (patch-cups-tls.c) = 055d24956b7ddcd04799642c2893e8e16b70391a
 SHA1 (patch-data_Makefile) = 090e240f851dfb062c7f645dcbe0d15d67f283bc
 SHA1 (patch-ppdc_Makefile) = a45af3310e706dd6433f029c55cf62e492de3448
-SHA1 (patch-scheduler_auth.c) = 70f1eda9d6d81eabc080c037fac0c2d4bb229db4
+SHA1 (patch-scheduler_auth.c) = 1e2b837647e2d943585cc5f9dae86fc2c0c5d98a
 SHA1 (patch-scheduler_dirsvc.c) = 4d1a3945401c03a8f1b557129b73c57459703b69
diff --git a/print/cups/patches/patch-ah b/print/cups/patches/patch-config-scripts_cups-compiler.m4
index e49cb760fe3..7a186bca5ef 100644
--- a/print/cups/patches/patch-ah
+++ b/print/cups/patches/patch-config-scripts_cups-compiler.m4
@@ -1,12 +1,12 @@
-$NetBSD: patch-ah,v 1.21 2014/06/07 07:34:05 wiz Exp $
+$NetBSD: patch-config-scripts_cups-compiler.m4,v 1.1 2015/01/02 02:03:42 christos Exp $
 
 Some builds of gcc seem to support this for compiling but then fail during
 linking with undefined reference to `__stack_chk_fail_local'
 
---- config-scripts/cups-compiler.m4.orig	2014-03-05 20:01:48.000000000 +0000
-+++ config-scripts/cups-compiler.m4
-@@ -113,12 +113,13 @@ if test -n "$GCC"; then
- 	AC_MSG_CHECKING(if GCC supports -fstack-protector)
+--- config-scripts/cups-compiler.m4.orig	2014-08-28 08:55:52.000000000 -0400
++++ config-scripts/cups-compiler.m4	2014-12-24 14:20:36.000000000 -0500
+@@ -113,12 +113,13 @@
+ 	AC_MSG_CHECKING(whether compiler supports -fstack-protector)
  	OLDCFLAGS="$CFLAGS"
  	CFLAGS="$CFLAGS -fstack-protector"
 -	AC_TRY_LINK(,,
diff --git a/print/cups/patches/patch-an b/print/cups/patches/patch-config-scripts_cups-directories.m4
index 0bbd0998bdb..1eda469a177 100644
--- a/print/cups/patches/patch-an
+++ b/print/cups/patches/patch-config-scripts_cups-directories.m4
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.12 2014/06/07 07:34:05 wiz Exp $
+$NetBSD: patch-config-scripts_cups-directories.m4,v 1.1 2015/01/02 02:03:42 christos Exp $
 
 The '$' while loops expand the variables as long as possible so that no
 references to other variables occur. This is necessary because fontpath
@@ -9,9 +9,9 @@ loop.
 I'm also sure that this is not the Right Way to fix it, but at least it
 works.
 
---- config-scripts/cups-directories.m4.orig	2013-04-09 20:10:23.000000000 +0000
-+++ config-scripts/cups-directories.m4
-@@ -103,12 +103,12 @@ dnl Fix "libdir" variable...
+--- config-scripts/cups-directories.m4.orig	2014-03-21 12:42:53.000000000 -0400
++++ config-scripts/cups-directories.m4	2014-12-24 14:25:53.000000000 -0500
+@@ -103,7 +103,7 @@
  if test "$libdir" = "\${exec_prefix}/lib"; then
  	case "$uname" in
  		Linux*)
@@ -20,13 +20,7 @@ works.
  				libdir="$exec_prefix/lib64"
  			fi
  			;;
- 		HP-UX*)
--			if test -d /usr/lib/hpux32; then
-+			if test -d /usr/lib/hpux32 && false; then
- 				libdir="$exec_prefix/lib/hpux32"
- 			fi
- 			;;
-@@ -298,7 +298,15 @@ AC_SUBST(CUPS_CACHEDIR)
+@@ -180,7 +180,15 @@
  
  # Data files
  CUPS_DATADIR="$datadir/cups"
@@ -43,7 +37,7 @@ works.
  AC_SUBST(CUPS_DATADIR)
  
  # Icon directory
-@@ -307,7 +315,11 @@ AC_ARG_WITH(icondir, [  --with-icondir  
+@@ -189,7 +197,11 @@
  if test "x$icondir" = x -a -d /usr/share/icons; then
  	ICONDIR="/usr/share/icons"
  else
@@ -56,7 +50,7 @@ works.
  fi
  
  AC_SUBST(ICONDIR)
-@@ -318,7 +330,11 @@ AC_ARG_WITH(menudir, [  --with-menudir  
+@@ -200,7 +212,11 @@
  if test "x$menudir" = x -a -d /usr/share/applications; then
  	MENUDIR="/usr/share/applications"
  else
@@ -69,7 +63,7 @@ works.
  fi
  
  AC_SUBST(MENUDIR)
-@@ -333,7 +349,15 @@ else
+@@ -215,7 +231,15 @@
  	CUPS_DOCROOT="$docdir"
  fi
  
@@ -86,7 +80,7 @@ works.
  AC_SUBST(CUPS_DOCROOT)
  
  # Fonts
-@@ -345,8 +369,16 @@ else
+@@ -227,8 +251,16 @@
  	CUPS_FONTPATH="$fontpath"
  fi
  
@@ -104,7 +98,7 @@ works.
  
  # Locale data
  if test "$localedir" = "\${datarootdir}/locale"; then
-@@ -368,6 +400,14 @@ else
+@@ -246,6 +278,14 @@
  	CUPS_LOCALEDIR="$localedir"
  fi
  
@@ -119,7 +113,7 @@ works.
  AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$CUPS_LOCALEDIR")
  AC_SUBST(CUPS_LOCALEDIR)
  
-@@ -376,7 +416,6 @@ AC_ARG_WITH(logdir, [  --with-logdir    
+@@ -254,7 +294,6 @@
  
  if test x$logdir = x; then
  	CUPS_LOGDIR="$localstatedir/log/cups"
@@ -127,7 +121,7 @@ works.
  else
  	CUPS_LOGDIR="$logdir"
  fi
-@@ -385,10 +424,13 @@ AC_SUBST(CUPS_LOGDIR)
+@@ -263,10 +302,13 @@
  
  # Longer-term spool data
  CUPS_REQUESTS="$localstatedir/spool/cups"
@@ -142,7 +136,7 @@ works.
  case "$uname" in
  	*BSD* | Darwin*)
  		# *BSD and Darwin (MacOS X)
-@@ -401,6 +443,10 @@ case "$uname" in
+@@ -279,6 +321,10 @@
  		CUPS_SERVERBIN="$exec_prefix/lib/cups"
  		;;
  esac
@@ -153,7 +147,7 @@ works.
  
  AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$CUPS_SERVERBIN")
  AC_SUBST(CUPS_SERVERBIN)
-@@ -408,7 +454,7 @@ AC_SUBST(INSTALL_SYSV)
+@@ -286,7 +332,7 @@
  
  # Configuration files
  CUPS_SERVERROOT="$sysconfdir/cups"
diff --git a/print/cups/patches/patch-ao b/print/cups/patches/patch-config-scripts_cups-manpages.m4
index b9c6625345a..191c5495a3a 100644
--- a/print/cups/patches/patch-ao
+++ b/print/cups/patches/patch-config-scripts_cups-manpages.m4
@@ -1,24 +1,23 @@
-$NetBSD: patch-ao,v 1.12 2014/06/07 07:34:05 wiz Exp $
+$NetBSD: patch-config-scripts_cups-manpages.m4,v 1.1 2015/01/02 02:03:42 christos Exp $
 
 Add '--with-manext' configure option.
 
---- config-scripts/cups-manpages.m4.orig	2012-10-15 21:02:10.000000000 +0000
-+++ config-scripts/cups-manpages.m4
-@@ -13,6 +13,8 @@ dnl   which should have been included wi
- dnl   file is missing or damaged, see the license at "http://www.cups.org/".
+--- config-scripts/cups-manpages.m4.orig	2013-10-18 16:36:01.000000000 -0400
++++ config-scripts/cups-manpages.m4	2014-12-24 14:30:03.000000000 -0500
+@@ -13,6 +13,8 @@
+ dnl file is missing or damaged, see the license at "http://www.cups.org/".
  dnl
  
 +AC_ARG_WITH(manext, [  --with-manext           set man page extension style (bsd,irix,sysv,none)],manext="$withval",manext="")
-+ 
++
  dnl Fix "mandir" variable...
  if test "$mandir" = "\${datarootdir}/man" -a "$prefix" = "/"; then
  	# New GNU "standards" break previous ones, so make sure we use
-@@ -44,8 +46,28 @@ AC_SUBST(AMANDIR)
+@@ -44,7 +46,27 @@
  AC_SUBST(PMANDIR)
  
  dnl Setup manpage extensions...
 -case "$uname" in
--	SunOS* | HP-UX*)
 +if test x$manext = x; then
 +	case "$uname" in
 +		*BSD* | DragonFly*)
@@ -40,11 +39,10 @@ Add '--with-manext' configure option.
 +fi
 +
 +case "$manext" in
-+	sysv)
- 		# Solaris and HP-UX
+ 	SunOS*)
+ 		# Solaris
  		MAN1EXT=1
- 		MAN5EXT=5
-@@ -53,7 +75,7 @@ case "$uname" in
+@@ -53,7 +75,7 @@
  		MAN8EXT=1m
  		MAN8DIR=1m
  		;;
@@ -53,7 +51,7 @@ Add '--with-manext' configure option.
  		# Linux, GNU Hurd, and OS X
  		MAN1EXT=1.gz
  		MAN5EXT=5.gz
-@@ -61,7 +83,7 @@ case "$uname" in
+@@ -61,7 +83,7 @@
  		MAN8EXT=8.gz
  		MAN8DIR=8
  		;;
diff --git a/print/cups/patches/patch-ad b/print/cups/patches/patch-config-scripts_cups-sharedlibs.m4
index e762a9c66e2..14248f2ee17 100644
--- a/print/cups/patches/patch-ad
+++ b/print/cups/patches/patch-config-scripts_cups-sharedlibs.m4
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.18 2014/06/07 07:34:05 wiz Exp $
+$NetBSD: patch-config-scripts_cups-sharedlibs.m4,v 1.1 2015/01/02 02:03:42 christos Exp $
 
 libtoolize.
 
---- config-scripts/cups-sharedlibs.m4.orig	2012-10-15 21:02:10.000000000 +0000
-+++ config-scripts/cups-sharedlibs.m4
-@@ -22,6 +22,24 @@ cupsbase="cups"
+--- config-scripts/cups-sharedlibs.m4.orig	2013-10-18 16:36:01.000000000 -0400
++++ config-scripts/cups-sharedlibs.m4	2014-12-24 14:33:48.000000000 -0500
+@@ -22,6 +22,24 @@
  LIBCUPSBASE="lib$cupsbase"
  LIBCUPSSTATIC="lib$cupsbase.a"
  
@@ -29,7 +29,7 @@ libtoolize.
  if test x$enable_shared != xno; then
  	case "$uname" in
  		SunOS*)
-@@ -122,6 +140,15 @@ if test x$enable_shared != xno; then
+@@ -67,6 +85,15 @@
  			DSOFLAGS="$DSOFLAGS -Wl,-soname,\`basename \$@\` -shared \$(OPTIM)"
  			;;
  	esac
@@ -45,7 +45,7 @@ libtoolize.
  else
  	PICFLAG=0
  	LIBCUPS="lib$cupsbase.a"
-@@ -145,8 +172,13 @@ AC_SUBST(LIBCUPSPPDC)
+@@ -90,8 +117,13 @@
  AC_SUBST(LIBCUPSSTATIC)
  
  if test x$enable_shared = xno; then
@@ -61,7 +61,7 @@ libtoolize.
  
  	EXTLINKCUPS="-lcups"
  	EXTLINKCUPSIMAGE="-lcupsimage"
-@@ -182,10 +214,11 @@ if test "$DSO" != ":"; then
+@@ -119,10 +151,11 @@
  	DSOLIBS="\$(LIBZ)"
  	IMGLIBS=""
  
@@ -74,10 +74,10 @@ libtoolize.
 +		# need this option, even when the library is installed in a
 +		# standard location...
 +		case $uname in
-                 HP-UX*)
- 			# HP-UX needs the path, even for /usr/lib...
- 			case "$uarch" in
-@@ -223,7 +256,8 @@ if test "$DSO" != ":"; then
+                 SunOS*)
+                 	# Solaris...
+ 			if test $exec_prefix != /usr; then
+@@ -147,7 +180,8 @@
  				EXPORT_LDFLAGS="-Wl,-rpath,$libdir"
  			fi
  			;;
diff --git a/print/cups/patches/patch-ac b/print/cups/patches/patch-configure.ac
index 77394957dc4..d4af11194e4 100644
--- a/print/cups/patches/patch-ac
+++ b/print/cups/patches/patch-configure.ac
@@ -1,9 +1,9 @@
-$NetBSD: patch-ac,v 1.16 2014/06/07 07:34:05 wiz Exp $
+$NetBSD: patch-configure.ac,v 1.1 2015/01/02 02:03:42 christos Exp $
 
 libtoolize.
 
---- configure.in.orig	2013-07-08 21:15:13.000000000 +0000
-+++ configure.in
+--- configure.ac.orig	2013-07-08 21:15:13.000000000 +0000
++++ configure.ac
 @@ -21,7 +21,6 @@ sinclude(config-scripts/cups-directories
  sinclude(config-scripts/cups-manpages.m4)
  
diff --git a/print/cups/patches/patch-cups-tls.c b/print/cups/patches/patch-cups-tls.c
new file mode 100644
index 00000000000..3fc151eea51
--- /dev/null
+++ b/print/cups/patches/patch-cups-tls.c
@@ -0,0 +1,20 @@
+$NetBSD: patch-cups-tls.c,v 1.1 2015/01/02 02:03:42 christos Exp $
+
+Add missing stub.
+
+--- cups/tls.c.orig	2014-08-29 11:19:40.000000000 -0400
++++ cups/tls.c	2014-12-24 14:59:52.000000000 -0500
+@@ -50,6 +50,13 @@
+ #    include "tls-sspi.c"
+ #  endif /* HAVE_GNUTLS */
+ #else
++
++void                                    
++_httpTLSSetOptions(int options)         /* I - Options */
++{                                       
++	(void)options;
++}
++
+ /* Stubs for when TLS is not supported/available */
+ int
+ httpCopyCredentials(http_t *http, cups_array_t **credentials)
diff --git a/print/cups/patches/patch-scheduler_auth.c b/print/cups/patches/patch-scheduler_auth.c
index d03354ecbf2..aef2055559a 100644
--- a/print/cups/patches/patch-scheduler_auth.c
+++ b/print/cups/patches/patch-scheduler_auth.c
@@ -1,13 +1,13 @@
-$NetBSD: patch-scheduler_auth.c,v 1.3 2014/06/07 07:34:05 wiz Exp $
+$NetBSD: patch-scheduler_auth.c,v 1.4 2015/01/02 02:03:42 christos Exp $
 
 Don't pull in sys/ucred.h on Solaris as it results in procfs.h being
 included and conflicts between _FILE_OFFSET_BITS=64 and 32-bit procfs.
 
 OpenBSD defines SO_PEERCRED, but it is different from Linux's one.
 
---- scheduler/auth.c.orig	2014-01-06 22:21:15.000000000 +0000
-+++ scheduler/auth.c
-@@ -84,7 +84,7 @@ extern const char *cssmErrorString(int e
+--- scheduler/auth.c.orig	2014-08-28 11:37:22.000000000 -0400
++++ scheduler/auth.c	2014-12-24 14:17:35.000000000 -0500
+@@ -49,7 +49,7 @@
  #ifdef HAVE_SYS_PARAM_H
  #  include <sys/param.h>
  #endif /* HAVE_SYS_PARAM_H */
@@ -16,16 +16,16 @@ OpenBSD defines SO_PEERCRED, but it is different from Linux's one.
  #  include <sys/ucred.h>
  typedef struct xucred cupsd_ucred_t;
  #  define CUPSD_UCRED_UID(c) (c).cr_uid
-@@ -500,7 +500,7 @@ cupsdAuthorize(cupsd_client_t *con)	/* I
+@@ -435,7 +435,7 @@
      con->type = CUPSD_AUTH_BASIC;
    }
  #endif /* HAVE_AUTHORIZATION_H */
 -#if defined(SO_PEERCRED) && defined(AF_LOCAL)
 +#if defined(SO_PEERCRED) && defined(AF_LOCAL) && !defined(__OpenBSD__)
    else if (!strncmp(authorization, "PeerCred ", 9) &&
-            con->http.hostaddr->addr.sa_family == AF_LOCAL)
+            con->http->hostaddr->addr.sa_family == AF_LOCAL && con->best)
    {
-@@ -1142,7 +1142,7 @@ cupsdAuthorize(cupsd_client_t *con)	/* I
+@@ -940,7 +940,7 @@
  
      gss_delete_sec_context(&minor_status, &context, GSS_C_NO_BUFFER);