Update cups to 1.2.8

ok'ed jlam a while back.

CUPS 1.2.8 adds a French localization, updates the Japanese and Spanish
localizations, and fixes several web interface, printing, and networking
bugs.

CUPS 1.2.7 adds several Mac OS X improvements, implements timeouts in the
SSL negotiation code, and fixes the bounding box generated by the PostScript
filter, bidirectional support in the USB backend, and another case where the
lpstat command could hang.

CUPS 1.2.6 fixes some compile errors, localization of the web interface on
Mac OS X, bugs in the lpc and lpstat commands, and backchannel support in
the parallel backend.

CUPS 1.2.5 fixes minor printing, networking, and documentation issues and
adds support for older versions of DBUS and a translation for Estonian.

CUPS 1.2.4 fixes a number of web interface, scheduler, and CUPS API
issues.

CUPS 1.2.3 fixes a number of web interface, networking, remote printing,
and CUPS API issues.

CUPS 1.2.2 fixes several build, platform, notification, and printing bugs.

CUPS 1.2.1 fixes several build, platform, and printing bugs.

CUPS 1.2.0 is the first stable feature release in the 1.2.x series and
includes over 90 new features and changes since CUPS 1.1.23, including a
greatly improved web interface and "plug-and-print" support for many local
and network printers.

25 files changed, 1235 insertions, 1192 deletions

diff --git a/print/cups/Makefile b/print/cups/Makefile
index 7b5bc4543cf..1821d4f7a85 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.115 2006/12/01 20:51:47 joerg Exp $
+# $NetBSD: Makefile,v 1.116 2007/03/14 12:29:03 markd 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,8 +6,7 @@
 
 DISTNAME=	cups-${DIST_VERS}-source
 PKGNAME=	cups-${VERS}
-PKGREVISION=	12
-BASE_VERS=	1.1.23
+BASE_VERS=	1.2.8
 DIST_VERS=	${BASE_VERS}
 VERS=		${DIST_VERS:S/-/./g}
 CATEGORIES=	print
@@ -41,6 +40,7 @@ AUTOCONF_REQD=		2.60
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR:Q}
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
+CONFIGURE_ARGS+=	--with-cachedir=${VARBASE:Q}/cache/cups
 CONFIGURE_ARGS+=	--with-docdir=${PREFIX}/share/doc/cups
 CONFIGURE_ARGS+=	--with-serverbindir=${PREFIX}/libexec/cups
 CONFIGURE_ARGS+=	--with-rcdir=${RCD_SCRIPTS_DIR:Q}
@@ -50,6 +50,10 @@ CONFIGURE_ARGS+=	--with-manext=bsd
 CONFIGURE_ARGS+=	--without-perl
 CONFIGURE_ARGS+=	--enable-libtool
 CONFIGURE_ARGS+=	--enable-ssl
+CONFIGURE_ARGS+=	--enable-gnutls=no
+CONFIGURE_ARGS+=	--enable-openssl
+CONFIGURE_ARGS+=	--without-php
+
 CONFIGURE_ENV+=		DSOFLAGS=${LDFLAGS:M*:Q}
 
 .include "../../mk/bsd.prefs.mk"
@@ -101,21 +105,21 @@ PKG_GECOS.${CUPS_USER}=	Common UNIX Printing System user
 PKG_SHELL.${CUPS_USER}=	${SH}
 
 SPECIAL_PERMS=		${PREFIX}/bin/lppasswd ${CUPS_USER} ${CUPS_GROUP} 4755
-CONF_FILES=		${EGDIR}/client.conf ${CUPS_CONFDIR}/client.conf
-CONF_FILES+=		${EGDIR}/cupsd.conf ${CUPS_CONFDIR}/cupsd.conf
-CONF_FILES+=		${EGDIR}/classes.conf ${CUPS_CONFDIR}/classes.conf
+CONF_FILES=		${EGDIR}/cupsd.conf ${CUPS_CONFDIR}/cupsd.conf
 CONF_FILES+=		${EGDIR}/mime.convs ${CUPS_CONFDIR}/mime.convs
 CONF_FILES+=		${EGDIR}/mime.types ${CUPS_CONFDIR}/mime.types
-CONF_FILES+=		${EGDIR}/printers.conf ${CUPS_CONFDIR}/printers.conf
 RCD_SCRIPTS=		cupsd
 
 OWN_DIRS=		${CUPS_CONFDIR}
 OWN_DIRS+=		${CUPS_CONFDIR}/interfaces
 OWN_DIRS+=		${CUPS_CONFDIR}/ppd
+OWN_DIRS+=		${PREFIX}/libexec/cups/driver
 OWN_DIRS+=		${CUPS_LOGDIR}
 OWN_DIRS_PERMS=		${CUPS_CONFDIR}/certs ${CUPS_USER} ${CUPS_GROUP} 0711
+OWN_DIRS_PERMS+=	${CUPS_CONFDIR}/ssl ${CUPS_USER} ${CUPS_GROUP} 0700
 OWN_DIRS_PERMS+=	${CUPS_REQUESTS} ${CUPS_USER} ${CUPS_GROUP} 0710
 OWN_DIRS_PERMS+=	${CUPS_REQUESTS}/tmp ${CUPS_USER} ${CUPS_GROUP} 1770
+OWN_DIRS_PERMS+=	${VARBASE}/cache/cups ${CUPS_USER} ${CUPS_GROUP} 0775
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
diff --git a/print/cups/PLIST b/print/cups/PLIST
index 6dd37b3b06e..24a352784f3 100644
--- a/print/cups/PLIST
+++ b/print/cups/PLIST
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.19 2006/04/17 07:07:32 jlam Exp $
+@comment $NetBSD: PLIST,v 1.20 2007/03/14 12:29:03 markd Exp $
 bin/cancel
 bin/cups-config
+bin/cupstestdsc
 bin/cupstestppd
-bin/disable
-bin/enable
 bin/lp
 bin/lpoptions
 bin/lppasswd
@@ -11,14 +10,21 @@ bin/lpq
 bin/lpr
 bin/lprm
 bin/lpstat
+include/cups/adminutil.h
+include/cups/array.h
+include/cups/backend.h
 include/cups/cups.h
+include/cups/dir.h
+include/cups/file.h
 include/cups/http.h
+include/cups/i18n.h
 include/cups/image.h
 include/cups/ipp.h
 include/cups/language.h
 include/cups/md5.h
 include/cups/ppd.h
 include/cups/raster.h
+include/cups/transcode.h
 lib/libcups.la
 lib/libcupsimage.la
 libexec/cups/backend/http
@@ -27,12 +33,16 @@ libexec/cups/backend/lpd
 libexec/cups/backend/parallel
 libexec/cups/backend/scsi
 libexec/cups/backend/serial
+libexec/cups/backend/snmp
 libexec/cups/backend/socket
 libexec/cups/backend/usb
 libexec/cups/cgi-bin/admin.cgi
 libexec/cups/cgi-bin/classes.cgi
+libexec/cups/cgi-bin/help.cgi
 libexec/cups/cgi-bin/jobs.cgi
 libexec/cups/cgi-bin/printers.cgi
+libexec/cups/daemon/cups-deviced
+libexec/cups/daemon/cups-driverd
 libexec/cups/daemon/cups-lpd
 libexec/cups/daemon/cups-polld
 libexec/cups/filter/gziptoany
@@ -44,157 +54,16 @@ libexec/cups/filter/pstops
 libexec/cups/filter/rastertodymo
 libexec/cups/filter/rastertoepson
 libexec/cups/filter/rastertohp
+libexec/cups/filter/rastertolabel
 libexec/cups/filter/texttops
-man/cat1/backend.0
-man/cat1/cancel.0
-man/cat1/cups-config.0
-man/cat1/cupstestppd.0
-man/cat1/filter.0
-man/cat1/lp.0
-man/cat1/lpoptions.0
-man/cat1/lppasswd.0
-man/cat1/lpq.0
-man/cat1/lpr.0
-man/cat1/lprm.0
-man/cat1/lpstat.0
-man/cat5/classes.conf.0
-man/cat5/cupsd.conf.0
-man/cat5/mime.convs.0
-man/cat5/mime.types.0
-man/cat5/printers.conf.0
-man/cat8/accept.0
-man/cat8/cups-lpd.0
-man/cat8/cups-polld.0
-man/cat8/cupsaddsmb.0
-man/cat8/cupsd.0
-man/cat8/disable.0
-man/cat8/enable.0
-man/cat8/lpadmin.0
-man/cat8/lpc.0
-man/cat8/lpinfo.0
-man/cat8/lpmove.0
-man/cat8/reject.0
-man/es/cat1/backend.0
-man/es/cat1/cancel.0
-man/es/cat1/cups-config.0
-man/es/cat1/cupstestppd.0
-man/es/cat1/filter.0
-man/es/cat1/lp.0
-man/es/cat1/lpoptions.0
-man/es/cat1/lppasswd.0
-man/es/cat1/lpq.0
-man/es/cat1/lpr.0
-man/es/cat1/lprm.0
-man/es/cat1/lpstat.0
-man/es/cat5/classes.conf.0
-man/es/cat5/cupsd.conf.0
-man/es/cat5/mime.convs.0
-man/es/cat5/mime.types.0
-man/es/cat5/printers.conf.0
-man/es/cat8/accept.0
-man/es/cat8/cups-lpd.0
-man/es/cat8/cups-polld.0
-man/es/cat8/cupsaddsmb.0
-man/es/cat8/cupsd.0
-man/es/cat8/disable.0
-man/es/cat8/enable.0
-man/es/cat8/lpadmin.0
-man/es/cat8/lpc.0
-man/es/cat8/lpinfo.0
-man/es/cat8/lpmove.0
-man/es/cat8/reject.0
-man/es/man1/backend.1
-man/es/man1/cancel.1
-man/es/man1/cups-config.1
-man/es/man1/cupstestppd.1
-man/es/man1/filter.1
-man/es/man1/lp.1
-man/es/man1/lpoptions.1
-man/es/man1/lppasswd.1
-man/es/man1/lpq.1
-man/es/man1/lpr.1
-man/es/man1/lprm.1
-man/es/man1/lpstat.1
-man/es/man5/classes.conf.5
-man/es/man5/cupsd.conf.5
-man/es/man5/mime.convs.5
-man/es/man5/mime.types.5
-man/es/man5/printers.conf.5
-man/es/man8/accept.8
-man/es/man8/cups-lpd.8
-man/es/man8/cups-polld.8
-man/es/man8/cupsaddsmb.8
-man/es/man8/cupsd.8
-man/es/man8/disable.8
-man/es/man8/enable.8
-man/es/man8/lpadmin.8
-man/es/man8/lpc.8
-man/es/man8/lpinfo.8
-man/es/man8/lpmove.8
-man/es/man8/reject.8
-man/fr/cat1/backend.0
-man/fr/cat1/cancel.0
-man/fr/cat1/cups-config.0
-man/fr/cat1/cupstestppd.0
-man/fr/cat1/filter.0
-man/fr/cat1/lp.0
-man/fr/cat1/lpoptions.0
-man/fr/cat1/lppasswd.0
-man/fr/cat1/lpq.0
-man/fr/cat1/lpr.0
-man/fr/cat1/lprm.0
-man/fr/cat1/lpstat.0
-man/fr/cat5/classes.conf.0
-man/fr/cat5/cupsd.conf.0
-man/fr/cat5/mime.convs.0
-man/fr/cat5/mime.types.0
-man/fr/cat5/printers.conf.0
-man/fr/cat8/accept.0
-man/fr/cat8/cups-lpd.0
-man/fr/cat8/cups-polld.0
-man/fr/cat8/cupsaddsmb.0
-man/fr/cat8/cupsd.0
-man/fr/cat8/disable.0
-man/fr/cat8/enable.0
-man/fr/cat8/lpadmin.0
-man/fr/cat8/lpc.0
-man/fr/cat8/lpinfo.0
-man/fr/cat8/lpmove.0
-man/fr/cat8/reject.0
-man/fr/man1/backend.1
-man/fr/man1/cancel.1
-man/fr/man1/cups-config.1
-man/fr/man1/cupstestppd.1
-man/fr/man1/filter.1
-man/fr/man1/lp.1
-man/fr/man1/lpoptions.1
-man/fr/man1/lppasswd.1
-man/fr/man1/lpq.1
-man/fr/man1/lpr.1
-man/fr/man1/lprm.1
-man/fr/man1/lpstat.1
-man/fr/man5/classes.conf.5
-man/fr/man5/cupsd.conf.5
-man/fr/man5/mime.convs.5
-man/fr/man5/mime.types.5
-man/fr/man5/printers.conf.5
-man/fr/man8/accept.8
-man/fr/man8/cups-lpd.8
-man/fr/man8/cups-polld.8
-man/fr/man8/cupsaddsmb.8
-man/fr/man8/cupsd.8
-man/fr/man8/disable.8
-man/fr/man8/enable.8
-man/fr/man8/lpadmin.8
-man/fr/man8/lpc.8
-man/fr/man8/lpinfo.8
-man/fr/man8/lpmove.8
-man/fr/man8/reject.8
-man/man1/backend.1
+libexec/cups/monitor/bcp
+libexec/cups/monitor/tbcp
+libexec/cups/notifier/mailto
+libexec/cups/notifier/testnotify
 man/man1/cancel.1
 man/man1/cups-config.1
+man/man1/cupstestdsc.1
 man/man1/cupstestppd.1
-man/man1/filter.1
 man/man1/lp.1
 man/man1/lpoptions.1
 man/man1/lppasswd.1
@@ -203,17 +72,25 @@ man/man1/lpr.1
 man/man1/lprm.1
 man/man1/lpstat.1
 man/man5/classes.conf.5
+man/man5/client.conf.5
+man/man5/cups-snmp.conf.5
 man/man5/cupsd.conf.5
+man/man5/mailto.conf.5
 man/man5/mime.convs.5
 man/man5/mime.types.5
 man/man5/printers.conf.5
+man/man5/subscriptions.conf.5
+man/man7/backend.7
+man/man7/filter.7
 man/man8/accept.8
+man/man8/cups-deviced.8
+man/man8/cups-driverd.8
 man/man8/cups-lpd.8
 man/man8/cups-polld.8
 man/man8/cupsaddsmb.8
 man/man8/cupsd.8
-man/man8/disable.8
-man/man8/enable.8
+man/man8/cupsdisable.8
+man/man8/cupsenable.8
 man/man8/lpadmin.8
 man/man8/lpc.8
 man/man8/lpinfo.8
@@ -222,6 +99,8 @@ man/man8/reject.8
 sbin/accept
 sbin/cupsaddsmb
 sbin/cupsd
+sbin/cupsdisable
+sbin/cupsenable
 sbin/lpadmin
 sbin/lpc
 sbin/lpinfo
@@ -233,6 +112,43 @@ share/cups/banners/secret
 share/cups/banners/standard
 share/cups/banners/topsecret
 share/cups/banners/unclassified
+share/cups/charmaps/euc-cn.txt
+share/cups/charmaps/euc-jp.txt
+share/cups/charmaps/euc-kr.txt
+share/cups/charmaps/euc-tw.txt
+share/cups/charmaps/iso-8859-1.txt
+share/cups/charmaps/iso-8859-10.txt
+share/cups/charmaps/iso-8859-11.txt
+share/cups/charmaps/iso-8859-13.txt
+share/cups/charmaps/iso-8859-14.txt
+share/cups/charmaps/iso-8859-15.txt
+share/cups/charmaps/iso-8859-16.txt
+share/cups/charmaps/iso-8859-2.txt
+share/cups/charmaps/iso-8859-3.txt
+share/cups/charmaps/iso-8859-4.txt
+share/cups/charmaps/iso-8859-5.txt
+share/cups/charmaps/iso-8859-6.txt
+share/cups/charmaps/iso-8859-7.txt
+share/cups/charmaps/iso-8859-8.txt
+share/cups/charmaps/iso-8859-9.txt
+share/cups/charmaps/koi8-r.txt
+share/cups/charmaps/koi8-u.txt
+share/cups/charmaps/mac-roman.txt
+share/cups/charmaps/windows-1250.txt
+share/cups/charmaps/windows-1251.txt
+share/cups/charmaps/windows-1252.txt
+share/cups/charmaps/windows-1253.txt
+share/cups/charmaps/windows-1254.txt
+share/cups/charmaps/windows-1255.txt
+share/cups/charmaps/windows-1256.txt
+share/cups/charmaps/windows-1257.txt
+share/cups/charmaps/windows-1258.txt
+share/cups/charmaps/windows-1361.txt
+share/cups/charmaps/windows-874.txt
+share/cups/charmaps/windows-932.txt
+share/cups/charmaps/windows-936.txt
+share/cups/charmaps/windows-949.txt
+share/cups/charmaps/windows-950.txt
 share/cups/charsets/iso-8859-1
 share/cups/charsets/iso-8859-10
 share/cups/charsets/iso-8859-13
