From d20b03a1d61c7fedb8552c8e52f647b4c8d1a3e7 Mon Sep 17 00:00:00 2001
From: fgsch <fgsch@openbsd.org>
Date: Sun, 25 Dec 2011 23:59:06 +0000
Subject: [PATCH] install doc under py-XXX making this ready for python 2 and
 3. benoit@ ok as part of a bigger diff sent to ports@.

---
 net/py-boto/Makefile                | 10 +++++-----
 net/py-boto/pkg/PLIST               | 12 ++++++------
 net/py-pcapy/Makefile               |  4 ++--
 net/py-pcapy/patches/patch-setup_py | 12 ++++++++++++
 net/py-pcapy/pkg/PLIST              | 12 ++++++------
 5 files changed, 31 insertions(+), 19 deletions(-)
 create mode 100644 net/py-pcapy/patches/patch-setup_py

diff --git a/net/py-boto/Makefile b/net/py-boto/Makefile
index c50f848c218..187d8d69c6c 100644
--- a/net/py-boto/Makefile
+++ b/net/py-boto/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.10 2011/09/16 11:13:39 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2011/12/25 23:59:07 fgsch Exp $
 
 COMMENT =	Python interface to Amazon Web Services
 
 MODPY_EGG_VERSION = 1.7a
 DISTNAME =	boto-${MODPY_EGG_VERSION}
 PKGNAME = 	py-${DISTNAME}
-REVISION =	2
+REVISION =	3
 CATEGORIES =	net
 
 HOMEPAGE =	http://code.google.com/p/boto/
@@ -27,8 +27,8 @@ MODPY_SETUPTOOLS =	Yes
 NO_REGRESS = 		Yes
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/boto
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/boto
-	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${PREFIX}/share/doc/boto
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/py-boto
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/py-boto
+	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${PREFIX}/share/doc/py-boto
 
 .include <bsd.port.mk>
diff --git a/net/py-boto/pkg/PLIST b/net/py-boto/pkg/PLIST
index e43573f6628..c91a6d212bf 100644
--- a/net/py-boto/pkg/PLIST
+++ b/net/py-boto/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.4 2009/05/15 16:31:45 jim Exp $
+@comment $OpenBSD: PLIST,v 1.5 2011/12/25 23:59:07 fgsch Exp $
 lib/python${MODPY_VERSION}/site-packages/boto/
 lib/python${MODPY_VERSION}/site-packages/boto-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/boto-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@@ -209,8 +209,8 @@ lib/python${MODPY_VERSION}/site-packages/boto/tests/test_sqsconnection.py
 lib/python${MODPY_VERSION}/site-packages/boto/tests/test_sqsconnection.pyc
 lib/python${MODPY_VERSION}/site-packages/boto/utils.py
 lib/python${MODPY_VERSION}/site-packages/boto/utils.pyc
-share/doc/boto/
-share/doc/boto/README
-share/doc/boto/ec2_tut.txt
-share/doc/boto/s3_tut.txt
-share/doc/boto/sqs_tut.txt
+share/doc/${MODPY_PY_PREFIX}boto/
+share/doc/${MODPY_PY_PREFIX}boto/README
+share/doc/${MODPY_PY_PREFIX}boto/ec2_tut.txt
+share/doc/${MODPY_PY_PREFIX}boto/s3_tut.txt
+share/doc/${MODPY_PY_PREFIX}boto/sqs_tut.txt
diff --git a/net/py-pcapy/Makefile b/net/py-pcapy/Makefile
index bfc1259cb1c..de3292477db 100644
--- a/net/py-pcapy/Makefile
+++ b/net/py-pcapy/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.8 2011/09/16 11:13:40 espie Exp $
+# $OpenBSD: Makefile,v 1.9 2011/12/25 23:59:06 fgsch Exp $
 
 COMMENT =		libpcap module for Python
 
 MODPY_EGG_VERSION =	0.10.5
 DISTNAME =		pcapy-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		5
+REVISION =		6
 
 CATEGORIES =		net devel
 
diff --git a/net/py-pcapy/patches/patch-setup_py b/net/py-pcapy/patches/patch-setup_py
new file mode 100644
index 00000000000..af2a2e34d3f
--- /dev/null
+++ b/net/py-pcapy/patches/patch-setup_py
@@ -0,0 +1,12 @@
+$OpenBSD: patch-setup_py,v 1.1 2011/12/25 23:59:06 fgsch Exp $
+--- setup.py.orig	Mon Dec 12 08:57:21 2011
++++ setup.py	Mon Dec 12 08:57:34 2011
+@@ -60,7 +60,7 @@ setup(name = PACKAGE_NAME,
+           include_dirs = include_dirs,
+           library_dirs = library_dirs,
+           libraries = libraries)],
+-      data_files = [(os.path.join('share', 'doc', PACKAGE_NAME),
++      data_files = [(os.path.join('share', 'doc', 'py-%s' % PACKAGE_NAME),
+                      ['README', 'LICENSE', 'pcapy.html'])],
+       )
+ 
diff --git a/net/py-pcapy/pkg/PLIST b/net/py-pcapy/pkg/PLIST
index 795e1acfc3c..0b9c22cda66 100644
--- a/net/py-pcapy/pkg/PLIST
+++ b/net/py-pcapy/pkg/PLIST
@@ -1,7 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2009/04/03 15:45:41 sthen Exp $
-lib/python${MODPY_VERSION}/site-packages/pcapy-0.10.5-py${MODPY_VERSION}.egg-info
+@comment $OpenBSD: PLIST,v 1.2 2011/12/25 23:59:06 fgsch Exp $
+lib/python${MODPY_VERSION}/site-packages/pca${MODPY_PY_PREFIX}${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/pcapy.so
-share/doc/pcapy/
-share/doc/pcapy/LICENSE
-share/doc/pcapy/README
-share/doc/pcapy/pcapy.html
+share/doc/${MODPY_PY_PREFIX}pcapy/
+share/doc/${MODPY_PY_PREFIX}pcapy/LICENSE
+share/doc/${MODPY_PY_PREFIX}pcapy/README
+share/doc/${MODPY_PY_PREFIX}pcapy/pcapy.html