replace py-pycups with py-cups

7 files changed, 2 insertions, 72 deletions

diff --git a/print/Makefile b/print/Makefile
index 2e4cc9403bf..a9391881f01 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -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+=	psify
 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 --git a/print/py-pycups/DESCR b/print/py-pycups/DESCR
deleted file mode 100644
index cedecd160f8..00000000000
--- a/print/py-pycups/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Python bindings for the CUPS API
diff --git a/print/py-pycups/Makefile b/print/py-pycups/Makefile
deleted file mode 100644
index 646333de001..00000000000
--- a/print/py-pycups/Makefile
+++ /dev/null
@@ -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
-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 --git a/print/py-pycups/PLIST b/print/py-pycups/PLIST
deleted file mode 100644
index cf9a4d83a90..00000000000
--- a/print/py-pycups/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/01/10 08:35:29 markd Exp $
-${PYSITELIB}/cups.so
diff --git a/print/py-pycups/buildlink3.mk b/print/py-pycups/buildlink3.mk
deleted file mode 100644
index 06cbe8f66fd..00000000000
--- a/print/py-pycups/buildlink3.mk
+++ /dev/null
@@ -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 --git a/print/py-pycups/distinfo b/print/py-pycups/distinfo
deleted file mode 100644
index 1b27174b6f6..00000000000
--- a/print/py-pycups/distinfo
+++ /dev/null
@@ -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 --git a/print/py-pycups/patches/patch-aa b/print/py-pycups/patches/patch-aa
deleted file mode 100644
index 1626b9fba70..00000000000
--- a/print/py-pycups/patches/patch-aa
+++ /dev/null
@@ -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