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)

1 files changed, 21 insertions, 22 deletions

diff --git a/print/cups/Makefile b/print/cups/Makefile
index 36afe571b18..7e37a22249c 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,30 +1,29 @@
-# $NetBSD: Makefile,v 1.80 2004/10/03 00:18:04 tv Exp $
+# $NetBSD: Makefile,v 1.81 2004/11/08 16:30:59 adam 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:
 # cups-bugs@cups.org.
 
-DISTNAME=		cups-${DIST_VERS}-source
-PKGNAME=		cups-${VERS}
-PKGREVISION=		# empty
-BASE_VERS=		1.1.20
-DIST_VERS=		${BASE_VERS}
-VERS=			${DIST_VERS:S/-/./g}
-PKGREVISION=		3
-CATEGORIES=		print
-MASTER_SITES=		ftp://ftp.easysw.com/pub/cups/${BASE_VERS}/ \
-			ftp://ftp2.easysw.com/pub/cups/${BASE_VERS}/ \
-			ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/${BASE_VERS}/ \
-			ftp://ftp.mpg.goe.ni.schule.de/pub/internet/printing/cups/${BASE_VERS}/ \
-			ftp://ftp.ntua.gr/pub/gnu/cups/${BASE_VERS}/ \
-			ftp://ftp.fisek.com.tr/pub/cups/${BASE_VERS}/
-EXTRACT_SUFX=		.tar.bz2
-
-MAINTAINER=		jlam@NetBSD.org
-HOMEPAGE=		http://www.cups.org/
-COMMENT=		Common UNIX Printing System
-
-CONFLICTS+=		LPRng-[0-9]* LPRng-core-[0-9]*
+DISTNAME=	cups-${DIST_VERS}-source
+PKGNAME=	cups-${VERS}
+BASE_VERS=	1.1.22
+DIST_VERS=	${BASE_VERS}
+VERS=		${DIST_VERS:S/-/./g}
+CATEGORIES=	print
+MASTER_SITES=	ftp://ftp.easysw.com/pub/cups/${BASE_VERS}/ \
+		ftp://ftp2.easysw.com/pub/cups/${BASE_VERS}/ \
+		ftp://ftp3.easysw.com/pub/cups/${BASE_VERS}/ \
+		ftp://ftp.ntua.gr/pub/gnu/cups/${BASE_VERS}/ \
+		ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/${BASE_VERS}/ \
+		ftp://ftp.mpg.goe.ni.schule.de/pub/internet/printing/cups/${BASE_VERS}/ \
+		ftp://ftp.fisek.com.tr/pub/cups/${BASE_VERS}/
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	jlam@NetBSD.org
+HOMEPAGE=	http://www.cups.org/
+COMMENT=	Common UNIX Printing System
+
+CONFLICTS+=	LPRng-[0-9]* LPRng-core-[0-9]*
 
 #PKG_INSTALLATION_TYPES=	overwrite pkgviews