Update to cups 1.2.10

pkgsrc changes: fix locale path
	patch a bug in pstops's n-up handling (reported to upstream)

CUPS 1.2.10 fixes the init script used to start the scheduler, a recursion
bug in the pdftops filter, and several other issues reported after the
1.2.9 release. Changes include:
* ppdLocalize() now supports localizing for Japanese using the "jp" locale
  name used by the ppdmerge program from the CUPS DDK 1.1.0
* _cupsAdminSetServerSettings() did not support changing of top-level
  directives as designed.
* The init script path check was broken.
* CUPS incorrectly used the attribute "notify-recipient" instead of
  "notify-recicpient-uri" in several places
* Fixed a configure script bug on MirBSD
* The pdftops filter did not limit the amount of recursion of page sets
* Custom page sizes with fractional point sizes did not work
* The lpoptions command would crash when adding or removing options on a
  system with no printers

3 files changed, 21 insertions, 7 deletions

diff --git a/print/cups/Makefile b/print/cups/Makefile
index fae922269e6..2e6fda8db7e 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.119 2007/03/22 08:19:01 dillo Exp $
+# $NetBSD: Makefile,v 1.120 2007/03/22 12:44:22 markd 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,7 +6,7 @@
 
 DISTNAME=	cups-${DIST_VERS}-source
 PKGNAME=	cups-${VERS}
-BASE_VERS=	1.2.9
+BASE_VERS=	1.2.10
 DIST_VERS=	${BASE_VERS}
 VERS=		${DIST_VERS:S/-/./g}
 CATEGORIES=	print
@@ -38,7 +38,7 @@ INSTALL_TARGET=		installcups
 AUTOCONF_REQD=		2.60
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-localedir=${PREFIX}/${PKGLOCALEDIR}
+CONFIGURE_ARGS+=	--with-localedir=${PREFIX}/${PKGLOCALEDIR}/locale
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR:Q}
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
 CONFIGURE_ARGS+=	--with-cachedir=${VARBASE:Q}/cache/cups
diff --git a/print/cups/distinfo b/print/cups/distinfo
index 5682d1cbe42..6c7ef6d32b2 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.47 2007/03/18 13:17:53 markd Exp $
+$NetBSD: distinfo,v 1.48 2007/03/22 12:44:22 markd Exp $
 
-SHA1 (cups-1.2.9-source.tar.bz2) = 58e67800103e699b4699f17db41da33ddea360fb
-RMD160 (cups-1.2.9-source.tar.bz2) = 8af1323a8006c3736a15c25c89773292a129161d
-Size (cups-1.2.9-source.tar.bz2) = 3617594 bytes
+SHA1 (cups-1.2.10-source.tar.bz2) = 241d7a3c52370fb08ed2ffc3fd8f59673d158299
+RMD160 (cups-1.2.10-source.tar.bz2) = 85b3bbd46a6fc097891c571ffad8e5e46693743f
+Size (cups-1.2.10-source.tar.bz2) = 3618084 bytes
 SHA1 (patch-aa) = 51ff6e66f881e445adca768d4cf2f6bd18fc36dd
 SHA1 (patch-ab) = f4e587f328390c550bbb70e24d7c2a90c4c73557
 SHA1 (patch-ac) = 02fab706563f7ba01d66530f9462759689c09f04
 SHA1 (patch-ad) = 6695c344453495cd960460733a80d50654786c60
+SHA1 (patch-ae) = 161bcbbbe4c065c44177082e675119a9d7c11374
 SHA1 (patch-an) = 4c5271b0f4a262e782e3de8396870498125675bd
 SHA1 (patch-ao) = 5cb88810f316ffad2a004d13e65b70108c8234b2
 SHA1 (patch-at) = eea32b989402c353f5f1644348c1042a3d4ddfa1
diff --git a/print/cups/patches/patch-ae b/print/cups/patches/patch-ae
new file mode 100644
index 00000000000..a67f226fd53
--- /dev/null
+++ b/print/cups/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.16 2007/03/22 12:44:22 markd Exp $
+
+--- filter/pstops.c.orig	2007-03-09 02:40:01.000000000 +1300
++++ filter/pstops.c
+@@ -1537,7 +1537,7 @@ copy_page(cups_file_t  *fp,		/* I - File
+ 	if (doc->number_up > 1 || doc->fitplot)
+ 	  continue;
+       }
+-      else if (!strncmp(line, "%%EndFeature:", 13))
++      else if (!strncmp(line, "%%EndFeature", 12))
+       {
+         feature = 0;
+