Attachment 51432 Details for Bug 78121 – file.diff

[patch] file.diff

file.diff (text/plain), 4.53 KB, created by Roman Bogorodskiy on 2005-02-26 16:30:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roman Bogorodskiy

Created: 2005-02-26 16:30:21 UTC

Size: 4.53 KB

patch

obsolete

>diff -ruN py-osd.orig/Makefile py-osd/Makefile
>--- py-osd.orig/Makefile	Sat Feb 26 18:40:10 2005
>+++ py-osd/Makefile	Sat Feb 26 19:16:38 2005
>@@ -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_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 -ruN py-osd.orig/files/patch-aa py-osd/files/patch-aa
>--- py-osd.orig/files/patch-aa	Sat Feb 26 18:40:10 2005
>+++ py-osd/files/patch-aa	Thu Jan  1 03:00:00 1970
>@@ -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 -ruN py-osd.orig/files/patch-setup.py py-osd/files/patch-setup.py
>--- py-osd.orig/files/patch-setup.py	Thu Jan  1 03:00:00 1970
>+++ py-osd/files/patch-setup.py	Sat Feb 26 18:45:35 2005
>@@ -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 -ruN py-osd.orig/pkg-plist py-osd/pkg-plist
>--- py-osd.orig/pkg-plist	Sat Feb 26 18:40:10 2005
>+++ py-osd/pkg-plist	Sat Feb 26 18:59:11 2005
>@@ -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
>--- py-osd.diff ends here ---

Actions: View | Diff

Attachments on bug 78121: 51432