From f5fdba95903bfbd687cee03bfe328e233de7e255 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Fri, 29 Jul 2011 16:56:09 +0000
Subject: [PATCH] Bugfix update to py-cups-1.9.58.

---
 print/py-cups/Makefile               |  4 ++--
 print/py-cups/distinfo               | 10 ++++-----
 print/py-cups/patches/patch-Makefile | 31 +++++++++++++++++++++-------
 print/py-cups/patches/patch-setup_py | 10 ++++-----
 4 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/print/py-cups/Makefile b/print/py-cups/Makefile
index 9234f13fe23..60e13b3752e 100644
--- a/print/py-cups/Makefile
+++ b/print/py-cups/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.17 2011/07/16 06:59:07 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.18 2011/07/29 16:56:09 ajacoutot Exp $
 
 COMMENT=		CUPS bindings for Python
 
-MODPY_EGG_VERSION=	1.9.57
+MODPY_EGG_VERSION=	1.9.58
 DISTNAME=		pycups-${MODPY_EGG_VERSION}
 PKGNAME=		py-cups-${MODPY_EGG_VERSION}
 
diff --git a/print/py-cups/distinfo b/print/py-cups/distinfo
index 5492fc810bb..69017c7266a 100644
--- a/print/py-cups/distinfo
+++ b/print/py-cups/distinfo
@@ -1,5 +1,5 @@
-MD5 (pycups-1.9.57.tar.bz2) = ZOMo4sYo5Bhi7+l/BOZtpA==
-RMD160 (pycups-1.9.57.tar.bz2) = uz2yWxrEhvpSer1ryRQWSownZgo=
-SHA1 (pycups-1.9.57.tar.bz2) = WFmEjDpb5R1nKHozKr7Qu2MeUdw=
-SHA256 (pycups-1.9.57.tar.bz2) = JMxia7SCdSONrrahKkjn0dWwXqJTU6yN9ea6agmko4o=
-SIZE (pycups-1.9.57.tar.bz2) = 49955
+MD5 (pycups-1.9.58.tar.bz2) = Mg2M4fEN6po92QVL769iOQ==
+RMD160 (pycups-1.9.58.tar.bz2) = CVFNdAN5MkfdwaUhfqx03eYGME8=
+SHA1 (pycups-1.9.58.tar.bz2) = PJYbErq+sLw+YEcTI5BmWpSigmU=
+SHA256 (pycups-1.9.58.tar.bz2) = TCJBWuNl2kegmtr7YoXsHGPA6vrzoSz0GqOe/i63OfQ=
+SIZE (pycups-1.9.58.tar.bz2) = 51429
diff --git a/print/py-cups/patches/patch-Makefile b/print/py-cups/patches/patch-Makefile
index 0622bd27013..895e5ab82b2 100644
--- a/print/py-cups/patches/patch-Makefile
+++ b/print/py-cups/patches/patch-Makefile
@@ -1,16 +1,33 @@
-$OpenBSD: patch-Makefile,v 1.3 2011/05/04 09:09:10 ajacoutot Exp $
---- Makefile.orig	Wed Feb 23 12:18:53 2011
-+++ Makefile	Wed May  4 08:28:54 2011
-@@ -11,7 +11,7 @@ DIST=Makefile test.py \
+$OpenBSD: patch-Makefile,v 1.4 2011/07/29 16:56:09 ajacoutot Exp $
+--- Makefile.orig	Tue Jul 26 13:28:36 2011
++++ Makefile	Fri Jul 29 18:40:58 2011
+@@ -1,5 +1,5 @@
+ NAME=pycups
+-VERSION:=$(shell python setup.py --version)
++VERSION:=$(shell ${PYTHON} setup.py --version)
+ SDIST_ARGS=--formats=bztar -d.
+ RPMCONFIGDIR:=$(shell rpm -E "%{_rpmconfigdir}" 2>/dev/null || :)
+ 
+@@ -12,7 +12,7 @@ DIST=Makefile test.py \
  	COPYING NEWS README TODO ChangeLog
  
- cups.so: $(SOURCES)
+ cups.so: force
 -	python setup.py build
 +	${PYTHON} setup.py build
- 	ln -sf build/lib*/$@ .
+ 	mv build/lib*/$@ .
  
  doc:	cups.so
-@@ -31,7 +31,7 @@ dist:
+@@ -26,15 +26,15 @@ clean:
+ 	-rm -rf build cups.so *.pyc *~
+ 
+ dist:
+-	python setup.py sdist $(SDIST_ARGS)
++	${PYTHON} setup.py sdist $(SDIST_ARGS)
+ 
+ upload:
+-	python setup.py sdist $(SDIST_ARGS) upload -s
++	${PYTHON} setup.py sdist $(SDIST_ARGS) upload -s
+ 
  install:	install-rpmhook
  	ROOT= ; \
  	if [ -n "$$DESTDIR" ]; then ROOT="--root $$DESTDIR"; fi; \
diff --git a/print/py-cups/patches/patch-setup_py b/print/py-cups/patches/patch-setup_py
index d6e658a8094..955c3f5737f 100644
--- a/print/py-cups/patches/patch-setup_py
+++ b/print/py-cups/patches/patch-setup_py
@@ -1,10 +1,10 @@
-$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",
+$OpenBSD: patch-setup_py,v 1.5 2011/07/29 16:56:09 ajacoutot Exp $
+--- setup.py.orig	Tue Jul 26 13:23:35 2011
++++ setup.py	Fri Jul 29 18:38:56 2011
+@@ -61,5 +61,5 @@ setup (name="pycups",
         ext_modules=[Extension("cups",
                                ["cupsmodule.c", "cupsconnection.c",
                                 "cupsppd.c", "cupsipp.c"],
--                              libraries=["cups"],
+-                              libraries=libraries,
 +                              libraries=["cups", "iconv"],
                                define_macros=[("VERSION", '"%s"' % VERSION)])])