- update to version 1.4.8

- fix few portlint warnings

Submitted by:		Pawel Pekala <c0rn@o2.pl>
PR:			ports/120225

6 files changed, 22 insertions, 36 deletions

diff --git a/audio/amarok-kde4/Makefile b/audio/amarok-kde4/Makefile
index 50009a9a9f60..3dc5e1a83bbe 100644
--- a/audio/amarok-kde4/Makefile
+++ b/audio/amarok-kde4/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	amarok
-PORTVERSION=	1.4.7
-PORTREVISION=	1
+PORTVERSION=	1.4.8
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTNAME}/${PORTVERSION}/src
@@ -25,9 +24,11 @@ USE_BZIP2=	yes
 USE_KDEBASE_VER=3
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
+USE_GETTEXT=	yes
 USE_SDL=	sdl
 USE_RUBY=	yes
 USE_LDCONFIG=	yes
+INSTALLS_ICONS=	yes
 
 OPTIONS=	GPOD "iPod support" on \
 		NJB "Creative Nomad and Dell support" on \
@@ -94,7 +95,7 @@ EXTRA_PATCHES=	${PATCHDIR}/hide-main-menu-bar-feature.patch
 
 .if defined(DEBUG)
 CONFIGURE_ARGS+=--enable-debug=full
-STRIP=          # none
+STRIP=		# none
 .endif
 
 pre-extract:	check-options-version
diff --git a/audio/amarok-kde4/distinfo b/audio/amarok-kde4/distinfo
index dfc694e0c3cd..6e6091f226b2 100644
--- a/audio/amarok-kde4/distinfo
+++ b/audio/amarok-kde4/distinfo
@@ -1,3 +1,3 @@
-MD5 (amarok-1.4.7.tar.bz2) = f1299e142da8a69bc3cff5d585e38d43
-SHA256 (amarok-1.4.7.tar.bz2) = 7ef2691d0cda238696e021421052a04b3cfb068ea0d9854e0c617b33216340f8
-SIZE (amarok-1.4.7.tar.bz2) = 12723499
+MD5 (amarok-1.4.8.tar.bz2) = 7f65c4a8f3f0ff9042a5b5dd21b36cc8
+SHA256 (amarok-1.4.8.tar.bz2) = 12877e60dc5a362e37dc4c775cc809ce8e5a15c13211902f6a821f238a45aae5
+SIZE (amarok-1.4.8.tar.bz2) = 12699378
diff --git a/audio/amarok-kde4/files/patch-amarok_src_metadata_mp4_mp4file.cpp b/audio/amarok-kde4/files/patch-amarok_src_metadata_mp4_mp4file.cpp
index 181d18e156a0..eb0f8af114cc 100644
--- a/audio/amarok-kde4/files/patch-amarok_src_metadata_mp4_mp4file.cpp
+++ b/audio/amarok-kde4/files/patch-amarok_src_metadata_mp4_mp4file.cpp
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- amarok/src/metadata/mp4/mp4file.cpp.orig
-+++ amarok/src/metadata/mp4/mp4file.cpp
+--- amarok/src/metadata/mp4/mp4file.cpp.orig	Mon Dec 17 16:53:19 2007
++++ amarok/src/metadata/mp4/mp4file.cpp	Thu Jan 31 23:14:42 2008
 @@ -27,9 +27,8 @@
  
  #include "mp4tag.h"
@@ -14,15 +11,10 @@ $FreeBSD$
  
  #define MP4V2_HAS_WRITE_BUG 1
  
-@@ -156,10 +155,8 @@
-     }
+@@ -157,6 +156,7 @@
  #endif
  
--    if(!MP4Close(handle))
--    {
--        fprintf(stderr, "close failed\n");
--    }
-+    MP4Close(handle);
+     MP4Close(handle);
 +    handle=NULL;
  
      mp4file = MP4Read(name());
diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index 50009a9a9f60..3dc5e1a83bbe 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	amarok
-PORTVERSION=	1.4.7
-PORTREVISION=	1
+PORTVERSION=	1.4.8
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTNAME}/${PORTVERSION}/src
@@ -25,9 +24,11 @@ USE_BZIP2=	yes
 USE_KDEBASE_VER=3
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
+USE_GETTEXT=	yes
 USE_SDL=	sdl
 USE_RUBY=	yes
 USE_LDCONFIG=	yes
+INSTALLS_ICONS=	yes
 
 OPTIONS=	GPOD "iPod support" on \
 		NJB "Creative Nomad and Dell support" on \
@@ -94,7 +95,7 @@ EXTRA_PATCHES=	${PATCHDIR}/hide-main-menu-bar-feature.patch
 
 .if defined(DEBUG)
 CONFIGURE_ARGS+=--enable-debug=full
-STRIP=          # none
+STRIP=		# none
 .endif
 
 pre-extract:	check-options-version
diff --git a/audio/amarok/distinfo b/audio/amarok/distinfo
index dfc694e0c3cd..6e6091f226b2 100644
--- a/audio/amarok/distinfo
+++ b/audio/amarok/distinfo
@@ -1,3 +1,3 @@
-MD5 (amarok-1.4.7.tar.bz2) = f1299e142da8a69bc3cff5d585e38d43
-SHA256 (amarok-1.4.7.tar.bz2) = 7ef2691d0cda238696e021421052a04b3cfb068ea0d9854e0c617b33216340f8
-SIZE (amarok-1.4.7.tar.bz2) = 12723499
+MD5 (amarok-1.4.8.tar.bz2) = 7f65c4a8f3f0ff9042a5b5dd21b36cc8
+SHA256 (amarok-1.4.8.tar.bz2) = 12877e60dc5a362e37dc4c775cc809ce8e5a15c13211902f6a821f238a45aae5
+SIZE (amarok-1.4.8.tar.bz2) = 12699378
diff --git a/audio/amarok/files/patch-amarok_src_metadata_mp4_mp4file.cpp b/audio/amarok/files/patch-amarok_src_metadata_mp4_mp4file.cpp
index 181d18e156a0..eb0f8af114cc 100644
--- a/audio/amarok/files/patch-amarok_src_metadata_mp4_mp4file.cpp
+++ b/audio/amarok/files/patch-amarok_src_metadata_mp4_mp4file.cpp
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- amarok/src/metadata/mp4/mp4file.cpp.orig
-+++ amarok/src/metadata/mp4/mp4file.cpp
+--- amarok/src/metadata/mp4/mp4file.cpp.orig	Mon Dec 17 16:53:19 2007
++++ amarok/src/metadata/mp4/mp4file.cpp	Thu Jan 31 23:14:42 2008
 @@ -27,9 +27,8 @@
  
  #include "mp4tag.h"
@@ -14,15 +11,10 @@ $FreeBSD$
  
  #define MP4V2_HAS_WRITE_BUG 1
  
-@@ -156,10 +155,8 @@
-     }
+@@ -157,6 +156,7 @@
  #endif
  
--    if(!MP4Close(handle))
--    {
--        fprintf(stderr, "close failed\n");
--    }
-+    MP4Close(handle);
+     MP4Close(handle);
 +    handle=NULL;
  
      mp4file = MP4Read(name());