From c0rn@o2.pl  Sun May 18 14:11:42 2008
Return-Path: <c0rn@o2.pl>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 07AC01065670;
	Sun, 18 May 2008 14:11:42 +0000 (UTC)
	(envelope-from c0rn@o2.pl)
Received: from poczta.o2.pl (mx12.go2.pl [193.17.41.142])
	by mx1.freebsd.org (Postfix) with ESMTP id 8D7448FC12;
	Sun, 18 May 2008 14:11:41 +0000 (UTC)
	(envelope-from c0rn@o2.pl)
Received: from poczta.o2.pl (mx12 [127.0.0.1])
	by poczta.o2.pl (Postfix) with ESMTP id 862AD104022;
	Sun, 18 May 2008 16:11:38 +0200 (CEST)
Received: from caprica.slowicza.org (ban210.neoplus.adsl.tpnet.pl [83.27.177.210])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by poczta.o2.pl (Postfix) with ESMTP;
	Sun, 18 May 2008 16:11:37 +0200 (CEST)
Message-Id: <1211119898.10392@caprica.slowicza.org>
Date: Sun, 18 May 2008 16:11:38 +0200
From: "Pawel Pekala" <c0rn@o2.pl>
To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@freebsd.org>
Cc: mich@freebsd.org
Subject: [PATCH] audio/amarok update to 1.4.9.1
X-Send-Pr-Version: gtk-send-pr 0.4.9 
X-GNATS-Notify:

>Number:         123794
>Category:       ports
>Synopsis:       [PATCH] audio/amarok update to 1.4.9.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    mich
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun May 18 14:20:00 UTC 2008
>Closed-Date:    Sun Jun 15 13:39:16 UTC 2008
>Last-Modified:  Sun Jun 15 13:40:03 UTC 2008
>Originator:     Pawel Pekala
>Release:        FreeBSD 6.2-RELEASE-p9 i386
>Organization:
>Environment:


System: FreeBSD 6.2-RELEASE-p9 #0: Thu Nov 29 04:07:33 UTC 2007
    root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC



>Description:


- update amarok to 1.4.9.1

This probably obsoletes:
http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/122753



>How-To-Repeat:





>Fix:


--- amarok.diff begins here ---
diff -u /usr/ports/audio/amarok/Makefile amarok/Makefile
--- /usr/ports/audio/amarok/Makefile	Tue Apr  1 17:50:14 2008
+++ amarok/Makefile	Thu May 15 15:29:13 2008
@@ -5,8 +5,7 @@
 # $FreeBSD: ports/audio/amarok/Makefile,v 1.82 2008/03/31 07:56:10 rafan Exp $
 
 PORTNAME=	amarok
-PORTVERSION=	1.4.8
-PORTREVISION=	3
+PORTVERSION=	1.4.9.1
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTNAME}/${PORTVERSION}/src
diff -u /usr/ports/audio/amarok/distinfo amarok/distinfo
--- /usr/ports/audio/amarok/distinfo	Thu Feb  7 15:56:31 2008
+++ amarok/distinfo	Thu May 15 15:31:17 2008
@@ -1,3 +1,3 @@
-MD5 (amarok-1.4.8.tar.bz2) = 7f65c4a8f3f0ff9042a5b5dd21b36cc8
-SHA256 (amarok-1.4.8.tar.bz2) = 12877e60dc5a362e37dc4c775cc809ce8e5a15c13211902f6a821f238a45aae5
-SIZE (amarok-1.4.8.tar.bz2) = 12699378
+MD5 (amarok-1.4.9.1.tar.bz2) = aa588778379a391ad3f4b3fc770217e4
+SHA256 (amarok-1.4.9.1.tar.bz2) = c4a02c3267cd5f3a9ff9efa066f1e0308c2cd903be2d5b24e3d9f75abdc1fa93
+SIZE (amarok-1.4.9.1.tar.bz2) = 12707926
Common subdirectories: /usr/ports/audio/amarok/files and amarok/files
diff -u /usr/ports/audio/amarok/pkg-plist amarok/pkg-plist
--- /usr/ports/audio/amarok/pkg-plist	Mon Sep 17 20:46:52 2007
+++ amarok/pkg-plist	Sun May 18 14:33:34 2008
@@ -666,6 +666,7 @@
 share/doc/HTML/es/amarok/browser_choice.png
 share/doc/HTML/es/amarok/buttons.png
 share/doc/HTML/es/amarok/collection.png
+share/doc/HTML/es/amarok/common
 share/doc/HTML/es/amarok/config.docbook
 share/doc/HTML/es/amarok/config_appearance.png
 share/doc/HTML/es/amarok/config_collection.png
