[pkgsrc/trunk]: pkgsrc/print replace py-pycups with py-cups

[markd <markd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1bcdcdc24992
branches:  trunk
changeset: 552835:1bcdcdc24992
user:      markd <markd%pkgsrc.org@localhost>
date:      Sat Jan 10 20:17:01 2009 +0000

description:
replace py-pycups with py-cups

diffstat:

 print/Makefile                   |   4 ++--
 print/py-pycups/DESCR            |   1 -
 print/py-pycups/Makefile         |  27 ---------------------------
 print/py-pycups/PLIST            |   2 --
 print/py-pycups/buildlink3.mk    |  21 ---------------------
 print/py-pycups/distinfo         |   6 ------
 print/py-pycups/patches/patch-aa |  13 -------------
 7 files changed, 2 insertions(+), 72 deletions(-)

diffs (113 lines):

diff -r 30b0d91f3e98 -r 1bcdcdc24992 print/Makefile
--- a/print/Makefile    Sat Jan 10 20:13:29 2009 +0000
+++ b/print/Makefile    Sat Jan 10 20:17:01 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.192 2009/01/10 08:36:43 markd Exp $
+# $NetBSD: Makefile,v 1.193 2009/01/10 20:17:01 markd Exp $
 #
 
 COMMENT=       Desktop publishing
@@ -100,8 +100,8 @@
 SUBDIR+=       psjoin
 SUBDIR+=       pslib
 SUBDIR+=       psutils
+SUBDIR+=       py-cups
 SUBDIR+=       py-pslib
-SUBDIR+=       py-pycups
 SUBDIR+=       py-reportlab
 SUBDIR+=       py-reportlab-renderPM
 SUBDIR+=       rlpr
diff -r 30b0d91f3e98 -r 1bcdcdc24992 print/py-pycups/DESCR
--- a/print/py-pycups/DESCR     Sat Jan 10 20:13:29 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-Python bindings for the CUPS API
diff -r 30b0d91f3e98 -r 1bcdcdc24992 print/py-pycups/Makefile
--- a/print/py-pycups/Makefile  Sat Jan 10 20:13:29 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/01/10 08:35:29 markd Exp $
-
-DISTNAME=      pycups-${VERSION}
-PKGNAME=       ${PYPKGPREFIX}-pycups-${VERSION}
-VERSION=       1.9.44
-CATEGORIES=    print python
-MASTER_SITES=  http://cyberelk.net/tim/data/pycups/
-EXTRACT_SUFX=  .tar.bz2
-
-MAINTAINER=    markd%NetBSD.org@localhost
-HOMEPAGE=      http://cyberelk.net/tim/software/pycups/
-COMMENT=       Python bindings for the CUPS API
-
-PKG_DESTDIR_SUPPORT=   user-destdir
-CFLAGS+=       -DVERSION=\"${VERSION}\"
-
-PYDISTUTILSPKG=        yes
-
-SUBST_CLASSES+=                paths
-SUBST_MESSAGE.paths=   Fix cups paths.
-SUBST_FILES.paths=     cupsconnection.c
-SUBST_SED.paths=       -e 's:"/usr/share/cups":"${BUILDLINK_PREFIX.cups}/share/cups/", "/usr/share/cups":'
-SUBST_STAGE.paths=     post-patch
-
-.include "../../lang/python/extension.mk"
-.include "../../print/cups/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r 30b0d91f3e98 -r 1bcdcdc24992 print/py-pycups/PLIST
--- a/print/py-pycups/PLIST     Sat Jan 10 20:13:29 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/01/10 08:35:29 markd Exp $
-${PYSITELIB}/cups.so
diff -r 30b0d91f3e98 -r 1bcdcdc24992 print/py-pycups/buildlink3.mk
--- a/print/py-pycups/buildlink3.mk     Sat Jan 10 20:13:29 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/01/10 08:54:01 markd Exp $
-
-BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
-PY25_PYCUPS_BUILDLINK3_MK:=    ${PY25_PYCUPS_BUILDLINK3_MK}+
-
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=    py25-pycups
-.endif
-
-BUILDLINK_PACKAGES:=   ${BUILDLINK_PACKAGES:Npy25-pycups}
-BUILDLINK_PACKAGES+=   py25-pycups
-BUILDLINK_ORDER:=      ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py25-pycups
-
-.if ${PY25_PYCUPS_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.py25-pycups+=    py25-pycups>=1.9.44
-BUILDLINK_PKGSRCDIR.py25-pycups?=      ../../print/py-pycups
-.endif # PY25_PYCUPS_BUILDLINK3_MK
-
-#.include "../../print/cups/buildlink3.mk"
-
-BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH:S/+$//}
diff -r 30b0d91f3e98 -r 1bcdcdc24992 print/py-pycups/distinfo
--- a/print/py-pycups/distinfo  Sat Jan 10 20:13:29 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/01/10 08:35:29 markd Exp $
-
-SHA1 (pycups-1.9.44.tar.bz2) = e5920cba3d888c867c5324810fa2fe18f9deb414
-RMD160 (pycups-1.9.44.tar.bz2) = db1376be3f344cc21c54ee7705b8d57fa016524b
-Size (pycups-1.9.44.tar.bz2) = 39561 bytes
-SHA1 (patch-aa) = 22ba76d03b7d7e4638f2a81f042b5fcfa48f7ac5
diff -r 30b0d91f3e98 -r 1bcdcdc24992 print/py-pycups/patches/patch-aa
--- a/print/py-pycups/patches/patch-aa  Sat Jan 10 20:13:29 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/01/10 08:35: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