- use the original extension name "pyosd", not "osd"

- install docs

PR:		78121
Submitted by:	novel
Approved by:	maintainer timeout

4 files changed, 35 insertions, 79 deletions

diff --git a/misc/py-osd/Makefile b/misc/py-osd/Makefile
index 07408b16c729..9ed8800cd9f1 100644
--- a/misc/py-osd/Makefile
+++ b/misc/py-osd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	osd
 PORTVERSION=	0.2.12
+PORTREVISION=	1
 CATEGORIES=	misc python
 MASTER_SITES=	http://repose.cx/pyosd/ \
 		http://damien.kangaweb.com/moving/stuff/pyosd/
@@ -23,10 +24,18 @@ USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 USE_REINPLACE=	yes
 
+PORTDOCS=	AUTHORS ChangeLog ChangeLog.old README README.daemon pyosd.html
+DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
+
 post-patch:
-		${REINPLACE_CMD} -e 's;_X11BASE_;${X11BASE};g' ${WRKSRC}/setup.py
+		@${REINPLACE_CMD} -e 's;_X11BASE_;${X11BASE};g' ${WRKSRC}/setup.py
 
-post-extract:
-		@${MV} ${WRKSRC}/pyosd ${WRKSRC}/osd
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for i in ${PORTDOCS}
+	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/misc/py-osd/files/patch-aa b/misc/py-osd/files/patch-aa
deleted file mode 100644
index 158bd1a6f505..000000000000
--- a/misc/py-osd/files/patch-aa
+++ /dev/null
@@ -1,68 +0,0 @@
---- setup.py.orig	Mon Feb 23 05:43:05 2004
-+++ setup.py	Tue Mar 30 03:11:16 2004
-@@ -8,9 +8,11 @@
-        url = "http://repose.cx/pyosd/",
-        author = "Damien Elmes",
-        author_email = "pyosd@repose.cx",
--       packages = ['pyosd'],
-+       include_dirs = ['_X11BASE_/include'],
-+       packages = ['osd'],
-        ext_modules = \
--       [Extension("_pyosd", ["_pyosd.c"],
--                  libraries=["xosd"])]
-+       [Extension("_osd", ["_pyosd.c"],
-+                  libraries=["xosd"],
-+                  library_dirs = ['_X11BASE_/lib'])]
-       )
- 
---- osd/__init__.py.orig	Mon Mar  1 06:17:23 2004
-+++ osd/__init__.py	Tue Mar 30 03:11:16 2004
-@@ -26,7 +26,7 @@
-          fonts or colours across the screen.
-          '''
- 
--import _pyosd
-+import _osd as _pyosd
- import re
- import string
- 
-@@ -44,7 +44,7 @@
- 
- error = _pyosd.error
- 
--default_font="-*-helvetica-medium-r-normal-*-*-360-*-*-p-*-*-*"
-+default_font="-*-helvetica-medium-r-normal-*-*-240-*-*-p-*-*-*"
- 
- class osd:
-     """ osd is a class used to create an object which can display messages on
---- osd/daemon.py.orig	Mon Jan 26 02:14:01 2004
-+++ osd/daemon.py	Tue Mar 30 03:11:16 2004
-@@ -37,8 +37,8 @@
- """
- 
- import os
--import pyosd
--import pyosd.daemon
-+import osd as pyosd
-+import osd.daemon
- import sys
- import string
- 
---- _pyosd.c.orig	Mon Mar  1 06:16:05 2004
-+++ _pyosd.c	Tue Mar 30 03:11:16 2004
-@@ -73,13 +73,13 @@
- };
- 
- void
--init_pyosd(void)
-+init_osd(void)
- {
-   PyObject *self;
-   PyObject *dict;
- 
-   // create the module and add the functions
--  self = Py_InitModule("_pyosd", pyosd_methods);
-+  self = Py_InitModule("_osd", pyosd_methods);
- 
-   // init custom exception
-   dict = PyModule_GetDict(self);
diff --git a/misc/py-osd/files/patch-setup.py b/misc/py-osd/files/patch-setup.py
new file mode 100644
index 000000000000..72f3812256bb
--- /dev/null
+++ b/misc/py-osd/files/patch-setup.py
@@ -0,0 +1,15 @@
+--- setup.py.orig	Thu Jan 27 15:46:22 2005
++++ setup.py	Sat Feb 26 18:43:15 2005
+@@ -8,9 +8,11 @@
+        url = "http://repose.cx/pyosd/",
+        author = "Damien Elmes",
+        author_email = "pyosd@repose.cx",
++       include_dirs = ['/usr/X11R6/include'],
+        packages = ['pyosd'],
+        ext_modules = \
+        [Extension("_pyosd", ["_pyosd.c"],
+-                  libraries=["xosd"])]
++                  libraries=["xosd"],
++                  library_dirs = ['/usr/X11R6/lib'])]
+       )
+ 
diff --git a/misc/py-osd/pkg-plist b/misc/py-osd/pkg-plist
index 01233c7fb629..4de60ade03c1 100644
--- a/misc/py-osd/pkg-plist
+++ b/misc/py-osd/pkg-plist
@@ -1,8 +1,8 @@
-lib/%%PYTHON_VERSION%%/site-packages/_osd.so
-lib/%%PYTHON_VERSION%%/site-packages/osd/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/osd/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/osd/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/osd/daemon.py
-lib/%%PYTHON_VERSION%%/site-packages/osd/daemon.pyc
-lib/%%PYTHON_VERSION%%/site-packages/osd/daemon.pyo
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/osd
+lib/%%PYTHON_VERSION%%/site-packages/_pyosd.so
+lib/%%PYTHON_VERSION%%/site-packages/pyosd/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/pyosd/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pyosd/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/pyosd/daemon.py
+lib/%%PYTHON_VERSION%%/site-packages/pyosd/daemon.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pyosd/daemon.pyo
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/pyosd