@@ -280,94 +196,53 @@ share/cups/model/stcolor2.ppd
 share/cups/model/stphoto.ppd
 share/cups/model/stphoto2.ppd
 share/cups/model/zebra.ppd
+share/cups/model/zebraep1.ppd
+share/cups/model/zebraep2.ppd
 share/cups/templates/add-class.tmpl
 share/cups/templates/add-printer.tmpl
-share/cups/templates/admin-op.tmpl
 share/cups/templates/admin.tmpl
-share/cups/templates/be/add-class.tmpl
-share/cups/templates/be/add-printer.tmpl
-share/cups/templates/be/admin-op.tmpl
-share/cups/templates/be/admin.tmpl
-share/cups/templates/be/choose-device.tmpl
-share/cups/templates/be/choose-make.tmpl
-share/cups/templates/be/choose-members.tmpl
-share/cups/templates/be/choose-model.tmpl
-share/cups/templates/be/choose-serial.tmpl
-share/cups/templates/be/choose-uri.tmpl
-share/cups/templates/be/class-added.tmpl
-share/cups/templates/be/class-confirm.tmpl
-share/cups/templates/be/class-deleted.tmpl
-share/cups/templates/be/class-modified.tmpl
-share/cups/templates/be/classes.tmpl
-share/cups/templates/be/config-printer.tmpl
-share/cups/templates/be/config-printer2.tmpl
-share/cups/templates/be/error.tmpl
-share/cups/templates/be/header.tmpl
-share/cups/templates/be/job-cancel.tmpl
-share/cups/templates/be/job-hold.tmpl
-share/cups/templates/be/job-op.tmpl
-share/cups/templates/be/job-release.tmpl
-share/cups/templates/be/job-restart.tmpl
-share/cups/templates/be/jobs.tmpl
-share/cups/templates/be/modify-class.tmpl
-share/cups/templates/be/modify-printer.tmpl
-share/cups/templates/be/option-boolean.tmpl
-share/cups/templates/be/option-conflict.tmpl
-share/cups/templates/be/option-header.tmpl
-share/cups/templates/be/option-pickmany.tmpl
-share/cups/templates/be/option-pickone.tmpl
-share/cups/templates/be/option-trailer.tmpl
-share/cups/templates/be/printer-accept.tmpl
-share/cups/templates/be/printer-added.tmpl
-share/cups/templates/be/printer-configured.tmpl
-share/cups/templates/be/printer-confirm.tmpl
-share/cups/templates/be/printer-deleted.tmpl
-share/cups/templates/be/printer-modified.tmpl
-share/cups/templates/be/printer-purge.tmpl
-share/cups/templates/be/printer-reject.tmpl
-share/cups/templates/be/printer-start.tmpl
-share/cups/templates/be/printer-stop.tmpl
-share/cups/templates/be/printers.tmpl
-share/cups/templates/be/test-page.tmpl
-share/cups/templates/be/trailer.tmpl
 share/cups/templates/choose-device.tmpl
 share/cups/templates/choose-make.tmpl
-share/cups/templates/choose-members.tmpl
 share/cups/templates/choose-model.tmpl
 share/cups/templates/choose-serial.tmpl
 share/cups/templates/choose-uri.tmpl
 share/cups/templates/class-added.tmpl
 share/cups/templates/class-confirm.tmpl
 share/cups/templates/class-deleted.tmpl
+share/cups/templates/class-jobs-header.tmpl
 share/cups/templates/class-modified.tmpl
+share/cups/templates/classes-header.tmpl
 share/cups/templates/classes.tmpl
-share/cups/templates/config-printer.tmpl
-share/cups/templates/config-printer2.tmpl
 share/cups/templates/de/add-class.tmpl
 share/cups/templates/de/add-printer.tmpl
-share/cups/templates/de/admin-op.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-members.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/classes-header.tmpl
 share/cups/templates/de/classes.tmpl
-share/cups/templates/de/config-printer.tmpl
-share/cups/templates/de/config-printer2.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/job-cancel.tmpl
 share/cups/templates/de/job-hold.tmpl
-share/cups/templates/de/job-op.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/maintenance.tmpl
 share/cups/templates/de/modify-class.tmpl
 share/cups/templates/de/modify-printer.tmpl
 share/cups/templates/de/option-boolean.tmpl
@@ -376,379 +251,1127 @@ 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/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/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
 share/cups/templates/es/add-class.tmpl
 share/cups/templates/es/add-printer.tmpl
-share/cups/templates/es/admin-op.tmpl
 share/cups/templates/es/admin.tmpl
 share/cups/templates/es/choose-device.tmpl
 share/cups/templates/es/choose-make.tmpl
-share/cups/templates/es/choose-members.tmpl
 share/cups/templates/es/choose-model.tmpl
 share/cups/templates/es/choose-serial.tmpl
 share/cups/templates/es/choose-uri.tmpl
 share/cups/templates/es/class-added.tmpl
 share/cups/templates/es/class-confirm.tmpl
 share/cups/templates/es/class-deleted.tmpl
+share/cups/templates/es/class-jobs-header.tmpl
 share/cups/templates/es/class-modified.tmpl
+share/cups/templates/es/classes-header.tmpl
 share/cups/templates/es/classes.tmpl
-share/cups/templates/es/config-printer.tmpl
-share/cups/templates/es/config-printer2.tmpl
+share/cups/templates/es/edit-config.tmpl
+share/cups/templates/es/error-op.tmpl
 share/cups/templates/es/error.tmpl
 share/cups/templates/es/header.tmpl
+share/cups/templates/es/help-header.tmpl
+share/cups/templates/es/help-printable.tmpl
 share/cups/templates/es/job-cancel.tmpl
 share/cups/templates/es/job-hold.tmpl
-share/cups/templates/es/job-op.tmpl
+share/cups/templates/es/job-move.tmpl
+share/cups/templates/es/job-moved.tmpl
 share/cups/templates/es/job-release.tmpl
 share/cups/templates/es/job-restart.tmpl
+share/cups/templates/es/jobs-header.tmpl
 share/cups/templates/es/jobs.tmpl
+share/cups/templates/es/maintenance.tmpl
 share/cups/templates/es/modify-class.tmpl
 share/cups/templates/es/modify-printer.tmpl
+share/cups/templates/es/norestart.tmpl
 share/cups/templates/es/option-boolean.tmpl
 share/cups/templates/es/option-conflict.tmpl
 share/cups/templates/es/option-header.tmpl
 share/cups/templates/es/option-pickmany.tmpl
 share/cups/templates/es/option-pickone.tmpl
 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-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
+share/cups/templates/es/printers-header.tmpl
 share/cups/templates/es/printers.tmpl
+share/cups/templates/es/restart.tmpl
+share/cups/templates/es/samba-export.tmpl
+share/cups/templates/es/samba-exported.tmpl
+share/cups/templates/es/search.tmpl
+share/cups/templates/es/set-printer-options-header.tmpl
+share/cups/templates/es/set-printer-options-trailer.tmpl
 share/cups/templates/es/test-page.tmpl
 share/cups/templates/es/trailer.tmpl
+share/cups/templates/es/users.tmpl
+share/cups/templates/et/add-class.tmpl
+share/cups/templates/et/add-printer.tmpl
+share/cups/templates/et/admin.tmpl
+share/cups/templates/et/choose-device.tmpl
+share/cups/templates/et/choose-make.tmpl
+share/cups/templates/et/choose-model.tmpl
+share/cups/templates/et/choose-serial.tmpl
+share/cups/templates/et/choose-uri.tmpl
+share/cups/templates/et/class-added.tmpl
+share/cups/templates/et/class-confirm.tmpl
+share/cups/templates/et/class-deleted.tmpl
+share/cups/templates/et/class-jobs-header.tmpl
+share/cups/templates/et/class-modified.tmpl
+share/cups/templates/et/classes-header.tmpl
+share/cups/templates/et/classes.tmpl
+share/cups/templates/et/edit-config.tmpl
+share/cups/templates/et/error-op.tmpl
+share/cups/templates/et/error.tmpl
+share/cups/templates/et/header.tmpl
+share/cups/templates/et/help-header.tmpl
+share/cups/templates/et/help-printable.tmpl
+share/cups/templates/et/job-cancel.tmpl
+share/cups/templates/et/job-hold.tmpl
+share/cups/templates/et/job-moved.tmpl
+share/cups/templates/et/job-release.tmpl
+share/cups/templates/et/job-restart.tmpl
+share/cups/templates/et/jobs-header.tmpl
+share/cups/templates/et/jobs.tmpl
+share/cups/templates/et/maintenance.tmpl
+share/cups/templates/et/modify-class.tmpl
+share/cups/templates/et/modify-printer.tmpl
+share/cups/templates/et/norestart.tmpl
+share/cups/templates/et/option-boolean.tmpl
+share/cups/templates/et/option-conflict.tmpl
+share/cups/templates/et/option-header.tmpl
+share/cups/templates/et/option-pickmany.tmpl
+share/cups/templates/et/option-pickone.tmpl
+share/cups/templates/et/option-trailer.tmpl
+share/cups/templates/et/pager.tmpl
+share/cups/templates/et/printer-accept.tmpl
+share/cups/templates/et/printer-added.tmpl
+share/cups/templates/et/printer-configured.tmpl
+share/cups/templates/et/printer-confirm.tmpl
+share/cups/templates/et/printer-default.tmpl
+share/cups/templates/et/printer-deleted.tmpl
+share/cups/templates/et/printer-jobs-header.tmpl
+share/cups/templates/et/printer-modified.tmpl
+share/cups/templates/et/printer-purge.tmpl
+share/cups/templates/et/printer-reject.tmpl
+share/cups/templates/et/printer-start.tmpl
+share/cups/templates/et/printer-stop.tmpl
+share/cups/templates/et/printers-header.tmpl
+share/cups/templates/et/printers.tmpl
+share/cups/templates/et/restart.tmpl
+share/cups/templates/et/samba-export.tmpl
+share/cups/templates/et/samba-exported.tmpl
+share/cups/templates/et/search.tmpl
+share/cups/templates/et/set-printer-options-header.tmpl
+share/cups/templates/et/set-printer-options-trailer.tmpl
+share/cups/templates/et/test-page.tmpl
+share/cups/templates/et/trailer.tmpl
+share/cups/templates/et/users.tmpl
 share/cups/templates/fr/add-class.tmpl
 share/cups/templates/fr/add-printer.tmpl
-share/cups/templates/fr/admin-op.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-members.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/classes-header.tmpl
 share/cups/templates/fr/classes.tmpl
-share/cups/templates/fr/config-printer.tmpl
-share/cups/templates/fr/config-printer2.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/job-cancel.tmpl
 share/cups/templates/fr/job-hold.tmpl
-share/cups/templates/fr/job-op.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/maintenance.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/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/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/it/add-class.tmpl
+share/cups/templates/it/add-printer.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/classes-header.tmpl
+share/cups/templates/it/classes.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/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/maintenance.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/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/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/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/classes-header.tmpl
+share/cups/templates/ja/classes.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/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/maintenance.tmpl
+share/cups/templates/ja/modify-class.tmpl
+share/cups/templates/ja/modify-printer.tmpl
+share/cups/templates/ja/option-conflict.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/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/test-page.tmpl
+share/cups/templates/ja/users.tmpl
 share/cups/templates/job-cancel.tmpl
 share/cups/templates/job-hold.tmpl
-share/cups/templates/job-op.tmpl
+share/cups/templates/job-move.tmpl
+share/cups/templates/job-moved.tmpl
 share/cups/templates/job-release.tmpl
 share/cups/templates/job-restart.tmpl
+share/cups/templates/jobs-header.tmpl
 share/cups/templates/jobs.tmpl
+share/cups/templates/maintenance.tmpl
 share/cups/templates/modify-class.tmpl
 share/cups/templates/modify-printer.tmpl
+share/cups/templates/norestart.tmpl
 share/cups/templates/option-boolean.tmpl
 share/cups/templates/option-conflict.tmpl
 share/cups/templates/option-header.tmpl
 share/cups/templates/option-pickmany.tmpl
 share/cups/templates/option-pickone.tmpl
 share/cups/templates/option-trailer.tmpl
+share/cups/templates/pager.tmpl
+share/cups/templates/pl/add-class.tmpl
+share/cups/templates/pl/add-printer.tmpl
+share/cups/templates/pl/admin.tmpl
+share/cups/templates/pl/choose-device.tmpl
+share/cups/templates/pl/choose-make.tmpl
+share/cups/templates/pl/choose-model.tmpl
+share/cups/templates/pl/choose-serial.tmpl
+share/cups/templates/pl/choose-uri.tmpl
+share/cups/templates/pl/class-added.tmpl
+share/cups/templates/pl/class-confirm.tmpl
+share/cups/templates/pl/class-deleted.tmpl
+share/cups/templates/pl/class-jobs-header.tmpl
+share/cups/templates/pl/class-modified.tmpl
+share/cups/templates/pl/classes-header.tmpl
+share/cups/templates/pl/classes.tmpl
+share/cups/templates/pl/edit-config.tmpl
+share/cups/templates/pl/error-op.tmpl
+share/cups/templates/pl/error.tmpl
+share/cups/templates/pl/header.tmpl
+share/cups/templates/pl/help-header.tmpl
+share/cups/templates/pl/help-printable.tmpl
+share/cups/templates/pl/job-cancel.tmpl
+share/cups/templates/pl/job-hold.tmpl
+share/cups/templates/pl/job-move.tmpl
+share/cups/templates/pl/job-moved.tmpl
+share/cups/templates/pl/job-release.tmpl
+share/cups/templates/pl/job-restart.tmpl
+share/cups/templates/pl/jobs-header.tmpl
+share/cups/templates/pl/jobs.tmpl
+share/cups/templates/pl/maintenance.tmpl
+share/cups/templates/pl/modify-class.tmpl
+share/cups/templates/pl/modify-printer.tmpl
+share/cups/templates/pl/option-boolean.tmpl
+share/cups/templates/pl/option-conflict.tmpl
+share/cups/templates/pl/option-header.tmpl
+share/cups/templates/pl/option-pickmany.tmpl
+share/cups/templates/pl/option-pickone.tmpl
+share/cups/templates/pl/option-trailer.tmpl
+share/cups/templates/pl/pager.tmpl
+share/cups/templates/pl/printer-accept.tmpl
+share/cups/templates/pl/printer-added.tmpl
+share/cups/templates/pl/printer-configured.tmpl
+share/cups/templates/pl/printer-confirm.tmpl
+share/cups/templates/pl/printer-default.tmpl
+share/cups/templates/pl/printer-deleted.tmpl
+share/cups/templates/pl/printer-jobs-header.tmpl
+share/cups/templates/pl/printer-modified.tmpl
+share/cups/templates/pl/printer-purge.tmpl
+share/cups/templates/pl/printer-reject.tmpl
+share/cups/templates/pl/printer-start.tmpl
+share/cups/templates/pl/printer-stop.tmpl
+share/cups/templates/pl/printers-header.tmpl
+share/cups/templates/pl/printers.tmpl
+share/cups/templates/pl/restart.tmpl
+share/cups/templates/pl/samba-export.tmpl
+share/cups/templates/pl/samba-exported.tmpl
+share/cups/templates/pl/search.tmpl
+share/cups/templates/pl/set-printer-options-header.tmpl
+share/cups/templates/pl/set-printer-options-trailer.tmpl
+share/cups/templates/pl/test-page.tmpl
+share/cups/templates/pl/trailer.tmpl
+share/cups/templates/pl/users.tmpl
 share/cups/templates/printer-accept.tmpl
 share/cups/templates/printer-added.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/printers-header.tmpl
 share/cups/templates/printers.tmpl
