From jr@opal.com  Mon Apr 19 19:16:17 2010
Return-Path: <jr@opal.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 83ACD1065670
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 19 Apr 2010 19:16:17 +0000 (UTC)
	(envelope-from jr@opal.com)
Received: from smtp.vzavenue.net (smtp.vzavenue.net [66.171.59.140])
	by mx1.freebsd.org (Postfix) with ESMTP id 3BD728FC1C
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 19 Apr 2010 19:16:16 +0000 (UTC)
Received: from 153.78.171.66.subscriber.vzavenue.net (HELO homobox.opal.com) ([66.171.78.153])
  by smtp.vzavenue.net with ESMTP; 19 Apr 2010 15:16:15 -0400
Received: from opal.com (localhost [IPv6:::1])
	by homobox.opal.com (8.14.3/8.14.3) with ESMTP id o3JJGDoI090391
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 19 Apr 2010 15:16:13 -0400 (EDT)
	(envelope-from jr@opal.com)
Received: from homobox.opal.com ([127.0.0.1] helo=homobox.opal.com) with
	IPv4:25 by opal.com; 19 Apr 2010 15:16:13 -0400
Received: (from jr@localhost)
	by homobox.opal.com (8.14.3/8.14.3/Submit) id o3JJGDmb090390;
	Mon, 19 Apr 2010 15:16:13 -0400 (EDT)
	(envelope-from jr)
Message-Id: <201004191916.o3JJGDmb090390@homobox.opal.com>
Date: Mon, 19 Apr 2010 15:16:13 -0400 (EDT)
From: "J.R. Oldroyd" <fbsd@opal.com>
Reply-To: "J.R. Oldroyd" <fbsd@opal.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: update port: multimedia/freevo to 1.9.0_3
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         145859
>Category:       ports
>Synopsis:       update port: multimedia/freevo to 1.9.0_3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    jacula
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Apr 19 19:20:03 UTC 2010
>Closed-Date:    Mon May 31 21:39:56 UTC 2010
>Last-Modified:  Mon May 31 21:40:03 UTC 2010
>Originator:     J.R. Oldroyd
>Release:        FreeBSD 7.2-STABLE i386
>Organization:
>Environment:
System: FreeBSD xx.opal.com 7.2-STABLE FreeBSD 7.2-STABLE #2: Tue May 19 15:48:23 EDT 2009 xx@xx.opal.com:/usr/obj/usr/src/sys/XX i386
>Description:
Update adds two patches to avoid run-time errors on FreeBSD.  Patches also sent upstream.
Update also tidys up the NLS support someone else added in a previous update.
>How-To-Repeat:
n/a
>Fix:
diff -ruN /usr/ports/multimedia/freevo/Makefile multimedia/freevo/Makefile
--- /usr/ports/multimedia/freevo/Makefile	2010-03-28 02:40:39.000000000 -0400
+++ multimedia/freevo/Makefile	2010-04-19 13:53:09.000000000 -0400
@@ -7,7 +7,7 @@
 
 PORTNAME=	freevo
 PORTVERSION=	1.9.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/Freevo%20releases/${PORTVERSION}
 
@@ -62,9 +62,8 @@
 
 post-patch:
 .if defined(WITHOUT_NLS)
-	@${REINPLACE_CMD} -e  '451d' ${WRKSRC}/${PORTNAME}
+	@${REINPLACE_CMD} -e 's| freevo_locale| # freevo_locale|' ${WRKSRC}/${PORTNAME}
 .endif
-
 	@${REINPLACE_CMD} -e 's|/etc/freevo|${PREFIX}/etc/freevo|' ${WRKSRC}/freevo_config.py
 	@${REINPLACE_CMD} -e 's|/etc/freevo|${PREFIX}/etc/freevo|' ${WRKSRC}/local_conf.py.example
 
