From nobody@FreeBSD.org  Wed Aug 24 20:11:58 2011
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8BEF2106564A
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 24 Aug 2011 20:11:58 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 708608FC0C
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 24 Aug 2011 20:11:58 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p7OKBvfO028195
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 24 Aug 2011 20:11:57 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p7OKBvcE028194;
	Wed, 24 Aug 2011 20:11:57 GMT
	(envelope-from nobody)
Message-Id: <201108242011.p7OKBvcE028194@red.freebsd.org>
Date: Wed, 24 Aug 2011 20:11:57 GMT
From: Ruslan Mahmatkhanov <cvs-src@yandex.ru>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [MAINTAINER] multimedia/gpodder: update to 2.18
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         160155
>Category:       ports
>Synopsis:       [MAINTAINER] multimedia/gpodder: update to 2.18
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 24 20:20:09 UTC 2011
>Closed-Date:    Fri Aug 26 03:29:05 UTC 2011
>Last-Modified:  Fri Aug 26 03:30:09 UTC 2011
>Originator:     Ruslan Mahmatkhanov
>Release:        9.0-BETA1
>Organization:
>Environment:
9.0-BETA1 i386
>Description:
- update to 2.18
- bump USE_PYTHON to 2.5+
- remove dependency on databases/py-pysqlite23, keep py-sqlite3
- conditionally depend on simplejson, since we have json module in python 2.6+
- whitespace fix 

tinderbuild logs:
7.4: http://happy-nation.by.ru/ports/tb/7.4/gpodder-2.18.log
8.2: http://happy-nation.by.ru/ports/tb/8.2/gpodder-2.18.log
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruNa gpodder.orig/Makefile gpodder/Makefile
--- gpodder.orig/Makefile	2011-07-14 17:18:39.000000000 +0400
+++ gpodder/Makefile	2011-08-24 22:43:01.000000000 +0400
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gpodder
-PORTVERSION=	2.16
+PORTVERSION=	2.18
 CATEGORIES=	multimedia
 MASTER_SITES=	BERLIOS \
 		http://thp.io/2010/mygpoclient/:mygpoclient \
@@ -22,15 +22,13 @@
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pysqlite>=2.3:${PORTSDIR}/databases/py-pysqlite23 \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \
 		${PYTHON_PKGNAMEPREFIX}dbus>=0:${PORTSDIR}/devel/py-dbus \
 		${PYTHON_PKGNAMEPREFIX}notify>=0:${PORTSDIR}/devel/py-notify \
 		xdg-open:${PORTSDIR}/devel/xdg-utils \
 		wget:${PORTSDIR}/ftp/wget \
 		gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme \
-		${PYTHON_PKGNAMEPREFIX}feedparser>=0:${PORTSDIR}/textproc/py-feedparser \
-		${PYTHON_PKGNAMEPREFIX}simplejson>=0:${PORTSDIR}/devel/py-simplejson
+		${PYTHON_PKGNAMEPREFIX}feedparser>=0:${PORTSDIR}/textproc/py-feedparser
 
 OPTIONS=	COVERART "Cover Art syncing support" off \
 		IPOD "iPod synchronization support" off \
@@ -38,13 +36,13 @@
 		OGG2MP3 "Ogg Vorbis conversion to MP3 support" off \
 		SHOWNOTES "HTML episode shownotes support" off
 
-USE_PYTHON=	yes
+USE_PYTHON=	2.5+
 USE_GNOME=	pygtk2
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 ALL_TARGET=	messages
 INSTALLS_ICONS=	yes
-INSTALLS_EGGINFO=yes
+INSTALLS_EGGINFO=	yes
 
 MAN1=		gpo.1 ${PORTNAME}.1 ${PORTNAME}-backup.1
 
@@ -53,6 +51,10 @@
 
 .include <bsd.port.pre.mk>
 
+.if ${PYTHON_REL} < 260
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}simplejson>=2.0.9:${PORTSDIR}/devel/py-simplejson
+.endif
+
 .if defined(WITH_COVERART)
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}imaging>=0:${PORTSDIR}/graphics/py-imaging
 .endif
diff -ruNa gpodder.orig/distinfo gpodder/distinfo
--- gpodder.orig/distinfo	2011-07-14 17:18:39.000000000 +0400
+++ gpodder/distinfo	2011-08-24 22:39:13.000000000 +0400
@@ -1,4 +1,4 @@
-SHA256 (gpodder-2.16.tar.gz) = 32624336d9f699d69011bfd92dcf279379dd2571b4ed893940d226dbd54cdb80
-SIZE (gpodder-2.16.tar.gz) = 1070010
+SHA256 (gpodder-2.18.tar.gz) = 5de7810403bb58f995e65caa2db094fc5a3b3285e4fb5c6d0c36d05c350ac974
+SIZE (gpodder-2.18.tar.gz) = 1024236
 SHA256 (mygpoclient-1.5.tar.gz) = bd3f31fa082965e3005cf725a09444bcc77600de355e1ee795e7af53fcae568b
 SIZE (mygpoclient-1.5.tar.gz) = 30719


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Fri Aug 26 03:28:59 UTC 2011 
State-Changed-Why:  
Comminted 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/160155: commit references a PR
Date: Fri, 26 Aug 2011 03:29:05 +0000 (UTC)

 miwi        2011-08-26 03:28:56 UTC
 
   FreeBSD ports repository
 
   Modified files:
     multimedia/gpodder   Makefile distinfo 
   Log:
   - Update to 2.18
   - Bump USE_PYTHON to 2.5+
   - Remove dependency on databases/py-pysqlite23, keep py-sqlite3
   - Conditionally depend on simplejson, since we have json module in python 2.6+
   - Whitespace fix
   
   PR:             160155
   Submitted by:   Ruslan Mahmatkhanov <cvs-src@yandex.ru>
   
   Revision  Changes    Path
   1.48      +9 -7      ports/multimedia/gpodder/Makefile
   1.29      +2 -2      ports/multimedia/gpodder/distinfo
 _______________________________________________
 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:
