Update to py-cups-1.9.51.

print/py-cups/Makefile

@@ -1,12 +1,13 @@
-# $OpenBSD: Makefile,v 1.10 2010/03/21 09:46:02 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.11 2010/08/01 11:59:18 ajacoutot Exp $
 
 SHARED_ONLY=		Yes
 
 COMMENT=		CUPS bindings for Python
 
-VERSION=		1.9.48
+VERSION=		1.9.51
 DISTNAME=		pycups-${VERSION}
 PKGNAME=		py-cups-${VERSION}
+
 CATEGORIES=		print
 
 HOMEPAGE=		http://cyberelk.net/tim/software/pycups/
@@ -19,13 +20,15 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+WANTLIB += cups
+
 MASTER_SITES=		http://cyberelk.net/tim/data/pycups/
 EXTRACT_SUFX=		.tar.bz2
 
 MODULES=		converters/libiconv \
 			lang/python
 
-LIB_DEPENDS=		cups::print/cups
+LIB_DEPENDS=		::print/cups
 
 CFLAGS+=		-I${LOCALBASE}/include -DVERSION=\"${VERSION}\"
 LDFLAGS+=		-L${LOCALBASE}/lib
@@ -36,6 +39,6 @@ MAKE_ENV=		PYTON="${MODPY_BIN}" \
 NO_REGRESS=		Yes
 
 pre-configure:
-	${SUBST_CMD} ${WRKSRC}/cupsconnection.c ${WRKSRC}/setup.py
+	${SUBST_CMD} ${WRKSRC}/cupsconnection.c
 
 .include <bsd.port.mk>

print/py-cups/distinfo

@@ -1,5 +1,5 @@
-MD5 (pycups-1.9.48.tar.bz2) = Lp7WksdTKOf7iPjCMPcJkA==
-RMD160 (pycups-1.9.48.tar.bz2) = bOa1UF7RPCGXmmTt1+Mfq0TGCFg=
-SHA1 (pycups-1.9.48.tar.bz2) = 5bpAHBSRIiUvNCsBdLvCLjIXO8U=
-SHA256 (pycups-1.9.48.tar.bz2) = Fx9pa2Jm0ZfGyfeP8Ahrlbl6ko23lB7vz52jcPE1n4U=
-SIZE (pycups-1.9.48.tar.bz2) = 45313
+MD5 (pycups-1.9.51.tar.bz2) = fp3mS86Uls4tNqtRPdad1Q==
+RMD160 (pycups-1.9.51.tar.bz2) = /VfH+ZfXlV4tZPxsVUrTM/HiGm0=
+SHA1 (pycups-1.9.51.tar.bz2) = 9lUBhtZrtU802W2M9cYyowNP48U=
+SHA256 (pycups-1.9.51.tar.bz2) = 7Ml9uJ/ZW9P3r0WGExQVcQLTy2EOmEYE2EcmSDB3c2g=
+SIZE (pycups-1.9.51.tar.bz2) = 46862

print/py-cups/patches/patch-Makefile

@@ -1,12 +1,12 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2008/04/10 10:21:42 jasper Exp $
---- Makefile.orig	Mon Mar 17 13:10:22 2008
-+++ Makefile	Thu Mar 27 15:23:38 2008
+$OpenBSD: patch-Makefile,v 1.2 2010/08/01 11:59:18 ajacoutot Exp $
+--- Makefile.orig	Tue May 18 14:19:13 2010
++++ Makefile	Sun Aug  1 13:46:34 2010
 @@ -9,7 +9,7 @@ DIST=Makefile test.py \
  	COPYING NEWS README TODO ChangeLog
  
  cups.so: $(SOURCES)
--	CFLAGS=-DVERSION=\\\"$(VERSION)\\\" python setup.py build
-+	CFLAGS=-DVERSION=\\\"$(VERSION)\\\" ${PYTHON} setup.py build
+-	python setup.py build
++	${PYTHON} setup.py build
  	mv build/lib*/$@ .
  
  doc:	cups.so

print/py-cups/patches/patch-cupsconnection_c

@@ -1,7 +1,7 @@
-$OpenBSD: patch-cupsconnection_c,v 1.6 2010/03/21 09:46:02 ajacoutot Exp $
---- cupsconnection.c.orig	Thu Jan 14 14:22:03 2010
-+++ cupsconnection.c	Tue Feb  9 20:34:48 2010
-@@ -3505,8 +3505,7 @@ Connection_printTestPage (Connection *self, PyObject *
+$OpenBSD: patch-cupsconnection_c,v 1.7 2010/08/01 11:59:18 ajacoutot Exp $
+--- cupsconnection.c.orig	Wed May 19 17:25:17 2010
++++ cupsconnection.c	Sun Aug  1 13:45:59 2010
+@@ -3630,8 +3630,7 @@ Connection_printTestPage (Connection *self, PyObject *
  	  break;
        }
      } else {

print/py-cups/patches/patch-setup_py

@@ -1,10 +1,10 @@
-$OpenBSD: patch-setup_py,v 1.3 2010/03/21 09:46:02 ajacoutot Exp $
---- setup.py.orig	Mon Aug 17 19:26:29 2009
-+++ setup.py	Tue Feb  9 20:34:48 2010
-@@ -3,4 +3,5 @@ setup (name="cups", version="1.0",
+$OpenBSD: patch-setup_py,v 1.4 2010/08/01 11:59:18 ajacoutot Exp $
+--- setup.py.orig	Fri Jun 25 17:17:24 2010
++++ setup.py	Sun Aug  1 13:54:44 2010
+@@ -5,5 +5,5 @@ setup (name="pycups",
         ext_modules=[Extension("cups",
                                ["cupsmodule.c", "cupsconnection.c",
                                 "cupsppd.c", "cupsipp.c"],
--                              libraries=["cups"])])
+-                              libraries=["cups"],
 +                              libraries=["cups", "iconv"],
-+			      include_dirs=['${LOCALBASE}/include'])])
+                               define_macros=[("VERSION", '"%s"' % VERSION)])])

print/py-cups/pkg/PLIST

@@ -1,3 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2008/04/10 10:21:42 jasper Exp $
-lib/python${MODPY_VERSION}/site-packages/cups-1.0-py${MODPY_VERSION}.egg-info
+@comment $OpenBSD: PLIST,v 1.2 2010/08/01 11:59:18 ajacoutot Exp $
 lib/python${MODPY_VERSION}/site-packages/cups.so
+lib/python${MODPY_VERSION}/site-packages/pycups-1.9.51-py${MODPY_VERSION}.egg-info