Update to cups-1.5.0

--------------------

CHANGES IN CUPS V1.5.0

	- Documentation updates.
	- Localization update (STR #3865)
	- Needed to limit TLS to v1.0 on some versions of Mac OS X.
	- The snmp backend did not work with some printers.


CHANGES IN CUPS V1.5rc1

	- Compile fixes (STR #3849, STR #3850)
	- The scheduler didn't check for empty values for several configuration
	  directives (STR #3861)
	- ipptool didn't generate valid XML when a test was skipped.
	- Added additional error checking to the 1284 device ID code (STR #3858)
	- Fixed some compatibility issues migrating from the old usblp backend
	  to the libusb backend (STR #3860)
	- Fixed the wake-from-sleep printing behavior on Mac OS X.
	- The scheduler incorrectly allowed jobs to be held from a terminating
	  state.
	- The cups-driverd program could crash when a PPD was renamed.
	- The dnssd backend took too long to discover printers on large or busy
	  networks with the new default timeout used by lpinfo and the web
	  interface. This resulted in "lost" printers.


CHANGES IN CUPS V1.5b2

	- Documentation updates.
	- Localization updates (STR #3845)
	- Compiler warning cleanup.
	- Fixed PIE support for Linux (STR #3846)
	- Made httpSetTimeout API public and use it in the IPP backend to avoid
	  timeout errors.
	- The scheduler incorrectly set the "authenticated" printer-type bit for
	  remote queues using authentication.


CHANGES IN CUPS V1.5b1

	- The CUPS library now supports per-connection HTTP timeouts and
	  callbacks.
	- The CUPS library now supports (limited) SSL/TLS X.509 certificate
	  validation and revocation (STR #1616)
	- Updated the PostScript filter to support IncludeFeature in more
	  circumstances (STR #3417)
	- The schedule did not correctly parse some IPv6 addresses and masks in
	  the cupsd.conf file (STR #3533)
	- Fixed a case-insensitive string comparison issue for locales that do
	  not treat "I" and "i" as equivalent (STR #3800)
	- The scheduler reported an incorrect job-printer-uri value when sharing
	  was not enabled (STR #3639)
	- The scheduler now allows the ServerAlias directive to contain multiple
	  hostnames separated by spaces or commas (STR #3813)
	- The scheduler now sets the process group for child processes and
	  manages the group (STR #2829)
	- Fixed some minor issues discovered by a Coverity scan (STR #3838)
	- The scheduler now more carefully creates and removes configuration,
	  cache, and state files (STR #3715)
	- The lpadmin command now allows default option values to be deleted
	  (STR #2959)
	- The lpadmin command now allows the cupsIPPSupplies and
	  cupsSNMPSupplies keywords to be set in a PPD file (STR #3825)
	- Moving a held job no longer releases it (STR #3839)
	- Restored support for GNU TLS and OpenSSL with threading enabled
	  (STR #3605)
	- Fixed a confusing error message from cups-polld (STR #3806)
	- Increased the default RIPCache value to 128MB (STR #3535)
	- MIME errors are now routed to the error_log file (STR #2410)
	- Updated PDF filter to support new Ghostscript ps2write device
	  (STR #3766)
	- Updated PDF filter to support new Poppler option to preserve page
	  sizes in PDF files when the user has not selected a particular media
	  size (STR #3689)
	- Added new PWG Raster filter for IPP Everywhere printer support.
	- Added job-uuid, printer-uuid, and subscription-uuid attributes.
	- Added support for the cupsSingleFile PPD keyword.
	- Dropped support for the printer-state-history attribute (STR #3654)
	- Added support for a new cupsIPPSupplies keyword in PPD files to allow
	  drivers to disable IPP supply level reporting.
	- Added support for a new cupsFilter2 keyword in PPD files to allow for
	  the propagation of the actual MIME media type produced by a filter.
	- The scheduler did not always get the correct Kerberos username when
	  authenticating (STR #3670)
	- Added new cupsRasterOpenIO function and CUPS_RASTER_WRITE_PWG to the
	  CUPS imaging library to support printing to IPP Everywhere raster
	  printers.
	- The scheduler now provides default values for the pages-per-minute and
	  pages-per-minute-color attributes for PPD files that lack a
	  Throughput keyword.
	- Email notifications did not work on Mac OS X.
	- The cupstestppd program now shows an error for files missing a
	  CloseGroup keyword (STR #3668)
	- Name resolution errors no longer cause queues to stop (STR #3719,
	  STR #3753)
	- Added a new cups-exec helper program that applies security profiles
	  to filters, port monitors, backends, CGI programs, and mini-daemons.
	- The web interface can now be disabled using the WebInterface directive
	  in cupsd.conf (STR #2625)
	- The scheduler now provides privacy controls for jobs and subscriptions
	  (STR #2969)
	- Added new cupsArrayNew3 API which offers memory management of array
	  elements.
	- Added several new color spaces to the CUPS raster format (STR #3419)
	- The Validate-Job operation now uses the same policy as Print-Job by
	  default.
	- CUPS now uses iconv to implement all of its character encoding
	  support (STR #3097)
	- The scheduler now implements the Cancel-Jobs, Cancel-My-Jobs, and
	  Close-Job operations along with the job-ids operation attribute from
	  PWG 5100.11.
	- The main CUPS header (<cups/cups.h>) no longer includes the PPD header
	  (<cups/ppd.h>).
	- The scheduler and CUPS API now support the print-quality job template
	  attribute.
	- The scheduler no longer supports the old Mac OS X Server quota
	  plugin.
	- The scheduler now allows writing to /Users/Shared from print filters
	  on Mac OS X.
	- CUPS no longer supports the old ~/.cupsrc or ~/.lpoptions files from
	  CUPS 1.1.x.  The ~/.cups/client.conf and ~/.cups/lpoptions files that
	  were introduced in CUPS 1.2 must now be used.
	- The ipptest tool is now a first-class user program and has several
	  improvements along with new documentation (STR #3484)
	- The cupstestppd tool now warns about non-unique filenames and
	  provides a way to ignore all filename warnings.
	- Dropped support for the recoverable: and recovered: message prefixes.
	- The scheduler now requires that filters and backends have group write
	  permissions disabled.
	- The PPD compiler now checks for overlapping filenames when writing
	  PPD files.
	- The HP-GL/2 filter is no longer included with CUPS (STR #3322)
	- The SCSI backend is no longer included with CUPS (STR #3500)

11 files changed, 74 insertions, 174 deletions

diff --git a/print/cups/Makefile b/print/cups/Makefile
index 42946be74db..225fef5e826 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.183 2011/11/13 21:06:30 sbd Exp $
+# $NetBSD: Makefile,v 1.184 2011/11/13 21:49:17 sbd 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,9 +6,8 @@
 
 DISTNAME=	cups-${DIST_VERS}-source
 PKGNAME=	cups-${DIST_VERS:S/-/./g}
-BASE_VERS=	1.4.8
+BASE_VERS=	1.5.0
 DIST_VERS=	${BASE_VERS}
-PKGREVISION=	2
 
 CATEGORIES=	print
 MASTER_SITES=	http://ftp.easysw.com/pub/cups/${BASE_VERS}/ \
@@ -33,7 +32,6 @@ USE_LANGUAGES=		c c++	# pdftops is a C++ application
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		aclocal autoconf automake gmake
 USE_LIBTOOL=		yes
-INSTALL_TARGET=		installcups
 # patch-a[jkl] were added for 2.60
 AUTOCONF_REQD=		2.60
 
@@ -143,7 +141,7 @@ SUBST_SED.piefix=	-e 's|@PIEFLAGS@||g'
 SUBST_STAGE.piefix=	post-patch
 .endif
 
-INSTALLATION_DIRS=	${DOCDIR} ${EGDIR} ${MIMEDIR}
+INSTALLATION_DIRS=	${DOCDIR} ${EGDIR} ${MIMEDIR} ${CUPS_CONFDIR}
 INSTALL_ENV+=		DSTROOT=${DESTDIR}
 
 pre-configure:
@@ -161,12 +159,11 @@ post-install:
 		${INSTALL_DATA} ${WRKSRC}/$${file}			\
 		     ${DESTDIR}${DOCDIR}/$${file}; \
 	done
-	set -e; cd ${WRKSRC}/conf; for file in cupsd.conf snmp.conf ; do \
-		${INSTALL_DATA} $${file} ${DESTDIR}${EGDIR}/$${file};	\
-	done
-	set -e; cd ${WRKSRC}/conf; for file in mime.convs mime.types; do \
-		${INSTALL_DATA} $${file} ${DESTDIR}${MIMEDIR}/$${file};	\
+	${RUN} for file in cupsd.conf snmp.conf ; do			\
+		${MV} -f ${DESTDIR}${CUPS_CONFDIR}/$${file}		\
+			${DESTDIR}${EGDIR}/$${file};			\
 	done
+	${RM} -f ${DESTDIR}${CUPS_CONFDIR}/cupsd.conf.default
 .if !empty(PKG_OPTIONS:Mpam)
 	${INSTALL_DATA} ${WRKDIR}/cups.pam ${DESTDIR}${EGDIR}
 .endif
@@ -175,6 +172,7 @@ post-install:
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../print/libpaper/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/cups/PLIST b/print/cups/PLIST
index 5d6f148a346..9b0d51fe800 100644
--- a/print/cups/PLIST
+++ b/print/cups/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.36 2011/08/28 07:11:00 sbd Exp $
+@comment $NetBSD: PLIST,v 1.37 2011/11/13 21:49:17 sbd Exp $
 bin/cancel
 bin/cups-config
 bin/cupstestdsc
 bin/cupstestppd
+bin/ipptool
 bin/lp
 bin/lpoptions
 bin/lppasswd
@@ -43,11 +44,12 @@ lib/libcupsmime.la
 lib/libcupsppdc.la
 ${PLIST.dnssd}libexec/cups/backend/dnssd
 libexec/cups/backend/http
+libexec/cups/backend/https
 libexec/cups/backend/ipp
+libexec/cups/backend/ipps
 libexec/cups/backend/lpd
 ${PLIST.dnssd}libexec/cups/backend/mdns
 ${PLIST.notmac}libexec/cups/backend/parallel
-${PLIST.notmac}libexec/cups/backend/scsi
 libexec/cups/backend/serial
 libexec/cups/backend/snmp
 libexec/cups/backend/socket
@@ -59,6 +61,7 @@ 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-exec
 libexec/cups/daemon/cups-lpd
 libexec/cups/daemon/cups-polld
 libexec/cups/filter/bannertops
@@ -66,7 +69,6 @@ libexec/cups/filter/commandtoescpx
 libexec/cups/filter/commandtopclx
 libexec/cups/filter/commandtops
 libexec/cups/filter/gziptoany
-libexec/cups/filter/hpgltops
 ${PLIST.notmac}libexec/cups/filter/imagetops
 ${PLIST.notmac}libexec/cups/filter/imagetoraster
 libexec/cups/filter/pdftops
@@ -77,6 +79,7 @@ libexec/cups/filter/rastertoescpx
 libexec/cups/filter/rastertohp
 libexec/cups/filter/rastertolabel
 libexec/cups/filter/rastertopclx
+libexec/cups/filter/rastertopwg
 libexec/cups/filter/texttops
 libexec/cups/monitor/bcp
 libexec/cups/monitor/tbcp
@@ -87,6 +90,7 @@ man/man1/cancel.1
 man/man1/cups-config.1
 man/man1/cupstestdsc.1
 man/man1/cupstestppd.1
+man/man1/ipptool.1
 man/man1/lp.1
 man/man1/lpoptions.1
 man/man1/lppasswd.1
@@ -103,6 +107,7 @@ man/man5/classes.conf.5
 man/man5/client.conf.5
 man/man5/cups-snmp.conf.5
 man/man5/cupsd.conf.5
+man/man5/ipptoolfile.5
 man/man5/mailto.conf.5
 man/man5/mime.convs.5
 man/man5/mime.types.5
@@ -150,46 +155,7 @@ 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/jis-x0213.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/utf-8
-share/cups/data/HPGLprolog
 share/cups/data/psglyphs
 share/cups/data/testprint
 share/cups/drv/sample.drv
@@ -208,6 +174,16 @@ share/cups/fonts/Monospace
 share/cups/fonts/Monospace-Bold
 share/cups/fonts/Monospace-BoldOblique
 share/cups/fonts/Monospace-Oblique
+share/cups/ipptool/create-printer-subscription.test
+share/cups/ipptool/get-completed-jobs.test
+share/cups/ipptool/get-jobs.test
+share/cups/ipptool/ipp-1.1.test
+share/cups/ipptool/ipp-2.0.test
+share/cups/ipptool/ipp-2.1.test
+share/cups/ipptool/testfile.jpg
+share/cups/ipptool/testfile.pdf
+share/cups/ipptool/testfile.ps
+share/cups/ipptool/testfile.txt
 share/cups/mime/mime.convs
 share/cups/mime/mime.types
 share/cups/ppdc/epson.h
@@ -883,6 +859,8 @@ 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-ipptool.html
+share/doc/cups/help/man-ipptoolfile.html
 share/doc/cups/help/man-lp.html
 share/doc/cups/help/man-lpadmin.html
 share/doc/cups/help/man-lpc.html
@@ -946,8 +924,8 @@ share/doc/cups/images/cups-raster-chain.png
 share/doc/cups/images/cups.png
 share/doc/cups/images/generic.png
 share/doc/cups/images/left.gif
-share/doc/cups/images/raster.png
 share/doc/cups/images/raster-organization.png
+share/doc/cups/images/raster.png
 share/doc/cups/images/right.gif
 share/doc/cups/images/sample-image.png
 share/doc/cups/images/sel.gif
diff --git a/print/cups/distinfo b/print/cups/distinfo
index beb6084adcd..15cd610119e 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1,20 +1,19 @@
-$NetBSD: distinfo,v 1.85 2011/11/13 21:06:30 sbd Exp $
+$NetBSD: distinfo,v 1.86 2011/11/13 21:49:17 sbd Exp $
 
-SHA1 (cups-1.4.8-source.tar.bz2) = 9167f556e78e0bc075f1eb2f695d79cc1f334007
-RMD160 (cups-1.4.8-source.tar.bz2) = ee80e8d0b56dc0e2edf2a9aa9a43c4b92619f741
-Size (cups-1.4.8-source.tar.bz2) = 4547162 bytes
-SHA1 (patch-ab) = 8269ed7f24bcd5b16c143353443d4689fef082b2
+SHA1 (cups-1.5.0-source.tar.bz2) = 628f549867751e373fc20c7558fec422f9eb942b
+RMD160 (cups-1.5.0-source.tar.bz2) = e7be9b6b44428561609c59abaea8fa31a11aefff
+Size (cups-1.5.0-source.tar.bz2) = 4090210 bytes
 SHA1 (patch-ac) = d99dfa6e71efdc5f069c2c3e73e1b29beebf5c9b
-SHA1 (patch-ad) = 40c7f9d14619fec77255783d918c79c24ead6631
+SHA1 (patch-ad) = a8d6610c4057ae98d98435ba577606e3c2bfb4b9
 SHA1 (patch-ae) = 7806067b36fa1c98763cf51a14941665f590b816
-SHA1 (patch-af) = c05f7739d65c7b81cc712cbf6008d53568601f6a
+SHA1 (patch-af) = 025f198dd491a55ffc460d03d3ad23a100fe5271
 SHA1 (patch-ag) = 680c1c7fb44d8153b5825252d2e297a5196ca98e
 SHA1 (patch-ah) = c4dae009ac5d2dec52fec609bfa38f282fb8e75c
-SHA1 (patch-ai) = fae5b2b5e54ea947d92c89c0bdcdd86c7e3bad12
+SHA1 (patch-ai) = 13725f3b4e0016acf5ead79cadb9626d1f2ce58e
 SHA1 (patch-an) = 231c871e31db279e8aeafba71506f93330e0a971
 SHA1 (patch-ao) = 7fe50080b9a6fd4dac186020f9351ef6000373c7
-SHA1 (patch-at) = aee1f0e8cbcd9e2dbcfa9af3fb675ea7ce1ce622
-SHA1 (patch-au) = e4e976ccb4d7782e31f5b0e3ed175359bf95ba42
-SHA1 (patch-config-scripts_cups-gssapi.m4) = a027a1c5a444c3ef39f892f2592fbbb16586087b
+SHA1 (patch-at) = bbda891ed0820e23fe7f6fe3dd5326eeda5b3b2e
+SHA1 (patch-au) = 6d9b086f2e043bc87d07e3657e46e8cf2fbfeb59
+SHA1 (patch-config-scripts_cups-gssapi.m4) = a3505afd30f0864e3022d8f65c810b9614d82cf4
 SHA1 (patch-filter_image-gif.c) = 2269cbf7e42ec80ba91c27eda4871884775f4b7a
 SHA1 (patch-scheduler_dirsvc.c) = 62c6b47522a60b9f8042421e4a9d25a5dfa47c47
diff --git a/print/cups/options.mk b/print/cups/options.mk
index 69877ac3c75..0b6aa3832e4 100644
--- a/print/cups/options.mk
+++ b/print/cups/options.mk
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.12 2011/01/03 05:58:49 adam Exp $
+# $NetBSD: options.mk,v 1.13 2011/11/13 21:49:17 sbd Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cups
 PKG_OPTIONS_REQUIRED_GROUPS=	pdftops
 PKG_OPTIONS_GROUP.pdftops=	ghostscript poppler
-PKG_SUPPORTED_OPTIONS=	acl dbus dnssd kerberos libusb pam slp tcpwrappers threads
+PKG_SUPPORTED_OPTIONS=	acl dbus dnssd kerberos libusb pam slp tcpwrappers
 PKG_SUGGESTED_OPTIONS=	dbus dnssd kerberos libusb poppler slp
 PKG_OPTIONS_LEGACY_OPTS+=	xpdf:poppler gs:ghostscript
 
@@ -89,10 +89,3 @@ CONFIGURE_ARGS+=	--enable-tcp-wrappers
 .else
 CONFIGURE_ARGS+=	--disable-tcp-wrappers
 .endif
-
-.if !empty(PKG_OPTIONS:Mthreads)
-.  include "../../mk/pthread.buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-threads
-.else
-CONFIGURE_ARGS+=	--disable-threads
-.endif
diff --git a/print/cups/patches/patch-ab b/print/cups/patches/patch-ab
deleted file mode 100644
index 0602c471fb3..00000000000
--- a/print/cups/patches/patch-ab
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-ab,v 1.21 2010/05/21 10:05:20 sbd Exp $
-
-Split the install target in installcups & installconf.
-(installcup is everything but the config files.)
-
---- Makefile.orig	2010-01-18 22:10:29.000000000 +0000
-+++ Makefile
-@@ -30,7 +30,7 @@ include Makedefs
- DIRS	=	cups filter backend berkeley cgi-bin driver locale man monitor \
- 		notifier ppdc scheduler systemv test \
- 		$(PHPDIR) \
--		conf data doc examples $(FONTS) templates
-+		data doc examples $(FONTS) templates
- 
- 
- #
-@@ -162,7 +162,8 @@ ctags:
- # Install everything...
- #
- 
--install:	install-data install-headers install-libs install-exec
-+install:	install-data install-conf install-headers install-libs install-exec
-+installcups:	install-data install-headers install-libs install-exec
- 
- 
- #
-@@ -177,6 +178,11 @@ install-data:
- 	echo Installing cups-config script...
- 	$(INSTALL_DIR) -m 755 $(BINDIR)
- 	$(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
-+
-+install-conf:
-+	(cd scheduler; $(MAKE) $(MFLAGS) install-dirs) || exit 1
-+	echo Installing in conf...
-+	(cd conf; $(MAKE) $(MFLAGS) install)
- 	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-ad b/print/cups/patches/patch-ad
index cafa6be7cdb..3017926ab6b 100644
--- a/print/cups/patches/patch-ad
+++ b/print/cups/patches/patch-ad
@@ -1,12 +1,12 @@
-$NetBSD: patch-ad,v 1.16 2010/11/12 08:54:58 sbd Exp $
+$NetBSD: patch-ad,v 1.17 2011/11/13 21:49:17 sbd Exp $
 
 libtoolize.
 
---- config-scripts/cups-sharedlibs.m4.orig	2010-06-16 00:49:01.000000000 +0000
+--- config-scripts/cups-sharedlibs.m4.orig	2010-06-16 00:48:25.000000000 +0000
 +++ config-scripts/cups-sharedlibs.m4
-@@ -18,6 +18,24 @@ DSOFLAGS="${DSOFLAGS:=}"
- 
- AC_ARG_ENABLE(shared, [  --disable-shared        do not create shared libraries])
+@@ -22,6 +22,24 @@ cupsbase="cups"
+ LIBCUPSBASE="lib$cupsbase"
+ LIBCUPSSTATIC="lib$cupsbase.a"
  
 +AC_ARG_ENABLE(libtool, [  --enable-libtool[=LIBTOOL_PATH]
 +			turn on building with libtool (UNSUPPORTED!), default=no])
@@ -29,7 +29,7 @@ libtoolize.
  if test x$enable_shared != xno; then
  	case "$uname" in
  		SunOS*)
-@@ -126,6 +144,15 @@ if test x$enable_shared != xno; then
+@@ -131,6 +149,15 @@ if test x$enable_shared != xno; then
  			DSOFLAGS="$DSOFLAGS -Wl,-soname,\`basename \$@\` -shared \$(OPTIM)"
  			;;
  	esac
@@ -44,15 +44,15 @@ libtoolize.
 +	DSOXX="\$(CXX)"
  else
  	PICFLAG=0
- 	LIBCUPS="libcups.a"
-@@ -156,8 +183,13 @@ AC_SUBST(LIBCUPSMIME)
- AC_SUBST(LIBCUPSPPDC)
+ 	LIBCUPS="lib$cupsbase.a"
+@@ -163,8 +190,13 @@ AC_SUBST(LIBCUPSPPDC)
+ AC_SUBST(LIBCUPSSTATIC)
  
  if test x$enable_shared = xno; then
--	LINKCUPS="../cups/libcups.a"
+-	LINKCUPS="../cups/lib$cupsbase.a"
 -	LINKCUPSIMAGE="../filter/libcupsimage.a"
 +	if test x$enable_libtool = xno; then
-+		LINKCUPS="../cups/libcups.a"
++		LINKCUPS="../cups/lib$cupsbase.a"
 +		LINKCUPSIMAGE="../filter/libcupsimage.a"
 +	else
 +		LINKCUPS="../cups/\$(LIBCUPS)"
@@ -61,7 +61,7 @@ libtoolize.
  
  	EXTLINKCUPS="-lcups"
  	EXTLINKCUPSDRIVER="-lcupsdriver"
-@@ -197,10 +229,11 @@ if test "$DSO" != ":"; then
+@@ -204,10 +236,11 @@ if test "$DSO" != ":"; then
  	DSOLIBS="\$(LIBTIFF) \$(LIBPNG) \$(LIBJPEG) \$(LIBZ)"
  	IMGLIBS=""
  
@@ -77,7 +77,7 @@ libtoolize.
                  HP-UX*)
  			# HP-UX needs the path, even for /usr/lib...
  			case "$uarch" in
-@@ -248,7 +281,8 @@ if test "$DSO" != ":"; then
+@@ -255,7 +288,8 @@ if test "$DSO" != ":"; then
  				EXPORT_LDFLAGS="-Wl,-rpath,$libdir"
  			fi
  			;;
diff --git a/print/cups/patches/patch-af b/print/cups/patches/patch-af
index fd2be5d9654..7de141aaf37 100644
--- a/print/cups/patches/patch-af
+++ b/print/cups/patches/patch-af
@@ -1,14 +1,11 @@
-$NetBSD: patch-af,v 1.20 2010/06/05 23:03:15 sbd Exp $
+$NetBSD: patch-af,v 1.21 2011/11/13 21:49:17 sbd Exp $
 
 * Remove unneeded $(LIBTOOL), it's now in $(INSTALL_BIN).
 
-* Add usb-hybrid.c for
-usb-backend-both-usblp-and-libusb.dpatch by  <till.kamppeter@gmail.com>
-
---- backend/Makefile.orig	2010-06-05 02:08:34.225590281 +0000
+--- backend/Makefile.orig	2011-05-04 04:28:00.000000000 +0000
 +++ backend/Makefile
-@@ -84,7 +84,7 @@ install-data:
- install-exec:
+@@ -89,7 +89,7 @@ install-exec:	$(INSTALLXPC)
+ 	echo Installing backends in $(SERVERBIN)/backend
  	$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
  	for file in $(RBACKENDS); do \
 -		$(LIBTOOL) $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
@@ -16,12 +13,3 @@ usb-backend-both-usblp-and-libusb.dpatch by  <till.kamppeter@gmail.com>
  	done
  	for file in $(UBACKENDS); do \
  		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
-@@ -267,7 +267,7 @@ usb:	usb.o ../cups/$(LIBCUPS) libbackend
- 	echo Linking $@...
- 	$(CC) $(LDFLAGS) -o usb usb.o libbackend.a $(LIBUSB) \
- 		$(BACKLIBS) $(LIBS)
--usb.o:	usb.c usb-darwin.c usb-libusb.c usb-unix.c
-+usb.o:	usb.c usb-darwin.c usb-hybrid.c usb-libusb.c usb-unix.c
- 
- 
- #
diff --git a/print/cups/patches/patch-ai b/print/cups/patches/patch-ai
index abf8143522e..c1162608058 100644
--- a/print/cups/patches/patch-ai
+++ b/print/cups/patches/patch-ai
@@ -1,18 +1,9 @@
-$NetBSD: patch-ai,v 1.18 2010/05/25 08:52:59 wiz Exp $
+$NetBSD: patch-ai,v 1.19 2011/11/13 21:49:17 sbd Exp $
 
 Don't create directories, do that with OWN_DIRS and OWN_DIRS_PERMS
 
 --- notifier/Makefile.orig	2009-04-12 23:04:51.000000000 +0000
 +++ notifier/Makefile
-@@ -54,7 +54,7 @@ clean:
- # Install all targets...
- #
- 
--install:	all install-data install-headers install-libs install-exec
-+install:	all install-data install-headers install-libs install-exec install-dirs
- 
- 
- #
 @@ -62,6 +62,8 @@ install:	all install-data install-header
  #
  
diff --git a/print/cups/patches/patch-at b/print/cups/patches/patch-at
index 6e7570b7712..16e36d46147 100644
--- a/print/cups/patches/patch-at
+++ b/print/cups/patches/patch-at
@@ -1,18 +1,9 @@
-$NetBSD: patch-at,v 1.11 2010/05/25 08:52:59 wiz Exp $
+$NetBSD: patch-at,v 1.12 2011/11/13 21:49:17 sbd Exp $
 
 Don't create directories, do that with OWN_DIRS and OWN_DIRS_PERMS
 
 --- scheduler/Makefile.orig	2009-05-26 23:27:06.000000000 +0000
 +++ scheduler/Makefile
-@@ -127,7 +127,7 @@ depend:
- # Install all targets...
- #
- 
--install:	all install-data install-headers install-libs install-exec
-+install:	all install-headers install-libs install-exec install-dirs
- 
- 
- #
 @@ -135,6 +135,8 @@ install:	all install-data install-header
  #
  
diff --git a/print/cups/patches/patch-au b/print/cups/patches/patch-au
index fc3056ffa67..85500148bfa 100644
--- a/print/cups/patches/patch-au
+++ b/print/cups/patches/patch-au
@@ -1,10 +1,10 @@
-$NetBSD: patch-au,v 1.13 2011/01/19 17:09:20 drochner Exp $
+$NetBSD: patch-au,v 1.14 2011/11/13 21:49:17 sbd Exp $
 
---- scheduler/printers.c.orig	2010-09-22 18:35:07.000000000 +0000
+--- scheduler/printers.c.orig	2011-06-15 00:46:13.000000000 +0000
 +++ scheduler/printers.c
-@@ -81,6 +81,9 @@
- #  include <sys/vfs.h>
- #endif /* HAVE_SYS_VFS_H */
+@@ -80,6 +80,9 @@
+ #  include <asl.h>
+ #endif /* __APPLE__ */
  
 +#if defined(HAVE_STATVFS) && defined(__NetBSD__)
 +#undef HAVE_STATFS
diff --git a/print/cups/patches/patch-config-scripts_cups-gssapi.m4 b/print/cups/patches/patch-config-scripts_cups-gssapi.m4
index d9a681e5f42..1340650389e 100644
--- a/print/cups/patches/patch-config-scripts_cups-gssapi.m4
+++ b/print/cups/patches/patch-config-scripts_cups-gssapi.m4
@@ -1,19 +1,19 @@
-$NetBSD: patch-config-scripts_cups-gssapi.m4,v 1.1 2011/10/13 13:05:57 hans Exp $
+$NetBSD: patch-config-scripts_cups-gssapi.m4,v 1.2 2011/11/13 21:49:17 sbd Exp $
 
---- config-scripts/cups-gssapi.m4.orig	2009-05-19 00:03:04.000000000 +0200
-+++ config-scripts/cups-gssapi.m4	2011-09-20 18:57:15.406259164 +0200
-@@ -29,14 +29,6 @@ if test x$enable_gssapi != xno; then
- 				# Mac OS X weak-links to the Kerberos framework...
- 				LIBGSSAPI="-weak_framework Kerberos"
+--- config-scripts/cups-gssapi.m4.orig	2011-05-12 05:21:56.000000000 +0000
++++ config-scripts/cups-gssapi.m4
+@@ -36,14 +36,6 @@ if test x$enable_gssapi != xno; then
+ 					AC_MSG_RESULT(no)
+ 				fi
  				;;
 -			SunOS*)
 -				# Solaris has a non-standard krb5-config, don't use it!
 -				AC_CHECK_LIB(gss, gss_display_status,
 -					AC_DEFINE(HAVE_GSSAPI, 1, [Whether GSSAPI is available])
--					CFLAGS="`$KRB5CONFIG --cflags` $CFLAGS"		
--					CPPFLAGS="`$KRB5CONFIG --cflags` $CPPFLAGS"		
+-					CFLAGS="`$KRB5CONFIG --cflags` $CFLAGS"
+-					CPPFLAGS="`$KRB5CONFIG --cflags` $CPPFLAGS"
 -					LIBGSSAPI="-lgss `$KRB5CONFIG --libs`")
 -				;;
  			*)
  				# Other platforms just ask for GSSAPI
- 				CFLAGS="`$KRB5CONFIG --cflags gssapi` $CFLAGS"		
+ 				CFLAGS="`$KRB5CONFIG --cflags gssapi` $CFLAGS"