6 files changed, 12 insertions, 34 deletions

diff --git a/audio/amarok-kde4/Makefile b/audio/amarok-kde4/Makefile
index 21b861eb5d86..4cf9fde5814d 100644
--- a/audio/amarok-kde4/Makefile
+++ b/audio/amarok-kde4/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 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 @@ post-patch:
 	@${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 @@ post-configure:
 	@${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 --git a/audio/amarok-kde4/distinfo b/audio/amarok-kde4/distinfo
index 2df4dca98918..fe76f5d3a6ee 100644
--- a/audio/amarok-kde4/distinfo
+++ b/audio/amarok-kde4/distinfo
@@ -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 --git a/audio/amarok-kde4/pkg-plist b/audio/amarok-kde4/pkg-plist
index d3e276494003..080d70225755 100644
--- a/audio/amarok-kde4/pkg-plist
+++ b/audio/amarok-kde4/pkg-plist
@@ -45,7 +45,6 @@ share/apps/amarok/icons/crystalsvg/22x22/actions/repeat_playlist.png
 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/splash_screen.png
 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/LC_MESSAGES/amarok.mo
 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
diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index 21b861eb5d86..4cf9fde5814d 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 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 @@ post-patch:
 	@${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 @@ post-configure:
 	@${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 --git a/audio/amarok/distinfo b/audio/amarok/distinfo
index 2df4dca98918..fe76f5d3a6ee 100644
--- a/audio/amarok/distinfo
+++ b/audio/amarok/distinfo
@@ -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 --git a/audio/amarok/pkg-plist b/audio/amarok/pkg-plist
index d3e276494003..080d70225755 100644
--- a/audio/amarok/pkg-plist
+++ b/audio/amarok/pkg-plist
@@ -45,7 +45,6 @@ share/apps/amarok/icons/crystalsvg/22x22/actions/repeat_playlist.png
 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/splash_screen.png
 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/LC_MESSAGES/amarok.mo
 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