diff -ruN /usr/ports/multimedia/freevo/files/patch-src-helpers-recordserver.py multimedia/freevo/files/patch-src-helpers-recordserver.py
--- /usr/ports/multimedia/freevo/files/patch-src-helpers-recordserver.py	1969-12-31 19:00:00.000000000 -0500
+++ multimedia/freevo/files/patch-src-helpers-recordserver.py	2010-04-09 08:08:03.000000000 -0400
@@ -0,0 +1,15 @@
+--- src/helpers/recordserver.py.orig	2009-05-23 08:51:25.000000000 -0400
++++ src/helpers/recordserver.py	2010-04-09 07:53:38.000000000 -0400
+@@ -503,10 +503,11 @@
+                 thisprog = progs[proglist[i]]
+                 nextprog = progs[proglist[i+1]]
+                 if thisprog.stop > nextprog.start:
+-                    conflictRating = conflictRating+1
+                     if thisprog == prog:
++                        conflictRating = conflictRating+1
+                         conflicts.append(nextprog)
+                     elif nextprog == prog:
++                        conflictRating = conflictRating+1
+                         conflicts.append(thisprog)
+             self.removeRecordingFromSchedule(prog, myScheduledRecordings)
+             return (conflictRating, conflicts)
diff -ruN /usr/ports/multimedia/freevo/files/patch-src-www-htdocs-favorites.rpy multimedia/freevo/files/patch-src-www-htdocs-favorites.rpy
--- /usr/ports/multimedia/freevo/files/patch-src-www-htdocs-favorites.rpy	1969-12-31 19:00:00.000000000 -0500
+++ multimedia/freevo/files/patch-src-www-htdocs-favorites.rpy	2010-02-19 11:05:05.000000000 -0500
@@ -0,0 +1,14 @@
+--- src/www/htdocs/favorites.rpy.orig	2009-02-19 12:59:44.000000000 -0500
++++ src/www/htdocs/favorites.rpy	2010-02-19 11:03:40.000000000 -0500
+@@ -115,9 +115,9 @@
+         fv.tableRowClose()
+ 
+         def sortByPriority(a,b):
+-            if (a.priority < b.priority):
++            if (int(a.priority) < int(b.priority)):
+                 return -1
+-            elif (a.priority > b.priority):
++            elif (int(a.priority) > int(b.priority)):
+                 return 1
+             else:
+                 return 0
diff -ruN /usr/ports/multimedia/freevo/pkg-plist multimedia/freevo/pkg-plist
--- /usr/ports/multimedia/freevo/pkg-plist	2009-06-01 15:56:31.000000000 -0400
+++ multimedia/freevo/pkg-plist	2010-04-19 12:51:55.000000000 -0400
@@ -2342,8 +2342,8 @@
 %%NLS%%share/locale/sv/LC_MESSAGES/freevo.po
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/freevo.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/freevo.po
-@dirrm %%NLS%%share/locale/nn_NO/LC_MESSAGES
-@dirrm %%NLS%%share/locale/nn_NO
+%%NLS%%@dirrm share/locale/nn_NO/LC_MESSAGES
+%%NLS%%@dirrm share/locale/nn_NO
 @dirrmtry etc/freevo
 @dirrm %%PYTHON_SITELIBDIR%%/freevo/animation
 @dirrm %%PYTHON_SITELIBDIR%%/freevo/audio/plugins
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->jacula 
Responsible-Changed-By: pgj 
Responsible-Changed-When: Sun Apr 25 23:44:53 UTC 2010 
Responsible-Changed-Why:  
Over to Jacula. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=145859 
State-Changed-From-To: open->feedback 
State-Changed-By: jacula 
State-Changed-When: Wed May 26 15:52:20 UTC 2010 
State-Changed-Why:  
Plist failed. Awaiting maintainer's feedback. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=145859 
State-Changed-From-To: feedback->closed 
State-Changed-By: jacula 
State-Changed-When: Mon May 31 21:39:55 UTC 2010 
State-Changed-Why:  
The patch has been committed with minor modifications. Thank you for 
your submission! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=145859 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/145859: commit references a PR
Date: Mon, 31 May 2010 21:39:16 +0000 (UTC)

 jacula      2010-05-31 21:38:16 UTC
 
   FreeBSD ports repository
 
   Modified files:
     multimedia/freevo    Makefile pkg-plist 
   Added files:
     multimedia/freevo/files patch-src-helpers-recordserver.py 
                             patch-src-www-htdocs-favorites.rpy 
   Log:
   - Update freevo to 1.9.0_3
   
   PR:                ports/145859
   Submitted by:      J.R. Oldroyd <fbsd@opal.com>
   Approved by:       tabthorpe
   
   Revision  Changes    Path
   1.23      +3 -2      ports/multimedia/freevo/Makefile
   1.1       +15 -0     ports/multimedia/freevo/files/patch-src-helpers-recordserver.py (new)
   1.1       +14 -0     ports/multimedia/freevo/files/patch-src-www-htdocs-favorites.rpy (new)
   1.8       +2 -2      ports/multimedia/freevo/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