+share/cups/templates/restart.tmpl
+share/cups/templates/samba-export.tmpl
+share/cups/templates/samba-exported.tmpl
+share/cups/templates/search.tmpl
+share/cups/templates/set-printer-options-header.tmpl
+share/cups/templates/set-printer-options-trailer.tmpl
+share/cups/templates/sv/add-class.tmpl
+share/cups/templates/sv/add-printer.tmpl
+share/cups/templates/sv/admin.tmpl
+share/cups/templates/sv/choose-device.tmpl
+share/cups/templates/sv/choose-make.tmpl
+share/cups/templates/sv/choose-model.tmpl
+share/cups/templates/sv/choose-serial.tmpl
+share/cups/templates/sv/choose-uri.tmpl
+share/cups/templates/sv/class-added.tmpl
+share/cups/templates/sv/class-confirm.tmpl
+share/cups/templates/sv/class-deleted.tmpl
+share/cups/templates/sv/class-jobs-header.tmpl
+share/cups/templates/sv/class-modified.tmpl
+share/cups/templates/sv/classes-header.tmpl
+share/cups/templates/sv/classes.tmpl
+share/cups/templates/sv/edit-config.tmpl
+share/cups/templates/sv/error-op.tmpl
+share/cups/templates/sv/error.tmpl
+share/cups/templates/sv/header.tmpl
+share/cups/templates/sv/help-header.tmpl
+share/cups/templates/sv/help-printable.tmpl
+share/cups/templates/sv/job-cancel.tmpl
+share/cups/templates/sv/job-hold.tmpl
+share/cups/templates/sv/job-move.tmpl
+share/cups/templates/sv/job-moved.tmpl
+share/cups/templates/sv/job-release.tmpl
+share/cups/templates/sv/job-restart.tmpl
+share/cups/templates/sv/jobs-header.tmpl
+share/cups/templates/sv/jobs.tmpl
+share/cups/templates/sv/maintenance.tmpl
+share/cups/templates/sv/modify-class.tmpl
+share/cups/templates/sv/modify-printer.tmpl
+share/cups/templates/sv/option-boolean.tmpl
+share/cups/templates/sv/option-conflict.tmpl
+share/cups/templates/sv/option-header.tmpl
+share/cups/templates/sv/option-pickmany.tmpl
+share/cups/templates/sv/option-pickone.tmpl
+share/cups/templates/sv/option-trailer.tmpl
+share/cups/templates/sv/pager.tmpl
+share/cups/templates/sv/printer-accept.tmpl
+share/cups/templates/sv/printer-added.tmpl
+share/cups/templates/sv/printer-configured.tmpl
+share/cups/templates/sv/printer-confirm.tmpl
+share/cups/templates/sv/printer-default.tmpl
+share/cups/templates/sv/printer-deleted.tmpl
+share/cups/templates/sv/printer-jobs-header.tmpl
+share/cups/templates/sv/printer-modified.tmpl
+share/cups/templates/sv/printer-purge.tmpl
+share/cups/templates/sv/printer-reject.tmpl
+share/cups/templates/sv/printer-start.tmpl
+share/cups/templates/sv/printer-stop.tmpl
+share/cups/templates/sv/printers-header.tmpl
+share/cups/templates/sv/printers.tmpl
+share/cups/templates/sv/restart.tmpl
+share/cups/templates/sv/samba-export.tmpl
+share/cups/templates/sv/samba-exported.tmpl
+share/cups/templates/sv/search.tmpl
+share/cups/templates/sv/set-printer-options-header.tmpl
+share/cups/templates/sv/set-printer-options-trailer.tmpl
+share/cups/templates/sv/test-page.tmpl
+share/cups/templates/sv/trailer.tmpl
+share/cups/templates/sv/users.tmpl
 share/cups/templates/test-page.tmpl
 share/cups/templates/trailer.tmpl
-share/doc/cups/CGI.txt
-share/doc/cups/ENCRYPTION.txt
+share/cups/templates/users.tmpl
 share/doc/cups/LICENSE.txt
 share/doc/cups/README.txt
-share/doc/cups/be/documentation.html
-share/doc/cups/be/images/accept-jobs.gif
-share/doc/cups/be/images/add-class.gif
-share/doc/cups/be/images/add-printer.gif
-share/doc/cups/be/images/cancel-job.gif
-share/doc/cups/be/images/config-printer.gif
-share/doc/cups/be/images/continue.gif
-share/doc/cups/be/images/delete-class.gif
-share/doc/cups/be/images/delete-printer.gif
-share/doc/cups/be/images/hold-job.gif
-share/doc/cups/be/images/manage-classes.gif
-share/doc/cups/be/images/manage-jobs.gif
-share/doc/cups/be/images/manage-printers.gif
-share/doc/cups/be/images/modify-class.gif
-share/doc/cups/be/images/modify-printer.gif
-share/doc/cups/be/images/navbar.gif
-share/doc/cups/be/images/print-test-page.gif
-share/doc/cups/be/images/reject-jobs.gif
-share/doc/cups/be/images/release-job.gif
-share/doc/cups/be/images/restart-job.gif
-share/doc/cups/be/images/show-active.gif
-share/doc/cups/be/images/show-completed.gif
-share/doc/cups/be/images/start-class.gif
-share/doc/cups/be/images/start-printer.gif
-share/doc/cups/be/images/stop-class.gif
-share/doc/cups/be/images/stop-printer.gif
-share/doc/cups/be/index.html
-share/doc/cups/cmp.html
-share/doc/cups/cmp.pdf
+share/doc/cups/cups-printable.css
 share/doc/cups/cups.css
-share/doc/cups/cupsdoc.css
-share/doc/cups/de/documentation.html
-share/doc/cups/de/images/accept-jobs.gif
-share/doc/cups/de/images/add-class.gif
-share/doc/cups/de/images/add-printer.gif
-share/doc/cups/de/images/cancel-job.gif
-share/doc/cups/de/images/config-printer.gif
-share/doc/cups/de/images/continue.gif
-share/doc/cups/de/images/delete-class.gif
-share/doc/cups/de/images/delete-printer.gif
-share/doc/cups/de/images/hold-job.gif
-share/doc/cups/de/images/manage-classes.gif
-share/doc/cups/de/images/manage-jobs.gif
-share/doc/cups/de/images/manage-printers.gif
-share/doc/cups/de/images/modify-class.gif
-share/doc/cups/de/images/modify-printer.gif
-share/doc/cups/de/images/navbar.gif
-share/doc/cups/de/images/print-test-page.gif
-share/doc/cups/de/images/reject-jobs.gif
-share/doc/cups/de/images/release-job.gif
-share/doc/cups/de/images/restart-job.gif
-share/doc/cups/de/images/show-active.gif
-share/doc/cups/de/images/show-completed.gif
-share/doc/cups/de/images/start-class.gif
-share/doc/cups/de/images/start-printer.gif
-share/doc/cups/de/images/stop-class.gif
-share/doc/cups/de/images/stop-printer.gif
+share/doc/cups/de/images/button-accept-jobs.gif
+share/doc/cups/de/images/button-add-class.gif
+share/doc/cups/de/images/button-add-printer.gif
+share/doc/cups/de/images/button-add-this-printer.gif
+share/doc/cups/de/images/button-cancel-all-jobs.gif
+share/doc/cups/de/images/button-cancel-job.gif
+share/doc/cups/de/images/button-change-settings.gif
+share/doc/cups/de/images/button-clean-print-heads.gif
+share/doc/cups/de/images/button-clear.gif
+share/doc/cups/de/images/button-continue.gif
+share/doc/cups/de/images/button-delete-class.gif
+share/doc/cups/de/images/button-delete-printer.gif
+share/doc/cups/de/images/button-edit-configuration-file.gif
+share/doc/cups/de/images/button-export-samba.gif
+share/doc/cups/de/images/button-help.gif
+share/doc/cups/de/images/button-hold-job.gif
+share/doc/cups/de/images/button-manage-classes.gif
+share/doc/cups/de/images/button-manage-jobs.gif
+share/doc/cups/de/images/button-manage-printers.gif
+share/doc/cups/de/images/button-manage-server.gif
+share/doc/cups/de/images/button-modify-class.gif
+share/doc/cups/de/images/button-modify-printer.gif
+share/doc/cups/de/images/button-move-job.gif
+share/doc/cups/de/images/button-move-jobs.gif
+share/doc/cups/de/images/button-print-self-test-page.gif
+share/doc/cups/de/images/button-print-test-page.gif
+share/doc/cups/de/images/button-publish-printer.gif
+share/doc/cups/de/images/button-reject-jobs.gif
+share/doc/cups/de/images/button-release-job.gif
+share/doc/cups/de/images/button-restart-job.gif
+share/doc/cups/de/images/button-save-changes.gif
+share/doc/cups/de/images/button-search.gif
+share/doc/cups/de/images/button-set-allowed-users.gif
+share/doc/cups/de/images/button-set-as-default.gif
+share/doc/cups/de/images/button-set-printer-options.gif
+share/doc/cups/de/images/button-show-active.gif
+share/doc/cups/de/images/button-show-all.gif
+share/doc/cups/de/images/button-show-completed.gif
+share/doc/cups/de/images/button-show-next.gif
+share/doc/cups/de/images/button-show-previous.gif
+share/doc/cups/de/images/button-sort-ascending.gif
+share/doc/cups/de/images/button-sort-descending.gif
+share/doc/cups/de/images/button-start-class.gif
+share/doc/cups/de/images/button-start-printer.gif
+share/doc/cups/de/images/button-stop-class.gif
+share/doc/cups/de/images/button-stop-printer.gif
+share/doc/cups/de/images/button-unpublish-printer.gif
+share/doc/cups/de/images/button-view-access-log.gif
+share/doc/cups/de/images/button-view-error-log.gif
+share/doc/cups/de/images/button-view-page-log.gif
+share/doc/cups/de/images/button-view-printable-version.gif
 share/doc/cups/de/index.html
-share/doc/cups/documentation.html
-share/doc/cups/es/documentation.html
-share/doc/cups/es/images/accept-jobs.gif
-share/doc/cups/es/images/add-class.gif
-share/doc/cups/es/images/add-printer.gif
-share/doc/cups/es/images/cancel-job.gif
-share/doc/cups/es/images/config-printer.gif
-share/doc/cups/es/images/continue.gif
-share/doc/cups/es/images/delete-class.gif
-share/doc/cups/es/images/delete-printer.gif
-share/doc/cups/es/images/hold-job.gif
-share/doc/cups/es/images/manage-classes.gif
-share/doc/cups/es/images/manage-jobs.gif
-share/doc/cups/es/images/manage-printers.gif
-share/doc/cups/es/images/modify-class.gif
-share/doc/cups/es/images/modify-printer.gif
-share/doc/cups/es/images/navbar.gif
-share/doc/cups/es/images/print-test-page.gif
-share/doc/cups/es/images/reject-jobs.gif
-share/doc/cups/es/images/release-job.gif
-share/doc/cups/es/images/restart-job.gif
-share/doc/cups/es/images/set-as-default.gif
-share/doc/cups/es/images/show-active.gif
-share/doc/cups/es/images/show-completed.gif
-share/doc/cups/es/images/start-class.gif
-share/doc/cups/es/images/start-printer.gif
-share/doc/cups/es/images/stop-class.gif
-share/doc/cups/es/images/stop-printer.gif
+share/doc/cups/es/images/button-accept-jobs.gif
+share/doc/cups/es/images/button-add-class.gif
+share/doc/cups/es/images/button-add-printer.gif
+share/doc/cups/es/images/button-add-this-printer.gif
+share/doc/cups/es/images/button-cancel-all-jobs.gif
+share/doc/cups/es/images/button-cancel-job.gif
+share/doc/cups/es/images/button-change-settings.gif
+share/doc/cups/es/images/button-clean-print-heads.gif
+share/doc/cups/es/images/button-clear.gif
+share/doc/cups/es/images/button-continue.gif
+share/doc/cups/es/images/button-delete-class.gif
+share/doc/cups/es/images/button-delete-printer.gif
+share/doc/cups/es/images/button-edit-configuration-file.gif
+share/doc/cups/es/images/button-export-samba.gif
+share/doc/cups/es/images/button-help.gif
+share/doc/cups/es/images/button-hold-job.gif
+share/doc/cups/es/images/button-manage-classes.gif
+share/doc/cups/es/images/button-manage-jobs.gif
+share/doc/cups/es/images/button-manage-printers.gif
+share/doc/cups/es/images/button-manage-server.gif
+share/doc/cups/es/images/button-modify-class.gif
+share/doc/cups/es/images/button-modify-printer.gif
+share/doc/cups/es/images/button-move-job.gif
+share/doc/cups/es/images/button-move-jobs.gif
+share/doc/cups/es/images/button-print-self-test-page.gif
+share/doc/cups/es/images/button-print-test-page.gif
+share/doc/cups/es/images/button-publish-printer.gif
+share/doc/cups/es/images/button-reject-jobs.gif
+share/doc/cups/es/images/button-release-job.gif
+share/doc/cups/es/images/button-restart-job.gif
+share/doc/cups/es/images/button-save-changes.gif
+share/doc/cups/es/images/button-search.gif
+share/doc/cups/es/images/button-set-allowed-users.gif
+share/doc/cups/es/images/button-set-as-default.gif
+share/doc/cups/es/images/button-set-printer-options.gif
+share/doc/cups/es/images/button-show-active.gif
+share/doc/cups/es/images/button-show-all.gif
+share/doc/cups/es/images/button-show-completed.gif
+share/doc/cups/es/images/button-show-next.gif
+share/doc/cups/es/images/button-show-previous.gif
+share/doc/cups/es/images/button-sort-ascending.gif
+share/doc/cups/es/images/button-sort-descending.gif
+share/doc/cups/es/images/button-start-class.gif
+share/doc/cups/es/images/button-start-printer.gif
+share/doc/cups/es/images/button-stop-class.gif
+share/doc/cups/es/images/button-stop-printer.gif
+share/doc/cups/es/images/button-unpublish-printer.gif
+share/doc/cups/es/images/button-use-default-config.gif
+share/doc/cups/es/images/button-view-access-log.gif
+share/doc/cups/es/images/button-view-error-log.gif
+share/doc/cups/es/images/button-view-page-log.gif
+share/doc/cups/es/images/button-view-printable-version.gif
 share/doc/cups/es/index.html
-share/doc/cups/fr/cups.css
-share/doc/cups/fr/cupsdoc.css
-share/doc/cups/fr/documentation.html
-share/doc/cups/fr/images/accept-jobs.gif
-share/doc/cups/fr/images/add-class.gif
-share/doc/cups/fr/images/add-printer.gif
-share/doc/cups/fr/images/cancel-job.gif
-share/doc/cups/fr/images/config-printer.gif
-share/doc/cups/fr/images/continue.gif
-share/doc/cups/fr/images/delete-class.gif
-share/doc/cups/fr/images/delete-printer.gif
-share/doc/cups/fr/images/hold-job.gif
-share/doc/cups/fr/images/manage-classes.gif
-share/doc/cups/fr/images/manage-jobs.gif
-share/doc/cups/fr/images/manage-printers.gif
-share/doc/cups/fr/images/modify-class.gif
-share/doc/cups/fr/images/modify-printer.gif
-share/doc/cups/fr/images/navbar.gif
-share/doc/cups/fr/images/print-test-page.gif
-share/doc/cups/fr/images/reject-jobs.gif
-share/doc/cups/fr/images/release-job.gif
-share/doc/cups/fr/images/restart-job.gif
-share/doc/cups/fr/images/show-active.gif
-share/doc/cups/fr/images/show-completed.gif
-share/doc/cups/fr/images/start-class.gif
-share/doc/cups/fr/images/start-printer.gif
-share/doc/cups/fr/images/stop-class.gif
-share/doc/cups/fr/images/stop-printer.gif
+share/doc/cups/et/images/button-accept-jobs.gif
+share/doc/cups/et/images/button-add-class.gif
+share/doc/cups/et/images/button-add-printer.gif
+share/doc/cups/et/images/button-add-this-printer.gif
+share/doc/cups/et/images/button-cancel-all-jobs.gif
+share/doc/cups/et/images/button-cancel-job.gif
+share/doc/cups/et/images/button-change-settings.gif
+share/doc/cups/et/images/button-clean-print-heads.gif
+share/doc/cups/et/images/button-clear.gif
+share/doc/cups/et/images/button-continue.gif
+share/doc/cups/et/images/button-delete-class.gif
+share/doc/cups/et/images/button-delete-printer.gif
+share/doc/cups/et/images/button-edit-configuration-file.gif
+share/doc/cups/et/images/button-export-samba.gif
+share/doc/cups/et/images/button-help.gif
+share/doc/cups/et/images/button-hold-job.gif
+share/doc/cups/et/images/button-manage-classes.gif
+share/doc/cups/et/images/button-manage-jobs.gif
+share/doc/cups/et/images/button-manage-printers.gif
+share/doc/cups/et/images/button-manage-server.gif
+share/doc/cups/et/images/button-modify-class.gif
+share/doc/cups/et/images/button-modify-printer.gif
+share/doc/cups/et/images/button-move-job.gif
+share/doc/cups/et/images/button-move-jobs.gif
+share/doc/cups/et/images/button-print-self-test-page.gif
+share/doc/cups/et/images/button-print-test-page.gif
+share/doc/cups/et/images/button-publish-printer.gif
+share/doc/cups/et/images/button-reject-jobs.gif
+share/doc/cups/et/images/button-release-job.gif
+share/doc/cups/et/images/button-restart-job.gif
+share/doc/cups/et/images/button-save-changes.gif
+share/doc/cups/et/images/button-search.gif
+share/doc/cups/et/images/button-set-allowed-users.gif
+share/doc/cups/et/images/button-set-as-default.gif
+share/doc/cups/et/images/button-set-printer-options.gif
+share/doc/cups/et/images/button-show-active.gif
+share/doc/cups/et/images/button-show-all.gif
+share/doc/cups/et/images/button-show-completed.gif
+share/doc/cups/et/images/button-show-next.gif
+share/doc/cups/et/images/button-show-previous.gif
+share/doc/cups/et/images/button-sort-ascending.gif
+share/doc/cups/et/images/button-sort-descending.gif
+share/doc/cups/et/images/button-start-class.gif
+share/doc/cups/et/images/button-start-printer.gif
+share/doc/cups/et/images/button-stop-class.gif
+share/doc/cups/et/images/button-stop-printer.gif
+share/doc/cups/et/images/button-unpublish-printer.gif
+share/doc/cups/et/images/button-use-default-config.gif
+share/doc/cups/et/images/button-view-access-log.gif
+share/doc/cups/et/images/button-view-error-log.gif
+share/doc/cups/et/images/button-view-page-log.gif
+share/doc/cups/et/images/button-view-printable-version.gif
+share/doc/cups/et/index.html
+share/doc/cups/favicon.ico
+share/doc/cups/fr/images/button-accept-jobs.gif
+share/doc/cups/fr/images/button-add-class.gif
+share/doc/cups/fr/images/button-add-printer.gif
+share/doc/cups/fr/images/button-add-this-printer.gif
+share/doc/cups/fr/images/button-cancel-all-jobs.gif
+share/doc/cups/fr/images/button-cancel-job.gif
+share/doc/cups/fr/images/button-change-settings.gif
+share/doc/cups/fr/images/button-clean-print-heads.gif
+share/doc/cups/fr/images/button-clear.gif
+share/doc/cups/fr/images/button-continue.gif
+share/doc/cups/fr/images/button-delete-class.gif
+share/doc/cups/fr/images/button-delete-printer.gif
+share/doc/cups/fr/images/button-edit-configuration-file.gif
+share/doc/cups/fr/images/button-export-samba.gif
+share/doc/cups/fr/images/button-help.gif
+share/doc/cups/fr/images/button-hold-job.gif
+share/doc/cups/fr/images/button-manage-classes.gif
+share/doc/cups/fr/images/button-manage-jobs.gif
+share/doc/cups/fr/images/button-manage-printers.gif
+share/doc/cups/fr/images/button-manage-server.gif
+share/doc/cups/fr/images/button-modify-class.gif
+share/doc/cups/fr/images/button-modify-printer.gif
+share/doc/cups/fr/images/button-move-job.gif
+share/doc/cups/fr/images/button-move-jobs.gif
+share/doc/cups/fr/images/button-print-self-test-page.gif
+share/doc/cups/fr/images/button-print-test-page.gif
+share/doc/cups/fr/images/button-publish-printer.gif
+share/doc/cups/fr/images/button-reject-jobs.gif
+share/doc/cups/fr/images/button-release-job.gif
+share/doc/cups/fr/images/button-restart-job.gif
+share/doc/cups/fr/images/button-save-changes.gif
+share/doc/cups/fr/images/button-search.gif
+share/doc/cups/fr/images/button-set-allowed-users.gif
+share/doc/cups/fr/images/button-set-as-default.gif
+share/doc/cups/fr/images/button-set-printer-options.gif
+share/doc/cups/fr/images/button-show-active.gif
+share/doc/cups/fr/images/button-show-all.gif
+share/doc/cups/fr/images/button-show-completed.gif
+share/doc/cups/fr/images/button-show-next.gif
+share/doc/cups/fr/images/button-show-previous.gif
+share/doc/cups/fr/images/button-sort-ascending.gif
+share/doc/cups/fr/images/button-sort-descending.gif
+share/doc/cups/fr/images/button-start-class.gif
+share/doc/cups/fr/images/button-start-printer.gif
+share/doc/cups/fr/images/button-stop-class.gif
+share/doc/cups/fr/images/button-stop-printer.gif
+share/doc/cups/fr/images/button-unpublish-printer.gif
+share/doc/cups/fr/images/button-use-default-config.gif
+share/doc/cups/fr/images/button-view-access-log.gif
+share/doc/cups/fr/images/button-view-error-log.gif
+share/doc/cups/fr/images/button-view-page-log.gif
+share/doc/cups/fr/images/button-view-printable-version.gif
 share/doc/cups/fr/index.html
-share/doc/cups/fr/overview.html
-share/doc/cups/fr/overview.pdf
-share/doc/cups/fr/sam.html
-share/doc/cups/fr/sam.pdf
-share/doc/cups/fr/sum.html
-share/doc/cups/fr/sum.pdf
-share/doc/cups/idd.html
-share/doc/cups/idd.pdf
-share/doc/cups/images/accept-jobs.gif
-share/doc/cups/images/add-class.gif
-share/doc/cups/images/add-printer.gif
-share/doc/cups/images/cancel-job.gif
+share/doc/cups/help/api-array.html
+share/doc/cups/help/api-cups.html
+share/doc/cups/help/api-filedir.html
+share/doc/cups/help/api-filter.html
+share/doc/cups/help/api-httpipp.html
+share/doc/cups/help/api-ppd.html
+share/doc/cups/help/api-raster.html
+share/doc/cups/help/cgi.html
+share/doc/cups/help/glossary.html
+share/doc/cups/help/license.html
+share/doc/cups/help/man-accept.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-lpd.html
+share/doc/cups/help/man-cups-polld.html
+share/doc/cups/help/man-cupsaddsmb.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
+share/doc/cups/help/man-cupstestppd.html
+share/doc/cups/help/man-filter.html
+share/doc/cups/help/man-lp.html
+share/doc/cups/help/man-lpadmin.html
+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
+share/doc/cups/help/man-lpstat.html
+share/doc/cups/help/man-mime.convs.html
+share/doc/cups/help/man-mime.types.html
+share/doc/cups/help/man-printers.conf.html
+share/doc/cups/help/network.html
+share/doc/cups/help/options.html
+share/doc/cups/help/overview.html
+share/doc/cups/help/policies.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-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-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/spec-cmp.html
+share/doc/cups/help/spec-command.html
+share/doc/cups/help/spec-design.html
+share/doc/cups/help/spec-ipp.html
+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/standard.html
+share/doc/cups/help/translation.html
+share/doc/cups/help/whatsnew.html
+share/doc/cups/images/bottom-left.gif
+share/doc/cups/images/bottom-right.gif
+share/doc/cups/images/button-accept-jobs.gif
+share/doc/cups/images/button-add-class.gif
+share/doc/cups/images/button-add-printer.gif
+share/doc/cups/images/button-add-this-printer.gif
+share/doc/cups/images/button-cancel-all-jobs.gif
+share/doc/cups/images/button-cancel-job.gif
+share/doc/cups/images/button-change-settings.gif
+share/doc/cups/images/button-clean-print-heads.gif
+share/doc/cups/images/button-clear.gif
+share/doc/cups/images/button-continue.gif
+share/doc/cups/images/button-delete-class.gif
+share/doc/cups/images/button-delete-printer.gif
+share/doc/cups/images/button-edit-configuration-file.gif
+share/doc/cups/images/button-export-samba.gif
+share/doc/cups/images/button-help.gif
+share/doc/cups/images/button-hold-job.gif
+share/doc/cups/images/button-manage-classes.gif
+share/doc/cups/images/button-manage-jobs.gif
+share/doc/cups/images/button-manage-printers.gif
+share/doc/cups/images/button-manage-server.gif
+share/doc/cups/images/button-modify-class.gif
+share/doc/cups/images/button-modify-printer.gif
+share/doc/cups/images/button-move-job.gif
+share/doc/cups/images/button-move-jobs.gif
+share/doc/cups/images/button-print-self-test-page.gif
+share/doc/cups/images/button-print-test-page.gif
+share/doc/cups/images/button-publish-printer.gif
+share/doc/cups/images/button-reject-jobs.gif
+share/doc/cups/images/button-release-job.gif
+share/doc/cups/images/button-restart-job.gif
+share/doc/cups/images/button-save-changes.gif
+share/doc/cups/images/button-search.gif
+share/doc/cups/images/button-set-allowed-users.gif
+share/doc/cups/images/button-set-as-default.gif
+share/doc/cups/images/button-set-printer-options.gif
+share/doc/cups/images/button-show-active.gif
+share/doc/cups/images/button-show-all.gif
+share/doc/cups/images/button-show-completed.gif
+share/doc/cups/images/button-show-next.gif
+share/doc/cups/images/button-show-previous.gif
+share/doc/cups/images/button-sort-ascending.gif
+share/doc/cups/images/button-sort-descending.gif
+share/doc/cups/images/button-start-class.gif
+share/doc/cups/images/button-start-printer.gif
+share/doc/cups/images/button-stop-class.gif
+share/doc/cups/images/button-stop-printer.gif
+share/doc/cups/images/button-unpublish-printer.gif
+share/doc/cups/images/button-use-default-config.gif
+share/doc/cups/images/button-view-access-log.gif
+share/doc/cups/images/button-view-error-log.gif
+share/doc/cups/images/button-view-page-log.gif
+share/doc/cups/images/button-view-printable-version.gif
 share/doc/cups/images/classes.gif
-share/doc/cups/images/config-printer.gif
-share/doc/cups/images/continue.gif
 share/doc/cups/images/cups-block-diagram.gif
-share/doc/cups/images/cups-large.gif
-share/doc/cups/images/cups-medium.gif
-share/doc/cups/images/cups-small.gif
-share/doc/cups/images/delete-class.gif
-share/doc/cups/images/delete-printer.gif
-share/doc/cups/images/hold-job.gif
-share/doc/cups/images/left.gif
+share/doc/cups/images/esp-logo.gif
+share/doc/cups/images/happy.gif
 share/doc/cups/images/logo.gif
-share/doc/cups/images/manage-classes.gif
-share/doc/cups/images/manage-jobs.gif
-share/doc/cups/images/manage-printers.gif
-share/doc/cups/images/modify-class.gif
-share/doc/cups/images/modify-printer.gif
-share/doc/cups/images/navbar.gif
-share/doc/cups/images/print-test-page.gif
 share/doc/cups/images/printer-idle.gif
 share/doc/cups/images/printer-processing.gif
 share/doc/cups/images/printer-stopped.gif
-share/doc/cups/images/reject-jobs.gif
-share/doc/cups/images/release-job.gif
-share/doc/cups/images/restart-job.gif
-share/doc/cups/images/right.gif
-share/doc/cups/images/set-as-default.gif
-share/doc/cups/images/show-active.gif
-share/doc/cups/images/show-completed.gif
-share/doc/cups/images/start-class.gif
-share/doc/cups/images/start-printer.gif
-share/doc/cups/images/stop-class.gif
-share/doc/cups/images/stop-printer.gif
+share/doc/cups/images/smiley.jpg
+share/doc/cups/images/tab-left.gif
+share/doc/cups/images/tab-right.gif
+share/doc/cups/images/top-left.gif
+share/doc/cups/images/top-middle.gif
+share/doc/cups/images/top-right.gif
+share/doc/cups/images/web-add-this-printer.gif
+share/doc/cups/images/web-password.gif
+share/doc/cups/images/web-printer-driver.gif
+share/doc/cups/images/web-printer-status.gif
+share/doc/cups/images/web-set-printer-options.gif
+share/doc/cups/images/web-test-page.gif
 share/doc/cups/index.html
-share/doc/cups/ipp.html
-share/doc/cups/ipp.pdf
-share/doc/cups/overview.html
-share/doc/cups/overview.pdf
+share/doc/cups/it/images/button-accept-jobs.gif
+share/doc/cups/it/images/button-add-class.gif
+share/doc/cups/it/images/button-add-printer.gif
+share/doc/cups/it/images/button-add-this-printer.gif
+share/doc/cups/it/images/button-cancel-all-jobs.gif
+share/doc/cups/it/images/button-cancel-job.gif
+share/doc/cups/it/images/button-change-settings.gif
+share/doc/cups/it/images/button-clean-print-heads.gif
+share/doc/cups/it/images/button-clear.gif
+share/doc/cups/it/images/button-continue.gif
+share/doc/cups/it/images/button-delete-class.gif
+share/doc/cups/it/images/button-delete-printer.gif
+share/doc/cups/it/images/button-edit-configuration-file.gif
+share/doc/cups/it/images/button-export-samba.gif
+share/doc/cups/it/images/button-help.gif
+share/doc/cups/it/images/button-hold-job.gif
+share/doc/cups/it/images/button-manage-classes.gif
+share/doc/cups/it/images/button-manage-jobs.gif
+share/doc/cups/it/images/button-manage-printers.gif
+share/doc/cups/it/images/button-manage-server.gif
+share/doc/cups/it/images/button-modify-class.gif
+share/doc/cups/it/images/button-modify-printer.gif
+share/doc/cups/it/images/button-move-job.gif
+share/doc/cups/it/images/button-move-jobs.gif
+share/doc/cups/it/images/button-print-self-test-page.gif
+share/doc/cups/it/images/button-print-test-page.gif
+share/doc/cups/it/images/button-publish-printer.gif
+share/doc/cups/it/images/button-reject-jobs.gif
+share/doc/cups/it/images/button-release-job.gif
+share/doc/cups/it/images/button-restart-job.gif
+share/doc/cups/it/images/button-save-changes.gif
+share/doc/cups/it/images/button-search.gif
+share/doc/cups/it/images/button-set-allowed-users.gif
+share/doc/cups/it/images/button-set-as-default.gif
+share/doc/cups/it/images/button-set-printer-options.gif
+share/doc/cups/it/images/button-show-active.gif
+share/doc/cups/it/images/button-show-all.gif
+share/doc/cups/it/images/button-show-completed.gif
+share/doc/cups/it/images/button-show-next.gif
+share/doc/cups/it/images/button-show-previous.gif
+share/doc/cups/it/images/button-sort-ascending.gif
+share/doc/cups/it/images/button-sort-descending.gif
+share/doc/cups/it/images/button-start-class.gif
+share/doc/cups/it/images/button-start-printer.gif
+share/doc/cups/it/images/button-stop-class.gif
+share/doc/cups/it/images/button-stop-printer.gif
+share/doc/cups/it/images/button-unpublish-printer.gif
+share/doc/cups/it/images/button-use-default-config.gif
+share/doc/cups/it/images/button-view-access-log.gif
+share/doc/cups/it/images/button-view-error-log.gif
+share/doc/cups/it/images/button-view-page-log.gif
+share/doc/cups/it/images/button-view-printable-version.gif
+share/doc/cups/it/index.html
+share/doc/cups/ja/images/button-accept-jobs.gif
+share/doc/cups/ja/images/button-add-class.gif
+share/doc/cups/ja/images/button-add-printer.gif
+share/doc/cups/ja/images/button-add-this-printer.gif
+share/doc/cups/ja/images/button-cancel-all-jobs.gif
+share/doc/cups/ja/images/button-cancel-job.gif
+share/doc/cups/ja/images/button-change-settings.gif
+share/doc/cups/ja/images/button-continue.gif
+share/doc/cups/ja/images/button-delete-class.gif
+share/doc/cups/ja/images/button-delete-printer.gif
+share/doc/cups/ja/images/button-edit-configuration-file.gif
+share/doc/cups/ja/images/button-export-samba.gif
+share/doc/cups/ja/images/button-help.gif
+share/doc/cups/ja/images/button-hold-job.gif
+share/doc/cups/ja/images/button-manage-classes.gif
+share/doc/cups/ja/images/button-manage-jobs.gif
+share/doc/cups/ja/images/button-manage-printers.gif
+share/doc/cups/ja/images/button-manage-server.gif
+share/doc/cups/ja/images/button-modify-class.gif
+share/doc/cups/ja/images/button-modify-printer.gif
+share/doc/cups/ja/images/button-move-job.gif
+share/doc/cups/ja/images/button-move-jobs.gif
+share/doc/cups/ja/images/button-print-test-page.gif
+share/doc/cups/ja/images/button-publish-printer.gif
+share/doc/cups/ja/images/button-reject-jobs.gif
+share/doc/cups/ja/images/button-release-job.gif
+share/doc/cups/ja/images/button-restart-job.gif
+share/doc/cups/ja/images/button-save-changes.gif
+share/doc/cups/ja/images/button-search.gif
+share/doc/cups/ja/images/button-set-allowed-users.gif
+share/doc/cups/ja/images/button-set-as-default.gif
+share/doc/cups/ja/images/button-set-printer-options.gif
+share/doc/cups/ja/images/button-show-active.gif
+share/doc/cups/ja/images/button-show-all.gif
+share/doc/cups/ja/images/button-show-completed.gif
+share/doc/cups/ja/images/button-show-next.gif
+share/doc/cups/ja/images/button-show-previous.gif
+share/doc/cups/ja/images/button-sort-ascending.gif
+share/doc/cups/ja/images/button-sort-descending.gif
+share/doc/cups/ja/images/button-start-class.gif
+share/doc/cups/ja/images/button-start-printer.gif
+share/doc/cups/ja/images/button-stop-class.gif
+share/doc/cups/ja/images/button-stop-printer.gif
+share/doc/cups/ja/images/button-unpublish-printer.gif
+share/doc/cups/ja/images/button-use-default-config.gif
+share/doc/cups/ja/images/button-view-access-log.gif
+share/doc/cups/ja/images/button-view-error-log.gif
+share/doc/cups/ja/images/button-view-page-log.gif
+share/doc/cups/ja/index.html
+share/doc/cups/pl/images/button-accept-jobs.gif
+share/doc/cups/pl/images/button-add-class.gif
+share/doc/cups/pl/images/button-add-printer.gif
+share/doc/cups/pl/images/button-add-this-printer.gif
+share/doc/cups/pl/images/button-cancel-all-jobs.gif
+share/doc/cups/pl/images/button-cancel-job.gif
+share/doc/cups/pl/images/button-change-settings.gif
+share/doc/cups/pl/images/button-clean-print-heads.gif
+share/doc/cups/pl/images/button-clear.gif
+share/doc/cups/pl/images/button-continue.gif
+share/doc/cups/pl/images/button-delete-class.gif
+share/doc/cups/pl/images/button-delete-printer.gif
+share/doc/cups/pl/images/button-edit-configuration-file.gif
+share/doc/cups/pl/images/button-export-samba.gif
+share/doc/cups/pl/images/button-help.gif
+share/doc/cups/pl/images/button-hold-job.gif
+share/doc/cups/pl/images/button-manage-classes.gif
+share/doc/cups/pl/images/button-manage-jobs.gif
+share/doc/cups/pl/images/button-manage-printers.gif
+share/doc/cups/pl/images/button-manage-server.gif
+share/doc/cups/pl/images/button-modify-class.gif
+share/doc/cups/pl/images/button-modify-printer.gif
+share/doc/cups/pl/images/button-move-job.gif
+share/doc/cups/pl/images/button-move-jobs.gif
+share/doc/cups/pl/images/button-print-self-test-page.gif
+share/doc/cups/pl/images/button-print-test-page.gif
+share/doc/cups/pl/images/button-publish-printer.gif
+share/doc/cups/pl/images/button-reject-jobs.gif
+share/doc/cups/pl/images/button-release-job.gif
+share/doc/cups/pl/images/button-restart-job.gif
+share/doc/cups/pl/images/button-save-changes.gif
+share/doc/cups/pl/images/button-search.gif
+share/doc/cups/pl/images/button-set-allowed-users.gif
+share/doc/cups/pl/images/button-set-as-default.gif
+share/doc/cups/pl/images/button-set-printer-options.gif
+share/doc/cups/pl/images/button-show-active.gif
+share/doc/cups/pl/images/button-show-all.gif
+share/doc/cups/pl/images/button-show-completed.gif
+share/doc/cups/pl/images/button-show-next.gif
+share/doc/cups/pl/images/button-show-previous.gif
+share/doc/cups/pl/images/button-sort-ascending.gif
+share/doc/cups/pl/images/button-sort-descending.gif
+share/doc/cups/pl/images/button-start-class.gif
+share/doc/cups/pl/images/button-start-printer.gif
+share/doc/cups/pl/images/button-stop-class.gif
+share/doc/cups/pl/images/button-stop-printer.gif
+share/doc/cups/pl/images/button-unpublish-printer.gif
+share/doc/cups/pl/images/button-use-default-config.gif
+share/doc/cups/pl/images/button-view-access-log.gif
+share/doc/cups/pl/images/button-view-error-log.gif
+share/doc/cups/pl/images/button-view-page-log.gif
+share/doc/cups/pl/images/button-view-printable-version.gif
+share/doc/cups/pl/index.html
 share/doc/cups/robots.txt
-share/doc/cups/sam.html
-share/doc/cups/sam.pdf
-share/doc/cups/sdd.html
-share/doc/cups/sdd.pdf
-share/doc/cups/spm.html
-share/doc/cups/spm.pdf
-share/doc/cups/sps.html
-share/doc/cups/sps.pdf
-share/doc/cups/ssr.html
-share/doc/cups/ssr.pdf
-share/doc/cups/stp.html
-share/doc/cups/stp.pdf
-share/doc/cups/sum.html
-share/doc/cups/sum.pdf
-share/doc/cups/svd.html
-share/doc/cups/svd.pdf
-share/doc/cups/translation.html
-share/doc/cups/translation.pdf
-share/examples/cups/classes.conf
-share/examples/cups/client.conf
+share/doc/cups/sv/images/button-accept-jobs.gif
+share/doc/cups/sv/images/button-add-class.gif
+share/doc/cups/sv/images/button-add-printer.gif
+share/doc/cups/sv/images/button-add-this-printer.gif
+share/doc/cups/sv/images/button-cancel-all-jobs.gif
+share/doc/cups/sv/images/button-cancel-job.gif
+share/doc/cups/sv/images/button-change-settings.gif
+share/doc/cups/sv/images/button-clean-print-heads.gif
+share/doc/cups/sv/images/button-clear.gif
+share/doc/cups/sv/images/button-continue.gif
+share/doc/cups/sv/images/button-delete-class.gif
+share/doc/cups/sv/images/button-delete-printer.gif
+share/doc/cups/sv/images/button-edit-configuration-file.gif
+share/doc/cups/sv/images/button-export-samba.gif
+share/doc/cups/sv/images/button-help.gif
+share/doc/cups/sv/images/button-hold-job.gif
+share/doc/cups/sv/images/button-manage-classes.gif
+share/doc/cups/sv/images/button-manage-jobs.gif
+share/doc/cups/sv/images/button-manage-printers.gif
+share/doc/cups/sv/images/button-manage-server.gif
+share/doc/cups/sv/images/button-modify-class.gif
+share/doc/cups/sv/images/button-modify-printer.gif
+share/doc/cups/sv/images/button-move-job.gif
+share/doc/cups/sv/images/button-move-jobs.gif
+share/doc/cups/sv/images/button-print-self-test-page.gif
+share/doc/cups/sv/images/button-print-test-page.gif
+share/doc/cups/sv/images/button-publish-printer.gif
+share/doc/cups/sv/images/button-reject-jobs.gif
+share/doc/cups/sv/images/button-release-job.gif
+share/doc/cups/sv/images/button-restart-job.gif
+share/doc/cups/sv/images/button-save-changes.gif
+share/doc/cups/sv/images/button-search.gif
+share/doc/cups/sv/images/button-set-allowed-users.gif
+share/doc/cups/sv/images/button-set-as-default.gif
+share/doc/cups/sv/images/button-set-printer-options.gif
+share/doc/cups/sv/images/button-show-active.gif
+share/doc/cups/sv/images/button-show-all.gif
+share/doc/cups/sv/images/button-show-completed.gif
+share/doc/cups/sv/images/button-show-next.gif
+share/doc/cups/sv/images/button-show-previous.gif
+share/doc/cups/sv/images/button-sort-ascending.gif
+share/doc/cups/sv/images/button-sort-descending.gif
+share/doc/cups/sv/images/button-start-class.gif
+share/doc/cups/sv/images/button-start-printer.gif
+share/doc/cups/sv/images/button-stop-class.gif
+share/doc/cups/sv/images/button-stop-printer.gif
+share/doc/cups/sv/images/button-unpublish-printer.gif
+share/doc/cups/sv/images/button-use-default-config.gif
+share/doc/cups/sv/images/button-view-access-log.gif
+share/doc/cups/sv/images/button-view-error-log.gif
+share/doc/cups/sv/images/button-view-page-log.gif
+share/doc/cups/sv/images/button-view-printable-version.gif
+share/doc/cups/sv/index.html
 ${PAM}share/examples/cups/cups.pam
 share/examples/cups/cupsd.conf
 share/examples/cups/mime.convs
 share/examples/cups/mime.types
-share/examples/cups/printers.conf
 share/examples/rc.d/cupsd
-share/locale/C/cups_C
-share/locale/be/cups_be
-share/locale/cs/cups_cs
-share/locale/de/cups_de
-share/locale/en/cups_en
-share/locale/en_US/cups_en_US
-share/locale/es/cups_es
-share/locale/fr/cups_fr
-share/locale/he/cups_he
-share/locale/it/cups_it
-share/locale/ru_RU/cups_ru_RU
-share/locale/sv/cups_sv
-share/locale/uk/cups_uk
-share/locale/uk_UA/cups_uk_UA
-share/locale/zh_CN/cups_zh_CN
-@unexec ${RMDIR} %D/share/locale/uk_UA 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/locale/ru_RU 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/locale/C 2>/dev/null || ${TRUE}
+share/locale/de/cups_de.po
+share/locale/es/cups_es.po
+share/locale/et/cups_et.po
+share/locale/fr/cups_fr.po
+share/locale/it/cups_it.po
+share/locale/ja/cups_ja.po
+share/locale/pl/cups_pl.po
+share/locale/sv/cups_sv.po
 @dirrm share/examples/cups
+@dirrm share/doc/cups/sv/images
+@dirrm share/doc/cups/sv
+@dirrm share/doc/cups/pl/images
+@dirrm share/doc/cups/pl
+@dirrm share/doc/cups/ja/images
+@dirrm share/doc/cups/ja
+@dirrm share/doc/cups/it/images
+@dirrm share/doc/cups/it
 @dirrm share/doc/cups/images
+@dirrm share/doc/cups/help
 @dirrm share/doc/cups/fr/images
 @dirrm share/doc/cups/fr
+@dirrm share/doc/cups/et/images
+@dirrm share/doc/cups/et
 @dirrm share/doc/cups/es/images
 @dirrm share/doc/cups/es
 @dirrm share/doc/cups/de/images
 @dirrm share/doc/cups/de
-@dirrm share/doc/cups/be/images
-@dirrm share/doc/cups/be
 @dirrm share/doc/cups
+@dirrm share/cups/templates/sv
+@dirrm share/cups/templates/pl
+@dirrm share/cups/templates/ja
+@dirrm share/cups/templates/it
 @dirrm share/cups/templates/fr
+@dirrm share/cups/templates/et
 @dirrm share/cups/templates/es
 @dirrm share/cups/templates/de
-@dirrm share/cups/templates/be
 @dirrm share/cups/templates
+@exec ${MKDIR} %D/share/cups/profiles
+@dirrm share/cups/profiles
 @dirrm share/cups/model
 @dirrm share/cups/fonts
 @dirrm share/cups/data
 @dirrm share/cups/charsets
+@dirrm share/cups/charmaps
 @dirrm share/cups/banners
 @dirrm share/cups
+@dirrm libexec/cups/notifier
+@dirrm libexec/cups/monitor
 @dirrm libexec/cups/filter
+@exec ${MKDIR} %D/libexec/cups/driver
+@dirrm libexec/cups/driver
 @dirrm libexec/cups/daemon
 @dirrm libexec/cups/cgi-bin
 @dirrm libexec/cups/backend
diff --git a/print/cups/distinfo b/print/cups/distinfo
index a12688233f0..97daf77ee3f 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1,27 +1,11 @@
-$NetBSD: distinfo,v 1.44 2006/10/05 01:13:00 rillig Exp $
+$NetBSD: distinfo,v 1.45 2007/03/14 12:29:03 markd Exp $
 
-SHA1 (cups-1.1.23-source.tar.bz2) = 32d5bfb44c4edc1b54ccb014b5a44499295c6c5c
-RMD160 (cups-1.1.23-source.tar.bz2) = 255ec4c22422b14f2367d69f3ec7e590dc46bea5
-Size (cups-1.1.23-source.tar.bz2) = 8705521 bytes
-SHA1 (patch-aa) = a8dc064c49adce682d1aa5e88991037c86f2358f
-SHA1 (patch-ab) = 29c205c31a70229f46f0c99775e70fc9c56af1e8
-SHA1 (patch-ac) = 45388ca8b1bfeaf5d3649b766f65ac7f3108af74
-SHA1 (patch-ad) = 166749eb9fc7b4b20e123d81cd3b2cf96db27677
-SHA1 (patch-ae) = 773b723b3cbd669cd1695577c578fea0fc7fa7f8
-SHA1 (patch-af) = 04e5bf3b73083eb2457a20b0f5238f017fe4aaab
-SHA1 (patch-ag) = 47a5c7a9ad7c604fa3253aebbaa62f576fb477d0
-SHA1 (patch-ah) = 1ef58b7e1dfcbd8aabb9e822d30f995b3d653ea4
-SHA1 (patch-ai) = f1b60cec40426e158801a24e043bc41fee199d1b
-SHA1 (patch-aj) = 248c7ae93fd81154d703a56c0149463d6a73a6f6
-SHA1 (patch-ak) = fe0a5317cf70f49fe3b386177b7a12b2df306ed1
-SHA1 (patch-al) = dcec693d824305cce6e31c07fb96be4759a55f81
-SHA1 (patch-am) = 660bdcd7717f68453fbb3e8b6aa81a4205ef08a1
-SHA1 (patch-an) = a300388af3673e9bf587326817f73edc813da11e
-SHA1 (patch-ao) = c4c8f833cf4a09a686a338df6c209cebec36c6ef
-SHA1 (patch-ap) = 2351844f81a561d69cd02a1e83e30f3c9ee33f5f
-SHA1 (patch-at) = aa36ec591164675b889d2cf32e4d754e9b6db94f
-SHA1 (patch-au) = ab43911c1b27b250a257c67d1d34066237e4da98
-SHA1 (patch-av) = 33437f71e0b6443b172246f1962f9d2eebbd8f11
-SHA1 (patch-aw) = f9a83423eac1a631b67e10911e0ef9e111da9b84
-SHA1 (patch-be) = 85c99298a6eca8f73c81298624d98b66f929aac2
-SHA1 (patch-bf) = a25cbddf47dc9637ccce2a8e40c6541320df4a8a
+SHA1 (cups-1.2.8-source.tar.bz2) = 690890b7d2f779a872e1464fd354498f7da72fee
+RMD160 (cups-1.2.8-source.tar.bz2) = 43d23bd6ef1f396d57f4b57089e6e31fe1304346
+Size (cups-1.2.8-source.tar.bz2) = 3632509 bytes
+SHA1 (patch-ab) = f4e587f328390c550bbb70e24d7c2a90c4c73557
+SHA1 (patch-ac) = 02fab706563f7ba01d66530f9462759689c09f04
+SHA1 (patch-ad) = 6695c344453495cd960460733a80d50654786c60
+SHA1 (patch-an) = 4c5271b0f4a262e782e3de8396870498125675bd
+SHA1 (patch-ao) = dbbd6c9a7cedc1fc698de147019b6256a13c5b59
+SHA1 (patch-at) = eea32b989402c353f5f1644348c1042a3d4ddfa1
diff --git a/print/cups/patches/patch-aa b/print/cups/patches/patch-aa
deleted file mode 100644
index 962f4494b78..00000000000
--- a/print/cups/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.18 2005/12/19 16:04:48 joerg Exp $
-
---- backend/serial.c.orig	2005-12-19 13:59:56.000000000 +0000
-+++ backend/serial.c
-@@ -542,7 +542,7 @@ main(int  argc,		/* I - Number of comman
- void
- list_devices(void)
- {
--#if defined(__hpux) || defined(__sgi) || defined(__sun) || defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if defined(__hpux) || defined(__sgi) || defined(__sun) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
-   static char	*funky_hex = "0123456789abcdefghijklmnopqrstuvwxyz";
- 				/* Funky hex numbering used for some devices */
- #endif /* __hpux || __sgi || __sun || __FreeBSD__ || __OpenBSD__ */
-@@ -792,7 +792,7 @@ list_devices(void)
-       printf("serial serial:%s?baud=38400 \"Unknown\" \"Serial Port #%d\"\n",
-              device, i + 1);
-   }
--#elif defined(__FreeBSD__) || defined(__OpenBSD__)
-+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
-   int	i, j;		/* Looping vars */
-   int	fd;		/* File descriptor */
-   char	device[255];	/* Device filename */
diff --git a/print/cups/patches/patch-ab b/print/cups/patches/patch-ab
index d07e05deee1..31a66418854 100644
--- a/print/cups/patches/patch-ab
+++ b/print/cups/patches/patch-ab
@@ -1,8 +1,17 @@
-$NetBSD: patch-ab,v 1.16 2003/05/28 02:34:00 jlam Exp $
+$NetBSD: patch-ab,v 1.17 2007/03/14 12:29:03 markd Exp $
 
---- Makefile.orig	Thu Mar  6 11:36:00 2003
-+++ Makefile
-@@ -67,13 +67,13 @@
+--- Makefile.orig	2006-08-30 03:51:19.000000000 +1200
++++ Makefile	2007-01-19 15:11:19.000000000 +1300
+@@ -31,7 +31,7 @@
+ DIRS	=	cups backend berkeley cgi-bin filter locale man monitor \
+ 		notifier $(PDFTOPS) scheduler systemv test \
+ 		$(PHPDIR) \
+-		conf data doc fonts ppd templates
++		data doc fonts ppd templates
+ 
+ 
+ #
+@@ -91,7 +91,9 @@
  # Install object and target files...
  #
  
@@ -13,23 +22,14 @@ $NetBSD: patch-ab,v 1.16 2003/05/28 02:34:00 jlam Exp $
  	for dir in $(DIRS); do\
  		echo Installing in $$dir... ;\
  		(cd $$dir; $(MAKE) $(MFLAGS) install) || exit 1;\
- 	done
--	echo Installing in conf...
--	(cd conf; $(MAKE) $(MFLAGS) install)
- 	echo Installing in data...
- 	(cd data; $(MAKE) $(MFLAGS) install)
- 	echo Installing in doc...
-@@ -89,6 +89,13 @@
+@@ -99,6 +101,10 @@
  	echo Installing cups-config script...
- 	$(INSTALL_DIR) $(BINDIR)
+ 	$(INSTALL_DIR) -m 755 $(BINDIR)
  	$(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
 +
-+#
-+# Install config files...
-+#
 +installconf:
 +	echo Installing in conf...
 +	(cd conf; $(MAKE) $(MFLAGS) install)
- 	echo Installing startup script...
- 	if test "x$(INITDIR)" != "x"; then \
- 		$(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/init.d; \
+ 	if test "x$(INITDIR)" != x; then \
+ 		echo Installing init scripts...; \
+ 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \
diff --git a/print/cups/patches/patch-ac b/print/cups/patches/patch-ac
index ad8b2ae5331..4af361bfdd2 100644
--- a/print/cups/patches/patch-ac
+++ b/print/cups/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.12 2004/05/17 10:40:45 jlam Exp $
+$NetBSD: patch-ac,v 1.13 2007/03/14 12:29:03 markd Exp $
 
---- configure.in.orig	Fri Mar 14 12:04:08 2003
+--- configure.in.orig	2006-12-07 09:10:16.000000000 +1300
 +++ configure.in
-@@ -30,7 +30,6 @@ sinclude(config-scripts/cups-directories
- sinclude(config-scripts/cups-manpages.m4)
+@@ -31,7 +31,6 @@ sinclude(config-scripts/cups-manpages.m4
  
+ sinclude(config-scripts/cups-3264.m4)
  sinclude(config-scripts/cups-sharedlibs.m4)
 -sinclude(config-scripts/cups-libtool.m4)
  sinclude(config-scripts/cups-compiler.m4)
diff --git a/print/cups/patches/patch-ad b/print/cups/patches/patch-ad
index c575c18c4e6..7164a311971 100644
--- a/print/cups/patches/patch-ad
+++ b/print/cups/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.12 2004/05/17 10:40:45 jlam Exp $
+$NetBSD: patch-ad,v 1.13 2007/03/14 12:29:03 markd Exp $
 
---- config-scripts/cups-sharedlibs.m4.orig	Wed Jul 23 16:07:34 2003
+--- config-scripts/cups-sharedlibs.m4.orig	2006-12-07 09:10:16.000000000 +1300
 +++ config-scripts/cups-sharedlibs.m4
 @@ -27,6 +27,24 @@ DSOFLAGS="${DSOFLAGS:=}"
  
@@ -27,8 +27,8 @@ $NetBSD: patch-ad,v 1.12 2004/05/17 10:40:45 jlam Exp $
  if test x$enable_shared != xno; then
  	case "$uname" in
  		SunOS* | UNIX_S*)
-@@ -74,6 +92,10 @@ if test x$enable_shared != xno; then
- 			DSOFLAGS="$DSOFLAGS -Wl,-soname,\$@ -shared \$(OPTIM)"
+@@ -84,6 +102,10 @@ if test x$enable_shared != xno; then
+ 			DSOFLAGS="$DSOFLAGS -Wl,-soname,\`basename \$@\` -shared \$(OPTIM)"
  			;;
  	esac
 +elif test x$enable_libtool != xno; then
@@ -38,14 +38,14 @@ $NetBSD: patch-ad,v 1.12 2004/05/17 10:40:45 jlam Exp $
  else
  	PICFLAG=0
  	LIBCUPS="libcups.a"
-@@ -87,8 +109,13 @@ AC_SUBST(LIBCUPS)
+@@ -104,8 +126,13 @@ AC_SUBST(LIBCUPS)
  AC_SUBST(LIBCUPSIMAGE)
  
  if test x$enable_shared = xno; then
--	LINKCUPS="../cups/libcups.a \$(SSLLIBS)"
+-	LINKCUPS="../cups/libcups.a"
 -	LINKCUPSIMAGE="../filter/libcupsimage.a"
 +	if test x$enable_libtool = xno; then
-+		LINKCUPS="../cups/libcups.a \$(SSLLIBS)"
++		LINKCUPS="../cups/libcups.a"
 +		LINKCUPSIMAGE="../filter/libcupsimage.a"
 +	else
 +		LINKCUPS="../cups/\$(LIBCUPS)"
@@ -54,29 +54,29 @@ $NetBSD: patch-ad,v 1.12 2004/05/17 10:40:45 jlam Exp $
  else
  	if test $uname = AIX; then
  		LINKCUPS="-lcups_s"
-@@ -113,10 +140,11 @@ if test "$DSO" != ":"; then
- 	DSOLIBS="\$(LIBPNG) \$(LIBTIFF) \$(LIBJPEG) \$(LIBZ)"
+@@ -130,10 +157,11 @@ if test "$DSO" != ":"; then
+ 	DSOLIBS="\$(LIBTIFF) \$(LIBPNG) \$(LIBJPEG) \$(LIBZ)"
  	IMGLIBS=""
  
--	# The *BSD, HP-UX, and Solaris run-time linkers need help when
--	# deciding where to find a DSO.  Add linker options to tell them
--	# where to find the DSO (usually in /usr/lib...  duh!)
+-	# Tell the run-time linkers where to find a DSO.  Some platforms
+-	# need this option, even when the library is installed in a
+-	# standard location...
 -	case $uname in
 +	if test x$enable_libtool = xno; then
-+		# The *BSD, HP-UX, and Solaris run-time linkers need help when
-+		# deciding where to find a DSO.  Add linker options to tell them
-+		# where to find the DSO (usually in /usr/lib...  duh!)
++		# Tell the run-time linkers where to find a DSO.  Some platforms
++		# need this option, even when the library is installed in a
++		# standard location...
 +		case $uname in
                  HP-UX*)
- 			# HP-UX
-                 	DSOFLAGS="+s +b $libdir $DSOFLAGS"
-@@ -141,7 +169,8 @@ if test "$DSO" != ":"; then
-                         LDFLAGS="$LDFLAGS -Wl,-rpath,$libdir"
-                         EXPORT_LDFLAGS="-Wl,-rpath,$libdir"
-                         ;;
+ 			# HP-UX needs the path, even for /usr/lib...
+ 			case "$uarch" in
+@@ -181,7 +209,8 @@ if test "$DSO" != ":"; then
+ 				EXPORT_LDFLAGS="-Wl,-rpath,$libdir"
+ 			fi
+ 			;;
 -	esac
 +		esac
 +	fi
  else
  	DSOLIBS=""
- 	IMGLIBS="\$(LIBPNG) \$(LIBTIFF) \$(LIBJPEG) \$(LIBZ)"
+ 	IMGLIBS="\$(LIBTIFF) \$(LIBPNG) \$(LIBJPEG) \$(LIBZ)"
diff --git a/print/cups/patches/patch-ae b/print/cups/patches/patch-ae
deleted file mode 100644
index 5d111eb7b71..00000000000
--- a/print/cups/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.14 2005/12/19 16:04:48 joerg Exp $
-
---- backend/parallel.c.orig	2005-12-19 14:00:24.000000000 +0000
-+++ backend/parallel.c
-@@ -633,7 +633,7 @@ list_devices(void)
-       printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d\"\n", device, i + 1);
-     }
-   }
--#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
-+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
-   int	i;			/* Looping var */
-   int	fd;			/* File descriptor */
-   char	device[255];		/* Device filename */
diff --git a/print/cups/patches/patch-af b/print/cups/patches/patch-af
deleted file mode 100644
index 0f96909d1de..00000000000
--- a/print/cups/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.16 2005/12/19 16:04:48 joerg Exp $
-
---- backend/usb.c.orig	2005-12-19 13:59:03.000000000 +0000
-+++ backend/usb.c
-@@ -71,7 +71,7 @@ int	print_device(const char *uri, const 
- 
- #ifdef __APPLE__
- #  include "usb-darwin.c"
--#elif defined(__linux) || defined(__sun) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#elif defined(__linux) || defined(__sun) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
- #  include "usb-unix.c"
- #else
- /*
diff --git a/print/cups/patches/patch-ag b/print/cups/patches/patch-ag
deleted file mode 100644
index b616f055907..00000000000
--- a/print/cups/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.18 2005/12/19 16:04:48 joerg Exp $
-
---- backend/usb-unix.c.orig	2005-12-19 13:59:35.000000000 +0000
-+++ backend/usb-unix.c
-@@ -544,7 +544,7 @@ list_devices(void)
-   }
- #elif defined(__hpux)
- #elif defined(__osf)
--#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
-   int   i;                      /* Looping var */
-   char  device[255];            /* Device filename */
- 
diff --git a/print/cups/patches/patch-ah b/print/cups/patches/patch-ah
deleted file mode 100644
index 7515b7c8d03..00000000000
--- a/print/cups/patches/patch-ah
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-ah,v 1.14 2006/02/16 15:52:15 yyamano Exp $
-
---- config-scripts/cups-compiler.m4.orig	2005-01-04 04:29:45.000000000 +0900
-+++ config-scripts/cups-compiler.m4
-@@ -39,36 +39,6 @@ CXXLIBS=""
- AC_SUBST(CXXLIBS)
- 
- if test -n "$GCC"; then
--	# Starting with GCC 3.0, you must link C++ programs against either
--	# libstdc++ (shared by default), or libsupc++ (always static).  If
--	# you care about binary portability between Linux distributions,
--	# you need to either 1) build your own GCC with static C++ libraries
--	# or 2) link using gcc and libsupc++.  We choose the latter since
--	# CUPS doesn't (currently) use any of the stdc++ library.
--	#
--	# Also, GCC 3.0.x still has problems compiling some code.  You may
--	# or may not have success with it.  USE 3.0.x WITH EXTREME CAUTION!
--	#
--	# Previous versions of GCC do not have the reliance on the stdc++
--	# or g++ libraries, so the extra supc++ library is not needed.
--
--	AC_MSG_CHECKING(if libsupc++ is required)
--
-- 	SUPC="`$CXX -print-file-name=libsupc++.a 2>/dev/null`"
--	case "$SUPC" in
--    		libsupc++.a*)
--			# Library not found, so this is and older GCC...
--			AC_MSG_RESULT(no)
--			;;
--		*)
--        		# This is gcc 3.x, and it knows of libsupc++, so we need it
--        		CXXLIBS="-lsupc++"
--        		AC_MSG_RESULT(yes)
--			;;
--	esac
--
--	CXX="$CC"
--
- 	if test -z "$OPTIM"; then
- 		if test "x$with_optim" = x; then
- 			if test $uname = HP-UX; then
diff --git a/print/cups/patches/patch-ai b/print/cups/patches/patch-ai
deleted file mode 100644
index bd70b465c9c..00000000000
--- a/print/cups/patches/patch-ai
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ai,v 1.15 2006/04/21 17:24:52 wiz Exp $
-
---- filter/image-png.c.orig	2005-01-03 20:29:57.000000000 +0100
-+++ filter/image-png.c
-@@ -83,7 +83,7 @@ ImageReadPNG(image_t    *img,		/* IO - I
-   png_read_info(pp, info);
- 
-   fprintf(stderr, "DEBUG: PNG image: %dx%dx%d, color_type=%x (%s%s%s)\n",
--          info->width, info->height, info->bit_depth, info->color_type,
-+          (int)info->width, (int)info->height, info->bit_depth, info->color_type,
- 	  (info->color_type & PNG_COLOR_MASK_COLOR) ? "RGB" : "GRAYSCALE",
- 	  (info->color_type & PNG_COLOR_MASK_ALPHA) ? "+ALPHA" : "",
- 	  (info->color_type & PNG_COLOR_MASK_PALETTE) ? "+PALETTE" : "");
-@@ -252,7 +252,7 @@ ImageReadPNG(image_t    *img,		/* IO - I
-     }
- 
-   png_read_end(pp, info);
--  png_read_destroy(pp, info, NULL);
-+  png_destroy_read_struct(&pp, &info, NULL);
- 
-   fclose(fp);
-   free(in);
diff --git a/print/cups/patches/patch-aj b/print/cups/patches/patch-aj
deleted file mode 100644
index 48af27bf020..00000000000
--- a/print/cups/patches/patch-aj
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aj,v 1.11 2006/07/05 20:12:06 wiz Exp $
-
---- Makedefs.in.orig	2005-01-03 19:29:44.000000000 +0000
-+++ Makedefs.in
-@@ -117,6 +117,7 @@ SSLLIBS		=	@SSLLIBS@
- 
- bindir		=	@bindir@
- datadir		=	@datadir@
-+datarootdir	=	@datarootdir@
- exec_prefix	=	@exec_prefix@
- includedir	=	@includedir@
- infodir		=	@infodir@
diff --git a/print/cups/patches/patch-ak b/print/cups/patches/patch-ak
deleted file mode 100644
index 6eafdabc79c..00000000000
--- a/print/cups/patches/patch-ak
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ak,v 1.11 2006/07/05 20:12:06 wiz Exp $
-
---- cups-config.in.orig	2005-01-03 19:29:44.000000000 +0000
-+++ cups-config.in
-@@ -32,6 +32,7 @@ bindir=@bindir@
- includedir=@includedir@
- libdir=@libdir@
- datadir=@datadir@
-+datarootdir=@datarootdir@
- sysconfdir=@sysconfdir@
- cups_datadir=@CUPS_DATADIR@
- cups_serverbin=@CUPS_SERVERBIN@
diff --git a/print/cups/patches/patch-al b/print/cups/patches/patch-al
deleted file mode 100644
index b24ab0ff56f..00000000000
--- a/print/cups/patches/patch-al
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-al,v 1.6 2006/07/05 20:12:06 wiz Exp $
-
---- cups.list.in.orig	2005-01-03 19:29:44.000000000 +0000
-+++ cups.list.in
-@@ -58,6 +58,7 @@ $prefix=@prefix@
- $exec_prefix=@exec_prefix@
- $bindir=@bindir@
- $datadir=@datadir@
-+$datarootdir=@datarootdir@
- $includedir=@includedir@
- $infodir=@infodir@
- $libdir=@libdir@
diff --git a/print/cups/patches/patch-am b/print/cups/patches/patch-am
deleted file mode 100644
index 9f2e7496db4..00000000000
--- a/print/cups/patches/patch-am
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-am,v 1.7 2006/09/24 17:09:13 jdc Exp $
-
---- pdftops/GfxFont.cxx.dist	2004-02-02 22:41:09.000000000 +0000
-+++ pdftops/GfxFont.cxx	2006-09-24 16:12:03.000000000 +0100
-@@ -969,7 +969,11 @@
-   if ((nameToGID = ff->getNameToGID())) {
-     for (i = 0; i < 256; ++i) {
-       if (!map[i] && (charName = enc[i])) {
--	map[i] = (Gushort)(int)nameToGID->lookup(charName);
-+	/*
-+	 * Note that we are casting from "void *" here.
-+	 * So, we must first cast to something at least as wide.
-+	 */
-+	map[i] = (Gushort)(long)nameToGID->lookup(charName);
-       }
-     }
-     delete nameToGID;
diff --git a/print/cups/patches/patch-an b/print/cups/patches/patch-an
index 27e6a3978f7..315e823d60b 100644
--- a/print/cups/patches/patch-an
+++ b/print/cups/patches/patch-an
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.7 2006/10/05 01:13:00 rillig Exp $
+$NetBSD: patch-an,v 1.8 2007/03/14 12:29:05 markd 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,120 +9,11 @@ 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	2005-01-03 20:29:45.000000000 +0100
-+++ config-scripts/cups-directories.m4	2006-10-05 02:58:53.000000000 +0200
-@@ -28,6 +28,8 @@ AC_ARG_WITH(fontpath, [  --with-fontpath
- AC_ARG_WITH(docdir, [  --with-docdir           set path for documentation],docdir="$withval",docdir="")
- AC_ARG_WITH(logdir, [  --with-logdir           set path for log files],logdir="$withval",logdir="")
- AC_ARG_WITH(rcdir, [  --with-rcdir            set path for rc scripts],rcdir="$withval",rcdir="")
-+AC_ARG_WITH(localedir, [  --with-localedir        set path for locale files],localedir="$withval",localedir="")
-+AC_ARG_WITH(serverbindir, [  --with-serverbindir     set path for server helper programs],serverbindir="$withval",serverbindir="")
- 
- dnl Fix "prefix" variable if it hasn't been specified...
- if test "$prefix" = "NONE"; then
-@@ -162,32 +164,32 @@ dnl Setup default locations...
- CUPS_SERVERROOT="$sysconfdir/cups"
- CUPS_REQUESTS="$localstatedir/spool/cups"
- 
--AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$sysconfdir/cups")
--AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$localstatedir/spool/cups")
-+AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$CUPS_SERVERROOT")
-+AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$CUPS_REQUESTS")
- 
- if test x$logdir = x; then
- 	CUPS_LOGDIR="$localstatedir/log/cups"
--	AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$localstatedir/log/cups")
- else
- 	CUPS_LOGDIR="$logdir"
--	AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$logdir")
- fi
-+AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$CUPS_LOGDIR")
- 
- dnl See what directory to put server executables...
--case "$uname" in
--	*BSD* | Darwin*)
--		# *BSD and Darwin (MacOS X)
--		INSTALL_SYSV=""
--		CUPS_SERVERBIN="$exec_prefix/libexec/cups"
--		AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$exec_prefix/libexec/cups")
--		;;
--	*)
--		# All others
--		INSTALL_SYSV="install-sysv"
--		CUPS_SERVERBIN="$libdir/cups"
--		AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$libdir/cups")
--		;;
--esac
-+if test x$serverbindir = x; then
-+	case "$uname" in
-+		*BSD* | Darwin*)
-+			# *BSD and Darwin (MacOS X)
-+			CUPS_SERVERBIN="$exec_prefix/libexec/cups"
-+			;;
-+		*)
-+			# All others
-+			CUPS_SERVERBIN="$libdir/cups"
-+			;;
-+	esac
-+else
-+	CUPS_SERVERBIN="$serverbindir"
-+fi
-+AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$CUPS_SERVERBIN")
- 
- AC_SUBST(INSTALL_SYSV)
- AC_SUBST(CUPS_SERVERROOT)
-@@ -196,29 +198,47 @@ AC_SUBST(CUPS_LOGDIR)
- AC_SUBST(CUPS_REQUESTS)
- 
- dnl Set the CUPS_LOCALE directory...
--case "$uname" in
--	Linux | GNU | *BSD* | Darwin*)
--		CUPS_LOCALEDIR="$datadir/locale"
--		AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$datadir/locale")
--		;;
--
--	OSF1* | AIX*)
--		CUPS_LOCALEDIR="$exec_prefix/lib/nls/msg"
--		AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$exec_prefix/lib/nls/msg")
--		;;
--
--	*)
--		# This is the standard System V location...
--		CUPS_LOCALEDIR="$exec_prefix/lib/locale"
--		AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$exec_prefix/lib/locale")
--		;;
--esac
-+if test x$localedir = x; then
-+	case "$uname" in
-+		Linux* | *BSD* | Darwin* | DragonFly*)
-+			CUPS_LOCALEDIR="$datadir/locale"
-+			;;
-+
-+		OSF1* | AIX*)
-+			CUPS_LOCALEDIR="$exec_prefix/lib/nls/msg"
-+			;;
-+
-+		*)
-+			# This is the standard System V location...
-+			CUPS_LOCALEDIR="$exec_prefix/lib/locale"
-+			;;
-+	esac
-+else
-+	CUPS_LOCALEDIR="$localedir"
-+fi
+--- config-scripts/cups-directories.m4.orig	2007-02-05 22:22:11.000000000 +1300
++++ config-scripts/cups-directories.m4
+@@ -223,7 +223,15 @@ AC_SUBST(CUPS_CACHEDIR)
  
