Update to 1.5.4 (ok by wiz@):

        - Documentation updates (STR #4112, STR #4130, STR #4134)
        - Fixes for libusb-based USB backend (STR #4128)
        - The lpq command did not show the owner or title of jobs unless passed
          a username on the command-line (STR #4135)
        - Localized empty strings contained the message catalog metadata
          (STR #4119)
        - Fixed a crash in the libusb-based USB backend (STR #4099)
        - The cups-lpd mini-daemon no longer handled jobs with multiple copies
          (STR #4118)
        - Multiple libusb backend fixes (STR #4098, STR #4100)
        - The IPP backend no longer tries to get the job status for printers
          that do not implement the required operation (STR #4083)
        - Sending a document in an unsupported format to an IPP printer now
          automatically cancels the job (STR #4093)
        - Fix some error reporting issues when printing from /dev/null and
          other unusual situations (STR #4015)
        - The scheduler now sets the CUPS_MAX_MESSAGE environment variable for
          filters (STR #4074)
        - Fixed a build issue when using older versions of autoconf (STR #4084)
        - The IPP backend now treats the client-error-not-possible status code
          as a job history issue, allowing IPP printing to Windows to work
          (STR #4047)
        - The IPP backend incorrectly included the document-format and
          compression attributes in Create-Job requests (STR #4086)
        - The libusb-based USB backend did not work on non-Linux platforms
          (STR #4088)

        - httpReconnect() did not reset the read/write buffers (STR #4065)
        - Compiling without threading support failed (STR #4060)
        - Fixed compile problem with old versions of OpenSSL (STR #4036)
        - The network backends did not check SNMP supply levels regularly
          (STR #4040)
        - The online help always included the "help on help" text (STR #4042)
        - Fixed a SSL handshake issue on OS X (STR #4045)
        - The scheduler could crash if a PPD file contained an invalid paper
          size (STR #4049)
        - The CUPS polling daemon did not reinitialize its connection to the
          remote server on errors in all cases (STR #4031)
        - PostScript auto-configuration was slow and unreliable with some
          printers (STR #4028)
        - Missing localizations caused empty output (STR #4033)
        - The cups-driverd program could temporarily "forget" a PPD file if it
          was updated in place.
        - The dnssd backend now prefers IPPS over IPP.
        - The USB backend now uses and requires LIBUSB 1.0 or later (STR #3477)
        - The LIBUSB-based USB backend now supports the back-channel (STR #2890)
        - Changed how timeouts are implemented in the LPD backend (STR #4013)
        - Added more supported color names for SNMP supplies (STR #3981)
        - The default InputSlot setting was never used (STR #3957)
        - POSIX ACLs are now set properly on certificate files (STR #3970)
        - Supplies with commas in their names were not reported correctly
          (STR #4020)
        - The cupsGetPPD3() function created a temporary file when one was not
          needed (STR #4018)
        - The scheduler now ensures that job notifications contain a value for
          the notify-printer-uri attribute (STR #4014)
        - The lp and lpr commands did not cancel jobs queued from stdin on an
          error (STR #4015)
        - Fixed the IPP backend's handling of HTTP/1.0 compatibility (STR #3988)
        - The IPP backend did not always setup username/password authentication
          for printers (STR #3985)
        - The IPP backend no longer re-queues print jobs that are too large for
          the printer/server (STR #3977)
        - The RPM spec file did not work (STR #4021, STR #4057)
        - Encryption did not work when the server name ended with "."
          (STR #4011)
        - The multi-purpose tray is now mapped to the IPP "by-pass-tray"
          (STR #4009)
        - The correct media size was not always passed to IPP printers
          (STR #4001)
        - Finishing options were not passed to IPP printers (STR #3995)
        - Fixed iCloud-based Back to My Mac printing (STR #3996)

5 files changed, 23 insertions, 17 deletions

diff --git a/print/cups/Makefile b/print/cups/Makefile
index f94ec1a38c6..c5c1994c3fd 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.190 2012/03/12 13:37:40 fhajny Exp $
+# $NetBSD: Makefile,v 1.191 2012/09/18 07:17:28 bouyer 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.5.2
+BASE_VERS=	1.5.4
 DIST_VERS=	${BASE_VERS}
-PKGREVISION=	1
 
 CATEGORIES=	print
 MASTER_SITES=	http://ftp.easysw.com/pub/cups/${BASE_VERS}/ \
@@ -173,6 +172,9 @@ post-install:
 .if !empty(PKG_OPTIONS:Mpam)
 	${INSTALL_DATA} ${WRKDIR}/cups.pam ${DESTDIR}${EGDIR}
 .endif
+.if !empty(PKG_OPTIONS:Mdnssd)
+	${LN} -s ${DESTDIR}${PREFIX}/libexec/cups/backend/dnssd ${DESTDIR}${PREFIX}/libexec/cups/backend/mdns
+.endif
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/print/cups/PLIST b/print/cups/PLIST
index d7f7d7a920d..14869032ac5 100644
--- a/print/cups/PLIST
+++ b/print/cups/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.38 2012/02/07 23:16:57 sbd Exp $
+@comment $NetBSD: PLIST,v 1.39 2012/09/18 07:17:28 bouyer Exp $
 bin/cancel
 bin/cups-config
 bin/cupstestdsc
@@ -182,6 +182,7 @@ share/cups/ipptool/document-letter.pdf
 share/cups/ipptool/document-letter.ps
 share/cups/ipptool/get-completed-jobs.test
 share/cups/ipptool/get-jobs.test
+share/cups/ipptool/get-printer-attributes.test
 share/cups/ipptool/gray.jpg
 share/cups/ipptool/ipp-1.1.test
 share/cups/ipptool/ipp-2.0.test
diff --git a/print/cups/distinfo b/print/cups/distinfo
index c84757e1700..4416170b2c4 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.91 2012/02/07 23:16:57 sbd Exp $
+$NetBSD: distinfo,v 1.92 2012/09/18 07:17:28 bouyer Exp $
 
-SHA1 (cups-1.5.2-source.tar.bz2) = 56fdb4f58e676607845321c0296c1e90e416883f
-RMD160 (cups-1.5.2-source.tar.bz2) = 98181e2ee8c6e574fb6d405f688f52c9b61a2355
-Size (cups-1.5.2-source.tar.bz2) = 9595665 bytes
+SHA1 (cups-1.5.4-source.tar.bz2) = cb39961cbaf1851a47694828ad9a7cdf4da51fbd
+RMD160 (cups-1.5.4-source.tar.bz2) = 9d6a7fd69d3036ec1f3dfd9c70672a2c6fb517b6
+Size (cups-1.5.4-source.tar.bz2) = 9583002 bytes
 SHA1 (patch-ac) = d99dfa6e71efdc5f069c2c3e73e1b29beebf5c9b
 SHA1 (patch-ad) = a8d6610c4057ae98d98435ba577606e3c2bfb4b9
-SHA1 (patch-ae) = 7806067b36fa1c98763cf51a14941665f590b816
+SHA1 (patch-ae) = 061dc910c2f79424969c0d84374c1f59d15ddaa8
 SHA1 (patch-af) = 025f198dd491a55ffc460d03d3ad23a100fe5271
 SHA1 (patch-ag) = 680c1c7fb44d8153b5825252d2e297a5196ca98e
 SHA1 (patch-ah) = 27d9b92a2f1ae116162b4f24d9aab3a955d52052
diff --git a/print/cups/options.mk b/print/cups/options.mk
index 0b6aa3832e4..37b1edb1c7a 100644
--- a/print/cups/options.mk
+++ b/print/cups/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.13 2011/11/13 21:49:17 sbd Exp $
+# $NetBSD: options.mk,v 1.14 2012/09/18 07:17:29 bouyer Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cups
 PKG_OPTIONS_REQUIRED_GROUPS=	pdftops
@@ -53,6 +53,7 @@ CONFIGURE_ARGS+=	--disable-gssapi
 .include "../../devel/libusb/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-libusb
 MESSAGE_SRC+=		${PKGDIR}/MESSAGE.libusb
+USE_TOOLS+=		pkg-config
 .else
 CONFIGURE_ARGS+=	--disable-libusb
 .endif
diff --git a/print/cups/patches/patch-ae b/print/cups/patches/patch-ae
index 3567a5852d1..fc94eaa70e9 100644
--- a/print/cups/patches/patch-ae
+++ b/print/cups/patches/patch-ae
@@ -1,12 +1,12 @@
-$NetBSD: patch-ae,v 1.28 2011/08/12 02:03:14 sbd Exp $
+$NetBSD: patch-ae,v 1.29 2012/09/18 07:17:29 bouyer Exp $
 
 For proper libtool usage split CC into CC_COMPILE and CC with libtool
 mode options compile/link respectively.
 
 Same for CXX.
 
---- Makedefs.in.orig	2010-04-23 18:56:34.000000000 +0000
-+++ Makedefs.in
+--- Makedefs.in.orig	2012-03-01 01:05:55.000000000 +0100
++++ Makedefs.in	2012-09-12 16:45:31.000000000 +0200
 @@ -19,9 +19,11 @@
  
  AR		=	@AR@
@@ -21,21 +21,23 @@ Same for CXX.
  DSO		=	@DSO@
  DSOXX		=	@DSOXX@
  HTMLDOC		=	@HTMLDOC@
-@@ -41,11 +43,11 @@ SHELL		=	/bin/sh
+@@ -41,12 +43,12 @@
  # Installation programs...
  #
  
 -INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
-+INSTALL_BIN	=	$(LIBTOOL) --mode=install $(INSTALL) -c -m 755 @INSTALL_STRIP@
++INSTALL_BIN	=	$(LIBTOOL) --mode=install $(INSTALL) -c -m 555 @INSTALL_STRIP@
  INSTALL_CONFIG	=	$(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
+-INSTALL_COMPDATA =	$(INSTALL) -c -m 444 @INSTALL_GZIP@
++INSTALL_COMPDATA =	$(INSTALL) -c -m 444
  INSTALL_DATA	=	$(INSTALL) -c -m 444
  INSTALL_DIR	=	$(INSTALL) -d
 -INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
-+INSTALL_LIB	=	$(LIBTOOL) --mode=install $(INSTALL) -c -m 755 @INSTALL_STRIP@
++INSTALL_LIB	=	$(LIBTOOL) --mode=install $(INSTALL) -c -m 555 @INSTALL_STRIP@
  INSTALL_MAN	=	$(INSTALL) -c -m 444
  INSTALL_SCRIPT	=	$(INSTALL) -c -m 555
  
-@@ -263,19 +265,19 @@ DBUSDIR		=	@DBUSDIR@
+@@ -279,19 +281,19 @@
  
  .c.o:
  	echo Compiling $<...