Changes 1.1.22:

	- The lpstat man page incorrectly listed the "-s" option
	  as using the equivalent of the "-p" option to list the
	  printers; it uses the "-v" option to list the printers
	  (STR #986)
	- Now allow 0-length reads in the CUPS file API (STR
	  #985)
	- cupsDoFileRequest() now sets cupsLastError() to
	  IPP_ERROR on network errors (STR #953)
	- The pdftops filter didn't scale small pages up to the
	  output page size when the fitplot option was used (STR
	  #984)
	- Fixed the ipptest program usage message (STR #959)
	- Added Spanish man pages (STR #963)
	- Fixed the order of comparisons in the client.conf
	  reading code (STR #971)
	- cupsLangGet() incorrectly set the current locale (STR
	  #970)

Changes 1.1.22rc2:
	- The pdftops filter didn't check the range of all
	  integer attributes (STR #972)
	- Documentation corrections (STR #944, STR #946)
	- Also sanitize device URI in argv[0] (STR #933)
	- cupsRasterReadHeader() didn't swap bytes for the
	  numeric fields properly (STR #930)

Changes 1.1.22rc1:
	- Now sanitize the device URI that is reported in the
	  error_log file (STR #920)
	- Fixed some memory and file descriptor leaks in the job
	  dispatch code (STR #921)
	- Deleting a printer could cause a crash with browsing
	  enabled (STR #865, STR #881, STR #928)
	- Browsing would turn off if the scheduler got an EAGAIN
	  error (STR #924)
	- The mime.types file didn't recognize PostScript as a
	  PJL language name (STR #925)

Changes 1.1.21:
	- The scheduler did not separate Digest authentication
	  parameters with commas (STR #882)
	- Fixed some problems with image printing to custom page
	  sizes (STR #891)
	- Removed the remaining scheduler code that did not use
	  the "close-on-exec" file descriptor flag to speed up
	  program invocations (STR #890)
	- The "lpr -r" command removed the print file even if it
	  was not printed. It now only removes the file if the
	  job is successfully created (STR #886)
	- Revamped the custom page size orientation fix (STR
	  #127)
	- The lp, lpq, lpr, and lpstat commands now report when
	  an environment variable is pointing to a non-existent
	  printer instead of just saying "no default
	  destination" (STR #879)
	- Queue names with 2 periods (e.g. "printer..2") were
	  not supported (STR #866)

3 files changed, 2 insertions, 48 deletions

diff --git a/print/cups/patches/patch-af b/print/cups/patches/patch-af
deleted file mode 100644
index 1d70c344af5..00000000000
--- a/print/cups/patches/patch-af
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-af,v 1.14 2004/05/17 10:40:45 jlam Exp $
-
---- cups/Makefile.orig	Fri Aug 29 17:26:40 2003
-+++ cups/Makefile
-@@ -93,8 +93,8 @@ install:	all	installhdrs
- 	fi
- 	if test $(LIBCUPS) != "libcups.a"; then \
- 		$(INSTALL_LIB) libcups.a $(LIBDIR); \
-+		$(RANLIB) $(LIBDIR)/libcups.a; \
- 	fi
--	$(RANLIB) $(LIBDIR)/libcups.a
- 
- installhdrs:
- 	$(INSTALL_DIR) $(INCLUDEDIR)/cups
-@@ -149,7 +149,7 @@ libcups_s.a:	$(LIBOBJS) ../Makedefs
- libcups.la:    $(LIBOBJS) ../Makedefs
- 	echo Linking $@...
- 	$(DSO) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
--		-version-info 2:5 $(SSLLIBS) $(COMMONLIBS)
-+		-version-info 2:6 $(SSLLIBS) $(COMMONLIBS)
- 
- 
- #
diff --git a/print/cups/patches/patch-ag b/print/cups/patches/patch-ag
deleted file mode 100644
index 9764ba0153c..00000000000
--- a/print/cups/patches/patch-ag
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ag,v 1.16 2004/01/10 03:32:09 jlam Exp $
-
---- filter/Makefile.orig	Mon Nov 17 17:04:53 2003
-+++ filter/Makefile
-@@ -46,7 +46,7 @@ OBJS	=	$(HPGLOBJS) $(IMAGEOBJS) $(FORMOB
- # Make all targets...
- #
- 
--all:	$(TARGETS) libcupsimage.a
-+all:	$(TARGETS) $(LIBCUPSIMAGE) libcupsimage.a
- 
- 
- #
-@@ -88,8 +88,8 @@ install:	all installhdrs
- 	fi
- 	-if test $(LIBCUPSIMAGE) != "libcupsimage.a"; then \
- 		$(INSTALL_LIB) libcupsimage.a $(LIBDIR); \
-+		$(RANLIB) $(LIBDIR)/libcupsimage.a; \
- 	fi
--	$(RANLIB) $(LIBDIR)/libcupsimage.a
- 
- installhdrs:
- 	$(INSTALL_DIR) $(INCLUDEDIR)/cups
diff --git a/print/cups/patches/patch-an b/print/cups/patches/patch-an
index 79d02ede6b7..bef9425a3bc 100644
--- a/print/cups/patches/patch-an
+++ b/print/cups/patches/patch-an
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.4 2003/06/04 06:08:44 jlam Exp $
+$NetBSD: patch-an,v 1.5 2004/11/08 16:30:59 adam Exp $
 
 --- config-scripts/cups-directories.m4.orig	Tue Dec 17 10:56:39 2002
 +++ config-scripts/cups-directories.m4
@@ -62,7 +62,7 @@ $NetBSD: patch-an,v 1.4 2003/06/04 06:08:44 jlam Exp $
  
  dnl Set the CUPS_LOCALE directory...
 -case "$uname" in
--	Linux* | *BSD* | Darwin*)
+-	Linux | GNU | *BSD* | Darwin*)
 -		CUPS_LOCALEDIR="$datadir/locale"
 -		AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$datadir/locale")
 -		;;