From mschout@gkg.net  Mon Sep 26 18:47:07 2005
Return-Path: <mschout@gkg.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B433416A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 26 Sep 2005 18:47:07 +0000 (GMT)
	(envelope-from mschout@gkg.net)
Received: from smtp-a.gkg.net (smtp.gkg.net [216.217.57.111])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E3D7843D82
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 26 Sep 2005 18:46:51 +0000 (GMT)
	(envelope-from mschout@gkg.net)
Received: from amavis.gkg.net (amavisd.gkg.net [216.217.56.20])
	by smtp-a.gkg.net (Postfix) with ESMTP id 7C76958306;
	Mon, 26 Sep 2005 13:46:50 -0500 (CDT)
Received: from mike.localdomain (proxy.gkg.net [216.217.56.220])
	by smtp-a.gkg.net (Postfix) with ESMTP id 7B5AF582B2;
	Mon, 26 Sep 2005 13:46:45 -0500 (CDT)
Received: (from mschout@localhost)
	by mike.localdomain (8.13.4/8.13.4/Submit) id j8QIktHc038273;
	Mon, 26 Sep 2005 13:46:55 -0500 (CDT)
	(envelope-from mschout)
Message-Id: <200509261846.j8QIktHc038273@mike.localdomain>
Date: Mon, 26 Sep 2005 13:46:55 -0500 (CDT)
From: Michael Schout <mschout@gkg.net>
Reply-To: Michael Schout <mschout@gkg.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: mschout@gkg.net
Subject: Update amarok port to 1.3.2
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         86610
>Category:       ports
>Synopsis:       Update amarok port to 1.3.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    mich
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 26 18:50:16 GMT 2005
>Closed-Date:    Tue Sep 27 09:41:17 GMT 2005
>Last-Modified:  Tue Sep 27 09:41:17 GMT 2005
>Originator:     Michael Schout <mschout@gkg.net>
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
<GKG.NET, Inc.>
>Environment:
System: FreeBSD mike.localdomain 5.4-STABLE FreeBSD 5.4-STABLE #2: Thu Sep 22 05:15:24 CDT 2005 mschout@mike.localdomain:/usr/obj/usr/src/sys/MYKERNEL5 i386
>Description:
    This updates the amarok port to version 1.3.2.  I tested that this builds with
    everything enabled except postgresql (because I dont have access to a pgsql db).
    package building works properly.  Install/uninstall works properly.  Amarok seems
    to be functioning normally.
>How-To-Repeat:
    n/a
>Fix:
    Apply the following patch to the amarok port.

diff -uNr amarok.orig/Makefile amarok/Makefile
--- amarok.orig/Makefile	Mon Sep 26 11:34:12 2005
+++ amarok/Makefile	Mon Sep 26 13:35:13 2005
@@ -5,8 +5,7 @@
 # $FreeBSD: ports/audio/amarok/Makefile,v 1.30 2005/09/21 18:36:49 arved Exp $
 
 PORTNAME=	amarok
-PORTVERSION=	1.3.1
-PORTREVISION=	1
+PORTVERSION=	1.3.2
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -98,15 +97,6 @@
 	@${REINPLACE_CMD} -e 's|xx||g' ${WRKSRC}/po/Makefile.in
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${TOUCH}
 
-pre-configure:
-	@${REINPLACE_CMD} -e 's|DbSetup|dbsetup|g' \
-		${WRKSRC}/amarok/src/Makefile.in
-	@${REINPLACE_CMD} -e 's|DbSetup.h|dbsetup.h|g' \
-		${WRKSRC}/amarok/src/configdialog.cpp \
-		${WRKSRC}/amarok/src/configdialog.h \
-		${WRKSRC}/amarok/src/Options7.ui \
-		${WRKSRC}/amarok/src/firstrunwizard.ui
-
 post-configure:
 .if defined(WITHOUT_XMMS)
 	@${REINPLACE_CMD} -e '/XMMS /d' ${WRKSRC}/config.h
@@ -116,8 +106,6 @@
 	@${REINPLACE_CMD} -e '/LIBVISUAL /d' ${WRKSRC}/config.h
 	@${REINPLACE_CMD} -e 's/libvisual//g' ${WRKSRC}/amarok/src/vis/Makefile
 .endif
-	@${MV} ${WRKSRC}/amarok/src/DbSetup.ui ${WRKSRC}/amarok/src/dbsetup.ui
-	@${MV} ${WRKSRC}/amarok/src/DbSetup.ui.h ${WRKSRC}/amarok/src/dbsetup.ui.h
 
 post-install:
 .if !defined(WITHOUT_LIBVISUAL)
diff -uNr amarok.orig/distinfo amarok/distinfo
--- amarok.orig/distinfo	Mon Sep 26 11:34:13 2005
+++ amarok/distinfo	Mon Sep 26 11:37:05 2005
@@ -1,2 +1,2 @@
-MD5 (amarok-1.3.1.tar.bz2) = 31f504e5fe985bbdb3c99f0e72d08fa1
-SIZE (amarok-1.3.1.tar.bz2) = 6806647
+MD5 (amarok-1.3.2.tar.bz2) = 5988bf5a1e6ac8da41e1a8710d75b6a8
+SIZE (amarok-1.3.2.tar.bz2) = 7646724
diff -uNr amarok.orig/pkg-plist amarok/pkg-plist
--- amarok.orig/pkg-plist	Mon Sep 26 11:34:13 2005
+++ amarok/pkg-plist	Mon Sep 26 12:50:55 2005
@@ -45,7 +45,6 @@
 share/apps/amarok/icons/crystalsvg/64x64/actions/dynamic.png
 share/apps/amarok/icons/crystalsvg/64x64/actions/random.png
 share/apps/amarok/icons/crystalsvg/64x64/actions/repeat_playlist.png
-share/apps/amarok/icons/crystalsvg/scalable/actions/collection.svg
 share/apps/amarok/icons/crystalsvg/scalable/actions/dynamic.svg
 share/apps/amarok/icons/crystalsvg/scalable/actions/player_playlist_2.svg
 share/apps/amarok/icons/hicolor/16x16/actions/collection.png
@@ -86,6 +85,9 @@
 share/apps/amarok/images/time_minus.png
 share/apps/amarok/images/time_plus.png
 share/apps/amarok/images/vol_speaker.png
+share/apps/amarok/images/volumeslider-gradient.png
+share/apps/amarok/images/volumeslider-handle.png
+share/apps/amarok/images/volumeslider-inset.png
 share/apps/amarok/images/wizard_compact.png
 share/apps/amarok/images/wizard_xmms.png
 share/apps/amarok/images/xine_logo.png
@@ -453,7 +455,6 @@
 share/locale/sr@Latn/LC_MESSAGES/amarok.mo
 share/locale/sv/LC_MESSAGES/amarok.mo
 share/locale/ta/LC_MESSAGES/amarok.mo
-share/locale/tg/LC_MESSAGES/amarok.mo
 share/locale/tr/LC_MESSAGES/amarok.mo
 share/locale/uk/LC_MESSAGES/amarok.mo
 share/locale/uz/LC_MESSAGES/amarok.mo
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->mich 
Responsible-Changed-By: mnag 
Responsible-Changed-When: Mon Sep 26 19:57:34 GMT 2005 
Responsible-Changed-Why:  
Over to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=86610 
State-Changed-From-To: open->closed 
State-Changed-By: mich 
State-Changed-When: Tue Sep 27 09:41:04 GMT 2005 
State-Changed-Why:  
Committed, thanks ! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=86610 
>Unformatted:
