-move the doc files and examples to share/doc/pycurl<pythonversion>

 for coexistence with a future py22pth (or even native thread) pkg
-use buildlink2

4 files changed, 37 insertions, 18 deletions

diff --git a/www/py-curl/Makefile b/www/py-curl/Makefile
index cc1243a1949..2f828960421 100644
--- a/www/py-curl/Makefile
+++ b/www/py-curl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/10/20 02:53:03 shell Exp $
+# $NetBSD: Makefile,v 1.6 2002/10/22 14:21:04 drochner Exp $
 
 DISTNAME=	pycurl-7.10.1
 PKGNAME=	${PYPKGPREFIX}-curl-7.10.1
@@ -9,11 +9,12 @@ MAINTAINER=	shell@netbsd.org
 HOMEPAGE=	http://pycurl.sf.net/
 COMMENT=	python module interface to the cURL library
 
-DEPENDS+=	curl>=7.10.1:../../www/curl
-
 PYDISTUTILSPKG=	# defined
 PYBINMODULE=	# defined
 PYTHON_VERSIONS_ACCEPTED=	21pth
+USE_BUILDLINK2=	yes
+PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 
+.include "../../www/curl/buildlink2.mk"
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/py-curl/PLIST b/www/py-curl/PLIST
index 6a73d243273..ff91325e6cf 100644
--- a/www/py-curl/PLIST
+++ b/www/py-curl/PLIST
@@ -1,15 +1,15 @@
-@comment $NetBSD: PLIST,v 1.2 2002/10/20 02:53:04 shell Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/10/22 14:21:04 drochner Exp $
 ${PYSITELIB}/pycurl.so
-doc/pycurl/COPYING
-doc/pycurl/ChangeLog
-doc/pycurl/INSTALL
-doc/pycurl/README
-doc/pycurl/TODO
-doc/pycurl/examples/basicfirst.py
-doc/pycurl/examples/curl.py
-doc/pycurl/examples/gtkhtml_demo.py
-doc/pycurl/examples/retriever.py
-doc/pycurl/examples/sfquery.py
-doc/pycurl/examples/xmlrpc_curl.py
-@dirrm doc/pycurl/examples
-@dirrm doc/pycurl
+share/doc/pycurl${PYVERSSUFFIX}/COPYING
+share/doc/pycurl${PYVERSSUFFIX}/ChangeLog
+share/doc/pycurl${PYVERSSUFFIX}/INSTALL
+share/doc/pycurl${PYVERSSUFFIX}/README
+share/doc/pycurl${PYVERSSUFFIX}/TODO
+share/doc/pycurl${PYVERSSUFFIX}/examples/basicfirst.py
+share/doc/pycurl${PYVERSSUFFIX}/examples/curl.py
+share/doc/pycurl${PYVERSSUFFIX}/examples/gtkhtml_demo.py
+share/doc/pycurl${PYVERSSUFFIX}/examples/retriever.py
+share/doc/pycurl${PYVERSSUFFIX}/examples/sfquery.py
+share/doc/pycurl${PYVERSSUFFIX}/examples/xmlrpc_curl.py
+@dirrm share/doc/pycurl${PYVERSSUFFIX}/examples
+@dirrm share/doc/pycurl${PYVERSSUFFIX}
diff --git a/www/py-curl/distinfo b/www/py-curl/distinfo
index be7381fe89e..334f8b51a06 100644
--- a/www/py-curl/distinfo
+++ b/www/py-curl/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.4 2002/10/20 02:53:04 shell Exp $
+$NetBSD: distinfo,v 1.5 2002/10/22 14:21:04 drochner Exp $
 
 SHA1 (pycurl-7.10.1.tar.gz) = 87f06eae731b79905924cdaf9102b90e7074f0c3
 Size (pycurl-7.10.1.tar.gz) = 41581 bytes
+SHA1 (patch-aa) = a78df7f3dd5c320a61b2903b707cc35beefd7801
diff --git a/www/py-curl/patches/patch-aa b/www/py-curl/patches/patch-aa
new file mode 100644
index 00000000000..8f874968d07
--- /dev/null
+++ b/www/py-curl/patches/patch-aa
@@ -0,0 +1,17 @@
+$NetBSD: patch-aa,v 1.1 2002/10/22 14:21:04 drochner Exp $
+
+--- setup.py.orig	Wed Oct 16 09:14:35 2002
++++ setup.py	Tue Oct 22 16:12:45 2002
+@@ -111,10 +111,10 @@
+     license="GNU Lesser General Public License (LGPL)",
+     data_files = [
+         # list of tuples with (path to install to, a list of files)
+-        (os.path.join("doc", "pycurl"), [
++        (os.path.join("share", "doc", "pycurl" + sys.version[0:3]), [
+             "ChangeLog", "COPYING", "INSTALL", "README", "TODO",
+         ]),
+-        (os.path.join("doc", "pycurl", "examples"), [
++        (os.path.join("share", "doc", "pycurl" + sys.version[0:3], "examples"), [
+             os.path.join("examples", "basicfirst.py"),
+             os.path.join("examples", "curl.py"),
+             os.path.join("examples", "gtkhtml_demo.py"),