diff options
| author | Nicola Vitale <nivit@FreeBSD.org> | 2007-04-19 20:20:08 +0000 |
|---|---|---|
| committer | Nicola Vitale <nivit@FreeBSD.org> | 2007-04-19 20:20:08 +0000 |
| commit | e85c7a8487b33e972d1f2ff30b635a16c67ca1cf (patch) | |
| tree | 1538da0860a437b5cf6130bef0b9a07b878a5ebd /multimedia/tunapie | |
| parent | e0cce1991bcf3804770ba02f211b066066ae23f8 (diff) | |
| download | ports-e85c7a8487b33e972d1f2ff30b635a16c67ca1cf.tar.gz ports-e85c7a8487b33e972d1f2ff30b635a16c67ca1cf.zip | |
Notes
Diffstat (limited to 'multimedia/tunapie')
| -rw-r--r-- | multimedia/tunapie/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/tunapie/distinfo | 6 | ||||
| -rw-r--r-- | multimedia/tunapie/files/patch-install.sh | 1 | ||||
| -rw-r--r-- | multimedia/tunapie/files/patch-src-tuner.py | 47 |
4 files changed, 10 insertions, 48 deletions
diff --git a/multimedia/tunapie/Makefile b/multimedia/tunapie/Makefile index 69fac0e37ee5..103cfcd87118 100644 --- a/multimedia/tunapie/Makefile +++ b/multimedia/tunapie/Makefile @@ -6,8 +6,8 @@ # PORTNAME= tunapie -PORTVERSION= 1.4.1 -PORTREVISION= 1 +PORTVERSION= 1.4.2 +#PORTREVISION= 0 CATEGORIES= multimedia audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/multimedia/tunapie/distinfo b/multimedia/tunapie/distinfo index 6dbf9b799b26..480bee431de9 100644 --- a/multimedia/tunapie/distinfo +++ b/multimedia/tunapie/distinfo @@ -1,3 +1,3 @@ -MD5 (tunapie-1.4.1.tar.gz) = 99a0b7c77a43782a381de4fb14c17596 -SHA256 (tunapie-1.4.1.tar.gz) = 3eff5dd91ec171a6e2895abae83024a4abfe3c104fb412b801878ab3e559dbb9 -SIZE (tunapie-1.4.1.tar.gz) = 40644 +MD5 (tunapie-1.4.2.tar.gz) = 0a5e344269ab3ef26ba56fa4c44fe7af +SHA256 (tunapie-1.4.2.tar.gz) = c3dab8b884eaf9874fde2dcaf79e1d3a084535f777bebe55e47b19b7e82e0b60 +SIZE (tunapie-1.4.2.tar.gz) = 40782 diff --git a/multimedia/tunapie/files/patch-install.sh b/multimedia/tunapie/files/patch-install.sh index a4c47b10f8f8..bee75c71cb39 100644 --- a/multimedia/tunapie/files/patch-install.sh +++ b/multimedia/tunapie/files/patch-install.sh @@ -1,3 +1,4 @@ +$FreeBSD$ --- install.sh Tue Apr 10 23:54:02 2007 +++ install.sh.port Wed Apr 11 09:15:43 2007 @@ -1,14 +1,12 @@ diff --git a/multimedia/tunapie/files/patch-src-tuner.py b/multimedia/tunapie/files/patch-src-tuner.py index 88e2ccd12b24..6b61a85c7a1a 100644 --- a/multimedia/tunapie/files/patch-src-tuner.py +++ b/multimedia/tunapie/files/patch-src-tuner.py @@ -1,46 +1,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 @@ +$FreeBSD$ +--- src/tuner.py Sun Apr 15 13:04:12 2007 ++++ src/tuner.py.port Wed Apr 18 23:23:51 2007 +@@ -296,7 +296,7 @@ popen2.Popen4(browser+' '+url) def adultset(): |