3 files changed, 35 insertions, 59 deletions

diff --git a/audio/waheela/Makefile b/audio/waheela/Makefile
index 08c3b94cbfe3..0365b62b1252 100644
--- a/audio/waheela/Makefile
+++ b/audio/waheela/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	waheela
-PORTVERSION=	0.2.2
-PORTREVISION=	1
+PORTVERSION=	0.3
 CATEGORIES=	audio kde
 MASTER_SITES=	http://linux.wuertz.org/dists/sid/main/source/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -19,10 +18,23 @@ RUN_DEPENDS=	amarok>=2:${PORTSDIR}/audio/amarok-kde4
 USE_CMAKE=	yes
 USE_KDE4=	automoc4 kdeprefix kdehier kdelibs
 USE_QT_VER=	4
-INSTALLS_ICONS=	yes
 QT_COMPONENTS=	gui dbus network svg xml \
 		qmake_build moc_build rcc_build uic_build
+MAKE_JOBS_SAFE=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
+ADD_NEWLINE_TO=	background.h \
+		dateTime.cpp \
+		dateTime.h \
+		metadata.cpp \
+		metadata.h \
+		playProgress.cpp \
+		playProgress.h
+
+post-patch:
+.for i in ${ADD_NEWLINE_TO}
+	${ECHO_CMD} >> ${WRKSRC}/src/widgets/${i}
+.endfor
+
 .include <bsd.port.mk>
diff --git a/audio/waheela/distinfo b/audio/waheela/distinfo
index 42759f6bc824..c8cbb5c45e8e 100644
--- a/audio/waheela/distinfo
+++ b/audio/waheela/distinfo
@@ -1,3 +1,3 @@
-MD5 (waheela_0.2.2.tar.gz) = c0b3b033e0ea0b8f6b6dea90f5003939
-SHA256 (waheela_0.2.2.tar.gz) = f4a0d8dc0f260064b09c11e5ce4549560430e9e095a0d753a6ee83d37c261f20
-SIZE (waheela_0.2.2.tar.gz) = 7109075
+MD5 (waheela_0.3.tar.gz) = 59862caa7e570ac60762f3022d60ad3e
+SHA256 (waheela_0.3.tar.gz) = c984ea3ef647172d96393b054d738966f26dc5147b109db28d2a1a950f9e2fd8
+SIZE (waheela_0.3.tar.gz) = 799802
diff --git a/audio/waheela/pkg-plist b/audio/waheela/pkg-plist
index 70a076db907a..35ebc88b814d 100644
--- a/audio/waheela/pkg-plist
+++ b/audio/waheela/pkg-plist
@@ -1,61 +1,25 @@
 bin/waheela
 share/applications/kde4/waheela.desktop
-share/apps/waheela/themes/Bubbles/background-wide.jpg
-share/apps/waheela/themes/Bubbles/background.jpg
-share/apps/waheela/themes/Bubbles/preview.jpg
-share/apps/waheela/themes/Bubbles/theme.config
-share/apps/waheela/themes/ColorWaves/background.jpg
-share/apps/waheela/themes/ColorWaves/preview.jpg
-share/apps/waheela/themes/ColorWaves/theme.config
-share/apps/waheela/themes/DreamingGirl/background-wide.jpg
-share/apps/waheela/themes/DreamingGirl/background.jpg
-share/apps/waheela/themes/DreamingGirl/preview.jpg
-share/apps/waheela/themes/DreamingGirl/theme.config
-share/apps/waheela/themes/FloralGlow/background.jpg
-share/apps/waheela/themes/FloralGlow/preview.jpg
-share/apps/waheela/themes/FloralGlow/theme.config
-share/apps/waheela/themes/HoneyComb/background-wide.jpg
-share/apps/waheela/themes/HoneyComb/background.jpg
-share/apps/waheela/themes/HoneyComb/preview.jpg
-share/apps/waheela/themes/HoneyComb/theme.config
-share/apps/waheela/themes/Kore/background.jpg
-share/apps/waheela/themes/Kore/preview.jpg
-share/apps/waheela/themes/Kore/theme.config
-share/apps/waheela/themes/LakePowell/background.jpg
-share/apps/waheela/themes/LakePowell/preview.jpg
-share/apps/waheela/themes/LakePowell/theme.config
-share/apps/waheela/themes/LandOfFreedom/background.jpg
-share/apps/waheela/themes/LandOfFreedom/preview.jpg
-share/apps/waheela/themes/LandOfFreedom/theme.config
-share/apps/waheela/themes/SunsetBliss/background.jpg
-share/apps/waheela/themes/SunsetBliss/preview.jpg
-share/apps/waheela/themes/SunsetBliss/theme.config
-share/apps/waheela/themes/TheSoundOfNature/background.jpg
-share/apps/waheela/themes/TheSoundOfNature/preview.jpg
-share/apps/waheela/themes/TheSoundOfNature/theme.config
-share/apps/waheela/themes/Tiles/background-wide.jpg
-share/apps/waheela/themes/Tiles/preview.jpg
-share/apps/waheela/themes/Tiles/theme.config
-share/apps/waheela/themes/VirtualWorld/background.jpg
-share/apps/waheela/themes/VirtualWorld/preview.jpg
-share/apps/waheela/themes/VirtualWorld/theme.config
+share/config/waheela/themes/Aghi.config
+share/config/waheela/themes/Air.config
+share/config/waheela/themes/Atra_Dot.config
+share/config/waheela/themes/Code_Poets_Dream.config
+share/config/waheela/themes/Curls_on_Green.config
+share/config/waheela/themes/EOS.config
+share/config/waheela/themes/Evening.config
+share/config/waheela/themes/Fields_of_Peace.config
+share/config/waheela/themes/Finally_Summer_in_Germany.config
+share/config/waheela/themes/Fresh_Morning.config
+share/config/waheela/themes/Plasmalicious.config
+share/config/waheela/themes/Red_Leaf.config
+share/config/waheela/themes/Spring_Sunray.config
+share/config/waheela/themes/The_Rings_of_Saturn.config
+share/config/waheela/themes/There_is_Rain_on_the_Table.config
 share/icons/hicolor/128x128/apps/waheela.png
 share/icons/hicolor/16x16/apps/waheela.png
 share/icons/hicolor/22x22/apps/waheela.png
 share/icons/hicolor/32x32/apps/waheela.png
 share/icons/hicolor/48x48/apps/waheela.png
 share/icons/hicolor/64x64/apps/waheela.png
-@dirrm share/apps/waheela/themes/VirtualWorld
-@dirrm share/apps/waheela/themes/Tiles
-@dirrm share/apps/waheela/themes/TheSoundOfNature
-@dirrm share/apps/waheela/themes/SunsetBliss
-@dirrm share/apps/waheela/themes/LandOfFreedom
-@dirrm share/apps/waheela/themes/LakePowell
-@dirrm share/apps/waheela/themes/Kore
-@dirrm share/apps/waheela/themes/HoneyComb
-@dirrm share/apps/waheela/themes/FloralGlow
-@dirrm share/apps/waheela/themes/DreamingGirl
-@dirrm share/apps/waheela/themes/ColorWaves
-@dirrm share/apps/waheela/themes/Bubbles
-@dirrm share/apps/waheela/themes
-@dirrm share/apps/waheela
+@dirrm share/config/waheela/themes
+@dirrm share/config/waheela