-+done=no
-+while test $done = no; do
-+	case "$CUPS_LOCALEDIR" in
-+	*'$'*) eval "CUPS_LOCALEDIR=$CUPS_LOCALEDIR";;
-+	*) done=yes;;
-+	esac
-+done
-+	
-+AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$CUPS_LOCALEDIR")
- AC_SUBST(CUPS_LOCALEDIR)
- 
- dnl Set the CUPS_DATADIR directory...
+ # Data files
  CUPS_DATADIR="$datadir/cups"
 -AC_DEFINE_UNQUOTED(CUPS_DATADIR, "$datadir/cups")
 +done=no
@@ -136,8 +27,9 @@ works.
 +AC_DEFINE_UNQUOTED(CUPS_DATADIR, "$CUPS_DATADIR")
  AC_SUBST(CUPS_DATADIR)
  
- dnl Set the CUPS_DOCROOT directory...
-@@ -230,11 +250,27 @@ else
+ # Documentation files
+@@ -236,7 +244,15 @@ else
+ 	CUPS_DOCROOT="$docdir"
  fi
  
 -AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$docdir")
@@ -152,8 +44,12 @@ works.
 +AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$CUPS_DOCROOT")
  AC_SUBST(CUPS_DOCROOT)
  
- dnl Set the CUPS_FONTPATH directory...
- CUPS_FONTPATH="$fontpath"
+ # Fonts
+@@ -248,10 +264,21 @@ else
+ 	CUPS_FONTPATH="$fontpath"
+ fi
+ 
+-AC_SUBST(CUPS_FONTPATH)
 +done=no
 +while test $done = no; do
 +	case "$CUPS_FONTPATH" in
@@ -162,8 +58,80 @@ works.
 +	esac
 +done
 +
-+AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$CUPS_FONTPATH")
- AC_SUBST(CUPS_FONTPATH)
--AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$fontpath")
+ AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$CUPS_FONTPATH")
++AC_SUBST(CUPS_FONTPATH)
+ 
+ # Locale data
++AC_ARG_WITH(localedir, [  --with-localedir        set path for locale files],localedir="$withval",localedir="")
++
++if test x$localedir = x; then
+ case "$uname" in
+ 	Linux | GNU | *BSD* | Darwin*)
+ 		CUPS_LOCALEDIR="$datadir/locale"
+@@ -266,6 +293,17 @@ case "$uname" in
+ 		CUPS_LOCALEDIR="$exec_prefix/lib/locale"
+ 		;;
+ esac
++else
++	CUPS_LOCALEDIR="$localedir"
++fi
++
++done=no
++while test $done = no; do
++	case "$CUPS_LOCALEDIR" in
++	*'$'*) eval "CUPS_LOCALEDIR=$CUPS_LOCALEDIR";;
++	*) done=yes;;
++	esac
++done
+ 
+ AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$CUPS_LOCALEDIR")
+ AC_SUBST(CUPS_LOCALEDIR)
+@@ -275,7 +313,6 @@ AC_ARG_WITH(logdir, [  --with-logdir    
+ 
+ if test x$logdir = x; then
+ 	CUPS_LOGDIR="$localstatedir/log/cups"
+-	AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$localstatedir/log/cups")
+ else
+ 	CUPS_LOGDIR="$logdir"
+ fi
+@@ -284,10 +321,13 @@ AC_SUBST(CUPS_LOGDIR)
+ 
+ # Longer-term spool data
+ CUPS_REQUESTS="$localstatedir/spool/cups"
+-AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$localstatedir/spool/cups")
++AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$CUPS_REQUESTS")
+ AC_SUBST(CUPS_REQUESTS)
+ 
+ # Server executables...
++AC_ARG_WITH(serverbindir, [  --with-serverbindir     set path for server helper programs],serverbindir="$withval",serverbindir="")
++
++if test x$serverbindir = x; then
+ case "$uname" in
+ 	*BSD* | Darwin*)
+ 		# *BSD and Darwin (MacOS X)
+@@ -300,6 +340,10 @@ case "$uname" in
+ 		CUPS_SERVERBIN="$exec_prefix/lib/cups"
+ 		;;
+ esac
++else
++	INSTALL_SYSV=""
++	CUPS_SERVERBIN="$serverbindir"
++fi
+ 
+ AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$CUPS_SERVERBIN")
+ AC_SUBST(CUPS_SERVERBIN)
+@@ -307,12 +351,12 @@ AC_SUBST(INSTALL_SYSV)
+ 
+ # Configuration files
+ CUPS_SERVERROOT="$sysconfdir/cups"
+-AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$sysconfdir/cups")
++AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$CUPS_SERVERROOT")
+ AC_SUBST(CUPS_SERVERROOT)
+ 
+ # Transient run-time state
+ CUPS_STATEDIR="$localstatedir/run/cups"
+-AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$localstatedir/run/cups")
++AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR")
+ AC_SUBST(CUPS_STATEDIR)
  
  dnl
diff --git a/print/cups/patches/patch-ao b/print/cups/patches/patch-ao
index 7930a67ce93..642417715bf 100644
--- a/print/cups/patches/patch-ao
+++ b/print/cups/patches/patch-ao
@@ -1,6 +1,6 @@
-$NetBSD: patch-ao,v 1.5 2003/06/04 06:08:45 jlam Exp $
+$NetBSD: patch-ao,v 1.6 2007/03/14 12:29:05 markd Exp $
 
---- config-scripts/cups-manpages.m4.orig	Tue Dec 17 10:56:39 2002
+--- config-scripts/cups-manpages.m4.orig	2007-02-05 23:09:00.000000000 +1300
 +++ config-scripts/cups-manpages.m4
 @@ -22,6 +22,8 @@ dnl       EMail: cups-info@cups.org
  dnl         WWW: http://www.cups.org
@@ -9,9 +9,9 @@ $NetBSD: patch-ao,v 1.5 2003/06/04 06:08:45 jlam Exp $
 +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" = "\${prefix}/man" -a "$prefix" = "/"; then
- 	case "$uname" in
-@@ -53,9 +55,28 @@ AC_SUBST(AMANDIR)
+ if test "$mandir" = "\${datarootdir}/man" -a "$prefix" = "/"; then
+ 	# New GNU "standards" break previous ones, so make sure we use
+@@ -59,41 +61,60 @@ AC_SUBST(AMANDIR)
  AC_SUBST(PMANDIR)
  
  dnl Setup manpage extensions...
@@ -32,6 +32,10 @@ $NetBSD: patch-ao,v 1.5 2003/06/04 06:08:45 jlam Exp $
 +			# Solaris and HP-UX
 +			manext=sysv
 +			;;
++		Linux* | GNU*)
++			# Linux and GNU Hurd
++			manext=linux
++			;;
 +		*)
 +			# All others
 +			manext=none
@@ -40,36 +44,42 @@ $NetBSD: patch-ao,v 1.5 2003/06/04 06:08:45 jlam Exp $
 +fi
 +case "$manext" in
 +	bsd)
- 		CAT1EXT=0
- 		CAT3EXT=0
- 		CAT5EXT=0
-@@ -63,8 +84,7 @@ case "$uname" in
+ 		MAN1EXT=1
+ 		MAN5EXT=5
+ 		MAN7EXT=7
  		MAN8EXT=8
  		MAN8DIR=8
  		;;
 -	IRIX*)
 -		# SGI IRIX
 +	irix)
- 		CAT1EXT=z
- 		CAT3EXT=z
- 		CAT5EXT=z
-@@ -72,8 +92,7 @@ case "$uname" in
+ 		MAN1EXT=1
+ 		MAN5EXT=5
+ 		MAN7EXT=7
  		MAN8EXT=1m
  		MAN8DIR=1
  		;;
 -	SunOS* | HP-UX*)
 -		# Solaris and HP-UX
 +	sysv)
- 		CAT1EXT=1
- 		CAT3EXT=3
- 		CAT5EXT=5
-@@ -81,8 +100,7 @@ case "$uname" in
+ 		MAN1EXT=1
+ 		MAN5EXT=5
+ 		MAN7EXT=7
  		MAN8EXT=1m
  		MAN8DIR=1m
  		;;
+-	Linux* | GNU*)
+-		# Linux and GNU Hurd
++	linux)
+ 		MAN1EXT=1.gz
+ 		MAN5EXT=5.gz
+ 		MAN7EXT=7.gz
+ 		MAN8EXT=8.gz
+ 		MAN8DIR=8
+ 		;;
 -	*)
 -		# All others
 +	none|*)
- 		CAT1EXT=1
- 		CAT3EXT=3
- 		CAT5EXT=5
+ 		MAN1EXT=1
+ 		MAN5EXT=5
+ 		MAN7EXT=7
diff --git a/print/cups/patches/patch-ap b/print/cups/patches/patch-ap
deleted file mode 100644
index 1531d2fbd6b..00000000000
--- a/print/cups/patches/patch-ap
+++ /dev/null
@@ -1,85 +0,0 @@
-$NetBSD: patch-ap,v 1.7 2006/03/29 17:22:46 joerg Exp $
-
---- pdftops/JBIG2Stream.cxx.orig	2006-02-13 22:20:31.000000000 +0100
-+++ pdftops/JBIG2Stream.cxx
-@@ -13,6 +13,7 @@
- #endif
- 
- #include <stdlib.h>
-+#include <limits.h>
- #include "GList.h"
- #include "Error.h"
- #include "JBIG2Stream.h"
-@@ -1001,6 +1002,10 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, 
-   w = wA;
-   h = hA;
-   line = (wA + 7) >> 3;
-+  if (h < 0 || line <= 0 || h >= INT_MAX / line) {
-+    data = NULL;
-+    return;
-+  }
-   data = (Guchar *)gmalloc(h * line);
- }
- 
-@@ -1010,6 +1015,12 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, 
-   w = bitmap->w;
-   h = bitmap->h;
-   line = bitmap->line;
-+
-+  if (h < 0 || line <= 0 || h >= INT_MAX / line) {
-+    data = NULL;
-+    return;
-+  }
-+
-   data = (Guchar *)gmalloc(h * line);
-   memcpy(data, bitmap->data, h * line);
- }
-@@ -1036,7 +1047,7 @@ JBIG2Bitmap *JBIG2Bitmap::getSlice(Guint
- }
- 
- void JBIG2Bitmap::expand(int newH, Guint pixel) {
--  if (newH <= h) {
-+  if (newH <= h || line <= 0 || newH >= INT_MAX / line) {
-     return;
-   }
-   data = (Guchar *)grealloc(data, newH * line);
-@@ -2565,6 +2576,14 @@ void JBIG2Stream::readHalftoneRegionSeg(
-       !readUWord(&stepX) || !readUWord(&stepY)) {
-     goto eofError;
-   }
-+   if (w == 0 || h == 0 || w >= INT_MAX / h) {
-+     error(getPos(), "Bad bitmap size in JBIG2 halftone segment");
-+     return;
-+   }
-+   if (gridH == 0 || gridW >= INT_MAX / gridH) {
-+     error(getPos(), "Bad grid size in JBIG2 halftone segment");
-+     return;
-+   }
- 
-   // get pattern dictionary
-   if (nRefSegs != 1) {
-@@ -2576,6 +2595,14 @@ void JBIG2Stream::readHalftoneRegionSeg(
-     error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone segment");
-     return;
-   }
-+  if (gridH == 0 || gridW >= INT_MAX / gridH) {
-+    error(getPos(), "Bad size in JBIG2 halftone segment");
-+    return;
-+  }
-+  if (w == 0 || h >= INT_MAX / w) {
-+    error(getPos(), "Bad size in JBIG2 bitmap segment");
-+    return;
-+  }
-   patternDict = (JBIG2PatternDict *)seg;
-   bpp = 0;
-   i = 1;
-@@ -2763,6 +2790,9 @@ JBIG2Bitmap *JBIG2Stream::readGenericBit
-   int code1, code2, code3;
-   int x, y, a0, pix, i, refI, codingI;
- 
-+  if (w < 0 || h <= 0 || w >= INT_MAX / h)
-+    return NULL;
-+
-   bitmap = new JBIG2Bitmap(0, w, h);
-   bitmap->clearToZero();
- 
diff --git a/print/cups/patches/patch-at b/print/cups/patches/patch-at
index 67a4efda161..8d5aa54584f 100644
--- a/print/cups/patches/patch-at
+++ b/print/cups/patches/patch-at
@@ -1,8 +1,8 @@
-$NetBSD: patch-at,v 1.6 2005/01/06 18:22:29 jlam Exp $
+$NetBSD: patch-at,v 1.7 2007/03/14 12:29:05 markd Exp $
 
---- scheduler/Makefile.orig	2005-01-03 14:29:59.000000000 -0500
+--- scheduler/Makefile.orig	2007-02-05 23:20:52.000000000 +1300
 +++ scheduler/Makefile
-@@ -60,12 +60,16 @@ depend:
+@@ -106,7 +106,9 @@ depend:
  # Install the scheduler...
  #
  
@@ -10,13 +10,15 @@ $NetBSD: patch-at,v 1.6 2005/01/06 18:22:29 jlam Exp $
 +install:	installbin
 +
 +installbin:	all
- 	$(INSTALL_DIR) $(SBINDIR)
- 	$(INSTALL_BIN) cupsd $(SBINDIR)
- 	$(INSTALL_DIR) $(SERVERBIN)/daemon
+ 	echo Creating $(SBINDIR)...
+ 	$(INSTALL_DIR) -m 755 $(SBINDIR)
+ 	echo Installing cupsd in $(SBINDIR)...
+@@ -120,6 +122,8 @@ install:	all
+ 	$(INSTALL_BIN) cups-driverd $(SERVERBIN)/daemon
  	$(INSTALL_BIN) cups-lpd $(SERVERBIN)/daemon
  	$(INSTALL_BIN) cups-polld $(SERVERBIN)/daemon
 +
 +installdir:
- 	$(INSTALL_DIR) -m 711 $(SERVERROOT)/certs
- 	$(INSTALL_DIR) $(SERVERROOT)/interfaces
- 	$(INSTALL_DIR) $(SERVERROOT)/ppd
+ 	echo Creating $(SERVERBIN)/driver...
+ 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/driver
+ 	echo Creating $(SERVERROOT)...
diff --git a/print/cups/patches/patch-au b/print/cups/patches/patch-au
deleted file mode 100644
index 491e5947146..00000000000
--- a/print/cups/patches/patch-au
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-au,v 1.4 2005/03/02 18:33:02 drochner Exp $
-
---- pdftops/XRef.cxx.orig	2004-10-13 22:55:53.000000000 +0200
-+++ pdftops/XRef.cxx
-@@ -76,7 +76,7 @@ XRef::XRef(BaseStream *strA, GString *ow
- 
-   // trailer is ok - read the xref table
-   } else {
--    if (size*sizeof(XRefEntry)/sizeof(XRefEntry) != size) {
-+    if (size*(int)sizeof(XRefEntry)/sizeof(XRefEntry) != size) {
-       error(-1, "Invalid 'size' inside xref table.");
-       ok = gFalse;
-       errCode = errDamaged;
-@@ -291,7 +291,7 @@ GBool XRef::readXRef(Guint *pos) {
-     // table size
-     if (first + n > size) {
-       newSize = first + n;
--      if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) {
-+      if (newSize*(int)sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) {
-         error(-1, "Invalid 'newSize'");
-         goto err2;
-       }
-@@ -445,7 +445,7 @@ GBool XRef::constructXRef() {
- 	    if (!strncmp(p, "obj", 3)) {
- 	      if (num >= size) {
- 		newSize = (num + 1 + 255) & ~255;
--	        if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) {
-+	        if (newSize*(int)sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) {
- 	          error(-1, "Invalid 'obj' parameters.");
- 	          return gFalse;
- 	        }
-@@ -470,7 +470,7 @@ GBool XRef::constructXRef() {
-     } else if (!strncmp(p, "endstream", 9)) {
-       if (streamEndsLen == streamEndsSize) {
- 	streamEndsSize += 64;
--        if (streamEndsSize*sizeof(int)/sizeof(int) != streamEndsSize) {
-+        if (streamEndsSize*(int)sizeof(int)/sizeof(int) != streamEndsSize) {
-           error(-1, "Invalid 'endstream' parameter.");
-           return gFalse;
-         }
-@@ -527,6 +527,9 @@ GBool XRef::checkEncrypted(GString *owne
- 	} else {
- 	  keyLength = 5;
- 	}
-+	if (keyLength > 16) {
-+	  keyLength = 16;
-+	}
- 	permFlags = permissions.getInt();
- 	if (encVersion >= 1 && encVersion <= 2 &&
- 	    encRevision >= 2 && encRevision <= 3) {
diff --git a/print/cups/patches/patch-av b/print/cups/patches/patch-av
deleted file mode 100644
index a0f6580b1ee..00000000000
--- a/print/cups/patches/patch-av
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-av,v 1.3 2005/03/02 18:33:02 drochner Exp $
-
---- pdftops/Catalog.cxx.orig	2005-03-01 15:38:37.000000000 +0100
-+++ pdftops/Catalog.cxx
-@@ -64,8 +64,8 @@ Catalog::Catalog(XRef *xrefA) {
-   }
-   pagesSize = numPages0 = (int)obj.getNum();
-   obj.free();
--  if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize ||
--      pagesSize*sizeof(Ref)/sizeof(Ref) != pagesSize) {
-+  if (pagesSize*(int)sizeof(Page *)/sizeof(Page *) != pagesSize ||
-+      pagesSize*(int)sizeof(Ref)/sizeof(Ref) != pagesSize) {
-     error(-1, "Invalid 'pagesSize'");
-     ok = gFalse;
-     return;
-@@ -197,7 +197,8 @@ int Catalog::readPageTree(Dict *pagesDic
-       }
-       if (start >= pagesSize) {
- 	pagesSize += 32;
--        if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize) {
-+        if (pagesSize*(int)sizeof(Page *)/sizeof(Page *) != pagesSize ||
-+		pagesSize*(int)sizeof(Ref)/sizeof(Ref) != pagesSize) {
-           error(-1, "Invalid 'pagesSize' parameter.");
-           goto err3;
-         }
diff --git a/print/cups/patches/patch-aw b/print/cups/patches/patch-aw
deleted file mode 100644
index 40cd90ecce0..00000000000
--- a/print/cups/patches/patch-aw
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aw,v 1.4 2005/08/11 00:03:18 salo Exp $
-
-Fix for CAN-2005-2097, from RedHat.
-
---- pdftops/FontFile.cxx.orig	2004-02-02 23:41:09.000000000 +0100
-+++ pdftops/FontFile.cxx	2005-08-10 22:30:54.000000000 +0200
-@@ -3572,6 +3573,9 @@
-     } else {
-       origLocaTable[i].pos = 2 * getUShort(pos + 2*i);
-     }
-+
-+    if (origLocaTable[i].pos < 0 || origLocaTable[i].pos > len)
-+      error (1, 0, "bad loca table pos value");
-   }
-   qsort(origLocaTable, nGlyphs + 1, sizeof(TrueTypeLoca), &cmpTrueTypeLocaPos);
-   for (i = 0; i < nGlyphs; ++i) {
diff --git a/print/cups/patches/patch-be b/print/cups/patches/patch-be
deleted file mode 100644
index aba75f9a624..00000000000
--- a/print/cups/patches/patch-be
+++ /dev/null
@@ -1,165 +0,0 @@
-$NetBSD: patch-be,v 1.3 2006/03/29 17:22:46 joerg Exp $
-
---- pdftops/Stream.cxx.orig	2004-02-02 17:41:09.000000000 -0500
-+++ pdftops/Stream.cxx
-@@ -12,6 +12,7 @@
- #pragma implementation
- #endif
- 
-+#include <limits.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <stddef.h>
-@@ -409,13 +410,26 @@ StreamPredictor::StreamPredictor(Stream 
-   width = widthA;
-   nComps = nCompsA;
-   nBits = nBitsA;
-+  predLine = NULL;
-+  ok = gFalse;
- 
-   nVals = width * nComps;
-+  if (width <= 0 || nComps <= 0 || nBits <= 0 ||
-+      nComps >= INT_MAX / nBits ||
-+      width >= INT_MAX / nComps / nBits ||
-+      nVals * nBits + 7 < 0) {
-+    return;
-+  }
-   pixBytes = (nComps * nBits + 7) >> 3;
-   rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
-+  if (rowBytes <= 0) {
-+    return;
-+  }
-   predLine = (Guchar *)gmalloc(rowBytes);
-   memset(predLine, 0, rowBytes);
-   predIdx = rowBytes;
-+
-+  ok = gTrue;
- }
- 
- StreamPredictor::~StreamPredictor() {
-@@ -991,6 +1005,10 @@ LZWStream::LZWStream(Stream *strA, int p
-     FilterStream(strA) {
-   if (predictor != 1) {
-     pred = new StreamPredictor(this, predictor, columns, colors, bits);
-+    if (!pred->isOK()) {
-+      delete pred;
-+      pred = NULL;
-+    }
-   } else {
-     pred = NULL;
-   }
-@@ -1239,6 +1257,9 @@ CCITTFaxStream::CCITTFaxStream(Stream *s
-   endOfLine = endOfLineA;
-   byteAlign = byteAlignA;
-   columns = columnsA;
-+  if (columns + 4 <= 0) {
-+    columns = INT_MAX - 4;
-+  }
-   rows = rowsA;
-   endOfBlock = endOfBlockA;
-   black = blackA;
-@@ -2891,6 +2912,11 @@ GBool DCTStream::readBaselineSOF() {
-   height = read16();
-   width = read16();
-   numComps = str->getChar();
-+  if (numComps <= 0 || numComps > 4) {
-+    error(getPos(), "Bad number of components in DCT stream", prec);
-+    numComps = 0;
-+    return gFalse;
-+  }
-   if (prec != 8) {
-     error(getPos(), "Bad DCT precision %d", prec);
-     return gFalse;
-@@ -2917,6 +2943,11 @@ GBool DCTStream::readProgressiveSOF() {
-   height = read16();
-   width = read16();
-   numComps = str->getChar();
-+  if (numComps <= 0 || numComps > 4) {
-+    error(getPos(), "Bad number of components in DCT stream", prec);
-+    numComps = 0;
-+    return gFalse;
-+  }
-   if (prec != 8) {
-     error(getPos(), "Bad DCT precision %d", prec);
-     return gFalse;
-@@ -2939,6 +2970,11 @@ GBool DCTStream::readScanInfo() {
- 
-   length = read16() - 2;
-   scanInfo.numComps = str->getChar();
-+  if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) {
-+    error(getPos(), "Bad number of components in DCT stream");
-+    scanInfo.numComps = 0;
-+    return gFalse;
-+  }
-   --length;
-   if (length != 2 * scanInfo.numComps + 3) {
-     error(getPos(), "Bad DCT scan info block");
-@@ -2980,22 +3016,32 @@ GBool DCTStream::readScanInfo() {
- }
- 
- GBool DCTStream::readQuantTables() {
--  int length;
--  int i;
--  int index;
-+  int length, prec, i, index;
- 
-   length = read16() - 2;
-   while (length > 0) {
-     index = str->getChar();
--    if ((index & 0xf0) || index >= 4) {
-+    prec = (index >> 4) & 0x0f;
-+    index &= 0x0f;
-+    if (prec > 1 || index >= 4) {
-       error(getPos(), "Bad DCT quantization table");
-       return gFalse;
-     }
--    if (index == numQuantTables)
-+    if (index == numQuantTables) {
-       numQuantTables = index + 1;
--    for (i = 0; i < 64; ++i)
--      quantTables[index][dctZigZag[i]] = str->getChar();
--    length -= 65;
-+    }
-+    for (i = 0; i < 64; ++i) {
-+      if (prec) {
-+	quantTables[index][dctZigZag[i]] = read16();
-+      } else {
-+	quantTables[index][dctZigZag[i]] = str->getChar();
-+      }
-+    }
-+    if (prec) {
-+      length -= 129;
-+    } else {
-+      length -= 65;
-+    }
-   }
-   return gTrue;
- }
-@@ -3023,6 +3069,7 @@ GBool DCTStream::readHuffmanTables() {
- 	numACHuffTables = index+1;
-       tbl = &acHuffTables[index];
-     } else {
-+      index &= 0x0f;
-       if (index >= numDCHuffTables)
- 	numDCHuffTables = index+1;
-       tbl = &dcHuffTables[index];
-@@ -3136,7 +3183,7 @@ int DCTStream::readMarker() {
-   do {
-     do {
-       c = str->getChar();
--    } while (c != 0xff);
-+    } while (c != 0xff && c != EOF);
-     do {
-       c = str->getChar();
-     } while (c == 0xff);
-@@ -3249,6 +3296,10 @@ FlateStream::FlateStream(Stream *strA, i
-     FilterStream(strA) {
-   if (predictor != 1) {
-     pred = new StreamPredictor(this, predictor, columns, colors, bits);
-+    if (!pred->isOK()) {
-+      delete pred;
-+      pred = NULL;
-+    }
-   } else {
-     pred = NULL;
-   }
diff --git a/print/cups/patches/patch-bf b/print/cups/patches/patch-bf
deleted file mode 100644
index ac915b4cf73..00000000000
--- a/print/cups/patches/patch-bf
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-bf,v 1.2 2006/03/29 17:22:46 joerg Exp $
-
---- pdftops/Stream.h.orig	2004-02-02 17:41:09.000000000 -0500
-+++ pdftops/Stream.h
-@@ -231,6 +231,8 @@ public:
- 
-   ~StreamPredictor();
- 
-+  GBool isOK() { return ok; }
-+
-   int lookChar();
-   int getChar();
- 
-@@ -248,6 +250,7 @@ private:
-   int rowBytes;			// bytes per line
-   Guchar *predLine;		// line buffer
-   int predIdx;			// current index in predLine
-+  GBool ok;
- };
- 
- //------------------------------------------------------------------------
-@@ -530,7 +533,7 @@ private:
-   short getWhiteCode();
-   short getBlackCode();
-   short lookBits(int n);
--  void eatBits(int n) { inputBits -= n; }
-+  void eatBits(int n) { if ((inputBits -= n) < 0) inputBits = 0; }
- };
- 
- //------------------------------------------------------------------------