Update to 1.9.61, set LICENSE. Requested by Francois Tigeot in PR 46489.

New in 1.9.60:

* New constants from 1.5:
  - IPP_AUTHENTICATION_CANCELED
  - IPP_PKI_ERROR
  - HTTP_NOT_IMPLEMENTED
  - HTTP_BAD_GATEWAY
  - HTTP_SERVICE_UNAVAILABLE
  - HTTP_GATEWAY_TIMEOUT
  - HTTP_NOT_SUPPORTED
  - HTTP_AUTHORIZATION_CANCELED
  - HTTP_PKI_ERROR

New in 1.9.59:

* Password callbacks can now return None to indicate they want to
  abort the current operation.

New in 1.9.58:

* cups.Connection.adminExportSamba

New in 1.9.57:

* Fixed rpm provides script for newer versions of rpm.

New in 1.9.56:

* Builds against older versions of CUPS again.

New in 1.9.55:

* cups.IPP_QUALITY_DRAFT, cups.IPP_QUALITY_NORMAL,
  cups.IPP_QUALITY_HIGH
* cups.IPP_PORTRAIT, cups.IPP_LANDSCAPE, cups.IPP_REVERSE_PORTRAIT,
  cups.IPP_REVERSE_LANDSCAPE
* cups.IPP_RES_UNITS_CM, cups.IPP_RES_UNITS_INCH
* Support for IPP_TAG_RESOLUTION as triplet (xres, yres, units).

New in 1.9.52:

* cups.Connection.getPPDs2(): New method, identical to getPPDs() but
  returning all attribute values as lists.

New in 1.9.50:

* cups.Connection.getPPD3()
* cups.Connection.getJobs() now takes optional requested_attributes argument.
* cups.Connection.getPrinterAttributes(): member-names is now always a list.
* cups.HTTP_NOT_MODIFIED constant.
* cups.PPD_ORDER_ANY constant.
* cups.PPD_ORDER_DOCUMENT constant.
* cups.PPD_ORDER_EXIT constant.
* cups.PPD_ORDER_JCL constant.
* cups.PPD_ORDER_PAGE constant.
* cups.PPD_ORDER_PROLOG constant.
* cups.PPD.emitString() method.
* cups.PPD.emit() method.
* cups.PPD.emitAfterOrder() method.
* cups.PPD.emitFd() method.
* cups.PPD.emitJCL() method.
* cups.PPD.emitJCLEnd() method.

New in 1.9.48:

* cups.Connection.cancelJob()'s optional second argument is now a keyword.

3 files changed, 7 insertions, 21 deletions

diff --git a/print/py-cups/Makefile b/print/py-cups/Makefile
index 62215a4839c..14d01d1a798 100644
--- a/print/py-cups/Makefile
+++ b/print/py-cups/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2012/04/08 19:09:11 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2012/05/28 09:02:55 wiz Exp $
 
 DISTNAME=	pycups-${VERSION}
 PKGNAME=	${PYPKGPREFIX}-cups-${VERSION}
-VERSION=	1.9.47
-PKGREVISION=	3
+VERSION=	1.9.61
 CATEGORIES=	print python
 MASTER_SITES=	http://cyberelk.net/tim/data/pycups/
 EXTRACT_SUFX=	.tar.bz2
@@ -11,6 +10,7 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	markd@NetBSD.org
 HOMEPAGE=	http://cyberelk.net/tim/software/pycups/
 COMMENT=	Python bindings for the CUPS API
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 CFLAGS+=	-DVERSION=\"${VERSION}\"
diff --git a/print/py-cups/distinfo b/print/py-cups/distinfo
index 4bcd805839f..0f98d759b50 100644
--- a/print/py-cups/distinfo
+++ b/print/py-cups/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2010/01/20 10:35:22 wiz Exp $
+$NetBSD: distinfo,v 1.4 2012/05/28 09:02:55 wiz Exp $
 
-SHA1 (pycups-1.9.47.tar.bz2) = 50663840cf64c6b7c6661a4b6b593f83f642dcca
-RMD160 (pycups-1.9.47.tar.bz2) = 1960eed95e34e95d51169774f7d65575e8cc569d
-Size (pycups-1.9.47.tar.bz2) = 45175 bytes
-SHA1 (patch-aa) = 22ba76d03b7d7e4638f2a81f042b5fcfa48f7ac5
+SHA1 (pycups-1.9.61.tar.bz2) = e1b87ac5c87412a6548a6b6fb62bdb3e678393eb
+RMD160 (pycups-1.9.61.tar.bz2) = 413275b55a650837463f1c8e9acf0d23e1b384c7
+Size (pycups-1.9.61.tar.bz2) = 52018 bytes
diff --git a/print/py-cups/patches/patch-aa b/print/py-cups/patches/patch-aa
deleted file mode 100644
index d5819f96ee0..00000000000
--- a/print/py-cups/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/01/10 20:13:29 markd Exp $
-
---- cupsppd.c.orig	2008-07-06 05:19:02.000000000 +1200
-+++ cupsppd.c
-@@ -451,7 +451,7 @@ PPD_nondefaultsMarked (PPD *self)
-   return PyBool_FromLong (nondefaults_marked);
- }
- 
--#ifdef __SVR4
-+#if defined(__SVR4) || defined(__OpenBSD__) || defined(__NetBSD__)
- /*
-  * A rudimentary emulation of getline() for systems that dont support it
-  * natively.  Since this is used for PPD file reading, it assumes (possibly