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)

6 files changed, 246 insertions, 81 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
 
diff --git a/print/cups/PLIST b/print/cups/PLIST
index 0d937730300..800e032e4dc 100644
--- a/print/cups/PLIST
+++ b/print/cups/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2004/10/20 16:58:01 abs Exp $
+@comment $NetBSD: PLIST,v 1.16 2004/11/08 16:30:59 adam Exp $
 bin/cancel
 bin/cups-config
 bin/cupstestppd
@@ -47,6 +47,7 @@ libexec/cups/filter/rastertohp
 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
@@ -56,7 +57,6 @@ man/cat1/lpq.0
 man/cat1/lpr.0
 man/cat1/lprm.0
 man/cat1/lpstat.0
-man/cat3/cups-config.0
 man/cat5/classes.conf.0
 man/cat5/cupsd.conf.0
 man/cat5/mime.convs.0
@@ -74,8 +74,67 @@ 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/disable.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/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
@@ -85,7 +144,6 @@ man/fr/cat1/lpq.0
 man/fr/cat1/lpr.0
 man/fr/cat1/lprm.0
 man/fr/cat1/lpstat.0
-man/fr/cat3/cups-config.0
 man/fr/cat5/classes.conf.0
 man/fr/cat5/cupsd.conf.0
 man/fr/cat5/mime.convs.0
@@ -105,6 +163,7 @@ 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
@@ -114,7 +173,6 @@ man/fr/man1/lpq.1
 man/fr/man1/lpr.1
 man/fr/man1/lprm.1
 man/fr/man1/lpstat.1
-man/fr/man3/cups-config.3
 man/fr/man5/classes.conf.5
 man/fr/man5/cupsd.conf.5
 man/fr/man5/mime.convs.5
@@ -134,6 +192,7 @@ man/fr/man8/lpmove.8
 man/fr/man8/reject.8
 man/man1/backend.1
 man/man1/cancel.1
+man/man1/cups-config.1
 man/man1/cupstestppd.1
 man/man1/filter.1
 man/man1/lp.1
@@ -143,7 +202,6 @@ man/man1/lpq.1
 man/man1/lpr.1
 man/man1/lprm.1
 man/man1/lpstat.1
-man/man3/cups-config.3
 man/man5/classes.conf.5
 man/man5/cupsd.conf.5
 man/man5/mime.convs.5
@@ -221,10 +279,57 @@ share/cups/model/stcolor.ppd
 share/cups/model/stcolor2.ppd
 share/cups/model/stphoto.ppd
 share/cups/model/stphoto2.ppd
+share/cups/model/zebra.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
@@ -285,6 +390,52 @@ share/cups/templates/de/printers.tmpl
 share/cups/templates/de/test-page.tmpl
 share/cups/templates/de/trailer.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-modified.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/error.tmpl
+share/cups/templates/es/header.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-release.tmpl
+share/cups/templates/es/job-restart.tmpl
+share/cups/templates/es/jobs.tmpl
+share/cups/templates/es/modify-class.tmpl
+share/cups/templates/es/modify-printer.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/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-deleted.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.tmpl
+share/cups/templates/es/test-page.tmpl
+share/cups/templates/es/trailer.tmpl
 share/cups/templates/fr/add-class.tmpl
 share/cups/templates/fr/add-printer.tmpl
 share/cups/templates/fr/admin-op.tmpl
@@ -350,6 +501,7 @@ 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-modified.tmpl
 share/cups/templates/printer-purge.tmpl
@@ -363,6 +515,33 @@ share/doc/cups/CGI.txt
 share/doc/cups/ENCRYPTION.txt
 share/doc/cups/LICENSE.txt
 share/doc/cups/README.txt
+share/doc/html/cups/be/documentation.html
+share/doc/html/cups/be/images/accept-jobs.gif
+share/doc/html/cups/be/images/add-class.gif
+share/doc/html/cups/be/images/add-printer.gif
+share/doc/html/cups/be/images/cancel-job.gif
+share/doc/html/cups/be/images/config-printer.gif
+share/doc/html/cups/be/images/continue.gif
+share/doc/html/cups/be/images/delete-class.gif
+share/doc/html/cups/be/images/delete-printer.gif
+share/doc/html/cups/be/images/hold-job.gif
+share/doc/html/cups/be/images/manage-classes.gif
+share/doc/html/cups/be/images/manage-jobs.gif
+share/doc/html/cups/be/images/manage-printers.gif
+share/doc/html/cups/be/images/modify-class.gif
+share/doc/html/cups/be/images/modify-printer.gif
+share/doc/html/cups/be/images/navbar.gif
+share/doc/html/cups/be/images/print-test-page.gif
+share/doc/html/cups/be/images/reject-jobs.gif
+share/doc/html/cups/be/images/release-job.gif
+share/doc/html/cups/be/images/restart-job.gif
+share/doc/html/cups/be/images/show-active.gif
+share/doc/html/cups/be/images/show-completed.gif
+share/doc/html/cups/be/images/start-class.gif
+share/doc/html/cups/be/images/start-printer.gif
+share/doc/html/cups/be/images/stop-class.gif
+share/doc/html/cups/be/images/stop-printer.gif
+share/doc/html/cups/be/index.html
 share/doc/html/cups/cmp.html
 share/doc/html/cups/cmp.pdf
 share/doc/html/cups/cups.css
@@ -395,6 +574,34 @@ share/doc/html/cups/de/images/stop-class.gif
 share/doc/html/cups/de/images/stop-printer.gif
 share/doc/html/cups/de/index.html
 share/doc/html/cups/documentation.html
+share/doc/html/cups/es/documentation.html
+share/doc/html/cups/es/images/accept-jobs.gif
+share/doc/html/cups/es/images/add-class.gif
+share/doc/html/cups/es/images/add-printer.gif
+share/doc/html/cups/es/images/cancel-job.gif
+share/doc/html/cups/es/images/config-printer.gif
+share/doc/html/cups/es/images/continue.gif
+share/doc/html/cups/es/images/delete-class.gif
+share/doc/html/cups/es/images/delete-printer.gif
+share/doc/html/cups/es/images/hold-job.gif
+share/doc/html/cups/es/images/manage-classes.gif
+share/doc/html/cups/es/images/manage-jobs.gif
+share/doc/html/cups/es/images/manage-printers.gif
+share/doc/html/cups/es/images/modify-class.gif
+share/doc/html/cups/es/images/modify-printer.gif
+share/doc/html/cups/es/images/navbar.gif
+share/doc/html/cups/es/images/print-test-page.gif
+share/doc/html/cups/es/images/reject-jobs.gif
+share/doc/html/cups/es/images/release-job.gif
+share/doc/html/cups/es/images/restart-job.gif
+share/doc/html/cups/es/images/set-as-default.gif
+share/doc/html/cups/es/images/show-active.gif
+share/doc/html/cups/es/images/show-completed.gif
+share/doc/html/cups/es/images/start-class.gif
+share/doc/html/cups/es/images/start-printer.gif
+share/doc/html/cups/es/images/stop-class.gif
+share/doc/html/cups/es/images/stop-printer.gif
+share/doc/html/cups/es/index.html
 share/doc/html/cups/fr/cups.css
 share/doc/html/cups/fr/cupsdoc.css
 share/doc/html/cups/fr/documentation.html
@@ -462,6 +669,7 @@ share/doc/html/cups/images/reject-jobs.gif
 share/doc/html/cups/images/release-job.gif
 share/doc/html/cups/images/restart-job.gif
 share/doc/html/cups/images/right.gif
+share/doc/html/cups/images/set-as-default.gif
 share/doc/html/cups/images/show-active.gif
 share/doc/html/cups/images/show-completed.gif
 share/doc/html/cups/images/start-class.gif
@@ -521,12 +729,18 @@ ${PKGLOCALEDIR}/locale/zh_CN/cups_zh_CN
 @dirrm share/doc/html/cups/images
 @dirrm share/doc/html/cups/fr/images
 @dirrm share/doc/html/cups/fr
+@dirrm share/doc/html/cups/es/images
+@dirrm share/doc/html/cups/es
 @dirrm share/doc/html/cups/de/images
 @dirrm share/doc/html/cups/de
+@dirrm share/doc/html/cups/be/images
+@dirrm share/doc/html/cups/be
 @dirrm share/doc/html/cups
 @dirrm share/doc/cups
 @dirrm share/cups/templates/fr
+@dirrm share/cups/templates/es
 @dirrm share/cups/templates/de
+@dirrm share/cups/templates/be
 @dirrm share/cups/templates
 @dirrm share/cups/model
 @dirrm share/cups/fonts
diff --git a/print/cups/distinfo b/print/cups/distinfo
index 63db9d671b2..78a44b39820 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.25 2004/05/17 10:40:45 jlam Exp $
+$NetBSD: distinfo,v 1.26 2004/11/08 16:30:59 adam Exp $
 
-SHA1 (cups-1.1.20-source.tar.bz2) = aa0fd35fb4b17ad3311801284295e2693a6e220b
-Size (cups-1.1.20-source.tar.bz2) = 3741510 bytes
+SHA1 (cups-1.1.22-source.tar.bz2) = 287fa4ee304617a40521efe694802d015cf865af
+Size (cups-1.1.22-source.tar.bz2) = 8527045 bytes
 SHA1 (patch-ab) = 29c205c31a70229f46f0c99775e70fc9c56af1e8
 SHA1 (patch-ac) = 45388ca8b1bfeaf5d3649b766f65ac7f3108af74
 SHA1 (patch-ad) = 166749eb9fc7b4b20e123d81cd3b2cf96db27677
-SHA1 (patch-af) = f60f9f9087d9802bbcb2870ca35030b9ddfd60a7
-SHA1 (patch-ag) = bb33db57dd0cfec78fd6110436d91c26615f5bf6
-SHA1 (patch-an) = c4266134f66868f59978ca513f8e3f68dc10f07f
+SHA1 (patch-an) = de699800471069b1521ab2ba7194df445fb75892
 SHA1 (patch-ao) = c4c8f833cf4a09a686a338df6c209cebec36c6ef
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")
 -		;;