Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 30 Mar 2004 03:49:50 +0200 (CEST)
From:      Stefan Grundmann <sg-sendpr@waset.de>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/64916: make ports/misc/py-osd usable (work) adn update to 0.2.9 
Message-ID:  <200403300149.i2U1noij072501@gate-com.com>
Resent-Message-ID: <200403300150.i2U1oGpB035038@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         64916
>Category:       ports
>Synopsis:       make ports/misc/py-osd usable (work) adn update to 0.2.9
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 29 17:50:16 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Stefan Grundmann
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
waset.de
>Environment:
System: FreeBSD chons.hb.waset.de 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Wed Mar 24 04:06:36 CET 2004 sg@chons.hb.waset.de:/usr/obj/usr/src/sys/CHONS  i386


>Description:
        
	Version 0.2.6_1 of ports/misc/py-osd is broken in several ways:
	1) it does not respect X11BASE
	2) it uses deprecated xosd api
	3) it installs a file that depends on ports/devel/py-twisted but
	   it does not require py-twisted in ints run depends
	4) all files installed by this port are broken  (unusable)
	   (this is because the submitter of this port decided to rename
	    the module from "pyosd" to "osd" but forgot to make the 
	    necessary changes in the source files)
>How-To-Repeat:

	Try to install the port (if you have a X11BASE different from 
	"/usr/X11R6" you will run into problem 1) xosd will complain about
	deprecated api (problem 2).
	Try to use the installed files, they will not work (because of 
	problem 3 and 4).    
>Fix:

	The attached patch will upgrade the port to version 0.2.9 
	(this is the latest release), and address all mentioned problems.

--- py-osd.diff begins here ---
diff -ru py-osd/Makefile py-osd.new/Makefile
--- py-osd/Makefile	Tue Mar 30 03:27:11 2004
+++ py-osd.new/Makefile	Tue Mar 30 03:20:46 2004
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	osd
-PORTVERSION=	0.2.6
-PORTREVISION=	1
+PORTVERSION=	0.2.9
 CATEGORIES=	misc python
 MASTER_SITES=	http://repose.cx/pyosd/ \
 		http://damien.kangaweb.com/moving/stuff/pyosd/
@@ -18,11 +17,16 @@
 COMMENT=	A python wrapper for osd, for displaying text on your X display
 
 LIB_DEPENDS=	xosd.4:${PORTSDIR}/misc/xosd
+RUN_DEPENDS=	${LOCALBASE}/bin/twistd:${PORTSDIR}/devel/py-twisted
 
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
+USE_REINPLACE=		yes
 
 post-extract:
 		${MV} ${WRKSRC}/pyosd ${WRKSRC}/osd
+
+post-patch:
+		${REINPLACE_CMD} -e 's;_X11BASE_;${X11BASE};g' ${WRKSRC}/setup.py
 
 .include <bsd.port.mk>
diff -ru py-osd/distinfo py-osd.new/distinfo
--- py-osd/distinfo	Tue Mar 30 03:27:11 2004
+++ py-osd.new/distinfo	Tue Mar 30 03:22:13 2004
@@ -1 +1,2 @@
-MD5 (pyosd-0.2.6.tar.gz) = 060df94f464f77f664446f59e62ca1a0
+MD5 (pyosd-0.2.9.tar.gz) = a5f0dbdd7516518a82538f20e1266fb9
+SIZE (pyosd-0.2.9.tar.gz) = 19274
diff -ru py-osd/files/patch-aa py-osd.new/files/patch-aa
--- py-osd/files/patch-aa	Tue Mar 30 03:27:11 2004
+++ py-osd.new/files/patch-aa	Tue Mar 30 03:14:58 2004
@@ -1,23 +1,68 @@
---- setup.py.orig	Sat Nov 23 22:17:59 2002
-+++ setup.py	Sat Aug  9 10:11:17 2003
-@@ -2,15 +2,16 @@
- 
- from distutils.core import setup, Extension
- 
--setup (name = "pyosd",
-+setup (name = "osd",
-        version = "0.2.6",
-        description = "Python wrapper for libosd",
+--- 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 = ['/usr/X11R6/include'],
++       include_dirs = ['/usr/local/X11R6/include'],
 +       packages = ['osd'],
         ext_modules = \
 -       [Extension("_pyosd", ["_pyosd.c"],
 -                  libraries=["xosd"])]
 +       [Extension("_osd", ["_pyosd.c"],
-+                  library_dirs = ['/usr/X11R6/lib'], libraries=["xosd"])]
++                  libraries=["xosd"],
++                  library_dirs = ['/usr/local/X11R6/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);
--- py-osd.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200403300149.i2U1noij072501>