diff options
| author | nivit <nivit@FreeBSD.org> | 2007-04-17 21:47:40 +0800 |
|---|---|---|
| committer | nivit <nivit@FreeBSD.org> | 2007-04-17 21:47:40 +0800 |
| commit | f89ba36f223bc68850afa6afa6e08bd6d7a59056 (patch) | |
| tree | 271cd5737e4b73e87fc429ffd9e15750e89186ca /multimedia/tunapie | |
| parent | 1cfb42b89944bb4bbf918631752f26bf1c17c58d (diff) | |
| download | freebsd-ports-gnome-f89ba36f223bc68850afa6afa6e08bd6d7a59056.tar.gz freebsd-ports-gnome-f89ba36f223bc68850afa6afa6e08bd6d7a59056.tar.zst freebsd-ports-gnome-f89ba36f223bc68850afa6afa6e08bd6d7a59056.zip | |
- Use a patch (provided by Authors) to fix working of Stop button
on FreeBSD
- Bump PORTREVISION
Diffstat (limited to 'multimedia/tunapie')
| -rw-r--r-- | multimedia/tunapie/Makefile | 1 | ||||
| -rw-r--r-- | multimedia/tunapie/files/patch-src-tuner.py | 46 |
2 files changed, 44 insertions, 3 deletions
diff --git a/multimedia/tunapie/Makefile b/multimedia/tunapie/Makefile index d9f4ff9b5d3e..69fac0e37ee5 100644 --- a/multimedia/tunapie/Makefile +++ b/multimedia/tunapie/Makefile @@ -7,6 +7,7 @@ PORTNAME= tunapie PORTVERSION= 1.4.1 +PORTREVISION= 1 CATEGORIES= multimedia audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/multimedia/tunapie/files/patch-src-tuner.py b/multimedia/tunapie/files/patch-src-tuner.py index 422e02b9b76f..88e2ccd12b24 100644 --- a/multimedia/tunapie/files/patch-src-tuner.py +++ b/multimedia/tunapie/files/patch-src-tuner.py @@ -1,6 +1,46 @@ ---- src/tuner.py Mon Apr 9 00:35:15 2007 -+++ src/tuner.py.port Mon Apr 9 16:33:50 2007 -@@ -290,7 +290,7 @@ +--- src/tuner.py Wed Apr 11 00:20:17 2007 ++++ src/tuner.py.port Tue Apr 17 14:57:55 2007 +@@ -14,7 +14,7 @@ + #along with this program; if not, write to the Free Software + #Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + # +-#Version 0.3.19 08/04/07 ++#Version 0.3.20 11/04/07 + + import urllib + import popen2 +@@ -29,9 +29,12 @@ + import time + + def pkill(program): ++ flag="" + rip = program + me = commands.getoutput("whoami") +- p = commands.getoutput("ps -u %s -o comm -o pid" % me) ++ if sys.platform.find("linux")==-1: ++ flag="-" ++ p = commands.getoutput("ps "+flag+"U "+me+" "+flag+"o pid "+flag+"o command") + ids = p.split("\n") + found=0 + firstrun=1 +@@ -44,10 +47,13 @@ + else: + found=1 + firstrun=0 +- regex = re.compile(r'(\d+).*',re.I) +- id = regex.sub(r'\1', id) ++ id=id.split(" ") ++ try: ++ id=str(int(id[0])) ++ except: ++ id=str(int(id[1])) + commands.getoutput("kill -15 %s" % id) +- if commands.getoutput("ps -u %s -o fname -o pid" % me).find(id) > -1: ++ if commands.getoutput("ps "+flag+"U "+me+" "+flag+"o pid "+flag+"o command").find(id) > -1: + commands.getoutput("kill -9 %s" % id) + return found + +@@ -290,7 +296,7 @@ popen2.Popen4(browser+' '+url) def adultset(): |