@@ -683,6 +684,8 @@
 share/doc/HTML/es/amarok/equalizer.png
 share/doc/HTML/es/amarok/faq.docbook
 share/doc/HTML/es/amarok/file_browser.png
+share/doc/HTML/es/amarok/index.cache.bz2
+share/doc/HTML/es/amarok/index.docbook
 share/doc/HTML/es/amarok/logo.png
 share/doc/HTML/es/amarok/media_device.png
 share/doc/HTML/es/amarok/menubar.png
--- amarok.diff ends here ---



>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->mich 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun May 18 14:20:13 UTC 2008 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=123794 
State-Changed-From-To: open->feedback 
State-Changed-By: mich 
State-Changed-When: Wed Jun 11 20:25:49 UTC 2008 
State-Changed-Why:  
Please have look at your PR; 
=> Patch patch-amarok_src_lastfm.cpp failed to apply cleanly. 

Thanks 

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

From: =?ISO-8859-2?Q?Pawe=B3_P=EAkala?= <c0rn@o2.pl>
To: mich@FreeBSD.org, FreeBSD-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/123794: [PATCH] audio/amarok update to 1.4.9.1
Date: Fri, 13 Jun 2008 15:31:45 +0200

 --MP_/Vq0EBJh3ThSzGM2mmhQQ56p
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 Sorry, wrong diff flags...
 --MP_/Vq0EBJh3ThSzGM2mmhQQ56p
 Content-Type: text/x-patch; name=amarok-v2.diff
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment; filename=amarok-v2.diff
 
 diff -urN /usr/ports/audio/amarok/Makefile amarok/Makefile
 --- /usr/ports/audio/amarok/Makefile	Sun Jun  8 01:16:56 2008
 +++ amarok/Makefile	Thu Jun 12 13:41:27 2008
 @@ -5,8 +5,7 @@
  # $FreeBSD: ports/audio/amarok/Makefile,v 1.83 2008/06/06 13:06:23 edwin Exp $
  
  PORTNAME=	amarok
 -PORTVERSION=	1.4.8
 -PORTREVISION=	4
 +PORTVERSION=	1.4.9.1
  CATEGORIES=	audio kde
  MASTER_SITES=	${MASTER_SITE_KDE}
  MASTER_SITE_SUBDIR=	stable/${PORTNAME}/${PORTVERSION}/src
 diff -urN /usr/ports/audio/amarok/distinfo amarok/distinfo
 --- /usr/ports/audio/amarok/distinfo	Thu Feb  7 15:56:31 2008
 +++ amarok/distinfo	Thu May 15 15:31:17 2008
 @@ -1,3 +1,3 @@
 -MD5 (amarok-1.4.8.tar.bz2) = 7f65c4a8f3f0ff9042a5b5dd21b36cc8
 -SHA256 (amarok-1.4.8.tar.bz2) = 12877e60dc5a362e37dc4c775cc809ce8e5a15c13211902f6a821f238a45aae5
 -SIZE (amarok-1.4.8.tar.bz2) = 12699378
 +MD5 (amarok-1.4.9.1.tar.bz2) = aa588778379a391ad3f4b3fc770217e4
 +SHA256 (amarok-1.4.9.1.tar.bz2) = c4a02c3267cd5f3a9ff9efa066f1e0308c2cd903be2d5b24e3d9f75abdc1fa93
 +SIZE (amarok-1.4.9.1.tar.bz2) = 12707926
 diff -urN /usr/ports/audio/amarok/files/patch-amarok_src_lastfm.cpp amarok/files/patch-amarok_src_lastfm.cpp
 --- /usr/ports/audio/amarok/files/patch-amarok_src_lastfm.cpp	Mon Feb 12 20:55:03 2007
 +++ amarok/files/patch-amarok_src_lastfm.cpp	Thu Jan  1 01:00:00 1970
 @@ -1,14 +0,0 @@
 -
 -$FreeBSD: ports/audio/amarok/files/patch-amarok_src_lastfm.cpp,v 1.2 2007/02/12 17:02:44 mich Exp $
 -
 ---- amarok/src/lastfm.cpp.orig
 -+++ amarok/src/lastfm.cpp
 -@@ -905,7 +905,7 @@
 - 
 -     QCString md5pass = KMD5( KMD5( m_password.utf8() ).hexDigest() + currentTime ).hexDigest();
 - 
 --    QString token = QString( "user=%1&auth=%2&nonce=%3recipient=%4" )
 -+    token = QString( "user=%1&auth=%2&nonce=%3recipient=%4" )
 -                        .arg( QString( QUrl( currentUsername() ).encodedPathAndQuery() ) )
 -                        .arg( QString( QUrl( md5pass ).encodedPathAndQuery() ) )
 -                        .arg( QString( QUrl( challenge ).encodedPathAndQuery() ) )
 diff -urN /usr/ports/audio/amarok/files/patch-amarok_src_metadata_audible_Makefile.in amarok/files/patch-amarok_src_metadata_audible_Makefile.in
 --- /usr/ports/audio/amarok/files/patch-amarok_src_metadata_audible_Makefile.in	Sat Sep 23 19:09:27 2006
 +++ amarok/files/patch-amarok_src_metadata_audible_Makefile.in	Thu May 15 15:41:51 2008
 @@ -1,14 +1,11 @@
 -
 -$FreeBSD: ports/audio/amarok/files/patch-amarok_src_metadata_audible_Makefile.in,v 1.2 2006/09/07 10:33:34 mich Exp $
 -
 ---- amarok/src/metadata/audible/Makefile.in.orig
 -+++ amarok/src/metadata/audible/Makefile.in
 -@@ -435,7 +435,7 @@
 - xmms_cflags = @xmms_cflags@
 - xmms_libs = @xmms_libs@
 +--- amarok/src/metadata/audible/Makefile.in.orig	Thu Apr 10 22:17:11 2008
 ++++ amarok/src/metadata/audible/Makefile.in	Thu May 15 15:40:38 2008
 +@@ -407,7 +407,7 @@
 + xdg_directorydir = @xdg_directorydir@
 + xdg_menudir = @xdg_menudir@
   SUBDIRS = 
 --INCLUDES = $(all_includes) $(taglib_includes)
 -+INCLUDES = -I$(top_srcdir)/amarok/src $(all_includes) $(taglib_includes)
 +-INCLUDES = $(all_includes) $(TAGLIB_CFLAGS)
 ++INCLUDES = -I$(top_srcdir)/amarok/src $(all_includes) $(TAGLIB_CFLAGS)
   #>- METASOURCES = AUTO
   libtagaudible_la_LDFLAGS = $(all_libraries)
   noinst_LTLIBRARIES = libtagaudible.la
 diff -urN /usr/ports/audio/amarok/pkg-plist amarok/pkg-plist
 --- /usr/ports/audio/amarok/pkg-plist	Mon Sep 17 20:46:52 2007
 +++ amarok/pkg-plist	Sun May 18 14:33:34 2008
 @@ -666,6 +666,7 @@
  share/doc/HTML/es/amarok/browser_choice.png
  share/doc/HTML/es/amarok/buttons.png
  share/doc/HTML/es/amarok/collection.png
 +share/doc/HTML/es/amarok/common
  share/doc/HTML/es/amarok/config.docbook
  share/doc/HTML/es/amarok/config_appearance.png
  share/doc/HTML/es/amarok/config_collection.png
 @@ -683,6 +684,8 @@
  share/doc/HTML/es/amarok/equalizer.png
  share/doc/HTML/es/amarok/faq.docbook
  share/doc/HTML/es/amarok/file_browser.png
 +share/doc/HTML/es/amarok/index.cache.bz2
 +share/doc/HTML/es/amarok/index.docbook
  share/doc/HTML/es/amarok/logo.png
  share/doc/HTML/es/amarok/media_device.png
  share/doc/HTML/es/amarok/menubar.png
 
 --MP_/Vq0EBJh3ThSzGM2mmhQQ56p--
State-Changed-From-To: feedback->closed 
State-Changed-By: mich 
State-Changed-When: Sun Jun 15 13:38:55 UTC 2008 
State-Changed-Why:  
Committed, thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/123794: commit references a PR
Date: Sun, 15 Jun 2008 13:38:33 +0000 (UTC)

 mich        2008-06-15 13:38:29 UTC
 
   FreeBSD ports repository
 
   Modified files:
     audio/amarok         Makefile distinfo pkg-plist 
     audio/amarok/files   
                          patch-amarok_src_metadata_audible_Makefile.in 
   Removed files:
     audio/amarok/files   patch-amarok_src_lastfm.cpp 
   Log:
   - update to 1.4.9.1
   
   Submitted by:           "Pawel Pekala" <c0rn@o2.pl>
   PR:                     ports/123794
   
   Revision  Changes    Path
   1.84      +1 -2      ports/audio/amarok/Makefile
   1.23      +3 -3      ports/audio/amarok/distinfo
   1.3       +0 -14     ports/audio/amarok/files/patch-amarok_src_lastfm.cpp (dead)
   1.3       +7 -10     ports/audio/amarok/files/patch-amarok_src_metadata_audible_Makefile.in
   1.33      +3 -0      ports/audio/amarok/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:
